diff --git a/.gitignore b/.gitignore index 9b65f79e02..f064a2bfb3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ expected/ .vscode/launch.json /tools/star-rod /ver/current +/ver/*/assets # Build artifacts build.ninja @@ -27,7 +28,9 @@ build.ninja *.zip baserom.* build/ -assets/ +!tools/build +/assets/jp +/assets/us /docs/doxygen/ /include/ld_addrs.h /include/message_ids.h diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f878bddd1d..e72e35e509 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,11 +33,11 @@ Decide on a function to match. These can be found in the subdirectories of `ver/ Take the relevant `.s` file and pass it to [mips_to_c](https://github.com/matt-kempster/mips_to_c) ([online version](https://simonsoftware.se/other/mips_to_c.py)). -Open up the `.c` file that uses your function and replace the function's `INCLUDE_ASM` macro with the output from mips_to_c. For example, for a function `asm/nonmatchings/code_FOO/func_DEADBEEF`: +Open up the `.c` file that uses your function and replace the function's `INCLUDE_ASM` macro with the output from mips_to_c. For example, for a function `asm/nonmatchings/FOO/func_DEADBEEF`: ```diff - // src/code_FOO.c -- INCLUDE_ASM("code_FOO", func_DEADBEEF); + // src/FOO.c +- INCLUDE_ASM("FOO", func_DEADBEEF); + s32 func_DEADBEEF() { + // ... + } diff --git a/configure.py b/configure.py deleted file mode 100755 index 9a23ac3473..0000000000 --- a/configure.py +++ /dev/null @@ -1,597 +0,0 @@ -#!/usr/bin/env python3 - -import re -import os, sys -from glob import glob -import ninja_syntax -from argparse import ArgumentParser -import asyncio -from subprocess import PIPE -import subprocess - -sys.path.append(os.path.dirname(__file__) + "/tools/splat") -import split -from segtypes.n64.code import Subsegment - -INCLUDE_ASM_RE = re.compile(r"___INCLUDE_ASM\([^,]+, ([^,]+), ([^,)]+)") # note _ prefix -SUPPORTED_VERSIONS = ["us", "jp"] -TARGET = "papermario" - -def obj(path: str): - if not path.startswith("ver/"): - path = f"ver/{version}/build/{path}" - path = re.sub(r"/assets/", "/build/", path) # XXX what about other asset dirs? - return path + ".o" - -def read_splat(splat_config: str, version: str): - import argparse - import yaml - from segtypes.n64.code import N64SegCode - from util import options - - # Load config - with open(splat_config) as f: - config = yaml.safe_load(f.read()) - - options.initialize(config) - assert options.get("ld_o_replace_extension", True) == False - - # Initialize segments - all_segments = split.initialize_segments(splat_config, config["segments"]) - - objects = set() - segments = {} - - for segment in all_segments: - for subdir, path, obj_type, start in segment.get_ld_files(): - # src workaround - if subdir.startswith("../../"): - subdir = subdir[6:] - if path.endswith(".c") or path.endswith(".s") or path.endswith(".data") or path.endswith(".rodata"): - path = subdir + "/" + path - else: - assert subdir == "assets", subdir + " " + path - subdir = "ver/" + version + "/assets" - - objects.add(path) - segments[path] = segment - - if isinstance(segment, N64SegCode): - for split_file in segment.subsegments: - if split_file.type in ["i4", "i8", "ia4", "ia8", "ia16", "rgba16", "rgba32", "ci4", "ci8", "palette"]: - path = os.path.join( - #segment.get_subdir(split_file["subtype"]), - split_file.name + "." + split_file.get_ext() - ) - - if path in segments: - segments[path] = split_file - - # note: `objects` lacks .o extensions - return objects, segments - -def rm_recursive(path): - from pathlib import Path - - path = Path(path) - - if path.exists(): - if path.is_dir(): - for f in path.iterdir(): - rm_recursive(f) - - path.rmdir() - else: - path.unlink() - -async def shell(cmd: str): - async with task_sem: - proc = await asyncio.create_subprocess_shell(cmd, stdout=PIPE, stderr=PIPE) - stdout, stderr = await proc.communicate() - - assert proc.returncode == 0, f"{cmd} failed: {stderr}" - - return stdout.decode("utf-8"), stderr.decode("utf-8") - -async def shell_status(cmd: str): - async with task_sem: - proc = await asyncio.create_subprocess_shell(cmd, stdout=PIPE, stderr=PIPE) - stdout, stderr = await proc.communicate() - - return proc.returncode - -def build_yay0_file(bin_file: str): - yay0_file = f"ver/{version}/build/{os.path.splitext(bin_file)[0]}.Yay0" - n.build(yay0_file, "yay0compress", find_asset(bin_file), implicit="tools/Yay0compress") - build_bin_object(yay0_file) - -def build_bin_object(bin_file: str): - n.build(obj(bin_file), "bin", bin_file) - -def build_image(f: str, segment): - path, img_type, png = f.rsplit(".", 2) - out = f"ver/{version}/build/" + path + "." + img_type + ".png" - - flags = "" - if img_type != "palette" and not isinstance(segment, dict): - if segment.flip_horizontal: - flags += "--flip-x" - if segment.flip_vertical: - flags += "--flip-y" - - n.build(out, "img", find_asset(path + ".png"), implicit="tools/img/build.py", variables={ - "img_type": img_type, - "img_flags": flags, - }) - build_bin_object(out) - -def cmd_exists(cmd): - return subprocess.call("type " + cmd, shell=True, - stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0 - -def find_asset_dir(path): - global ASSET_DIRS - for d in ASSET_DIRS: - if os.path.exists(d + "/" + path): - return d - - print("Unable to find asset: " + path) - print("The asset dump may be incomplete. Try:") - print(" ./configure.py --clean") - exit(1) - -def find_asset(path): - return find_asset_dir(path) + "/" + path - -async def main(): - global n, cpp, task_sem, num_tasks, num_tasks_done, ASSET_DIRS, version - - task_sem = asyncio.Semaphore(8) - - parser = ArgumentParser(description="Paper Mario build.ninja generator") - parser.add_argument("version", nargs="*", default=[], help="Version(s) to configure for. Most tools will operate on the first-provided only. Supported versions: " + ','.join(SUPPORTED_VERSIONS)) - parser.add_argument("--cpp", help="GNU C preprocessor command") - parser.add_argument("--cflags", default="", help="Extra cc/cpp flags") - parser.add_argument("--no-splat", action="store_true", help="Don't split assets from the baserom(s)") - parser.add_argument("--clean", action="store_true", help="Delete assets and previously-built files") - parser.add_argument("--depend-on-s", action="store_true", help="Configure dependencies on .s files for c files that include them") - args = parser.parse_args() - versions = args.version - - # default version behaviour is to only do those that exist - if len(versions) == 0: - for version in SUPPORTED_VERSIONS: - rom = f"ver/{version}/baserom.z64" - if os.path.exists(rom): - versions.append(version) - - if len(versions) == 0: - print("error: no baserom.z64 files could be found in the ver/*/ directories.") - exit(1) - - print("Configuring for versions: " + ', '.join(versions)) - print("") - - # on macOS, /usr/bin/cpp defaults to clang rather than gcc (but we need gcc's) - if args.cpp is None and sys.platform == "darwin" and "Free Software Foundation" not in (await shell("cpp --version"))[0]: - print("error: system C preprocessor is not GNU!") - print("This is a known issue on macOS - only clang's cpp is installed by default.") - print("Use 'brew' to obtain GNU cpp, then run this script again with the --cpp option, e.g.") - print(" ./configure.py --cpp cpp-10") - exit(1) - - cpp = args.cpp or "cpp" - - if args.clean: - print("Cleaning...") - await shell("ninja -t clean") - rm_recursive(f".splat_cache") - - for version in versions: - rm_recursive(f"ver/{version}/assets") - rm_recursive(f"ver/{version}/build") - rm_recursive(f"ver/{version}/.splat_cache") - - if not args.no_splat: - # compile splat dependencies - await shell("make -C tools/splat") - - has_any_rom = False - for version in versions: - rom = f"ver/{version}/baserom.z64" - has_rom = False - - try: - with open(rom, "rb") as f: - has_rom = True - has_any_rom = True - except IOError: - print(f"error: could not find baserom file '{rom}'!") - if len(versions) >= 2: - print(f"You can avoid building version '{version}' by specifying versions on the command-line:") - print(f" ./configure.py {' '.join(ver for ver in versions if ver != version)}") - exit(1) - - if has_rom: - print(f"Splitting assets from {rom}", end="") - split.main( - f"ver/{version}/splat.yaml", - f"ver/{version}", - rom, - [ "ld", "bin", "Yay0", "PaperMarioMapFS", "PaperMarioMessages", "img", "PaperMarioNpcSprites" ], - False, - False, - ) - print("") - - print("Configuring build...") - - n = ninja_syntax.Writer(open("build.ninja", "w"), width=120) - - cflags = " " + args.cflags - iconv = "tools/iconv.py UTF-8 SHIFT-JIS" if sys.platform == "darwin" else "iconv --from UTF-8 --to SHIFT-JIS" - cross = "mips-linux-gnu-" - - n.variable("target", TARGET) - n.variable("cross", cross) - n.variable("python", sys.executable) - - if sys.platform == "darwin": - os_dir = "mac" - elif sys.platform == "linux": - if os.uname()[4] == "aarch64": - os_dir = "arm" - else: - os_dir = "linux" - else: - print(f"Unsupported platform {sys.platform}") - sys.exit(1) - - # $version - n.rule("cc", - command=f"bash -o pipefail -c '{cpp} -Iver/$version/build/include -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -D VERSION=$version -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 {args.cflags} -MD -MF $out.d $in -o - | {iconv} | tools/{os_dir}/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow {args.cflags} -o - | tools/{os_dir}/mips-nintendo-nu64-as -EB -G 0 - -o $out'", - description="cc $in", - depfile="$out.d", - deps="gcc") - n.rule("cc_dsl", - command=f"bash -o pipefail -c '{cpp} -Iver/$version/build/include -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -D VERSION=$version -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 {args.cflags} -MD -MF $out.d $in -o - | $python tools/compile_dsl_macros.py | {iconv} | tools/{os_dir}/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow {args.cflags} -o - | tools/{os_dir}/mips-nintendo-nu64-as -EB -G 0 - -o $out'", - description="dsl $in", - depfile="$out.d", - deps="gcc") - n.newline() - - with open("tools/permuter_settings.toml", "w") as f: - version = versions[0] - f.write(f"compiler_command = \"{cpp} -Iver/{version}/build/include -Iinclude -Isrc -DPERMUTER -D _LANGUAGE_C -D _FINALROM -D VERSION={version} -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 {args.cflags} -D SCRIPT(...)={{}} | {iconv} | tools/{os_dir}/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow {args.cflags} -o - | tools/{os_dir}/mips-nintendo-nu64-as -EB -G 0 -\"\n") - f.write(f"assembler_command = \"{cross}as -march=vr4300 -mabi=32\"\n") - f.write("\n") - f.write("[preserve_macros]\n") - f.write("\"g[DS]P.*\" = \"void\"\n") - - # $version - n.rule("cpp", - command=f"{cpp} -P -DBUILD_DIR=ver/$version/build $in -o $out", - description="cpp $in", - depfile="$out.d", - deps="gcc") - n.newline() - - n.rule("yay0compress", - command=f"tools/Yay0compress $in $out", - description="compress $in") - n.newline() - - n.rule("bin", - command="${cross}ld -r -b binary $in -o $out", - description="bin $in") - n.newline() - - n.rule("as", - command="${cross}as -EB -march=vr4300 -mtune=vr4300 -Iinclude $in -o $out", - description="assemble $in") - n.newline() - - # $img_type, $img_flags - n.rule("img", - command="$python tools/img/build.py $img_type $in $out $img_flags", - description="image $in") - n.rule("img_header", - command="$python tools/img/header.py $in $out", - description="image_header $in") - n.newline() - - # $sprite_id, $sprite_dir, $sprite_name - n.rule("sprite_animations_h", - command="$python tools/gen_sprite_animations_h.py $out $sprite_dir $sprite_id", - description="sprite_animations_h $sprite_name ($sprite_id)") - n.rule("npc_sprite", - command="$python tools/compile_npc_sprite.py $out $sprite_dir", - description="npc_sprite $sprite_name ($sprite_id)") - n.rule("npc_sprites", - command="$python tools/compile_npc_sprites.py $out $in", - description="package npc sprites") - n.newline() - - n.rule("ld_addrs_h", - command="grep -E \"[^\. ]+ =\" $in -o | sed 's/^/extern void* /; s/ =/;/' > $out", - description="ld_addrs_h $in") - n.newline() - - n.rule("msg_combine", - command="$python tools/msg/combine.py $out $in", - description="combine messages") - n.rule("msg", - command="$python tools/msg/parse_compile.py $in $out", - description="msg $in") - n.newline() - - n.rule("assets", - command="$python tools/build_assets_bin.py $out $in", - description="combine assets") - n.newline() - - # $version - n.rule("link", - command="${cross}ld -T ver/$version/undefined_syms.txt -T ver/$version/undefined_syms_auto.txt -T ver/$version/undefined_funcs_auto.txt -T ver/$version/dead_syms.txt -Map ver/$version/build/$target.map --no-check-sections -T $in -o $out", - description="link $out") - n.newline() - - n.rule("rom", - command="${cross}objcopy $in $out -O binary && tools/n64crc $out", - description="rom $in") - n.newline() - - # $version - n.rule("checksum", - command=f"sha1sum -c ver/$version/checksum.sha1 && touch $out", - description="compare") - n.newline() - - n.rule("cc_modern_exe", command="cc $in -O3 -o $out") - n.newline() - - for version in versions: - objects, segments = read_splat(f"ver/{version}/splat.yaml", version) # no .o extensions! - #c_files = (f for f in objects if f.endswith(".c")) - - n.build(f"ver/{version}/build/$target.ld", "cpp", f"ver/{version}/$target.ld", variables={ "version": version }) - n.build(f"ver/{version}/build/$target.elf", "link", f"ver/{version}/build/$target.ld", implicit=[obj(o) for o in objects], implicit_outputs=f"ver/{version}/$target.map", variables={ "version": version }) - n.build(f"ver/{version}/build/$target.z64", "rom", f"ver/{version}/build/$target.elf", implicit="tools/n64crc") - n.build(f"ver/{version}/build/ok", "checksum", implicit=f"ver/{version}/build/$target.z64", variables={ "version": version }) - n.build(version, "phony", f"ver/{version}/build/ok") - n.build(f"$target.{version}.z64", "phony", f"ver/{version}/build/$target.z64") - - CFG = {} - with open(f"ver/{version}/build.cfg", "r") as f: - for line in f.readlines(): - if line.strip() != "": - key, value = [part.strip() for part in line.split("=", 1)] - CFG[key] = value - - ASSET_DIRS = CFG.get("asset_dirs", "assets").split(" ") - - NPC_SPRITES = CFG.get("npc_sprites", "").split(" ") - MAPS = CFG.get("maps", "").split(" ") - TEXTURE_ARCHIVES = CFG.get("texture_archives", "").split(" ") - BACKGROUNDS = CFG.get("backgrounds", "").split(" ") - PARTY_IMAGES = CFG.get("party_images", "").split(" ") - - ASSETS = sum([[f"{map_name}_shape", f"{map_name}_hit"] for map_name in MAPS], []) + TEXTURE_ARCHIVES + BACKGROUNDS + ["title_data"] + PARTY_IMAGES - - generated_headers = [] - - def add_generated_header(h: str): - generated_headers.append(h) - - if not os.path.exists(h): - # mkdir -p - os.makedirs(os.path.dirname(h), exist_ok=True) - - # touch it so cpp doesn't complain if its #included - open(h, "w").close() - - # mark it as really old so ninja builds it - os.utime(h, (0, 0)) - - return h - - n.build(add_generated_header(f"ver/{version}/build/include/ld_addrs.h"), "ld_addrs_h", f"ver/{version}/build/$target.ld") - - # messages - msg_files = set() - for d in ASSET_DIRS: - for f in glob(d + "/msg/**/*.msg", recursive=True): - msg_files.add(find_asset(f[len(d)+1:])) - msg_files = list(msg_files) - for msg_file in msg_files: - n.build( - f"ver/{version}/build/{msg_file.split('/', 1)[1]}.bin", - "msg", - msg_file, - implicit="tools/msg/parse_compile.py", - ) - msg_bins = [f"ver/{version}/build/{msg_file.split('/', 1)[1]}.bin" for msg_file in msg_files] - n.build( - [f"ver/{version}/build/msg.bin", add_generated_header(f"ver/{version}/build/include/message_ids.h")], - "msg_combine", - msg_bins, - implicit="tools/msg/combine.py", - ) - n.build(f"ver/{version}/build/msg.o", "bin", f"ver/{version}/build/msg.bin") - - # sprites - npc_sprite_yay0s = [] - for sprite_id, sprite_name in enumerate(NPC_SPRITES, 1): - if len(sprite_name) == 0 or sprite_name == "_": - continue - - asset_dir = find_asset_dir(f"sprite/npc/{sprite_name}") - sources = glob(f"{asset_dir}/sprite/npc/{sprite_name}/**/*.*", recursive=True) - variables = { - "sprite_name": sprite_name, - "sprite_dir": f"{asset_dir}/sprite/npc/{sprite_name}", - "sprite_id": sprite_id, - } - - # generated header - n.build( - add_generated_header(f"ver/{version}/build/include/sprite/npc/{sprite_name}.h"), - "sprite_animations_h", - implicit=sources + ["tools/gen_sprite_animations_h.py"], - variables=variables, - ) - - # sprite bin/yay0 - n.build( - f"ver/{version}/build/sprite/npc/{sprite_name}", - "npc_sprite", - implicit=sources + ["tools/compile_npc_sprite.py"], - variables=variables, - ) - yay0 = f"ver/{version}/build/sprite/npc/{sprite_name}.Yay0" - npc_sprite_yay0s.append(yay0) - n.build( - yay0, - "yay0compress", - f"ver/{version}/build/sprite/npc/{sprite_name}", - implicit=["tools/Yay0compress"], - ) - - n.newline() - - # fast tasks - for f in objects: - segment = segments[f] - - if f.endswith(".c"): - continue # these are handled later - elif f.endswith(".Yay0"): - build_yay0_file(os.path.splitext(f)[0] + ".bin") - elif f.endswith(".bin"): - build_bin_object(find_asset(f)) - elif f.endswith(".data"): - n.build(obj(f), "as", f"ver/{version}/asm/" + f + ".s") - elif f.endswith(".rodata"): - n.build(obj(f), "as", f"ver/{version}/asm/" + f[2:] + ".s") - elif f.endswith(".s"): - n.build(obj(f), "as", f"ver/{version}/" + f) - elif f.endswith(".png"): - if isinstance(segment, Subsegment): - # image within a code section - out = f"ver/{version}/build/{f}.bin" - infile = find_asset(re.sub(r"\.pal\.png", ".png", f)) - - n.build(out, "img", infile, implicit="tools/img/build.py", variables={ - "img_type": segment.type, - "img_flags": "", - }) - - if ".pal.png" not in f: - n.build(add_generated_header(f"ver/{version}/build/include/" + f + ".h"), "img_header", infile, implicit="tools/img/header.py") - - n.build(f"ver/{version}/build/{f}.o", "bin", out) - else: - build_image(f, segment) - elif f == "sprite/npc": - # combine sprites - n.build(f"ver/{version}/build/{f}.bin", "npc_sprites", npc_sprite_yay0s, implicit="tools/compile_npc_sprites.py") - n.build(obj(f), "bin", f"ver/{version}/build/{f}.bin") - elif segment.type == "PaperMarioMessages": - continue # done already above - elif segment.type == "PaperMarioMapFS": - asset_files = [] # even indexes: uncompressed; odd indexes: compressed - - for asset_name in ASSETS: - if asset_name.endswith("_tex"): # uncompressed - asset_files.append(find_asset(f"map/{asset_name}.bin")) - asset_files.append(find_asset(f"map/{asset_name}.bin")) - elif asset_name.startswith("party_"): - source_file = f"ver/{version}/build/{asset_name}.bin" - asset_file = f"ver/{version}/build/{asset_name}.Yay0" - - n.build(source_file, "img", find_asset(f"party/{asset_name}.png"), implicit="tools/img/build.py", variables={ - "img_type": "party", - "img_flags": "", - }) - - asset_files.append(source_file) - asset_files.append(asset_file) - n.build(asset_file, "yay0compress", source_file, implicit="tools/Yay0compress") - elif asset_name.endswith("_bg"): - source_file = f"ver/{version}/build/{asset_name}.bin" - asset_file = f"ver/{version}/build/{asset_name}.Yay0" - - n.build(source_file, "img", find_asset(f"map/{asset_name}.png"), implicit="tools/img/build.py", variables={ - "img_type": "bg", - "img_flags": "", - }) - - asset_files.append(source_file) - asset_files.append(asset_file) - n.build(asset_file, "yay0compress", source_file, implicit="tools/Yay0compress") - elif asset_name.endswith("_shape") or asset_name.endswith("_hit"): - source_file = find_asset(f"map/{asset_name}.bin") - asset_file = f"ver/{version}/build/assets/{asset_name}.Yay0" - - asset_files.append(source_file) - asset_files.append(asset_file) - n.build(asset_file, "yay0compress", source_file, implicit="tools/Yay0compress") - else: - source_file = find_asset(f"{asset_name}.bin") - asset_file = f"ver/{version}/build/assets/{asset_name}.Yay0" - - asset_files.append(source_file) - asset_files.append(asset_file) - n.build(asset_file, "yay0compress", source_file, implicit="tools/Yay0compress") - - n.build(f"ver/{version}/build/assets.bin", "assets", asset_files) - n.build(obj(f), "bin", f"ver/{version}/build/assets.bin") - else: - print("warning: dont know what to do with object " + f) - n.newline() - - n.build("generated_headers_" + version, "phony", generated_headers) - n.newline() - - for c_file in glob("src/**/*.c", recursive=True): - if c_file.endswith(".inc.c"): - continue - - status = await shell_status(f"grep -q SCRIPT\( {c_file}") - - for version in versions: - s_glob = "ver/" + version + "/" + re.sub("src/", "asm/nonmatchings/", c_file)[:-2] + "/*.s" - n.build( - obj(c_file), - "cc_dsl" if status == 0 else "cc", - c_file, - implicit = None if not args.depend_on_s else glob(s_glob), - order_only="generated_headers_" + version, - variables={ "version": version } - ) - - print("") - - # c tools that need to be compiled - n.build("tools/Yay0compress", "cc_modern_exe", "tools/Yay0compress.c") - n.build("tools/n64crc", "cc_modern_exe", "tools/n64crc.c") - n.newline() - - n.build("all", "phony", versions) - n.default("all") - - # update ver/current to versions[0] - try: - os.remove("ver/current") - except Exception: - pass - os.symlink(versions[0], "ver/current") - n.build("ver/current/build/papermario.z64", "phony", "ver/" + versions[0] + "/build/papermario.z64") - - print("Build configuration complete! Now run") - print(" ninja") - print("to compile " + ', '.join(f'\'{TARGET}.{version}.z64\'' for version in versions) + ".") - -if __name__ == "__main__": - loop = asyncio.get_event_loop() - loop.run_until_complete(main()) diff --git a/configure.py b/configure.py new file mode 120000 index 0000000000..fc3870c53f --- /dev/null +++ b/configure.py @@ -0,0 +1 @@ +tools/build/configure.py \ No newline at end of file diff --git a/docs/message-colors.jpg b/docs/message-colors.jpg deleted file mode 100644 index 65f3ab8190..0000000000 Binary files a/docs/message-colors.jpg and /dev/null differ diff --git a/docs/messages.md b/docs/messages.md deleted file mode 100644 index 11c8e01da8..0000000000 --- a/docs/messages.md +++ /dev/null @@ -1,214 +0,0 @@ -# `.msg` syntax - -## Character Set - -`[font=normal]`: 𝅘𝅥𝅮!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[¥]^_`abcdefghijklmnopqrstuvwxyz{|}~°ÀÁÂÄÇÈÉÊËÌÍÎÏÑÒÓÔÖÙÚÛÜßàáâäçèéêëìíîïñòóôöùúûü¡¿ª♥★↑↓←→●✖“”‘’ ⒶⒷⓈ▲▼◀▶ⓁⓇⓏ - -`[font=title]` and `[font=subtitle]`: ABCDEFGHIJKLMNOPQRSTUVWXYZ'.,0123456789©& - -## Tags - -Similar to BBCode, tags begin with `[` and end with `]`. They may take positional arguments (`value`) and named arguments (`arg=value`). The order of named arguments does not matter. Values are parsed as integers if possible, and hexidecimal integers are supported. Tag names and argument names are case-insensitive. - -To write a literal `[` character (and not start a tag), prefix it with a backslash; i.e. `\[`. - -### `[message name section= index=]...[/message]` - -Marks the beginning and end of a message. - -All parameters on the opening tag are optional. -If `section` and/or `index` are omitted, the message will be allocated a section and/or index respectively. - -### `[br]` -Line break. - -### `[prompt]` -Waits for the A button to be pressed before continuing. - -### `[next]` -Scrolls down the message box to begin a new 'paragraph.' - -### `[sleep n]` -Waits for `n` frames before continuing. - -### `[color= ctx=]` - -Supported color names are: - -`ctx=normal` (default): normal red pink purple blue cyan green yellow - -`ctx=diary`: normal red - -`ctx=inspect`: dark - -`ctx=button`: blue green red yellow gray grey - -`ctx=popup`: normal red pink purple blue teal green yellow - -`ctx=sign`: normal red blue green - -To use other colors, provide `color` as an integer (e.g. `[color=0x10]`). Here are all the colors supported by the engine: -![Message colors](message-colors.jpg) - -### `[/color]` -Resets the color to what it was before the most recent `[color=]` tag. The default color at the start of the message is assumed to be `[color=normal]`, which is true for most messages. - -### `[a]` `[b]` `[l]` `[r]` `[z]` `[start]` `[c-up]` `[c-down]` `[c-left]` `[c-right]` - -Shorthand for the button prompt characters ⒶⒷⓁⓇⓏⓈ▲▼◀▶ respectively. You can override the color used with a named parameter `[a color=]`. - -Supported color names: blue green red yellow gray grey - -### `[style=]` - -Sets the box style to use for this message. Supported styles are: - -`[style=right]` `[style=left]` `[style=center]` - Standard speech bubble with the speaker coming from the given direction - -`[style=tattle]` - Small bubble used for overworld tattles - -`[style=choice x= y= w= h=]` - Box for multiple-choice options - -`[style=inspect]` - Internal narration box, often used when inspecting objects by pressing A - -`[style=sign]` `[style=lamppost]` `[style=postcard]` - Boxes with custom backgrounds - -`[style=popup]` - Box in center of screen that grows dynamically depending on how long the message is - -`[style=upgrade x= y= w= h=]` - Super Block box - -`[style=narrate]` - Narration; used when you obtain new partners - -`[style=epilogue]` - Used for post-chapter descriptions of what Mario and party did - -### `[font=]` - -Supported fonts: normal title subtitle - -Note that the `title` and `subtitle` fonts use a different character set to `normal`. - -### `[/font]` - -Resets the font to what it was before the most recent `[font=]` tag. - -### `[noskip]...[/noskip]` - -Disables the B button from skipping text within. - -### `[instant]...[/instant]` - -Causes all text within to appear instantly. - -### `[kerning=]` - -Modifies the spacing between letters. - -### `[scroll n]` - -Scrolls down `n` lines. - -### `[size x= y=]` - -Changes font size. - -### `[/size]` - -Resets the size back to x=10 y=10 (the default). - -### `[speed delay= chars=]` - -Changes text printing speed. `delay` is the number of frames between each print, and `chars` is the number of characters to print at once. For example, `[speed delay=5 chars=3]` would print 3 characters every 5 frames. - -### `[pos x= y=]` - -Overrides the current text printing position. - -`x` is optional. If only `y` is provided, the x position will not change. - -### `[indent n]` - -Indents the following text by `n` tabs. - -### `[up n]` and `[down n]` - -Moves the text printing position up/down by `n` pixels respectively. - -### `[image id]` - -Displays the given image. This requires extra setup when printing the message. - -There is also a 7-parameter variant of `image` that is not yet understood. - -### `[sprite unknown id raster]` - -Displays the given sprite. - -### `[item a b]` - -Displays the given world icon. - -### `[cursor n]` and `[option n]` - -Denotes the position for the hand cursor to appear and the start of the option text for choice `n` of a `[style=choice]` box. - -### `[choicecount=]` - -Sets the number of options given in this `[style=choice]` box. - -### `[cancel=]` - -Sets the option number to be selected if the user presses B. -If this is not provided, pressing B does nothing. - -### Effects - -- `[shaky]...[/shaky]` -- `[noise fade=]...[/noise]` -- `[faded-shaky fade=]...[/faded-shaky]` -- `[fade=]...[/fade]` -- `[shout]...[/shout]` or `[shrinking]...[/shrinking]` -- `[whisper]...[/whisper]` or `[growing]...[/growing]` -- `[scream]...[/scream]` or `[shaky-size]...[/shaky-size]` -- `[chortle]...[/chortle]` or `[wavy-size]...[/wavy-size]` -- `[shadow]...[/shadow]` - -### `[var n]` - -Replaced with the value of message variable `n`. Must be set before the message is printed. - -### `[center=]` - -Centers the following text. Parameter purpose is unknown. - -### `[volume=]` - -Changes the volume of the following text. - -### `[sound=]` - -Changes the speech sound for the following text. - -Supported sound names: normal bowser spirit - -You can also use an integer for the parameter. - -### `[/sound]` - -Resets the speech sound to what it was before the most recent `[sound=]` tag. - -### `[note]` `[heart]` `[star]` `[circle]` `[cross]` `[arrow-up]` `[arrow-down]` `[arrow-left]` `[arrow-right]` - -Equivalent to the characters 𝅘𝅥𝅮♥★●✖↑↓←→ respectively. - -### `[raw ...]` - -Outputs all arguments provided as bytes, without modification. - -### `[func ...]` - -Same as `raw`, but prefixed with 0xFF. - -## Comments - -`//` line comments are allowed anywhere outside of a `[message]...[/message]` block and will be ignored. -Block comments are not supported. diff --git a/include/common_structs.h b/include/common_structs.h index 4dd155bbda..a895a45d34 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -1704,7 +1704,7 @@ typedef struct struct802E2BA4 { /* 0x02 */ u16 unk_02[24][2]; } struct802E2BA4; -// from code_102c80, size unknown. +// from 102c80, size unknown. typedef struct struct802E1400 { /* 0x000 */ Vec3f unk_00; /* 0x00C */ char unk_0C[4]; @@ -1734,7 +1734,7 @@ typedef struct struct802E1400 { /* 0x188 */ f32 unk_188[24]; } struct802E1400; -// from code_104940_len_dc0, size unknown +// from 104940_len_dc0, size unknown // appears to belong to the hammer blocks(?) typedef struct struct802E3650 { /* 0x000 */ u8 unk_00; diff --git a/include/enums.h b/include/enums.h index 428aa03041..59fe2084aa 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1541,6 +1541,7 @@ enum NpcFlags { NPC_FLAG_200000 = 0x00200000, NPC_FLAG_400000 = 0x00400000, NPC_FLAG_NO_DROPS = 0x00800000, ///< Do not drop hearts, flowers, or coins on defeat + NPC_FLAG_SIMPLE_XZ_HITBOX = 0x04000000, ///< Perform only a single lateral collision test during motion. NPC_FLAG_40000000 = 0x40000000, NPC_FLAG_80000000 = 0x80000000, }; diff --git a/include/macros.h b/include/macros.h index d38bdd4089..11548e7335 100644 --- a/include/macros.h +++ b/include/macros.h @@ -30,7 +30,6 @@ #define OVERRIDE_FLAG_UNSET(flag) { s32* overrideFlags = &gOverrideFlags; *overrideFlags &= ~flag; } #define OVERRIDE_FLAG_CHECK(flag) ({ s32* overrideFlags = &gOverrideFlags; *overrideFlags & flag; }) - #define MAX_MAPVARS 16 #define MAX_MAPFLAGS 3 diff --git a/include/types.h b/include/types.h index 4bd31d098e..5be34c38f1 100644 --- a/include/types.h +++ b/include/types.h @@ -10,6 +10,9 @@ #define UNK_FUN_PTR(name) void(*name)(void) #define UNK_ARGS +/// Linker symbol address, as in `ld_addrs.h`. +typedef u8 Addr[]; + typedef s32 BattleID; #define BATTLE_ID(unk, area, stage, index) ((unk << 24) + (area << 16) + (stage << 8) + index) diff --git a/papermario.jp.z64 b/papermario.jp.z64 deleted file mode 120000 index cac000b0eb..0000000000 --- a/papermario.jp.z64 +++ /dev/null @@ -1 +0,0 @@ -ver/jp/papermario.z64 \ No newline at end of file diff --git a/papermario.us.z64 b/papermario.us.z64 deleted file mode 120000 index 474104e95f..0000000000 --- a/papermario.us.z64 +++ /dev/null @@ -1 +0,0 @@ -ver/us/build/papermario.z64 \ No newline at end of file diff --git a/src/101b90_len_8f0.c b/src/101b90_len_8f0.c new file mode 100644 index 0000000000..445ad2114a --- /dev/null +++ b/src/101b90_len_8f0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "101b90_len_8f0", func_802DEAA0); + +INCLUDE_ASM(s32, "101b90_len_8f0", load_sprite); + +INCLUDE_ASM(s32, "101b90_len_8f0", func_802DED60); + +INCLUDE_ASM(s32, "101b90_len_8f0", func_802DEEA0); + +INCLUDE_ASM(s32, "101b90_len_8f0", func_802DEFB4); + +INCLUDE_ASM(s32, "101b90_len_8f0", func_802DF00C); + +INCLUDE_ASM(s32, "101b90_len_8f0", func_802DF2D8); diff --git a/src/code_102610_len_2330.c b/src/102610_len_2330.c similarity index 97% rename from src/code_102610_len_2330.c rename to src/102610_len_2330.c index b2ca988661..d14388a438 100644 --- a/src/code_102610_len_2330.c +++ b/src/102610_len_2330.c @@ -14,7 +14,7 @@ s32 func_802E0DB0(Shadow* shadow) { return FALSE; } -INCLUDE_ASM(s32, "code_102610_len_2330", func_802E0DE0); +INCLUDE_ASM(s32, "102610_len_2330", func_802E0DE0); typedef struct struct802E10F4 { char unk_0[4]; diff --git a/src/code_102C80.c b/src/102C80.c similarity index 98% rename from src/code_102C80.c rename to src/102C80.c index 0a262f9363..4c11860b39 100644 --- a/src/code_102C80.c +++ b/src/102C80.c @@ -310,7 +310,7 @@ s32 func_802E17A8(Entity* entity) { } } #else -INCLUDE_ASM(s32, "code_102C80", func_802E17A8, Entity* entity); +INCLUDE_ASM(s32, "102C80", func_802E17A8, Entity* entity); #endif void func_802E1EA8(Entity* entity) { @@ -461,7 +461,7 @@ void func_802E1EDC(Entity* entity) { } } #else -INCLUDE_ASM(void, "code_102C80", func_802E1EDC, Entity* entity); +INCLUDE_ASM(void, "102C80", func_802E1EDC, Entity* entity); #endif void func_802E234C(Entity* entity) { @@ -513,9 +513,9 @@ void func_802E2450(Entity* entity) { } -INCLUDE_ASM(void, "code_102C80", func_802E246C, Entity* entity, void* arg1, void* arg2); +INCLUDE_ASM(void, "102C80", func_802E246C, Entity* entity, void* arg1, void* arg2); -INCLUDE_ASM(void, "code_102C80", func_802E263C, Entity* entity); +INCLUDE_ASM(void, "102C80", func_802E263C, Entity* entity); #ifdef NON_MATCHING // display list issues @@ -569,5 +569,5 @@ void func_802E2BA4(s32 entityIndex) { gMasterGfxPos = temp_s2; } #else -INCLUDE_ASM(s32, "code_102C80", func_802E2BA4); +INCLUDE_ASM(s32, "102C80", func_802E2BA4); #endif diff --git a/src/code_10400_len_d30.c b/src/10400_len_d30.c similarity index 89% rename from src/code_10400_len_d30.c rename to src/10400_len_d30.c index 03af63d092..61897bd468 100644 --- a/src/code_10400_len_d30.c +++ b/src/10400_len_d30.c @@ -46,9 +46,9 @@ void state_init_file_select(void) { OVERRIDE_FLAG_SET(0x10000); } -INCLUDE_ASM(s32, "code_10400_len_d30", state_step_language_select); +INCLUDE_ASM(s32, "10400_len_d30", state_step_language_select); -INCLUDE_ASM(s32, "code_10400_len_d30", func_800354EC); +INCLUDE_ASM(s32, "10400_len_d30", func_800354EC); void state_drawUI_language_select(void) { } @@ -83,9 +83,9 @@ void func_80035660(void) { OVERRIDE_FLAG_UNSET(0x40); } -INCLUDE_ASM(s32, "code_10400_len_d30", func_80035704); +INCLUDE_ASM(s32, "10400_len_d30", func_80035704); -INCLUDE_ASM(s32, "code_10400_len_d30", func_80035B40); +INCLUDE_ASM(s32, "10400_len_d30", func_80035B40); void func_80035D18(void) { } diff --git a/src/code_104730.c b/src/104730.c similarity index 100% rename from src/code_104730.c rename to src/104730.c diff --git a/src/code_104940_len_dc0.c b/src/104940_len_dc0.c similarity index 97% rename from src/code_104940_len_dc0.c rename to src/104940_len_dc0.c index b2892c28e5..08b15423ea 100644 --- a/src/code_104940_len_dc0.c +++ b/src/104940_len_dc0.c @@ -1,7 +1,7 @@ #include "common.h" //display list func -INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E30C0); +INCLUDE_ASM(s32, "104940_len_dc0", func_802E30C0); void func_802E31B0(Entity* entity) { func_80072230(0, entity->position.x, entity->position.y, entity->position.z, 1.0f, 0x3C); @@ -38,7 +38,7 @@ void func_802E328C(Entity* entity) { func_802E3650(entity); } -INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3370); +INCLUDE_ASM(s32, "104940_len_dc0", func_802E3370); s32 func_802E3650(Entity* entity) { struct802E3650* temp = (struct802E3650*)entity->dataBuf; @@ -306,7 +306,7 @@ s32 func_802E3BA4(Entity* entity) { return 1; } #else -INCLUDE_ASM(s32, "code_104940_len_dc0", func_802E3BA4, Entity* entity); +INCLUDE_ASM(s32, "104940_len_dc0", func_802E3BA4, Entity* entity); #endif void entity_init_Hammer1Block_normal(Entity* entity) { diff --git a/src/code_105700_len_2130.c b/src/105700_len_2130.c similarity index 97% rename from src/code_105700_len_2130.c rename to src/105700_len_2130.c index e96c0f6f7c..1d8fcd59e2 100644 --- a/src/code_105700_len_2130.c +++ b/src/105700_len_2130.c @@ -33,9 +33,9 @@ void func_802E3E9C(Entity* entity) { } } -INCLUDE_ASM(s32, "code_105700_len_2130", func_802E3EE0); +INCLUDE_ASM(s32, "105700_len_2130", func_802E3EE0); -INCLUDE_ASM(void, "code_105700_len_2130", func_802E3F0C, Entity* entity); +INCLUDE_ASM(void, "105700_len_2130", func_802E3F0C, Entity* entity); void func_802E4040(Entity* entity) { func_80110678(entity); diff --git a/src/code_105F90.c b/src/105F90.c similarity index 93% rename from src/code_105F90.c rename to src/105F90.c index beaed3399a..ae3ae1db6a 100644 --- a/src/code_105F90.c +++ b/src/105F90.c @@ -5,9 +5,9 @@ extern UNK_TYPE D_802EA760; extern StaticEntityData D_802EA7BC; extern UNK_TYPE D_802EB3C0; -INCLUDE_ASM(s32, "code_105F90", func_802E4710); +INCLUDE_ASM(s32, "105F90", func_802E4710); -INCLUDE_ASM(s32, "code_105F90", func_802E4730); +INCLUDE_ASM(s32, "105F90", func_802E4730); void func_802E4AEC(s32 entityIndex) { func_802E4730(entityIndex, &D_0A000808); @@ -52,7 +52,7 @@ void func_802E4B60(Entity* entity) { func_802E4B10(entity); } -INCLUDE_ASM(s32, "code_105F90", func_802E4C10); +INCLUDE_ASM(s32, "105F90", func_802E4C10); void func_802E4DE0(Entity* entity) { struct802E4B10* temp = entity->dataBuf; @@ -64,13 +64,13 @@ void func_802E4DE0(Entity* entity) { entity->rotation.z = 0.0f; } -INCLUDE_ASM(s32, "code_105F90", func_802E4E04); +INCLUDE_ASM(s32, "105F90", func_802E4E04); void func_802E5308(Entity* entity) { func_802E3650(entity); } -INCLUDE_ASM(s32, "code_105F90", func_802E5324); +INCLUDE_ASM(s32, "105F90", func_802E5324); void func_802E540C(Entity* entity) { func_802E4B10(entity); diff --git a/src/code_1060_len_310.c b/src/1060_len_310.c similarity index 96% rename from src/code_1060_len_310.c rename to src/1060_len_310.c index e4c45f6a3e..f8af3ed1a0 100644 --- a/src/code_1060_len_310.c +++ b/src/1060_len_310.c @@ -86,7 +86,7 @@ void func_80025F44(char* arg0, char* file, s32 line) { PANIC(); } #else -INCLUDE_ASM(void, "code_1060_len_310", func_80025F44, char* arg0, char* file, s32 line); +INCLUDE_ASM(void, "1060_len_310", func_80025F44, char* arg0, char* file, s32 line); #endif diff --git a/src/code_106EF0.c b/src/106EF0.c similarity index 98% rename from src/code_106EF0.c rename to src/106EF0.c index d6573a5ba6..2c0c592494 100644 --- a/src/code_106EF0.c +++ b/src/106EF0.c @@ -68,7 +68,7 @@ void func_802E581C(Entity* entity) { } // display list func -INCLUDE_ASM(s32, "code_106EF0", func_802E586C); +INCLUDE_ASM(s32, "106EF0", func_802E586C); void func_802E5E50(Entity* entity) { struct802E4B10* temp_s0 = entity->dataBuf; diff --git a/src/107830_len_e70.c b/src/107830_len_e70.c new file mode 100644 index 0000000000..1a50095105 --- /dev/null +++ b/src/107830_len_e70.c @@ -0,0 +1,28 @@ +#include "common.h" + +INCLUDE_ASM(s32, "107830_len_e70", func_802E5FB0); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6064); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6118); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6178); + +void func_802E6194(void) { +} + +INCLUDE_ASM(s32, "107830_len_e70", func_802E619C); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E61B0); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6338); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6390); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E63A8); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6574); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6B6C); + +INCLUDE_ASM(s32, "107830_len_e70", func_802E6C24); diff --git a/src/1086a0_len_fc0.c b/src/1086a0_len_fc0.c new file mode 100644 index 0000000000..e89374dc27 --- /dev/null +++ b/src/1086a0_len_fc0.c @@ -0,0 +1,37 @@ +#include "common.h" + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E6E20); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E6E90); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E6ED8); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7034); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E70B0); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E71F8); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7230); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E742C); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E75C0); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E75E4); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7AE4); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7C70); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7C8C); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7CB8); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7D28); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7D38); + +INCLUDE_ASM(s32, "1086a0_len_fc0", func_802E7D54); + +INCLUDE_ASM(s32, "1086a0_len_fc0", entity_init_Chest); diff --git a/src/code_109660_len_1270.c b/src/109660_len_1270.c similarity index 93% rename from src/code_109660_len_1270.c rename to src/109660_len_1270.c index f6781d54c8..42012f8e70 100644 --- a/src/code_109660_len_1270.c +++ b/src/109660_len_1270.c @@ -18,7 +18,7 @@ typedef struct struct802E7DE0 { /* 0x304 */ f32 unk_304[36]; } struct802E7DE0; -INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7DE0); +INCLUDE_ASM(s32, "109660_len_1270", func_802E7DE0); typedef struct struct802E7F40 { /* 0x00 */ s32 unk_00; @@ -44,9 +44,9 @@ void func_802E7F6C(Entity* entity) { func_802E7DE0(entity, &D_0A004350, &D_0A0026F0); } -INCLUDE_ASM(s32, "code_109660_len_1270", func_802E7FA0); +INCLUDE_ASM(s32, "109660_len_1270", func_802E7FA0); -INCLUDE_ASM(s32, "code_109660_len_1270", func_802E854C); +INCLUDE_ASM(s32, "109660_len_1270", func_802E854C); s32 func_802E8858(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/code_10A230.c b/src/10A230.c similarity index 98% rename from src/code_10A230.c rename to src/10A230.c index 551aee9dcd..94637ccaab 100644 --- a/src/code_10A230.c +++ b/src/10A230.c @@ -146,7 +146,7 @@ void func_802E8E10(Entity* entity) { func_80110678(entity); } -INCLUDE_ASM(s32, "code_10A230", push_entity_matrix); +INCLUDE_ASM(s32, "10A230", push_entity_matrix); f32 func_802E8F94(Entity* entity) { struct802E89B0* temp_s0; diff --git a/src/code_10A8D0.c b/src/10A8D0.c similarity index 100% rename from src/code_10A8D0.c rename to src/10A8D0.c diff --git a/src/code_11130_len_c0.c b/src/11130_len_c0.c similarity index 94% rename from src/code_11130_len_c0.c rename to src/11130_len_c0.c index 21f1197cfe..badf150002 100644 --- a/src/code_11130_len_c0.c +++ b/src/11130_len_c0.c @@ -6,7 +6,7 @@ void begin_state_world(void) { void step_world(void) { update_counters(); - update_npcs(); + npc_list_update(); update_player(); update_item_entities(); update_effects(); diff --git a/src/code_111f0_len_860.c b/src/111f0_len_860.c similarity index 90% rename from src/code_111f0_len_860.c rename to src/111f0_len_860.c index 08d41a747a..eb22873bcc 100644 --- a/src/code_111f0_len_860.c +++ b/src/111f0_len_860.c @@ -37,7 +37,7 @@ void func_80035E54(void) { D_8009A5D8 = 0; } -INCLUDE_ASM(s32, "code_111f0_len_860", func_80035EEC); +INCLUDE_ASM(s32, "111f0_len_860", func_80035EEC); void func_800360FC(void) { if (gGameStatusPtr->loadMenuState == 2) { @@ -58,7 +58,7 @@ void func_80036130(void) { } } -INCLUDE_ASM(s32, "code_111f0_len_860", func_8003617C); +INCLUDE_ASM(s32, "111f0_len_860", func_8003617C); void func_800363FC(void) { if (D_800A0944 == 4 || D_800A0944 == 0) { @@ -78,7 +78,7 @@ s32 func_80036430(void) { return playerStatus->flags; } -INCLUDE_ASM(s32, "code_111f0_len_860", func_8003646C); +INCLUDE_ASM(s32, "111f0_len_860", func_8003646C); void func_80036640(void) { } diff --git a/src/code_11a50_len_7a0.c b/src/11a50_len_7a0.c similarity index 97% rename from src/code_11a50_len_7a0.c rename to src/11a50_len_7a0.c index e8a9b7e92a..9772698724 100644 --- a/src/code_11a50_len_7a0.c +++ b/src/11a50_len_7a0.c @@ -72,7 +72,7 @@ void begin_state_intro(void) { intro_logos_update_fade(); } -INCLUDE_ASM(s32, "code_11a50_len_7a0", step_intro); +INCLUDE_ASM(s32, "11a50_len_7a0", step_intro); void func_80036DE0(void) { } diff --git a/src/121f0_len_1290.c b/src/121f0_len_1290.c new file mode 100644 index 0000000000..ef53b9095e --- /dev/null +++ b/src/121f0_len_1290.c @@ -0,0 +1,20 @@ +#include "common.h" + +INCLUDE_ASM(s32, "121f0_len_1290", begin_state_title_screen); + +INCLUDE_ASM(s32, "121f0_len_1290", step_title_screen); + +INCLUDE_ASM(s32, "121f0_len_1290", func_800375A4); + +INCLUDE_ASM(s32, "121f0_len_1290", title_append_gfx); + +void func_80037960(void) { +} + +INCLUDE_ASM(s32, "121f0_len_1290", title_draw_images); + +INCLUDE_ASM(s32, "121f0_len_1290", title_draw_logo); + +INCLUDE_ASM(s32, "121f0_len_1290", title_draw_press_start); + +INCLUDE_ASM(s32, "121f0_len_1290", title_draw_copyright); diff --git a/src/code_13480_len_3f0.c b/src/13480_len_3f0.c similarity index 90% rename from src/code_13480_len_3f0.c rename to src/13480_len_3f0.c index b5787e9064..5a8561a46a 100644 --- a/src/code_13480_len_3f0.c +++ b/src/13480_len_3f0.c @@ -19,7 +19,7 @@ void init_demo_data(void) { clear_script_list(); } -INCLUDE_ASM(s32, "code_13480_len_3f0", next_demo_scene); +INCLUDE_ASM(s32, "13480_len_3f0", next_demo_scene); void func_8003845C(void) { diff --git a/src/code_1370_len_7d0.c b/src/1370_len_7d0.c similarity index 97% rename from src/code_1370_len_7d0.c rename to src/1370_len_7d0.c index 423c2ade56..8dc7621d2b 100644 --- a/src/code_1370_len_7d0.c +++ b/src/1370_len_7d0.c @@ -89,7 +89,7 @@ void gfxRetrace_Callback(s32 arg0) { } } -INCLUDE_ASM(void, "code_1370_len_7d0", gfx_task_main); +INCLUDE_ASM(void, "1370_len_7d0", gfx_task_main); void gfxPreNMI_Callback(void) { D_80073E00 = 1; diff --git a/src/163400.c b/src/163400.c new file mode 100644 index 0000000000..cef720f00b --- /dev/null +++ b/src/163400.c @@ -0,0 +1,59 @@ +#include "common.h" + +INCLUDE_ASM(s32, "163400", func_80242BA0); + +INCLUDE_ASM(s32, "163400", func_80242D94); + +INCLUDE_ASM(s32, "163400", func_80242DEC); + +INCLUDE_ASM(s32, "163400", func_80242E00); + +INCLUDE_ASM(s32, "163400", func_80242F68); + +INCLUDE_ASM(s32, "163400", func_802431A0); + +INCLUDE_ASM(s32, "163400", func_8024330C); + +INCLUDE_ASM(s32, "163400", func_80243380); + +INCLUDE_ASM(s32, "163400", func_802433F4); + +INCLUDE_ASM(s32, "163400", func_80243468); + +INCLUDE_ASM(s32, "163400", func_802434DC); + +INCLUDE_ASM(s32, "163400", func_80243550); + +INCLUDE_ASM(s32, "163400", func_802435C4); + +INCLUDE_ASM(s32, "163400", func_80243628); + +INCLUDE_ASM(s32, "163400", func_8024368C); + +INCLUDE_ASM(s32, "163400", func_802436F0); + +INCLUDE_ASM(s32, "163400", func_80243754); + +INCLUDE_ASM(s32, "163400", func_802437B8); + +INCLUDE_ASM(s32, "163400", func_8024381C); + +INCLUDE_ASM(s32, "163400", func_80243898); + +INCLUDE_ASM(s32, "163400", func_80243908); + +INCLUDE_ASM(s32, "163400", func_80243B10); + +INCLUDE_ASM(s32, "163400", func_80243CCC); + +INCLUDE_ASM(s32, "163400", func_80243EEC); + +INCLUDE_ASM(s32, "163400", func_80244030); + +INCLUDE_ASM(s32, "163400", func_802440BC); + +INCLUDE_ASM(s32, "163400", func_802448E0); + +INCLUDE_ASM(s32, "163400", func_80244B00); + +INCLUDE_ASM(s32, "163400", func_80244BC4); diff --git a/src/165490.c b/src/165490.c new file mode 100644 index 0000000000..c32f8d2241 --- /dev/null +++ b/src/165490.c @@ -0,0 +1,41 @@ +#include "common.h" + +INCLUDE_ASM(s32, "165490", func_80244C30); + +INCLUDE_ASM(s32, "165490", func_80244CEC); + +INCLUDE_ASM(s32, "165490", func_80244D60); + +INCLUDE_ASM(s32, "165490", func_80244DD0); + +INCLUDE_ASM(s32, "165490", func_80244E54); + +INCLUDE_ASM(s32, "165490", func_80244F44); + +INCLUDE_ASM(s32, "165490", func_80244FD4); + +INCLUDE_ASM(s32, "165490", func_8024544C); + +INCLUDE_ASM(s32, "165490", func_80245588); + +INCLUDE_ASM(s32, "165490", func_802455D8); + +INCLUDE_ASM(s32, "165490", func_80245628); + +INCLUDE_ASM(s32, "165490", func_80245678); + +INCLUDE_ASM(s32, "165490", func_802456C8); + +INCLUDE_ASM(s32, "165490", func_80245718); + +INCLUDE_ASM(s32, "165490", func_80245768); + +INCLUDE_ASM(s32, "165490", func_802457B8); + +INCLUDE_ASM(s32, "165490", func_80245808); + +INCLUDE_ASM(s32, "165490", func_80245A40); + +INCLUDE_ASM(s32, "165490", func_80246B2C); + +INCLUDE_ASM(s32, "165490", func_80246CBC); diff --git a/src/167570.c b/src/167570.c new file mode 100644 index 0000000000..1c6cbe6187 --- /dev/null +++ b/src/167570.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "167570", func_80246D10); + +INCLUDE_ASM(s32, "167570", func_80246E24); + +INCLUDE_ASM(s32, "167570", func_80247198); + +INCLUDE_ASM(s32, "167570", func_802471EC); + +void func_80247D14(void) { +} + +void func_80247D1C(void) { +} diff --git a/src/168590.c b/src/168590.c new file mode 100644 index 0000000000..721fb03c47 --- /dev/null +++ b/src/168590.c @@ -0,0 +1,28 @@ +#include "common.h" + +INCLUDE_ASM(s32, "168590", func_80247D30); + +INCLUDE_ASM(s32, "168590", func_80247FD0); + +INCLUDE_ASM(s32, "168590", func_80248024); + +void func_80248160(void) { +} + +void func_80248168(void) { +} + +INCLUDE_ASM(s32, "168590", func_80248170); + +INCLUDE_ASM(s32, "168590", func_802481B8); + +INCLUDE_ASM(s32, "168590", func_8024830C); + +INCLUDE_ASM(s32, "168590", func_80248A80); + +INCLUDE_ASM(s32, "168590", func_80248BF4); + +void func_80249324(void) { +} + +INCLUDE_ASM(s32, "168590", func_8024932C); diff --git a/src/169BE0.c b/src/169BE0.c new file mode 100644 index 0000000000..21beaaabe0 --- /dev/null +++ b/src/169BE0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "169BE0", func_80249380); + +INCLUDE_ASM(s32, "169BE0", func_8024997C); + +INCLUDE_ASM(s32, "169BE0", func_80249AA4); + +INCLUDE_ASM(s32, "169BE0", func_80249AB8); diff --git a/src/code_16F740.c b/src/16F740.c similarity index 73% rename from src/code_16F740.c rename to src/16F740.c index 3f6d6b72c9..d9100e9176 100644 --- a/src/code_16F740.c +++ b/src/16F740.c @@ -5,9 +5,9 @@ extern s16 D_802809F6; extern s32 D_80280A30; extern s32 D_8029F254; -INCLUDE_ASM(s32, "code_16F740", func_80240E60); +INCLUDE_ASM(s32, "16F740", func_80240E60); -INCLUDE_ASM(s32, "code_16F740", func_80240FDC); +INCLUDE_ASM(s32, "16F740", func_80240FDC); void func_80241190(s32 battleState) { s32 flags = gBattleStatus.flags2; @@ -38,7 +38,7 @@ void func_80241190(s32 battleState) { } } -INCLUDE_ASM(s32, "code_16F740", begin_battle); +INCLUDE_ASM(s32, "16F740", begin_battle); void func_80241AB8(void) { set_transition_stencil_color(0, 0, 0, 0); @@ -50,32 +50,32 @@ void func_80241AB8(void) { } } -INCLUDE_ASM(s32, "code_16F740", func_80241B14); +INCLUDE_ASM(s32, "16F740", func_80241B14); void func_8024201C(void) { } -INCLUDE_ASM(s32, "code_16F740", update_heroes_start_turn); +INCLUDE_ASM(s32, "16F740", update_heroes_start_turn); void func_80242AC0(void) { } -INCLUDE_ASM(s32, "code_16F740", switch_to_player); +INCLUDE_ASM(s32, "16F740", switch_to_player); void func_80242BA8(void) { } -INCLUDE_ASM(s32, "code_16F740", update_end_player_turn); +INCLUDE_ASM(s32, "16F740", update_end_player_turn); void func_80242EF8(void) { } -INCLUDE_ASM(s32, "code_16F740", switch_to_partner); +INCLUDE_ASM(s32, "16F740", switch_to_partner); void func_80242FD8(void) { } -INCLUDE_ASM(s32, "code_16F740", func_80242FE0); +INCLUDE_ASM(s32, "16F740", func_80242FE0); void func_80243910(void) { } @@ -94,7 +94,7 @@ void switch_order(void) { battleStatus->unk_62 = -1; battleStatus->unk_63 = -1; - dma_copy(&code_code_415D90_ROM_START, &code_code_415D90_ROM_END, &code_code_415D90_VRAM); + dma_copy(_415D90_ROM_START, _415D90_ROM_END, _415D90_VRAM); // TODO Needed to match if (0) { s32 new_var; do { } while (new_var); } @@ -113,7 +113,7 @@ void switch_order(void) { void func_802439D0(void) { } -INCLUDE_ASM(s32, "code_16F740", func_802439D8); +INCLUDE_ASM(s32, "16F740", func_802439D8); void func_80243FD4(void) { } @@ -126,31 +126,31 @@ void func_80243FDC(void) { void func_80244000(void) { } -INCLUDE_ASM(s32, "code_16F740", func_80244008); +INCLUDE_ASM(s32, "16F740", func_80244008); void func_80244708(void) { } -INCLUDE_ASM(s32, "code_16F740", func_80244710); +INCLUDE_ASM(s32, "16F740", func_80244710); void func_80244A48(void) { } -INCLUDE_ASM(s32, "code_16F740", end_battle); +INCLUDE_ASM(s32, "16F740", end_battle); -INCLUDE_ASM(s32, "code_16F740", func_80244D90); +INCLUDE_ASM(s32, "16F740", func_80244D90); -INCLUDE_ASM(s32, "code_16F740", func_80244E38); +INCLUDE_ASM(s32, "16F740", func_80244E38); void func_80244EF8(void) { } -INCLUDE_ASM(s32, "code_16F740", update_run_away); +INCLUDE_ASM(s32, "16F740", update_run_away); void func_80245438(void) { } -INCLUDE_ASM(s32, "code_16F740", func_80245440); +INCLUDE_ASM(s32, "16F740", func_80245440); void func_802456B0(void) { } @@ -165,22 +165,22 @@ ApiStatus DisablePartnerBlur(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_16F740", update_swap_partner); +INCLUDE_ASM(s32, "16F740", update_swap_partner); void func_80245AC8(void) { } -INCLUDE_ASM(s32, "code_16F740", update_player_action); +INCLUDE_ASM(s32, "16F740", update_player_action); void func_80246448(void) { } -INCLUDE_ASM(s32, "code_16F740", update_player_change_turn); +INCLUDE_ASM(s32, "16F740", update_player_change_turn); void func_80246B2C_code(void) { } -INCLUDE_ASM(s32, "code_16F740", update_partner_action); +INCLUDE_ASM(s32, "16F740", update_partner_action); void func_80247214(void) { } @@ -211,28 +211,28 @@ void func_8024721C(void) { } } #else -INCLUDE_ASM(s32, "code_16F740", func_8024721C); +INCLUDE_ASM(s32, "16F740", func_8024721C); #endif void func_802472A4(void) { } -INCLUDE_ASM(s32, "code_16F740", update_enemy_change_turn); +INCLUDE_ASM(s32, "16F740", update_enemy_change_turn); void func_80247568(void) { } -INCLUDE_ASM(s32, "code_16F740", update_enemy_action); +INCLUDE_ASM(s32, "16F740", update_enemy_action); void func_80247AFC(void) { } -INCLUDE_ASM(s32, "code_16F740", func_80247B04); +INCLUDE_ASM(s32, "16F740", func_80247B04); -INCLUDE_ASM(s32, "code_16F740", func_802480F0); +INCLUDE_ASM(s32, "16F740", func_802480F0); -INCLUDE_ASM(s32, "code_16F740", func_80248190); +INCLUDE_ASM(s32, "16F740", func_80248190); void func_802485FC(void) { if (D_8029F254 != 0) { @@ -251,7 +251,7 @@ void func_802485FC(void) { } } -INCLUDE_ASM(s32, "code_16F740", func_80248660); +INCLUDE_ASM(s32, "16F740", func_80248660); void func_80248AA4(void) { if (D_8029F254 != 0) { @@ -270,7 +270,7 @@ void func_80248AA4(void) { } } -INCLUDE_ASM(s32, "code_16F740", func_80248B08); +INCLUDE_ASM(s32, "16F740", func_80248B08); void func_80248D78(void) { if (D_802809F6 == -1) { diff --git a/src/code_16c8e0.c b/src/16c8e0.c similarity index 92% rename from src/code_16c8e0.c rename to src/16c8e0.c index d0951d7cae..c1604fd982 100644 --- a/src/code_16c8e0.c +++ b/src/16c8e0.c @@ -46,7 +46,7 @@ Script BtlBringPartnerOut = SCRIPT({ SetActorScale(ACTOR_PARTNER, 1.0, 1.0, 1.0); } PlaySoundAtActor(ACTOR_PLAYER, SOUND_UNKNOWN_D); - GetGoalPos(ACTOR_PARTNER, SI_VAR(0), SI_VAR(1), SI_VAR(2)); + GetGoalPos(256, SI_VAR(0), SI_VAR(1), SI_VAR(2)); SetActorJumpGravity(ACTOR_PARTNER, 1.0); if (SI_VAR(1) == 0) { JumpToGoal(ACTOR_PARTNER, 20, 0, 0, 1); @@ -181,7 +181,7 @@ void func_8023E11C(void) { D_802809F5 = 0; } -INCLUDE_ASM(s32, "code_16c8e0", initialize_battle); +INCLUDE_ASM(s32, "16c8e0", initialize_battle); void func_8023E3FC(void) { } @@ -193,27 +193,27 @@ void update_actor_shadows(void) { } } -INCLUDE_ASM(s32, "code_16c8e0", update_battle_state); +INCLUDE_ASM(s32, "16c8e0", update_battle_state); -INCLUDE_ASM(s32, "code_16c8e0", draw_main_battle_ui); +INCLUDE_ASM(s32, "16c8e0", draw_main_battle_ui); -INCLUDE_ASM(s32, "code_16c8e0", func_8023ED5C); +INCLUDE_ASM(s32, "16c8e0", func_8023ED5C); -INCLUDE_ASM(s32, "code_16c8e0", func_8023F060); +INCLUDE_ASM(s32, "16c8e0", func_8023F060); -INCLUDE_ASM(s32, "code_16c8e0", func_8023F088); +INCLUDE_ASM(s32, "16c8e0", func_8023F088); void func_8023FF84(void) { show_foreground_models_unsafe(); } -INCLUDE_ASM(s32, "code_16c8e0", draw_enemy_health_bars); +INCLUDE_ASM(s32, "16c8e0", draw_enemy_health_bars); -INCLUDE_ASM(s32, "code_16c8e0", update_starpoints_display); +INCLUDE_ASM(s32, "16c8e0", update_starpoints_display); -INCLUDE_ASM(s32, "code_16c8e0", func_802409F4); +INCLUDE_ASM(s32, "16c8e0", func_802409F4); -INCLUDE_ASM(s32, "code_16c8e0", func_80240AA8); +INCLUDE_ASM(s32, "16c8e0", func_80240AA8); void delete_actor(Actor* actor) { ActorPart* partsTable; diff --git a/src/1776B0.c b/src/1776B0.c new file mode 100644 index 0000000000..54070c7a6b --- /dev/null +++ b/src/1776B0.c @@ -0,0 +1,95 @@ +#include "common.h" + +INCLUDE_ASM(ApiStatus, "1776B0", func_80248DD0, ScriptInstance* script, s32 isInitialCall); + +INCLUDE_ASM(s32, "1776B0", func_80248DE4); + +INCLUDE_ASM(s32, "1776B0", func_80249804); + +INCLUDE_ASM(s32, "1776B0", func_8024A214); + +INCLUDE_ASM(s32, "1776B0", func_8024A990); + +INCLUDE_ASM(s32, "1776B0", func_8024AFE4); + +INCLUDE_ASM(s32, "1776B0", func_8024B5FC); + +INCLUDE_ASM(s32, "1776B0", func_8024B9A0); + +INCLUDE_ASM(s32, "1776B0", func_8024BDA4); + +INCLUDE_ASM(s32, "1776B0", func_8024C180); + +INCLUDE_ASM(s32, "1776B0", func_8024C570); + +INCLUDE_ASM(s32, "1776B0", func_8024C944); + +INCLUDE_ASM(s32, "1776B0", func_8024CB68); + +INCLUDE_ASM(s32, "1776B0", func_8024CE9C); + +INCLUDE_ASM(s32, "1776B0", use_cam_preset); + +INCLUDE_ASM(s32, "1776B0", func_8024E3D8); + +INCLUDE_ASM(s32, "1776B0", func_8024E40C); + +INCLUDE_ASM(s32, "1776B0", cam_target_actor); + +INCLUDE_ASM(s32, "1776B0", func_8024E45C); + +INCLUDE_ASM(s32, "1776B0", func_8024E484); + +INCLUDE_ASM(s32, "1776B0", move_cam_over); + +INCLUDE_ASM(s32, "1776B0", set_cam_target_pos); + +INCLUDE_ASM(s32, "1776B0", func_8024E554); + +INCLUDE_ASM(s32, "1776B0", func_8024E584); + +INCLUDE_ASM(s32, "1776B0", set_cam_zoom); + +INCLUDE_ASM(s32, "1776B0", add_cam_zoom); + +INCLUDE_ASM(s32, "1776B0", set_cam_zoffset); + +INCLUDE_ASM(s32, "1776B0", unfreeze_cam); + +INCLUDE_ASM(s32, "1776B0", func_8024E60C); + +INCLUDE_ASM(s32, "1776B0", UseCamPreset); + +INCLUDE_ASM(s32, "1776B0", func_8024E664); + +INCLUDE_ASM(s32, "1776B0", func_8024E6B4); + +INCLUDE_ASM(s32, "1776B0", func_8024E748); + +INCLUDE_ASM(s32, "1776B0", func_8024E820); + +INCLUDE_ASM(s32, "1776B0", SetBattleCamTarget); + +INCLUDE_ASM(s32, "1776B0", func_8024E9B0); + +INCLUDE_ASM(s32, "1776B0", SetBattleCamOffsetZ); + +INCLUDE_ASM(s32, "1776B0", AddBattleCamOffsetZ); + +INCLUDE_ASM(s32, "1776B0", SetBattleCamYaw); + +INCLUDE_ASM(s32, "1776B0", BattleCamTargetActor); + +INCLUDE_ASM(s32, "1776B0", func_8024EB84); + +INCLUDE_ASM(s32, "1776B0", MoveBattleCamOver); + +INCLUDE_ASM(s32, "1776B0", SetBattleCamZoom); + +INCLUDE_ASM(s32, "1776B0", AddBattleCamZoom); + +INCLUDE_ASM(s32, "1776B0", func_8024ECF8); + +INCLUDE_ASM(s32, "1776B0", FreezeBattleCam); + +INCLUDE_ASM(s32, "1776B0", func_8024EDA4); diff --git a/src/17D6A0.c b/src/17D6A0.c new file mode 100644 index 0000000000..e066f656d9 --- /dev/null +++ b/src/17D6A0.c @@ -0,0 +1,75 @@ +#include "common.h" + +INCLUDE_ASM(s32, "17D6A0", func_8024EDC0); + +INCLUDE_ASM(s32, "17D6A0", func_8024EDEC); + +INCLUDE_ASM(s32, "17D6A0", func_8024EE48); + +INCLUDE_ASM(s32, "17D6A0", func_8024EEA8); + +INCLUDE_ASM(s32, "17D6A0", func_8024EF08); + +INCLUDE_ASM(s32, "17D6A0", create_popup); + +INCLUDE_ASM(s32, "17D6A0", func_8024EFA4); + +INCLUDE_ASM(s32, "17D6A0", func_8024EFE0); + +INCLUDE_ASM(s32, "17D6A0", func_8024F394); + +INCLUDE_ASM(s32, "17D6A0", func_8024F5AC); + +INCLUDE_ASM(s32, "17D6A0", func_8024F768); + +INCLUDE_ASM(s32, "17D6A0", func_8024F7C8); + +INCLUDE_ASM(s32, "17D6A0", func_8024F84C); + +INCLUDE_ASM(s32, "17D6A0", func_8024F940); + +INCLUDE_ASM(s32, "17D6A0", show_battle_message); + +INCLUDE_ASM(s32, "17D6A0", show_variable_battle_message); + +INCLUDE_ASM(s32, "17D6A0", is_popup_displayed); + +INCLUDE_ASM(s32, "17D6A0", set_popup_duration); + +INCLUDE_ASM(s32, "17D6A0", func_8024FAE8); + +INCLUDE_ASM(s32, "17D6A0", func_8024FAFC); + +INCLUDE_ASM(s32, "17D6A0", close_action_command_instruction_popup); + +INCLUDE_ASM(s32, "17D6A0", func_8024FB3C); + +INCLUDE_ASM(s32, "17D6A0", func_80250818); + +INCLUDE_ASM(s32, "17D6A0", show_message_popup); + +INCLUDE_ASM(s32, "17D6A0", ShowMessageBox); + +INCLUDE_ASM(s32, "17D6A0", ShowVariableMessageBox); + +ApiStatus IsMessageBoxDisplayed(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 outVar = *args++; + + set_variable(script, outVar, is_popup_displayed()); + return ApiStatus_DONE2; +} + +ApiStatus WaitForMessageBoxDone(ScriptInstance* script, s32 isInitialCall) { + return !is_popup_displayed() * ApiStatus_DONE2; +} + +INCLUDE_ASM(s32, "17D6A0", ForceCloseMessageBox); + +INCLUDE_ASM(s32, "17D6A0", SetMessageBoxDuration); + +INCLUDE_ASM(s32, "17D6A0", func_80251434); + +INCLUDE_ASM(s32, "17D6A0", func_80251454); + +INCLUDE_ASM(s32, "17D6A0", func_80251474); diff --git a/src/code_17FEB0.c b/src/17FEB0.c similarity index 99% rename from src/code_17FEB0.c rename to src/17FEB0.c index f9545814b8..f779abfbda 100644 --- a/src/code_17FEB0.c +++ b/src/17FEB0.c @@ -37,7 +37,7 @@ HitResult calc_item_check_hit(void) { return HIT_RESULT_HIT; } -INCLUDE_ASM(s32, "code_17FEB0", calc_item_damage_enemy); +INCLUDE_ASM(s32, "17FEB0", calc_item_damage_enemy); ApiStatus ItemDamageEnemy(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/code_181810.c b/src/181810.c similarity index 98% rename from src/code_181810.c rename to src/181810.c index 2604e3351a..da8ce59dae 100644 --- a/src/code_181810.c +++ b/src/181810.c @@ -108,7 +108,7 @@ ApiStatus ActorSpeak(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "code_181810", EndActorSpeech); +INCLUDE_ASM(s32, "181810", EndActorSpeech); ApiStatus ShowBattleChoice(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -146,7 +146,7 @@ ApiStatus OverrideBattleDmaDest(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_181810", LoadBattleDmaData); +INCLUDE_ASM(s32, "181810", LoadBattleDmaData); ApiStatus func_802536A8(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -347,9 +347,9 @@ s32 is_actortype_hpbar_visible(s32 actorType) { return ((get_global_byte(idx + 365) | battleStatus->tattleFlags[idx]) >> (actorType - (idx * 8))) & 1; } -INCLUDE_ASM(s32, "code_181810", save_tattle_flags); +INCLUDE_ASM(s32, "181810", save_tattle_flags); -INCLUDE_ASM(s32, "code_181810", load_tattle_flags); +INCLUDE_ASM(s32, "181810", load_tattle_flags); ApiStatus func_80253FB0(ScriptInstance* script, s32 isInitialCall) { gCurrentEncounter.battleOutcome = 3; diff --git a/src/code_182B30.c b/src/182B30.c similarity index 72% rename from src/code_182B30.c rename to src/182B30.c index e53193aefe..0bc3e98954 100644 --- a/src/code_182B30.c +++ b/src/182B30.c @@ -25,11 +25,11 @@ void mtx_mirror_y(Matrix4f arg0) { (arg0)[3][3] = 1.0f; } -INCLUDE_ASM(s32, "code_182B30", enable_actor_blur); +INCLUDE_ASM(s32, "182B30", enable_actor_blur); -INCLUDE_ASM(s32, "code_182B30", disable_actor_blur); +INCLUDE_ASM(s32, "182B30", disable_actor_blur); -INCLUDE_ASM(s32, "code_182B30", reset_actor_blur); +INCLUDE_ASM(s32, "182B30", reset_actor_blur); void func_80254610(Actor* actor) { ActorPart* actorPart = actor->partsTable; @@ -125,13 +125,13 @@ void func_802549C0(void) { decorationTable->effectType = 1; } -INCLUDE_ASM(s32, "code_182B30", func_802549F4); +INCLUDE_ASM(s32, "182B30", func_802549F4); -INCLUDE_ASM(s32, "code_182B30", func_80254C50); +INCLUDE_ASM(s32, "182B30", func_80254C50); -INCLUDE_ASM(s32, "code_182B30", func_802550BC); +INCLUDE_ASM(s32, "182B30", func_802550BC); -INCLUDE_ASM(s32, "code_182B30", func_802552EC); +INCLUDE_ASM(s32, "182B30", func_802552EC); void func_8025593C(s32 arg0) { func_802550BC(0, arg0); @@ -149,7 +149,7 @@ void func_8025599C(s32 arg0) { func_802552EC(1, arg0); } -INCLUDE_ASM(s32, "code_182B30", update_actor_shadow); +INCLUDE_ASM(s32, "182B30", update_actor_shadow); s32 update_enemy_shadows(void) { BattleStatus* battleStatus = &gBattleStatus; @@ -168,9 +168,9 @@ void update_hero_shadows(void) { void func_80255FD8(void) { } -INCLUDE_ASM(s32, "code_182B30", func_80255FE0); +INCLUDE_ASM(s32, "182B30", func_80255FE0); -INCLUDE_ASM(s32, "code_182B30", func_802571F0); +INCLUDE_ASM(s32, "182B30", func_802571F0); void func_80257B28(s32 arg0) { func_80255FE0(0, arg0); @@ -188,23 +188,23 @@ void func_80257B88(void) { func_802571F0(1, gBattleStatus.partnerActor); } -INCLUDE_ASM(s32, "code_182B30", update_player_actor_shadow); +INCLUDE_ASM(s32, "182B30", update_player_actor_shadow); -INCLUDE_ASM(s32, "code_182B30", func_80257DA4); +INCLUDE_ASM(s32, "182B30", func_80257DA4); -INCLUDE_ASM(s32, "code_182B30", func_80258E14); +INCLUDE_ASM(s32, "182B30", func_80258E14); -INCLUDE_ASM(s32, "code_182B30", func_802591EC); +INCLUDE_ASM(s32, "182B30", func_802591EC); -INCLUDE_ASM(s32, "code_182B30", func_80259494); +INCLUDE_ASM(s32, "182B30", func_80259494); -INCLUDE_ASM(s32, "code_182B30", func_8025950C); +INCLUDE_ASM(s32, "182B30", func_8025950C); -INCLUDE_ASM(s32, "code_182B30", func_802596C0); +INCLUDE_ASM(s32, "182B30", func_802596C0); -INCLUDE_ASM(s32, "code_182B30", func_802597B0); +INCLUDE_ASM(s32, "182B30", func_802597B0); -INCLUDE_ASM(s32, "code_182B30", func_8025995C); +INCLUDE_ASM(s32, "182B30", func_8025995C); void func_80259A48(s32 arg0, ActorPart* arg1, s32 arg2, s32 arg3) { DecorationTable* decorationTable = arg1->decorationTable; @@ -222,27 +222,27 @@ void func_80259A48(s32 arg0, ActorPart* arg1, s32 arg2, s32 arg3) { } } -INCLUDE_ASM(s32, "code_182B30", func_80259AAC); +INCLUDE_ASM(s32, "182B30", func_80259AAC); -INCLUDE_ASM(s32, "code_182B30", func_80259D9C); +INCLUDE_ASM(s32, "182B30", func_80259D9C); -INCLUDE_ASM(s32, "code_182B30", func_8025A2C4); +INCLUDE_ASM(s32, "182B30", func_8025A2C4); -INCLUDE_ASM(s32, "code_182B30", func_8025A50C); +INCLUDE_ASM(s32, "182B30", func_8025A50C); -INCLUDE_ASM(s32, "code_182B30", func_8025A74C); +INCLUDE_ASM(s32, "182B30", func_8025A74C); -INCLUDE_ASM(s32, "code_182B30", func_8025AA80); +INCLUDE_ASM(s32, "182B30", func_8025AA80); -INCLUDE_ASM(s32, "code_182B30", func_8025AD90); +INCLUDE_ASM(s32, "182B30", func_8025AD90); -INCLUDE_ASM(s32, "code_182B30", func_8025B1A8); +INCLUDE_ASM(s32, "182B30", func_8025B1A8); -INCLUDE_ASM(s32, "code_182B30", func_8025B5C0); +INCLUDE_ASM(s32, "182B30", func_8025B5C0); -INCLUDE_ASM(s32, "code_182B30", func_8025BAA0); +INCLUDE_ASM(s32, "182B30", func_8025BAA0); -INCLUDE_ASM(s32, "code_182B30", func_8025C120); +INCLUDE_ASM(s32, "182B30", func_8025C120); s32 func_8025C840(s32 arg0, ActorPart* arg1) { @@ -270,7 +270,7 @@ s32 func_8025C8A0(s32 arg0, ActorPart* arg1) { } } -INCLUDE_ASM(s32, "code_182B30", func_8025C918); +INCLUDE_ASM(s32, "182B30", func_8025C918); s32 func_8025CCC8(s32 arg0, ActorPart* arg1) { @@ -296,11 +296,11 @@ void func_8025CD28(s32 arg0, ActorPart* arg1) { decorationTable->unk_768 = 0; } -INCLUDE_ASM(s32, "code_182B30", func_8025CD40); +INCLUDE_ASM(s32, "182B30", func_8025CD40); -INCLUDE_ASM(s32, "code_182B30", func_8025CEC8); +INCLUDE_ASM(s32, "182B30", func_8025CEC8); -INCLUDE_ASM(s32, "code_182B30", _remove_part_decoration); +INCLUDE_ASM(s32, "182B30", _remove_part_decoration); void func_8025D150(void) { } @@ -308,52 +308,52 @@ void func_8025D150(void) { void func_8025D158(void) { } -INCLUDE_ASM(s32, "code_182B30", func_8025D160); +INCLUDE_ASM(s32, "182B30", func_8025D160); -INCLUDE_ASM(s32, "code_182B30", func_8025D290); +INCLUDE_ASM(s32, "182B30", func_8025D290); -INCLUDE_ASM(s32, "code_182B30", func_8025D2B0); +INCLUDE_ASM(s32, "182B30", func_8025D2B0); void func_8025D3C4(void) { } -INCLUDE_ASM(s32, "code_182B30", func_8025D3CC); +INCLUDE_ASM(s32, "182B30", func_8025D3CC); -INCLUDE_ASM(s32, "code_182B30", func_8025D4A0); +INCLUDE_ASM(s32, "182B30", func_8025D4A0); -INCLUDE_ASM(s32, "code_182B30", func_8025D4C8); +INCLUDE_ASM(s32, "182B30", func_8025D4C8); -INCLUDE_ASM(s32, "code_182B30", func_8025D620); +INCLUDE_ASM(s32, "182B30", func_8025D620); -INCLUDE_ASM(s32, "code_182B30", func_8025D640); +INCLUDE_ASM(s32, "182B30", func_8025D640); -INCLUDE_ASM(s32, "code_182B30", func_8025D6FC); +INCLUDE_ASM(s32, "182B30", func_8025D6FC); -INCLUDE_ASM(s32, "code_182B30", func_8025D71C); +INCLUDE_ASM(s32, "182B30", func_8025D71C); -INCLUDE_ASM(s32, "code_182B30", func_8025D810); +INCLUDE_ASM(s32, "182B30", func_8025D810); -INCLUDE_ASM(s32, "code_182B30", func_8025D830); +INCLUDE_ASM(s32, "182B30", func_8025D830); -INCLUDE_ASM(s32, "code_182B30", func_8025D8EC); +INCLUDE_ASM(s32, "182B30", func_8025D8EC); -INCLUDE_ASM(s32, "code_182B30", func_8025D90C); +INCLUDE_ASM(s32, "182B30", func_8025D90C); void func_8025DA60(void) { } -INCLUDE_ASM(s32, "code_182B30", func_8025DA68); +INCLUDE_ASM(s32, "182B30", func_8025DA68); void func_8025DBC8(void) { } -INCLUDE_ASM(s32, "code_182B30", func_8025DBD0); +INCLUDE_ASM(s32, "182B30", func_8025DBD0); void func_8025DD40(ActorPart* actorPart, s32 arg1) { actorPart->decorationTable->unk_8B0[arg1]->unk_0C->unk_2C = 5; } -INCLUDE_ASM(s32, "code_182B30", func_8025DD60); +INCLUDE_ASM(s32, "182B30", func_8025DD60); void func_8025DE88(ActorPart* actorPart, s32 arg1) { actorPart->decorationTable->unk_8B0[arg1]->unk_00 |= 0x10; diff --git a/src/18C790.c b/src/18C790.c new file mode 100644 index 0000000000..063dd06470 --- /dev/null +++ b/src/18C790.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(s32, "18C790", func_8025DEB0); + +INCLUDE_ASM(s32, "18C790", func_8025DEC4); + +INCLUDE_ASM(s32, "18C790", func_8025E030); + +INCLUDE_ASM(s32, "18C790", func_8025E044); + +INCLUDE_ASM(s32, "18C790", func_8025E108); + +INCLUDE_ASM(s32, "18C790", func_8025E14C); + +INCLUDE_ASM(s32, "18C790", func_8025E190); + +INCLUDE_ASM(s32, "18C790", func_8025FF8C); + +INCLUDE_ASM(s32, "18C790", func_802601BC); + +INCLUDE_ASM(s32, "18C790", func_80260948); + +INCLUDE_ASM(s32, "18C790", func_80260A20); diff --git a/src/code_18F340.c b/src/18F340.c similarity index 73% rename from src/code_18F340.c rename to src/18F340.c index caaf059b07..19a37af2d8 100644 --- a/src/code_18F340.c +++ b/src/18F340.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(s32, "code_18F340", func_80260A60); +INCLUDE_ASM(s32, "18F340", func_80260A60); ApiStatus IsPartnerImmobile(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -20,11 +20,11 @@ ApiStatus IsPartnerImmobile(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_18F340", activate_defend_command); +INCLUDE_ASM(s32, "18F340", activate_defend_command); -INCLUDE_ASM(s32, "code_18F340", func_80260B70); +INCLUDE_ASM(s32, "18F340", func_80260B70); -INCLUDE_ASM(s32, "code_18F340", func_80260BF4); +INCLUDE_ASM(s32, "18F340", func_80260BF4); ApiStatus func_80260DB8(ScriptInstance* script, s32 isInitialCall) { gBattleStatus.flags1 |= 0x40000; @@ -60,17 +60,17 @@ ApiStatus func_80260E5C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_18F340", func_80260E90); +INCLUDE_ASM(s32, "18F340", func_80260E90); -INCLUDE_ASM(s32, "code_18F340", func_80261064); +INCLUDE_ASM(s32, "18F340", func_80261064); -INCLUDE_ASM(s32, "code_18F340", func_802610CC); +INCLUDE_ASM(s32, "18F340", func_802610CC); -INCLUDE_ASM(s32, "code_18F340", func_80261164); +INCLUDE_ASM(s32, "18F340", func_80261164); -INCLUDE_ASM(s32, "code_18F340", func_802611E8); +INCLUDE_ASM(s32, "18F340", func_802611E8); -INCLUDE_ASM(s32, "code_18F340", func_8026127C); +INCLUDE_ASM(s32, "18F340", func_8026127C); ApiStatus func_80261388(ScriptInstance* script, s32 isInitialCall) { s32 partnerActorExists = gBattleStatus.partnerActor != NULL; @@ -87,21 +87,21 @@ ApiStatus func_802613A8(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_18F340", func_802613BC); +INCLUDE_ASM(s32, "18F340", func_802613BC); -INCLUDE_ASM(s32, "code_18F340", func_80261478); +INCLUDE_ASM(s32, "18F340", func_80261478); -INCLUDE_ASM(s32, "code_18F340", func_80261530); +INCLUDE_ASM(s32, "18F340", func_80261530); -INCLUDE_ASM(s32, "code_18F340", func_802615C8); +INCLUDE_ASM(s32, "18F340", func_802615C8); -INCLUDE_ASM(s32, "code_18F340", func_80261648); +INCLUDE_ASM(s32, "18F340", func_80261648); -INCLUDE_ASM(s32, "code_18F340", func_802616B4); +INCLUDE_ASM(s32, "18F340", func_802616B4); -INCLUDE_ASM(s32, "code_18F340", func_802616F4); +INCLUDE_ASM(s32, "18F340", func_802616F4); -INCLUDE_ASM(s32, "code_18F340", func_802619B4); +INCLUDE_ASM(s32, "18F340", func_802619B4); ApiStatus HasMerleeCastsLeft(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; @@ -113,13 +113,13 @@ ApiStatus HasMerleeCastsLeft(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_18F340", func_802619E8); +INCLUDE_ASM(s32, "18F340", func_802619E8); -INCLUDE_ASM(s32, "code_18F340", func_80261B40); +INCLUDE_ASM(s32, "18F340", func_80261B40); -INCLUDE_ASM(s32, "code_18F340", FXRecoverHP); +INCLUDE_ASM(s32, "18F340", FXRecoverHP); -INCLUDE_ASM(s32, "code_18F340", FXRecoverFP); +INCLUDE_ASM(s32, "18F340", FXRecoverFP); ApiStatus IncrementPlayerHP(ScriptInstance* script, s32 isInitialCall) { PlayerData* playerData = &gPlayerData; @@ -155,8 +155,8 @@ ApiStatus func_80261DD4(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_18F340", func_80261DF4); +INCLUDE_ASM(s32, "18F340", func_80261DF4); -INCLUDE_ASM(s32, "code_18F340", func_80261FB4); +INCLUDE_ASM(s32, "18F340", func_80261FB4); -INCLUDE_ASM(s32, "code_18F340", func_802620F8); +INCLUDE_ASM(s32, "18F340", func_802620F8); diff --git a/src/190A10.c b/src/190A10.c new file mode 100644 index 0000000000..497c22cf4c --- /dev/null +++ b/src/190A10.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "190A10", func_80262130); + +INCLUDE_ASM(s32, "190A10", func_8026220C); diff --git a/src/code_190B20.c b/src/190B20.c similarity index 95% rename from src/code_190B20.c rename to src/190B20.c index 282ea2734a..0c87a939cd 100644 --- a/src/code_190B20.c +++ b/src/190B20.c @@ -1052,7 +1052,7 @@ MessageID bActorMessages[] = { s32 D_802838F8 = 0; -INCLUDE_ASM(s32, "code_190B20", create_target_list); +INCLUDE_ASM(s32, "190B20", create_target_list); void player_create_target_list(Actor* actor) { create_target_list(actor, 0); @@ -1062,41 +1062,41 @@ void enemy_create_target_list(Actor* actor) { create_target_list(actor, 1); } -INCLUDE_ASM(s32, "code_190B20", func_80263064); +INCLUDE_ASM(s32, "190B20", func_80263064); -INCLUDE_ASM(s32, "code_190B20", func_80263230); +INCLUDE_ASM(s32, "190B20", func_80263230); -INCLUDE_ASM(s32, "code_190B20", func_8026324C); +INCLUDE_ASM(s32, "190B20", func_8026324C); -INCLUDE_ASM(s32, "code_190B20", func_80263268); +INCLUDE_ASM(s32, "190B20", func_80263268); -INCLUDE_ASM(s32, "code_190B20", func_80263300); +INCLUDE_ASM(s32, "190B20", func_80263300); -INCLUDE_ASM(s32, "code_190B20", func_802633E8); +INCLUDE_ASM(s32, "190B20", func_802633E8); -INCLUDE_ASM(s32, "code_190B20", func_80263434); +INCLUDE_ASM(s32, "190B20", func_80263434); -INCLUDE_ASM(s32, "code_190B20", func_80263464); +INCLUDE_ASM(s32, "190B20", func_80263464); -INCLUDE_ASM(s32, "code_190B20", func_802634B8); +INCLUDE_ASM(s32, "190B20", func_802634B8); -INCLUDE_ASM(s32, "code_190B20", func_802636E4); +INCLUDE_ASM(s32, "190B20", func_802636E4); -INCLUDE_ASM(s32, "code_190B20", func_80263914); +INCLUDE_ASM(s32, "190B20", func_80263914); -INCLUDE_ASM(s32, "code_190B20", count_power_plus); +INCLUDE_ASM(s32, "190B20", count_power_plus); -INCLUDE_ASM(s32, "code_190B20", deduct_current_move_fp); +INCLUDE_ASM(s32, "190B20", deduct_current_move_fp); -INCLUDE_ASM(s32, "code_190B20", func_80263C60); +INCLUDE_ASM(s32, "190B20", func_80263C60); -INCLUDE_ASM(s32, "code_190B20", func_80263CC4); +INCLUDE_ASM(s32, "190B20", func_80263CC4); -INCLUDE_ASM(s32, "code_190B20", set_animation); +INCLUDE_ASM(s32, "190B20", set_animation); -INCLUDE_ASM(s32, "code_190B20", func_80263E08); +INCLUDE_ASM(s32, "190B20", func_80263E08); -INCLUDE_ASM(void, "code_190B20", set_animation_rate, ActorID actorID, s32 partIndex, f32 rate); +INCLUDE_ASM(void, "190B20", set_animation_rate, ActorID actorID, s32 partIndex, f32 rate); void set_actor_yaw(ActorID actorID, s32 yaw) { get_actor(actorID)->yaw = yaw; @@ -1106,17 +1106,17 @@ void set_part_yaw(ActorID actorID, s32 partIndex, s32 value) { get_actor_part(get_actor(actorID), partIndex)->yaw = value; } -INCLUDE_ASM(s32, "code_190B20", func_80263FE8); +INCLUDE_ASM(s32, "190B20", func_80263FE8); -INCLUDE_ASM(s32, "code_190B20", func_80264084); +INCLUDE_ASM(s32, "190B20", func_80264084); -INCLUDE_ASM(void, "code_190B20", add_xz_vec3f, Vec3f* vector, f32 speed, f32 angleDeg); +INCLUDE_ASM(void, "190B20", add_xz_vec3f, Vec3f* vector, f32 speed, f32 angleDeg); -INCLUDE_ASM(void, "code_190B20", add_xz_vec3f_copy1, Vec3f* vector, f32 speed, f32 angleDeg); +INCLUDE_ASM(void, "190B20", add_xz_vec3f_copy1, Vec3f* vector, f32 speed, f32 angleDeg); -INCLUDE_ASM(void, "code_190B20", add_xz_vec3f_copy2, Vec3f* vector, f32 speed, f32 angleDeg); +INCLUDE_ASM(void, "190B20", add_xz_vec3f_copy2, Vec3f* vector, f32 speed, f32 angleDeg); -INCLUDE_ASM(void, "code_190B20", play_movement_dust_effects, s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg); +INCLUDE_ASM(void, "190B20", play_movement_dust_effects, s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg); ActorPart* get_actor_part(Actor* actor, s32 partIndex) { ActorPart* part = &actor->partsTable[0]; @@ -1135,15 +1135,15 @@ ActorPart* get_actor_part(Actor* actor, s32 partIndex) { return NULL; } -INCLUDE_ASM(s32, "code_190B20", load_player_actor); +INCLUDE_ASM(s32, "190B20", load_player_actor); -INCLUDE_ASM(s32, "code_190B20", load_partner_actor); +INCLUDE_ASM(s32, "190B20", load_partner_actor); -INCLUDE_ASM(s32, "code_190B20", create_actor); +INCLUDE_ASM(s32, "190B20", create_actor); -INCLUDE_ASM(s32, "code_190B20", func_80265CE8); +INCLUDE_ASM(s32, "190B20", func_80265CE8); -INCLUDE_ASM(s32, "code_190B20", func_80265D44); +INCLUDE_ASM(s32, "190B20", func_80265D44); s32 lookup_defense(DefenseTableEntry* defenseTable, Element elementKey) { DefenseTableEntry* row; @@ -1164,11 +1164,11 @@ s32 lookup_defense(DefenseTableEntry* defenseTable, Element elementKey) { return normalDefense; } -INCLUDE_ASM(s32, "code_190B20", lookup_status_chance); // exactly (?) the same as lookup_defense +INCLUDE_ASM(s32, "190B20", lookup_status_chance); // exactly (?) the same as lookup_defense -INCLUDE_ASM(s32, "code_190B20", lookup_status_duration_mod); // exactly (?) the same as lookup_defense +INCLUDE_ASM(s32, "190B20", lookup_status_duration_mod); // exactly (?) the same as lookup_defense -INCLUDE_ASM(s32, "code_190B20", inflict_status); +INCLUDE_ASM(s32, "190B20", inflict_status); s32 inflict_partner_ko(Actor* target, s32 statusTypeKey, s32 duration) { if (statusTypeKey == STATUS_DAZE) { @@ -1280,53 +1280,53 @@ s32 get_defense(Actor* actor, s32* defenseTable, s32 elementFlags) { return minDefense; } -INCLUDE_ASM(s32, "code_190B20", func_802664DC); +INCLUDE_ASM(s32, "190B20", func_802664DC); -INCLUDE_ASM(void, "code_190B20", show_damage_popup, f32 x, f32 y, f32 z, s32 damageAmount, s32 arg4); +INCLUDE_ASM(void, "190B20", show_damage_popup, f32 x, f32 y, f32 z, s32 damageAmount, s32 arg4); -INCLUDE_ASM(s32, "code_190B20", func_80266684); +INCLUDE_ASM(s32, "190B20", func_80266684); -INCLUDE_ASM(s32, "code_190B20", func_802666E4); +INCLUDE_ASM(s32, "190B20", func_802666E4); -INCLUDE_ASM(s32, "code_190B20", func_802667F0); +INCLUDE_ASM(s32, "190B20", func_802667F0); -INCLUDE_ASM(s32, "code_190B20", func_80266970); +INCLUDE_ASM(s32, "190B20", func_80266970); -INCLUDE_ASM(s32, "code_190B20", func_80266978); +INCLUDE_ASM(s32, "190B20", func_80266978); -INCLUDE_ASM(s32, "code_190B20", func_80266ADC); +INCLUDE_ASM(s32, "190B20", func_80266ADC); -INCLUDE_ASM(s32, "code_190B20", func_80266AF8); +INCLUDE_ASM(s32, "190B20", func_80266AF8); -INCLUDE_ASM(s32, "code_190B20", func_80266B14); +INCLUDE_ASM(s32, "190B20", func_80266B14); -INCLUDE_ASM(s32, "code_190B20", try_inflict_status); +INCLUDE_ASM(s32, "190B20", try_inflict_status); -INCLUDE_ASM(s32, "code_190B20", inflict_status_set_duration); +INCLUDE_ASM(s32, "190B20", inflict_status_set_duration); -INCLUDE_ASM(s32, "code_190B20", func_80266D6C); +INCLUDE_ASM(s32, "190B20", func_80266D6C); -INCLUDE_ASM(s32, "code_190B20", func_80266DAC); +INCLUDE_ASM(s32, "190B20", func_80266DAC); -INCLUDE_ASM(s32, "code_190B20", func_80266E14); +INCLUDE_ASM(s32, "190B20", func_80266E14); -INCLUDE_ASM(s32, "code_190B20", func_80266E40); +INCLUDE_ASM(s32, "190B20", func_80266E40); -INCLUDE_ASM(s32, "code_190B20", func_80266EA8); +INCLUDE_ASM(s32, "190B20", func_80266EA8); -INCLUDE_ASM(s32, "code_190B20", func_80266EE8); +INCLUDE_ASM(s32, "190B20", func_80266EE8); -INCLUDE_ASM(s32, "code_190B20", func_80266F60); +INCLUDE_ASM(s32, "190B20", func_80266F60); -INCLUDE_ASM(s32, "code_190B20", func_80266F8C); +INCLUDE_ASM(s32, "190B20", func_80266F8C); -INCLUDE_ASM(s32, "code_190B20", func_80266FD8); +INCLUDE_ASM(s32, "190B20", func_80266FD8); -INCLUDE_ASM(s32, "code_190B20", func_80267018); +INCLUDE_ASM(s32, "190B20", func_80267018); -INCLUDE_ASM(s32, "code_190B20", func_8026709C); +INCLUDE_ASM(s32, "190B20", func_8026709C); -INCLUDE_ASM(s32, "code_190B20", func_802670C8); +INCLUDE_ASM(s32, "190B20", func_802670C8); void add_part_decoration(ActorPart* part, s32 decorationIndex, DecorationID decorationType) { if ((part->idleAnimations) && !(part->flags & 2)) { @@ -1469,13 +1469,13 @@ void remove_player_buffs(PlayerBuff buffs) { } } -INCLUDE_ASM(s32, "code_190B20", func_8026777C); +INCLUDE_ASM(s32, "190B20", func_8026777C); -INCLUDE_ASM(s32, "code_190B20", func_8026787C); +INCLUDE_ASM(s32, "190B20", func_8026787C); -INCLUDE_ASM(s32, "code_190B20", func_80267A3C); +INCLUDE_ASM(s32, "190B20", func_80267A3C); -INCLUDE_ASM(s32, "code_190B20", reset_all_actor_sounds); +INCLUDE_ASM(s32, "190B20", reset_all_actor_sounds); void hide_foreground_models_unsafe(void) { FGModelData* data = gBattleStatus.foregroundModelData; @@ -1545,5 +1545,5 @@ void show_foreground_models(void) { #include "common/StartRumbleWithParams.inc.c" -INCLUDE_ASM(s32, "code_190B20", start_rumble_type); +INCLUDE_ASM(s32, "190B20", start_rumble_type); diff --git a/src/code_1967B0.c b/src/1967B0.c similarity index 81% rename from src/code_1967B0.c rename to src/1967B0.c index 28207b3d72..f74cdb90dc 100644 --- a/src/code_1967B0.c +++ b/src/1967B0.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM(s32, "code_1967B0", LoadItemScript); +INCLUDE_ASM(s32, "1967B0", LoadItemScript); -INCLUDE_ASM(s32, "code_1967B0", LoadFreeItemScript); +INCLUDE_ASM(s32, "1967B0", LoadFreeItemScript); ApiStatus LoadMoveScript(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/code_196AA0.c b/src/196AA0.c similarity index 67% rename from src/code_196AA0.c rename to src/196AA0.c index cc17c99b2f..896eec8e55 100644 --- a/src/code_196AA0.c +++ b/src/196AA0.c @@ -1,45 +1,45 @@ #include "common.h" -INCLUDE_ASM(s32, "code_196AA0", LoadActionCommand); +INCLUDE_ASM(s32, "196AA0", LoadActionCommand); -INCLUDE_ASM(s32, "code_196AA0", func_80268224); +INCLUDE_ASM(s32, "196AA0", func_80268224); -INCLUDE_ASM(s32, "code_196AA0", func_80268284); +INCLUDE_ASM(s32, "196AA0", func_80268284); -INCLUDE_ASM(s32, "code_196AA0", func_80268770); +INCLUDE_ASM(s32, "196AA0", func_80268770); -INCLUDE_ASM(s32, "code_196AA0", func_80268798); +INCLUDE_ASM(s32, "196AA0", func_80268798); -INCLUDE_ASM(s32, "code_196AA0", func_802687BC); +INCLUDE_ASM(s32, "196AA0", func_802687BC); -INCLUDE_ASM(s32, "code_196AA0", func_802687E4); +INCLUDE_ASM(s32, "196AA0", func_802687E4); -INCLUDE_ASM(s32, "code_196AA0", func_8026880C); +INCLUDE_ASM(s32, "196AA0", func_8026880C); -INCLUDE_ASM(s32, "code_196AA0", func_80268834); +INCLUDE_ASM(s32, "196AA0", func_80268834); -INCLUDE_ASM(s32, "code_196AA0", func_80268858); +INCLUDE_ASM(s32, "196AA0", func_80268858); -INCLUDE_ASM(s32, "code_196AA0", func_80268938); +INCLUDE_ASM(s32, "196AA0", func_80268938); -INCLUDE_ASM(s32, "code_196AA0", func_80268AF8); +INCLUDE_ASM(s32, "196AA0", func_80268AF8); -INCLUDE_ASM(s32, "code_196AA0", func_80268C9C); +INCLUDE_ASM(s32, "196AA0", func_80268C9C); -INCLUDE_ASM(s32, "code_196AA0", func_80268E88); +INCLUDE_ASM(s32, "196AA0", func_80268E88); -INCLUDE_ASM(s32, "code_196AA0", check_block_input); +INCLUDE_ASM(s32, "196AA0", check_block_input); -INCLUDE_ASM(s32, "code_196AA0", func_80269118); +INCLUDE_ASM(s32, "196AA0", func_80269118); -INCLUDE_ASM(s32, "code_196AA0", func_80269160); +INCLUDE_ASM(s32, "196AA0", func_80269160); ApiStatus func_8026919C(ScriptInstance* script, s32 isInitialCall) { gBattleStatus.unk_434 = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_196AA0", func_802691C8); +INCLUDE_ASM(s32, "196AA0", func_802691C8); ApiStatus GetActionSuccess(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); @@ -61,22 +61,22 @@ ApiStatus func_80269318(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_196AA0", func_80269344); +INCLUDE_ASM(s32, "196AA0", func_80269344); -INCLUDE_ASM(s32, "code_196AA0", func_80269370); +INCLUDE_ASM(s32, "196AA0", func_80269370); -INCLUDE_ASM(s32, "code_196AA0", func_8026939C); +INCLUDE_ASM(s32, "196AA0", func_8026939C); ApiStatus func_802693F0(ScriptInstance* script, s32 isInitialCall) { gBattleStatus.flags1 &= ~0x4000; return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_196AA0", CloseActionCommandInfo); +INCLUDE_ASM(s32, "196AA0", CloseActionCommandInfo); -INCLUDE_ASM(s32, "code_196AA0", func_80269470); +INCLUDE_ASM(s32, "196AA0", func_80269470); -INCLUDE_ASM(s32, "code_196AA0", func_802694A4); +INCLUDE_ASM(s32, "196AA0", func_802694A4); ApiStatus GetActionSuccessCopy(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gBattleStatus.actionSuccess); diff --git a/src/code_197F40.c b/src/197F40.c similarity index 96% rename from src/code_197F40.c rename to src/197F40.c index d5c6b2877a..fff3bccad8 100644 --- a/src/code_197F40.c +++ b/src/197F40.c @@ -39,9 +39,9 @@ s32 get_nearest_home_index(f32 x, f32 y, f32 z) { return yVal | (xVal << 2); } -INCLUDE_ASM(void, "code_197F40", set_goal_pos_to_part, f32* goalPos, ActorID target, s32 partIndex); +INCLUDE_ASM(void, "197F40", set_goal_pos_to_part, f32* goalPos, ActorID target, s32 partIndex); -INCLUDE_ASM(s32, "code_197F40", set_part_goal_to_actor_part); +INCLUDE_ASM(s32, "197F40", set_part_goal_to_actor_part); void set_actor_current_position(ActorID actorID, f32 x, f32 y, f32 z) { Actor* actor = get_actor(actorID); @@ -99,7 +99,7 @@ Actor* get_actor(ActorID actorID) { return ret; } -INCLUDE_ASM(s32, "code_197F40", LoadBattleSection); +INCLUDE_ASM(s32, "197F40", LoadBattleSection); ApiStatus GetBattlePhase(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gBattleStatus.battlePhase); @@ -155,7 +155,7 @@ ApiStatus SetIdleGoalToHome(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", SetGoalToIndex); +INCLUDE_ASM(s32, "197F40", SetGoalToIndex); ApiStatus GetIndexFromPos(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -1145,7 +1145,7 @@ ApiStatus AddActorVar(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "code_197F40", AddActorVar); +INCLUDE_ASM(s32, "197F40", AddActorVar); #endif ApiStatus GetPartMovementVar(ScriptInstance* script, s32 isInitialCall) { @@ -1921,7 +1921,7 @@ ApiStatus func_8026DA94(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", SummonEnemy); +INCLUDE_ASM(s32, "197F40", SummonEnemy); ApiStatus GetOwnerID(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, script->owner1.actorID); @@ -2053,11 +2053,11 @@ ApiStatus func_8026E16C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", func_8026E198); +INCLUDE_ASM(s32, "197F40", func_8026E198); -INCLUDE_ASM(s32, "code_197F40", func_8026E208); +INCLUDE_ASM(s32, "197F40", func_8026E208); -INCLUDE_ASM(s32, "code_197F40", func_8026E260); +INCLUDE_ASM(s32, "197F40", func_8026E260); ApiStatus PlayerCreateTargetList(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -2090,11 +2090,11 @@ ApiStatus InitTargetIterator(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", SetOwnerTarget); +INCLUDE_ASM(s32, "197F40", SetOwnerTarget); -INCLUDE_ASM(s32, "code_197F40", ChooseNextTarget); +INCLUDE_ASM(s32, "197F40", ChooseNextTarget); -INCLUDE_ASM(s32, "code_197F40", func_8026E558); +INCLUDE_ASM(s32, "197F40", func_8026E558); ApiStatus GetTargetListLength(ScriptInstance* script) { Bytecode* args = script->ptrReadPos; @@ -2103,60 +2103,60 @@ ApiStatus GetTargetListLength(ScriptInstance* script) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", GetOwnerTarget); +INCLUDE_ASM(s32, "197F40", GetOwnerTarget); -INCLUDE_ASM(s32, "code_197F40", func_8026E914); +INCLUDE_ASM(s32, "197F40", func_8026E914); ApiStatus GetAttackerActorID(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gBattleStatus.attackerActorID); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", func_8026E9A0); +INCLUDE_ASM(s32, "197F40", func_8026E9A0); -INCLUDE_ASM(s32, "code_197F40", GetDistanceToGoal); +INCLUDE_ASM(s32, "197F40", GetDistanceToGoal); -INCLUDE_ASM(s32, "code_197F40", func_8026EA7C); +INCLUDE_ASM(s32, "197F40", func_8026EA7C); -INCLUDE_ASM(s32, "code_197F40", func_8026EB20); +INCLUDE_ASM(s32, "197F40", func_8026EB20); -INCLUDE_ASM(s32, "code_197F40", func_8026EBF8); +INCLUDE_ASM(s32, "197F40", func_8026EBF8); -INCLUDE_ASM(s32, "code_197F40", func_8026ED20); +INCLUDE_ASM(s32, "197F40", func_8026ED20); -INCLUDE_ASM(s32, "code_197F40", func_8026EDE4); +INCLUDE_ASM(s32, "197F40", func_8026EDE4); -INCLUDE_ASM(s32, "code_197F40", AddActorDecoration); +INCLUDE_ASM(s32, "197F40", AddActorDecoration); -INCLUDE_ASM(s32, "code_197F40", RemoveActorDecoration); +INCLUDE_ASM(s32, "197F40", RemoveActorDecoration); -INCLUDE_ASM(s32, "code_197F40", ModifyActorDecoration); +INCLUDE_ASM(s32, "197F40", ModifyActorDecoration); -INCLUDE_ASM(s32, "code_197F40", UseIdleAnimation); +INCLUDE_ASM(s32, "197F40", UseIdleAnimation); -INCLUDE_ASM(s32, "code_197F40", func_8026F1A0); +INCLUDE_ASM(s32, "197F40", func_8026F1A0); -INCLUDE_ASM(s32, "code_197F40", GetStatusFlags); +INCLUDE_ASM(s32, "197F40", GetStatusFlags); ApiStatus RemovePlayerBuffs(ScriptInstance* script, s32 isInitialCall) { remove_player_buffs(*script->ptrReadPos); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", SetPartAlpha); +INCLUDE_ASM(s32, "197F40", SetPartAlpha); -INCLUDE_ASM(s32, "code_197F40", CreatePartShadow); +INCLUDE_ASM(s32, "197F40", CreatePartShadow); -INCLUDE_ASM(s32, "code_197F40", RemovePartShadow); +INCLUDE_ASM(s32, "197F40", RemovePartShadow); ApiStatus func_8026F60C(ScriptInstance* script, s32 isInitialCall) { gBattleStatus.unk_8D = get_variable(script, *script->ptrReadPos); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", SetBattleVar); +INCLUDE_ASM(s32, "197F40", SetBattleVar); -INCLUDE_ASM(s32, "code_197F40", GetBattleVar); +INCLUDE_ASM(s32, "197F40", GetBattleVar); ApiStatus ResetAllActorSounds(ScriptInstance* script, s32 isInitialCall) { ActorID actorID = get_variable(script, *script->ptrReadPos); @@ -2169,13 +2169,13 @@ ApiStatus ResetAllActorSounds(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", SetActorSounds); +INCLUDE_ASM(s32, "197F40", SetActorSounds); -INCLUDE_ASM(s32, "code_197F40", ResetActorSounds); +INCLUDE_ASM(s32, "197F40", ResetActorSounds); -INCLUDE_ASM(s32, "code_197F40", SetPartSounds); +INCLUDE_ASM(s32, "197F40", SetPartSounds); -INCLUDE_ASM(s32, "code_197F40", SetActorType); +INCLUDE_ASM(s32, "197F40", SetActorType); ApiStatus ShowShockEffect(ScriptInstance* script, s32 isInitialCall) { ActorID actorID = get_variable(script, *script->ptrReadPos); @@ -2188,22 +2188,22 @@ ApiStatus ShowShockEffect(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", GetActorAttackBoost); +INCLUDE_ASM(s32, "197F40", GetActorAttackBoost); -INCLUDE_ASM(s32, "code_197F40", GetActorDefenseBoost); +INCLUDE_ASM(s32, "197F40", GetActorDefenseBoost); -INCLUDE_ASM(s32, "code_197F40", BoostAttack); +INCLUDE_ASM(s32, "197F40", BoostAttack); -INCLUDE_ASM(s32, "code_197F40", BoostDefense); +INCLUDE_ASM(s32, "197F40", BoostDefense); -INCLUDE_ASM(s32, "code_197F40", VanishActor); +INCLUDE_ASM(s32, "197F40", VanishActor); -INCLUDE_ASM(s32, "code_197F40", ElectrifyActor); +INCLUDE_ASM(s32, "197F40", ElectrifyActor); -INCLUDE_ASM(s32, "code_197F40", HealActor); +INCLUDE_ASM(s32, "197F40", HealActor); ApiStatus WaitForBuffDone(ScriptInstance* script, s32 isInitialCall) { return (D_8029FBD4 == 0) * ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_197F40", CopyBuffs); +INCLUDE_ASM(s32, "197F40", CopyBuffs); diff --git a/src/code_19FAF0.c b/src/19FAF0.c similarity index 56% rename from src/code_19FAF0.c rename to src/19FAF0.c index 58ac933a8e..5fca391db1 100644 --- a/src/code_19FAF0.c +++ b/src/19FAF0.c @@ -11,30 +11,30 @@ ApiStatus func_80271258(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_19FAF0", func_802712A0); +INCLUDE_ASM(s32, "19FAF0", func_802712A0); -INCLUDE_ASM(s32, "code_19FAF0", func_80271328); +INCLUDE_ASM(s32, "19FAF0", func_80271328); -INCLUDE_ASM(s32, "code_19FAF0", func_802713B0); +INCLUDE_ASM(s32, "19FAF0", func_802713B0); ApiStatus func_8027143C(ScriptInstance* script, s32 isInitialCall) { func_80070A90(0, script->varTable[0], script->varTable[1], script->varTable[2]); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_19FAF0", func_80271484); +INCLUDE_ASM(s32, "19FAF0", func_80271484); -INCLUDE_ASM(s32, "code_19FAF0", func_80271588); +INCLUDE_ASM(s32, "19FAF0", func_80271588); -INCLUDE_ASM(s32, "code_19FAF0", dispatch_event_player); +INCLUDE_ASM(s32, "19FAF0", dispatch_event_player); -INCLUDE_ASM(s32, "code_19FAF0", dispatch_event_player_continue_turn); +INCLUDE_ASM(s32, "19FAF0", dispatch_event_player_continue_turn); -INCLUDE_ASM(s32, "code_19FAF0", calc_player_test_enemy); +INCLUDE_ASM(s32, "19FAF0", calc_player_test_enemy); -INCLUDE_ASM(s32, "code_19FAF0", calc_player_damage_enemy); +INCLUDE_ASM(s32, "19FAF0", calc_player_damage_enemy); -INCLUDE_ASM(s32, "code_19FAF0", dispatch_damage_event_player); +INCLUDE_ASM(s32, "19FAF0", dispatch_damage_event_player); void dispatch_damage_event_player_0(s32 damageAmount, Event event) { BattleStatus* battleStatus = &gBattleStatus; @@ -48,32 +48,32 @@ void dispatch_damage_event_player_1(s32 damageAmount, Event event) { dispatch_damage_event_player(damageAmount, event, TRUE); } -INCLUDE_ASM(s32, "code_19FAF0", GetMenuSelection); +INCLUDE_ASM(s32, "19FAF0", GetMenuSelection); -INCLUDE_ASM(s32, "code_19FAF0", func_80273444); +INCLUDE_ASM(s32, "19FAF0", func_80273444); -INCLUDE_ASM(s32, "code_19FAF0", PlayerFallToGoal); +INCLUDE_ASM(s32, "19FAF0", PlayerFallToGoal); -INCLUDE_ASM(s32, "code_19FAF0", PlayerLandJump); +INCLUDE_ASM(s32, "19FAF0", PlayerLandJump); -INCLUDE_ASM(s32, "code_19FAF0", PlayerRunToGoal); +INCLUDE_ASM(s32, "19FAF0", PlayerRunToGoal); -INCLUDE_ASM(s32, "code_19FAF0", CancelablePlayerRunToGoal); +INCLUDE_ASM(s32, "19FAF0", CancelablePlayerRunToGoal); ApiStatus GetPlayerHP(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gPlayerData.curHP); return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_19FAF0", PlayerDamageEnemy); +INCLUDE_ASM(s32, "19FAF0", PlayerDamageEnemy); -INCLUDE_ASM(s32, "code_19FAF0", PlayerPowerBounceEnemy); +INCLUDE_ASM(s32, "19FAF0", PlayerPowerBounceEnemy); -INCLUDE_ASM(s32, "code_19FAF0", PlayerTestEnemy); +INCLUDE_ASM(s32, "19FAF0", PlayerTestEnemy); -INCLUDE_ASM(s32, "code_19FAF0", DispatchDamagePlayerEvent); +INCLUDE_ASM(s32, "19FAF0", DispatchDamagePlayerEvent); -INCLUDE_ASM(s32, "code_19FAF0", EnablePlayerBlur); +INCLUDE_ASM(s32, "19FAF0", EnablePlayerBlur); ApiStatus func_802749D8(ScriptInstance* script, s32 isInitialCall) { func_802549A0(); @@ -85,13 +85,13 @@ ApiStatus func_802749F8(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_19FAF0", func_80274A18); +INCLUDE_ASM(s32, "19FAF0", func_80274A18); -INCLUDE_ASM(s32, "code_19FAF0", func_802752AC); +INCLUDE_ASM(s32, "19FAF0", func_802752AC); -INCLUDE_ASM(s32, "code_19FAF0", func_80275F00); +INCLUDE_ASM(s32, "19FAF0", func_80275F00); -INCLUDE_ASM(s32, "code_19FAF0", DidActionSucceed); +INCLUDE_ASM(s32, "19FAF0", DidActionSucceed); ApiStatus func_80276EFC(ScriptInstance* script, s32 isInitialCall) { gBattleStatus.flags1 |= 0x200000; diff --git a/src/code_1A5830.c b/src/1A5830.c similarity index 94% rename from src/code_1A5830.c rename to src/1A5830.c index c7018aa019..28a58ce31b 100644 --- a/src/code_1A5830.c +++ b/src/1A5830.c @@ -33,7 +33,7 @@ void dispatch_event_general(Actor* actor, Event event) { } } -INCLUDE_ASM(s32, "code_1A5830", play_hit_sound); +INCLUDE_ASM(s32, "1A5830", play_hit_sound); void dispatch_event_actor(Actor* actor, Event event) { ScriptInstance* onHitScript = actor->onHitScript; @@ -60,11 +60,11 @@ void dispatch_event_actor(Actor* actor, Event event) { } } -INCLUDE_ASM(s32, "code_1A5830", calc_enemy_test_target); +INCLUDE_ASM(s32, "1A5830", calc_enemy_test_target); -INCLUDE_ASM(s32, "code_1A5830", calc_enemy_damage_target); +INCLUDE_ASM(s32, "1A5830", calc_enemy_damage_target); -INCLUDE_ASM(s32, "code_1A5830", dispatch_damage_event_actor); +INCLUDE_ASM(s32, "1A5830", dispatch_damage_event_actor); s32 dispatch_damage_event_actor_0(Actor* actor, s32 damageAmount, s32 event) { return dispatch_damage_event_actor(actor, damageAmount, event, FALSE); @@ -200,37 +200,37 @@ ApiStatus BindNextTurn(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_1A5830", JumpToGoal); +INCLUDE_ASM(s32, "1A5830", JumpToGoal); -INCLUDE_ASM(s32, "code_1A5830", IdleJumpToGoal); +INCLUDE_ASM(s32, "1A5830", IdleJumpToGoal); -INCLUDE_ASM(s32, "code_1A5830", JumpToGoalSimple2); +INCLUDE_ASM(s32, "1A5830", JumpToGoalSimple2); -INCLUDE_ASM(s32, "code_1A5830", JumpWithBounce); +INCLUDE_ASM(s32, "1A5830", JumpWithBounce); -INCLUDE_ASM(s32, "code_1A5830", LandJump); +INCLUDE_ASM(s32, "1A5830", LandJump); -INCLUDE_ASM(s32, "code_1A5830", FallToGoal); +INCLUDE_ASM(s32, "1A5830", FallToGoal); -INCLUDE_ASM(s32, "code_1A5830", RunToGoal); +INCLUDE_ASM(s32, "1A5830", RunToGoal); -INCLUDE_ASM(s32, "code_1A5830", IdleRunToGoal); +INCLUDE_ASM(s32, "1A5830", IdleRunToGoal); -INCLUDE_ASM(s32, "code_1A5830", JumpPartTo); +INCLUDE_ASM(s32, "1A5830", JumpPartTo); -INCLUDE_ASM(s32, "code_1A5830", FallPartTo); +INCLUDE_ASM(s32, "1A5830", FallPartTo); -INCLUDE_ASM(s32, "code_1A5830", LandJumpPart); +INCLUDE_ASM(s32, "1A5830", LandJumpPart); -INCLUDE_ASM(s32, "code_1A5830", RunPartTo); +INCLUDE_ASM(s32, "1A5830", RunPartTo); -INCLUDE_ASM(s32, "code_1A5830", update_lerp_battle); +INCLUDE_ASM(s32, "1A5830", update_lerp_battle); -INCLUDE_ASM(s32, "code_1A5830", FlyToGoal); +INCLUDE_ASM(s32, "1A5830", FlyToGoal); -INCLUDE_ASM(s32, "code_1A5830", IdleFlyToGoal); +INCLUDE_ASM(s32, "1A5830", IdleFlyToGoal); -INCLUDE_ASM(s32, "code_1A5830", FlyPartTo); +INCLUDE_ASM(s32, "1A5830", FlyPartTo); ApiStatus GetLastEvent(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -331,9 +331,9 @@ ApiStatus GetEnemyMaxHP(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_1A5830", RemoveActor); +INCLUDE_ASM(s32, "1A5830", RemoveActor); -INCLUDE_ASM(s32, "code_1A5830", DropStarPoints); +INCLUDE_ASM(s32, "1A5830", DropStarPoints); ApiStatus SetDefenseTable(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -400,7 +400,7 @@ ApiStatus func_8027CC10(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_1A5830", EnemyDamageTarget); +INCLUDE_ASM(s32, "1A5830", EnemyDamageTarget); ApiStatus EnemyFollowupAfflictTarget(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -441,7 +441,7 @@ ApiStatus EnemyFollowupAfflictTarget(ScriptInstance* script, s32 isInitialCall) } -INCLUDE_ASM(s32, "code_1A5830", EnemyTestTarget); +INCLUDE_ASM(s32, "1A5830", EnemyTestTarget); ApiStatus DispatchDamageEvent(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -699,7 +699,7 @@ ApiStatus GetActorSize(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_1A5830", SetPartSize); +INCLUDE_ASM(s32, "1A5830", SetPartSize); ApiStatus GetOriginalActorType(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/code_1AC760.c b/src/1AC760.c similarity index 91% rename from src/code_1AC760.c rename to src/1AC760.c index 22177079f0..6219daf011 100644 --- a/src/code_1AC760.c +++ b/src/1AC760.c @@ -42,11 +42,11 @@ void dispatch_event_partner_continue_turn(s8 lastEventType) { } } -INCLUDE_ASM(s32, "code_1AC760", calc_partner_test_enemy); +INCLUDE_ASM(s32, "1AC760", calc_partner_test_enemy); -INCLUDE_ASM(s32, "code_1AC760", calc_partner_damage_enemy); +INCLUDE_ASM(s32, "1AC760", calc_partner_damage_enemy); -INCLUDE_ASM(s32, "code_1AC760", dispatch_damage_event_partner); +INCLUDE_ASM(s32, "1AC760", dispatch_damage_event_partner); s32 dispatch_damage_event_partner_0(s32 damageAmount, s32 event, s32 stopMotion) { return dispatch_damage_event_partner(damageAmount, event, FALSE); @@ -81,7 +81,7 @@ ApiStatus MakeOwnerTargetIndex(ScriptInstance* script, s32 isInitialCall) { actor->targetActorID = selectableTarget->actorID; actor->targetPartIndex = selectableTarget->partID; } - + set_variable(script, otherArg, arg2); return ApiStatus_DONE2; } @@ -127,13 +127,13 @@ ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_1AC760", PartnerDamageEnemy); +INCLUDE_ASM(s32, "1AC760", PartnerDamageEnemy); -INCLUDE_ASM(s32, "code_1AC760", PartnerAfflictEnemy); +INCLUDE_ASM(s32, "1AC760", PartnerAfflictEnemy); -INCLUDE_ASM(s32, "code_1AC760", PartnerPowerBounceEnemy); +INCLUDE_ASM(s32, "1AC760", PartnerPowerBounceEnemy); -INCLUDE_ASM(s32, "code_1AC760", PartnerTestEnemy); +INCLUDE_ASM(s32, "1AC760", PartnerTestEnemy); ApiStatus func_8028070C(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -177,7 +177,7 @@ ApiStatus func_802807D0(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -/// Seems to be the same functionality as YieldTurn in code_1A5830.c +/// Seems to be the same functionality as YieldTurn in 1A5830.c ApiStatus func_80280818(ScriptInstance* script, s32 isInitialCall) { gBattleStatus.flags1 |= 0x200000; return ApiStatus_DONE2; diff --git a/src/code_1AF120.c b/src/1AF120.c similarity index 100% rename from src/code_1AF120.c rename to src/1AF120.c diff --git a/src/code_1AF230.c b/src/1AF230.c similarity index 100% rename from src/code_1AF230.c rename to src/1AF230.c diff --git a/src/code_1a1f0_len_5390.c b/src/1a1f0_len_5390.c similarity index 94% rename from src/code_1a1f0_len_5390.c rename to src/1a1f0_len_5390.c index 46e29c06be..281c6b110e 100644 --- a/src/code_1a1f0_len_5390.c +++ b/src/1a1f0_len_5390.c @@ -101,7 +101,7 @@ ApiStatus FadeOutMerlee(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "code_1a1f0_len_5390", MerleeUpdateFX); +INCLUDE_ASM(s32, "1a1f0_len_5390", MerleeUpdateFX); ApiStatus MerleeStopFX(ScriptInstance* script, s32 isInitialCall) { D_800A0BB8 = 1; @@ -210,18 +210,18 @@ ApiStatus OnFleeBattleDrops(ScriptInstance* script, s32 isInitialCall) { } /// Default/neutral state during world gameplay; checks for player-enemy collisions and initiates battles when they occur. -INCLUDE_ASM(s32, "code_1a1f0_len_5390", update_encounters_neutral); +INCLUDE_ASM(s32, "1a1f0_len_5390", update_encounters_neutral); void draw_encounters_neutral() { } -INCLUDE_ASM(s32, "code_1a1f0_len_5390", update_encounters_pre_battle); +INCLUDE_ASM(s32, "1a1f0_len_5390", update_encounters_pre_battle); -INCLUDE_ASM(s32, "code_1a1f0_len_5390", draw_encounters_pre_battle); +INCLUDE_ASM(s32, "1a1f0_len_5390", draw_encounters_pre_battle); -INCLUDE_ASM(s32, "code_1a1f0_len_5390", show_first_strike_message); +INCLUDE_ASM(s32, "1a1f0_len_5390", show_first_strike_message); -INCLUDE_ASM(s32, "code_1a1f0_len_5390", update_encounters_post_battle); +INCLUDE_ASM(s32, "1a1f0_len_5390", update_encounters_post_battle); s32 draw_encounters_post_battle(void) { EncounterStatus* currentEncounter = &gCurrentEncounter; @@ -294,9 +294,9 @@ void update_encounters_conversation(void) { void draw_encounters_conversation() { } -INCLUDE_ASM(s32, "code_1a1f0_len_5390", check_conversation_trigger); +INCLUDE_ASM(s32, "1a1f0_len_5390", check_conversation_trigger); -INCLUDE_ASM(s32, "code_1a1f0_len_5390", create_encounters); +INCLUDE_ASM(s32, "1a1f0_len_5390", create_encounters); void init_encounters_ui() { } diff --git a/src/code_1b40_len_20b0.c b/src/1b40_len_20b0.c similarity index 87% rename from src/code_1b40_len_20b0.c rename to src/1b40_len_20b0.c index 8bd45ab111..4630b50ee9 100644 --- a/src/code_1b40_len_20b0.c +++ b/src/1b40_len_20b0.c @@ -72,7 +72,7 @@ void step_game_loop(void) { } func_8011BAE8(); - func_8003857C(); + npc_iter_no_op(); update_dynamic_entities(); update_triggers(); update_scripts(); @@ -170,18 +170,18 @@ void gfx_task_background(void) { NU_GFX_UCODE_F3DEX2, NU_SC_NOSWAPBUFFER); } -INCLUDE_ASM(s32, "code_1b40_len_20b0", gfx_draw_frame); +INCLUDE_ASM(s32, "1b40_len_20b0", gfx_draw_frame); void load_engine_data(void) { GameStatus** gameStatus = &gGameStatusPtr; s32 i; - dma_copy(&code_code_FEE30_ROM_START, &code_code_FEE30_ROM_END, &code_code_FEE30_VRAM); - dma_copy(&code_code_759B0_ROM_START, &code_code_759B0_ROM_END, &code_code_759B0_VRAM); - dma_copy(&code_code_E79B0_ROM_START, &code_code_E79B0_ROM_END, &code_code_E79B0_VRAM); - dma_copy(&code_code_102610_ROM_START, &code_code_102610_ROM_END, &code_code_102610_VRAM); - dma_copy(&code_code_A5DD0_ROM_START, &code_code_A5DD0_ROM_END, &code_code_A5DD0_VRAM); - dma_copy(&code_code_10CC10_ROM_START, &code_code_10CC10_ROM_END, &code_code_10CC10_VRAM); + dma_copy(FEE30_ROM_START, FEE30_ROM_END, FEE30_VRAM); + dma_copy(_759B0_ROM_START, _759B0_ROM_END, _759B0_VRAM); + dma_copy(E79B0_ROM_START, E79B0_ROM_END, E79B0_VRAM); + dma_copy(_102610_ROM_START, _102610_ROM_END, _102610_VRAM); + dma_copy(A5DD0_ROM_START, A5DD0_ROM_END, A5DD0_VRAM); + dma_copy(_10CC10_ROM_START, _10CC10_ROM_END, _10CC10_VRAM); gOverrideFlags = 0; (*gameStatus)->unk_79 = 0; @@ -214,7 +214,7 @@ void load_engine_data(void) { clear_character_set(); clear_printers(); func_80112B98(); - clear_npcs(); + npc_list_clear(); func_80141100(); clear_trigger_data(); clear_entity_data(0); @@ -286,19 +286,19 @@ void gfx_init_state(void) { gSPDisplayList(gMasterGfxPos++, OS_K0_TO_PHYSICAL(&D_80074210)); } #else -INCLUDE_ASM(void, "code_1b40_len_20b0", gfx_init_state); +INCLUDE_ASM(void, "1b40_len_20b0", gfx_init_state); #endif -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800271FC); +INCLUDE_ASM(s32, "1b40_len_20b0", func_800271FC); -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_8002725C); +INCLUDE_ASM(s32, "1b40_len_20b0", func_8002725C); -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027600); +INCLUDE_ASM(s32, "1b40_len_20b0", func_80027600); -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027774); +INCLUDE_ASM(s32, "1b40_len_20b0", func_80027774); -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_800279B4); +INCLUDE_ASM(s32, "1b40_len_20b0", func_800279B4); -INCLUDE_ASM(s32, "code_1b40_len_20b0", func_80027BAC); +INCLUDE_ASM(s32, "1b40_len_20b0", func_80027BAC); -INCLUDE_ASM(void, "code_1b40_len_20b0", gfx_draw_background); +INCLUDE_ASM(void, "1b40_len_20b0", gfx_draw_background); diff --git a/src/code_1f580_len_1940.c b/src/1f580_len_1940.c similarity index 96% rename from src/code_1f580_len_1940.c rename to src/1f580_len_1940.c index aec15adaae..0a9beae5bd 100644 --- a/src/code_1f580_len_1940.c +++ b/src/1f580_len_1940.c @@ -58,9 +58,9 @@ ApiStatus MakeNpcs(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "code_1f580_len_1940", RemoveNpc, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "1f580_len_1940", RemoveNpc, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_1f580_len_1940", RemoveEncounter, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "1f580_len_1940", RemoveEncounter, ScriptInstance* script, s32 isInitialCall); ApiStatus GetBattleOutcome(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gCurrentEncounter.battleOutcome); @@ -99,7 +99,7 @@ ApiStatus DoNpcDefeat(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_FINISH; } -INCLUDE_ASM(s32, "code_1f580_len_1940", start_battle); +INCLUDE_ASM(s32, "1f580_len_1940", start_battle); ApiStatus StartBattle(ScriptInstance* script, s32 isInitialCall) { start_battle(script, -1); @@ -111,7 +111,7 @@ ApiStatus StartBattleWith(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE1; } -INCLUDE_ASM(s32, "code_1f580_len_1940", StartBossBattle, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "1f580_len_1940", StartBossBattle, ScriptInstance* script, s32 isInitialCall); ApiStatus SetBattleMusic(ScriptInstance* script, s32 isInitialCall) { Bytecode songID = get_variable(script, *script->ptrReadPos); @@ -123,7 +123,7 @@ ApiStatus SetBattleMusic(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_1f580_len_1940", BindNpcAI, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "1f580_len_1940", BindNpcAI, ScriptInstance* script, s32 isInitialCall); ApiStatus BindNpcIdle(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -198,7 +198,7 @@ ApiStatus EnableNpcAI(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_1f580_len_1940", SetNpcAux, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "1f580_len_1940", SetNpcAux, ScriptInstance* script, s32 isInitialCall); ApiStatus BindNpcAux(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/20ec0_len_5040.c b/src/20ec0_len_5040.c new file mode 100644 index 0000000000..ae989c1ce6 --- /dev/null +++ b/src/20ec0_len_5040.c @@ -0,0 +1,104 @@ +#include "common.h" +#include "map.h" + +extern s32 D_800A0F40; + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045AC0); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045B10); + +INCLUDE_ASM(s32, "20ec0_len_5040", update_merlee_messages); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045BC8); + +INCLUDE_ASM(s32, "20ec0_len_5040", draw_merlee_messages); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045C88); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045CC4); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045D00); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045D7C); + +INCLUDE_ASM(s32, "20ec0_len_5040", draw_merlee_message_string); + +INCLUDE_ASM(s32, "20ec0_len_5040", draw_merlee_message); + +s32 is_merlee_message_done(void) { + return D_800A0F40; +} + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80045FB4); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80046030); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_800465E0); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047608); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_800476F4); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_8004778C); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_800477F4); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047820); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047898); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_800478F8); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047928); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_800479A0); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047A00); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047A30); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047AA8); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047B08); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047B38); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047B84); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047BE4); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047C14); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047CA4); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047D00); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047D30); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047DC0); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047E1C); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047E4C); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047EDC); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047F28); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047F58); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80047FE8); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80048034); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80048064); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_800480F4); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80048140); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80048170); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_80048200); + +INCLUDE_ASM(s32, "20ec0_len_5040", func_8004824C); diff --git a/src/code_23680.c b/src/23680.c similarity index 86% rename from src/code_23680.c rename to src/23680.c index 5de0f5d748..bb0fdd8f6e 100644 --- a/src/code_23680.c +++ b/src/23680.c @@ -1,7 +1,7 @@ #include "common.h" #include "map.h" -INCLUDE_ASM(s32, "code_23680", spawn_drops); +INCLUDE_ASM(s32, "23680", spawn_drops); // The issues here are only in the beginning where max and min are flipped #ifdef NON_MATCHING @@ -62,10 +62,10 @@ s32 get_coin_drop_amount(Enemy* enemy) { return amt; } #else -INCLUDE_ASM(s32, "code_23680", get_coin_drop_amount); +INCLUDE_ASM(s32, "23680", get_coin_drop_amount); #endif -INCLUDE_ASM(s32, "code_23680", func_80048E34); +INCLUDE_ASM(s32, "23680", func_80048E34); s32 func_80048F0C(void) { EncounterStatus* currentEncounter = &gCurrentEncounter; @@ -106,7 +106,7 @@ s32 is_point_within_region(s32 shape, f32 pointX, f32 pointY, f32 centerX, f32 c } } -INCLUDE_ASM(s32, "code_23680", func_800490B4, EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, f32 arg3, s32 arg4); +INCLUDE_ASM(s32, "23680", func_800490B4, EnemyTerritoryThing* arg0, Enemy* arg1, f32 arg2, f32 arg3, s32 arg4); s32 func_800493EC(Enemy* enemy, s32 arg1, f32 arg2, f32 arg3) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -160,14 +160,14 @@ void func_80049550(ScriptInstance* script, s32 arg1) { } } -INCLUDE_ASM(s32, "code_23680", func_800495A0); +INCLUDE_ASM(s32, "23680", func_800495A0); -INCLUDE_ASM(s32, "code_23680", func_800496B8); +INCLUDE_ASM(s32, "23680", func_800496B8); #define NAMESPACE base #include "world/common/UnkNpcAIFunc1.inc.c" -INCLUDE_ASM(s32, "code_23680", func_80049C04); +INCLUDE_ASM(s32, "23680", func_80049C04); void func_80049E3C(ScriptInstance* script) { Enemy* enemy = script->owner1.enemy; @@ -203,9 +203,9 @@ void func_80049ECC(ScriptInstance* script) { } } -INCLUDE_ASM(void, "code_23680", func_80049F7C, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +INCLUDE_ASM(s32, "23680", func_80049F7C); -INCLUDE_ASM(void, "code_23680", func_8004A124, ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory); +INCLUDE_ASM(s32, "23680", func_8004A124); void func_8004A3E8(ScriptInstance* script, s32 arg1) { Enemy* enemy = script->owner1.enemy; @@ -218,4 +218,4 @@ void func_8004A3E8(ScriptInstance* script, s32 arg1) { } } -INCLUDE_ASM(s32, "code_23680", DoBasicAI, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "23680", DoBasicAI, ScriptInstance* script, s32 isInitialCall); diff --git a/src/code_25AF0.c b/src/25AF0.c similarity index 81% rename from src/code_25AF0.c rename to src/25AF0.c index f1e8ea14ef..800983c70b 100644 --- a/src/code_25AF0.c +++ b/src/25AF0.c @@ -19,4 +19,4 @@ void func_8004A73C(ScriptInstance* script) { } } -INCLUDE_ASM(void, "code_25AF0", func_8004A784, Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5); +INCLUDE_ASM(void, "25AF0", func_8004A784, Npc* npc, f32 arg1, f32* arg2, s32* arg3, s32* arg4, s32* arg5); diff --git a/src/code_25f00_len_940.c b/src/25f00_len_940.c similarity index 91% rename from src/code_25f00_len_940.c rename to src/25f00_len_940.c index 37e2fff63a..7e5687bdc4 100644 --- a/src/code_25f00_len_940.c +++ b/src/25f00_len_940.c @@ -15,7 +15,7 @@ u8 D_80078181 = 1; //bss //static u16 D_800A0F50; -INCLUDE_ASM(s32, "code_25f00_len_940", create_audio_system); +INCLUDE_ASM(s32, "25f00_len_940", create_audio_system); void nuAuPreNMIFuncSet(NUAuPreNMIFunc func) { OSIntMask mask = osSetIntMask(OS_IM_NONE); @@ -24,10 +24,10 @@ void nuAuPreNMIFuncSet(NUAuPreNMIFunc func) { osSetIntMask(mask); } -INCLUDE_ASM(s32, "code_25f00_len_940", func_8004AE08); +INCLUDE_ASM(s32, "25f00_len_940", func_8004AE08); s32 nuAuDmaCallBack(s32 addr, s32 len, void* state, s32 arg3); -INCLUDE_ASM(s32, "code_25f00_len_940", nuAuDmaCallBack, s32 addr, s32 len, void* state, s32 arg3); +INCLUDE_ASM(s32, "25f00_len_940", nuAuDmaCallBack, s32 addr, s32 len, void* state, s32 arg3); ALDMAproc nuAuDmaNew(NUDMAState** state) { if (!nuAuDmaState.initialized) { @@ -109,7 +109,7 @@ void func_8004B328(s16 arg0, s32 arg1) { } } #else -INCLUDE_ASM(s32, "code_25f00_len_940", func_8004B328); +INCLUDE_ASM(s32, "25f00_len_940", func_8004B328); #endif void alLink(ALLink* element, ALLink* after) { diff --git a/src/code_26840_len_20d0.c b/src/26840_len_20d0.c similarity index 62% rename from src/code_26840_len_20d0.c rename to src/26840_len_20d0.c index ebae62280d..6d5491d067 100644 --- a/src/code_26840_len_20d0.c +++ b/src/26840_len_20d0.c @@ -83,7 +83,7 @@ void func_8004B440(SoundManager* manager, u8 arg1, u8 arg2, UnkAl19E0* arg3, u8 func_8004B9E4(manager, 0); } -INCLUDE_ASM(void, "code_26840_len_20d0", snd_load_sfx_groups_from_SEF, SoundManager* manager); +INCLUDE_ASM(void, "26840_len_20d0", snd_load_sfx_groups_from_SEF, SoundManager* manager); void snd_clear_sfx_queue(SoundManager* manager) { s32 i; @@ -128,7 +128,7 @@ void snd_enqueue_sfx_event(SoundManager* manager, s32 soundID, s16 volume, s16 p } } -INCLUDE_ASM(void, "code_26840_len_20d0", func_8004B748, SoundManager* manager); +INCLUDE_ASM(void, "26840_len_20d0", func_8004B748, SoundManager* manager); s32 func_8004B9E4(SoundManager* manager, s32 arg1) { s32 a1 = (u8) arg1; @@ -158,85 +158,85 @@ void func_8004BA54(SoundManager* manager, s32 arg1) { } } -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004BA74); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004BA74); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C0E4); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004C0E4); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C268); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004C268); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C2A4); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004C2A4); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C300); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004C300); -INCLUDE_ASM(void, "code_26840_len_20d0", snd_set_modifiers, SoundManager* manager, SoundSFXEntry* sfxEntry); +INCLUDE_ASM(void, "26840_len_20d0", snd_set_modifiers, SoundManager* manager, SoundSFXEntry* sfxEntry); -INCLUDE_ASM(void, "code_26840_len_20d0", snd_set_player_modifiers, SoundManager* manager, SoundSFXEntry* sfxEntry); +INCLUDE_ASM(void, "26840_len_20d0", snd_set_player_modifiers, SoundManager* manager, SoundSFXEntry* sfxEntry); -INCLUDE_ASM(s16, "code_26840_len_20d0", func_8004C444, SoundManager* manager); +INCLUDE_ASM(s16, "26840_len_20d0", func_8004C444, SoundManager* manager); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C578); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004C578); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C844); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004C844); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004C884); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004C884); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CD94); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004CD94); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CDF8); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004CDF8); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CE70); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004CE70); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CEA4); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004CEA4); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CEC4); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004CEC4); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CF0C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004CF0C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004CF3C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004CF3C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D00C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D00C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D038); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D038); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D050); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D050); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D07C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D07C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D114); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D114); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D130); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D130); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D15C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D15C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D180); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D180); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D1B4); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D1B4); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D23C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D23C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D2B0); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D2B0); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D2E4); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D2E4); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D310); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D310); void func_8004D31C(void) { } -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D324); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D324); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D33C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D33C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D354); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D354); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D36C); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D36C); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D3A0); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D3A0); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D3F8); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D3F8); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D428); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D428); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D484); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D484); -INCLUDE_ASM(s32, "code_26840_len_20d0", func_8004D4BC); +INCLUDE_ASM(s32, "26840_len_20d0", func_8004D4BC); diff --git a/src/code_28910_len_5090.c b/src/28910_len_5090.c similarity index 82% rename from src/code_28910_len_5090.c rename to src/28910_len_5090.c index 0c5bb47788..271f0d8b46 100644 --- a/src/code_28910_len_5090.c +++ b/src/28910_len_5090.c @@ -1,6 +1,6 @@ #include "audio.h" -INCLUDE_ASM(void, "code_28910_len_5090", func_8004D510, BGMPlayer* arg0); +INCLUDE_ASM(void, "28910_len_5090", func_8004D510, BGMPlayer* arg0); // Return values are being pushed into v0 in the wrong place // May depend on data decomp @@ -17,10 +17,10 @@ BGMPlayer* snd_get_player_with_song_name(s32 songString) { return NULL; } #else -INCLUDE_ASM(BGMPlayer*, "code_28910_len_5090", snd_get_player_with_song_name, s32 songString); +INCLUDE_ASM(BGMPlayer*, "28910_len_5090", snd_get_player_with_song_name, s32 songString); #endif -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004D7E0); +INCLUDE_ASM(s32, "28910_len_5090", func_8004D7E0); s32 func_8004DA0C(s32 songName) { s32 ret = 0; @@ -47,7 +47,7 @@ s32 func_8004DA0C(s32 songName) { return ret; } -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DA74); +INCLUDE_ASM(s32, "28910_len_5090", func_8004DA74); void func_8004DAA8(BGMPlayer* player) { if (player->unk_221 != 0) { @@ -58,21 +58,21 @@ void func_8004DAA8(BGMPlayer* player) { } } -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DAE0); +INCLUDE_ASM(s32, "28910_len_5090", func_8004DAE0); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DB28); +INCLUDE_ASM(s32, "28910_len_5090", func_8004DB28); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DB4C); +INCLUDE_ASM(s32, "28910_len_5090", func_8004DB4C); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DC80); +INCLUDE_ASM(s32, "28910_len_5090", func_8004DC80); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DCB8); +INCLUDE_ASM(s32, "28910_len_5090", func_8004DCB8); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004DE2C); +INCLUDE_ASM(s32, "28910_len_5090", func_8004DE2C); -INCLUDE_ASM(void, "code_28910_len_5090", func_8004DFD4, UnkAl19E0* arg0); +INCLUDE_ASM(void, "28910_len_5090", func_8004DFD4, UnkAl19E0* arg0); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E0F4); +INCLUDE_ASM(s32, "28910_len_5090", func_8004E0F4); void func_8004E158(BGMPlayer* player, s32 arg1, s32 arg2, UnkAl19E0* arg3) { s16 i; @@ -153,7 +153,7 @@ void func_8004E158(BGMPlayer* player, s32 arg1, s32 arg2, UnkAl19E0* arg3) { } -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E344); +INCLUDE_ASM(s32, "28910_len_5090", func_8004E344); void snd_update_bgm_fade(BGMPlayer* player) { player->fadeInfo.fadeTime--; @@ -190,23 +190,23 @@ void func_8004E444(BGMPlayer *arg0) { } } -INCLUDE_ASM(s16, "code_28910_len_5090", func_8004E4B8, BGMPlayer* player); +INCLUDE_ASM(s16, "28910_len_5090", func_8004E4B8, BGMPlayer* player); -INCLUDE_ASM(s32, "code_28910_len_5090", snd_initialize_bgm_player, BGMPlayer* player); +INCLUDE_ASM(s32, "28910_len_5090", snd_initialize_bgm_player, BGMPlayer* player); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E844); +INCLUDE_ASM(s32, "28910_len_5090", func_8004E844); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E880); +INCLUDE_ASM(s32, "28910_len_5090", func_8004E880); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004E904); +INCLUDE_ASM(s32, "28910_len_5090", func_8004E904); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EA34); +INCLUDE_ASM(s32, "28910_len_5090", func_8004EA34); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EAD4); +INCLUDE_ASM(s32, "28910_len_5090", func_8004EAD4); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC04); +INCLUDE_ASM(s32, "28910_len_5090", func_8004EC04); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8004EC68); +INCLUDE_ASM(s32, "28910_len_5090", func_8004EC68); void snd_BGMCmd_E0_MasterTempo(BGMPlayer* player, BGMPlayerTrack* track) { u32 unk_D4 = player->unk_D4.u16; @@ -395,7 +395,7 @@ void snd_BGMCmd_F4(BGMPlayer* player, BGMPlayerTrack* track) { track->unk_57 = player->unk_D4.u8[1] & 0x7F; } -INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_F5_TrackVoice, BGMPlayer* player, BGMPlayerTrack* track); +INCLUDE_ASM(void, "28910_len_5090", snd_BGMCmd_F5_TrackVoice, BGMPlayer* player, BGMPlayerTrack* track); void snd_BGMCmd_F7_SubTrackReverbType(BGMPlayer* player, BGMPlayerTrack* track) { u8 temp_v0 = player->unk_D4.u8[0]; @@ -414,7 +414,7 @@ void snd_BGMCmd_FD(BGMPlayer* player, BGMPlayerTrack* track) { func_800560BC(player->unk_234, track->unk_5C, player->unk_D4.u16 >> 8); } #else -INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_FD, BGMPlayer* player, BGMPlayerTrack* track); +INCLUDE_ASM(void, "28910_len_5090", snd_BGMCmd_FD, BGMPlayer* player, BGMPlayerTrack* track); #endif void snd_BGMCmd_FE(BGMPlayer* player, BGMPlayerTrack* track) { @@ -425,22 +425,22 @@ void snd_BGMCmd_FE(BGMPlayer* player, BGMPlayerTrack* track) { track->bgmReadPos = temp; } -INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_FC_Jump, BGMPlayer* player, BGMPlayerTrack* track); +INCLUDE_ASM(void, "28910_len_5090", snd_BGMCmd_FC_Jump, BGMPlayer* player, BGMPlayerTrack* track); -INCLUDE_ASM(void, "code_28910_len_5090", snd_BGMCmd_FF, BGMPlayer* player, BGMPlayerTrack* track); +INCLUDE_ASM(void, "28910_len_5090", snd_BGMCmd_FF, BGMPlayer* player, BGMPlayerTrack* track); void snd_BGMCmd_NOP(BGMPlayer* player, BGMPlayerTrack* track) { } -INCLUDE_ASM(s32, "code_28910_len_5090", func_80050568); +INCLUDE_ASM(s32, "28910_len_5090", func_80050568); -INCLUDE_ASM(s32, "code_28910_len_5090", func_800505E4); +INCLUDE_ASM(s32, "28910_len_5090", func_800505E4); -INCLUDE_ASM(s32, "code_28910_len_5090", func_80050654); +INCLUDE_ASM(s32, "28910_len_5090", func_80050654); -INCLUDE_ASM(s32, "code_28910_len_5090", func_8005068C); +INCLUDE_ASM(s32, "28910_len_5090", func_8005068C); -INCLUDE_ASM(s32, "code_28910_len_5090", func_800506C8, s32 arg0, s32 arg1); +INCLUDE_ASM(s32, "28910_len_5090", func_800506C8, s32 arg0, s32 arg1); void func_80050770(BGMPlayer *player, f32 arg1) { if (arg1 > 2.0) { @@ -477,10 +477,10 @@ void func_8005083C(BGMPlayer* arg0, s32 arg1, s16 arg2, s8 arg3) { } } -INCLUDE_ASM(void, "code_28910_len_5090", func_8005087C, BGMPlayer* player, s32* arg1, s32 arg2); +INCLUDE_ASM(void, "28910_len_5090", func_8005087C, BGMPlayer* player, s32* arg1, s32 arg2); -INCLUDE_ASM(s32, "code_28910_len_5090", func_80050888); +INCLUDE_ASM(s32, "28910_len_5090", func_80050888); -INCLUDE_ASM(s32, "code_28910_len_5090", func_80050900); +INCLUDE_ASM(s32, "28910_len_5090", func_80050900); -INCLUDE_ASM(s32, "code_28910_len_5090", func_80050970); +INCLUDE_ASM(s32, "28910_len_5090", func_80050970); diff --git a/src/code_2BF90.c b/src/2BF90.c similarity index 62% rename from src/code_2BF90.c rename to src/2BF90.c index 4f3952ea76..6bc121d9ca 100644 --- a/src/code_2BF90.c +++ b/src/2BF90.c @@ -1,6 +1,6 @@ #include "audio.h" -INCLUDE_ASM(s32, "code_2BF90", func_80050B90); +INCLUDE_ASM(s32, "2BF90", func_80050B90); s32 func_80050C30(u32 arg0) { if (D_8009A628->unk_20 <= arg0) { @@ -14,25 +14,25 @@ void func_80050C54(s32 arg0, s8 arg1) { D_8009A628->unk_21 = arg1; } -INCLUDE_ASM(s32, "code_2BF90", func_80050C64); +INCLUDE_ASM(s32, "2BF90", func_80050C64); -INCLUDE_ASM(s32, "code_2BF90", func_80050CA0); +INCLUDE_ASM(s32, "2BF90", func_80050CA0); -INCLUDE_ASM(void, "code_2BF90", func_80050D50, UnkAl1E4* arg0); +INCLUDE_ASM(void, "2BF90", func_80050D50, UnkAl1E4* arg0); -INCLUDE_ASM(s32, "code_2BF90", func_80050E18); +INCLUDE_ASM(s32, "2BF90", func_80050E18); -INCLUDE_ASM(s32, "code_2BF90", func_80050E84); +INCLUDE_ASM(s32, "2BF90", func_80050E84); -INCLUDE_ASM(s32, "code_2BF90", func_80050EF0); +INCLUDE_ASM(s32, "2BF90", func_80050EF0); -INCLUDE_ASM(s32, "code_2BF90", func_80050F64); +INCLUDE_ASM(s32, "2BF90", func_80050F64); -INCLUDE_ASM(s32, "code_2BF90", func_80050FD0); +INCLUDE_ASM(s32, "2BF90", func_80050FD0); -INCLUDE_ASM(s32, "code_2BF90", func_80051050); +INCLUDE_ASM(s32, "2BF90", func_80051050); -INCLUDE_ASM(s32, "code_2BF90", func_800510A4); +INCLUDE_ASM(s32, "2BF90", func_800510A4); void func_800511BC(UnkAl834* arg0) { u32 i; @@ -85,14 +85,14 @@ void func_800511BC(UnkAl834* arg0) { arg0->unk_21 = 0; } -INCLUDE_ASM(void, "code_2BF90", func_80051334, UnkAl834* arg0, UnkAl1E4* arg1); +INCLUDE_ASM(void, "2BF90", func_80051334, UnkAl834* arg0, UnkAl1E4* arg1); -INCLUDE_ASM(void, "code_2BF90", func_80051434, UnkAl834* arg0, UnkAl1E4* arg1); +INCLUDE_ASM(void, "2BF90", func_80051434, UnkAl834* arg0, UnkAl1E4* arg1); -INCLUDE_ASM(s32, "code_2BF90", func_800521D0); +INCLUDE_ASM(s32, "2BF90", func_800521D0); -INCLUDE_ASM(void, "code_2BF90", func_800521E8, UnkAl834* arg0, UnkAl1E4* arg1); +INCLUDE_ASM(void, "2BF90", func_800521E8, UnkAl834* arg0, UnkAl1E4* arg1); -INCLUDE_ASM(void, "code_2BF90", func_800522A8, UnkAl834* arg0, UnkAl1E4* arg1); +INCLUDE_ASM(void, "2BF90", func_800522A8, UnkAl834* arg0, UnkAl1E4* arg1); -INCLUDE_ASM(void, "code_2BF90", func_8005232C, UnkAl834* arg0, UnkAl1E4* arg1); +INCLUDE_ASM(void, "2BF90", func_8005232C, UnkAl834* arg0, UnkAl1E4* arg1); diff --git a/src/code_2d9a0_len_890.c b/src/2d9a0_len_890.c similarity index 79% rename from src/code_2d9a0_len_890.c rename to src/2d9a0_len_890.c index 9f3dc87c4a..08ff18c231 100644 --- a/src/code_2d9a0_len_890.c +++ b/src/2d9a0_len_890.c @@ -34,7 +34,7 @@ void func_80052614(UnkAl19E0* arg0) { } } -INCLUDE_ASM(void, "code_2d9a0_len_890", func_80052660, UnkAl19E0* arg0); +INCLUDE_ASM(void, "2d9a0_len_890", func_80052660, UnkAl19E0* arg0); void func_80052B44(UnkAl48* arg0) { s32 temp_lo = ((arg0->unk_3A * arg0->unk_40 * arg0->unk_3F) >> 14) * arg0->unk_30; @@ -49,8 +49,8 @@ s32 func_80052BC0(s32 arg0) { return (arg0 / 5750) * 0xB8; } -INCLUDE_ASM(void, "code_2d9a0_len_890", func_80052BF8, UnkAl48* arg0, s32* arg1); +INCLUDE_ASM(void, "2d9a0_len_890", func_80052BF8, UnkAl48* arg0, s32* arg1); -INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052CFC, UnkAl48* arg0); +INCLUDE_ASM(s32, "2d9a0_len_890", func_80052CFC, UnkAl48* arg0); -INCLUDE_ASM(s32, "code_2d9a0_len_890", func_80052E18); +INCLUDE_ASM(s32, "2d9a0_len_890", func_80052E18); diff --git a/src/code_2e230_len_2190.c b/src/2e230_len_2190.c similarity index 92% rename from src/code_2e230_len_2190.c rename to src/2e230_len_2190.c index 04bcf67bbb..4db3754fd5 100644 --- a/src/code_2e230_len_2190.c +++ b/src/2e230_len_2190.c @@ -364,7 +364,7 @@ void func_800538C4(UnkAl48* arg0, s32 arg1) { // type may be wrong but it seems func_800576EC(arg1, 0, 0xB8); } -INCLUDE_ASM(s32, "code_2e230_len_2190", func_800538F8); +INCLUDE_ASM(s32, "2e230_len_2190", func_800538F8); void snd_initialize_fade(Fade* fade, s32 time, s32 startValue, s16 endValue) { fade->currentVolume.s32 = startValue * 0x10000; @@ -449,7 +449,7 @@ void func_80053BA8(UnkAl1* arg0) { } } -INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053BE8, UnkAl19E0* arg0, s32 arg1, s32 arg2, s32* arg3); +INCLUDE_ASM(s32, "2e230_len_2190", func_80053BE8, UnkAl19E0* arg0, s32 arg1, s32 arg2, s32* arg3); void snd_get_sequence_player_and_track(u32 playerIndex, s32** outCurrentTrackData, BGMPlayer** outPlayer) { UnkAl19E0* temp_v1 = D_8009A5C0; @@ -489,9 +489,9 @@ void snd_get_sequence_player(u32 playerIndex, BGMPlayer** outPlayer) { } } -INCLUDE_ASM(s32, "code_2e230_len_2190", snd_load_song_files); +INCLUDE_ASM(s32, "2e230_len_2190", snd_load_song_files); -INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053E58); +INCLUDE_ASM(s32, "2e230_len_2190", func_80053E58); BGMPlayer* func_80053F64(s32 arg0) { if (arg0 == 0) { @@ -500,7 +500,7 @@ BGMPlayer* func_80053F64(s32 arg0) { return NULL; } -INCLUDE_ASM(s32, "code_2e230_len_2190", func_80053F80); +INCLUDE_ASM(s32, "2e230_len_2190", func_80053F80); BGMPlayer* func_80054248(u8 arg0) { switch (arg0) { @@ -515,15 +515,15 @@ BGMPlayer* func_80054248(u8 arg0) { } } -INCLUDE_ASM(void, "code_2e230_len_2190", snd_load_INIT, UnkAl19E0* arg0, s32 arg1, ALHeap* arg2); +INCLUDE_ASM(void, "2e230_len_2190", snd_load_INIT, UnkAl19E0* arg0, s32 arg1, ALHeap* arg2); -INCLUDE_ASM(s32, "code_2e230_len_2190", snd_fetch_SBN_file, u16 arg0, s32 arg1, s32* arg2); +INCLUDE_ASM(s32, "2e230_len_2190", snd_fetch_SBN_file, u16 arg0, s32 arg1, s32* arg2); -INCLUDE_ASM(void, "code_2e230_len_2190", snd_load_PER, UnkAl19E0* arg0, s32* arg1); +INCLUDE_ASM(void, "2e230_len_2190", snd_load_PER, UnkAl19E0* arg0, s32* arg1); -INCLUDE_ASM(void, "code_2e230_len_2190", snd_load_PRG, UnkAl19E0* arg0, s32* arg1); +INCLUDE_ASM(void, "2e230_len_2190", snd_load_PRG, UnkAl19E0* arg0, s32* arg1); -INCLUDE_ASM(s32, "code_2e230_len_2190", snd_load_BGM); +INCLUDE_ASM(s32, "2e230_len_2190", snd_load_BGM); InstrumentGroup* snd_get_BK_instruments(s32 bankGroup, u32 bankIndex) { InstrumentGroup* ret = NULL; @@ -556,7 +556,7 @@ InstrumentGroup* snd_get_BK_instruments(s32 bankGroup, u32 bankIndex) { return ret; } -INCLUDE_ASM(s32, "code_2e230_len_2190", snd_load_BK_to_bank, s32 bkFileOffset, SoundBank* bank, s32 bankIndex, s32 arg3); +INCLUDE_ASM(s32, "2e230_len_2190", snd_load_BK_to_bank, s32 bkFileOffset, SoundBank* bank, s32 bankIndex, s32 arg3); void snd_swizzle_BK_instruments(s32 bkFileOffset, SoundBank* bank, InstrumentGroup instruments, s32 instrumentCount, u8 arg4); // float weirdness @@ -594,20 +594,20 @@ void snd_swizzle_BK_instruments(s32 bkFileOffset, SoundBank *bank, Instruments i } } #else -INCLUDE_ASM(void, "code_2e230_len_2190", snd_swizzle_BK_instruments, s32 bkFileOffset, SoundBank* bank, InstrumentGroup instruments, s32 instrumentCount, u8 arg4); +INCLUDE_ASM(void, "2e230_len_2190", snd_swizzle_BK_instruments, s32 bkFileOffset, SoundBank* bank, InstrumentGroup instruments, s32 instrumentCount, u8 arg4); #endif -INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054AA0); +INCLUDE_ASM(s32, "2e230_len_2190", func_80054AA0); s32 snd_load_BK(s32 arg0, s32 arg1) { snd_load_BK_to_bank(arg0, D_8009A5C0->banks[arg1], arg1, 1); return 0; } -INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054C84); +INCLUDE_ASM(s32, "2e230_len_2190", func_80054C84); -INCLUDE_ASM(void, "code_2e230_len_2190", func_80054CE0, s32 arg0, s32 arg1); +INCLUDE_ASM(void, "2e230_len_2190", func_80054CE0, s32 arg0, s32 arg1); s32 func_80054D74(s32 arg0, s32 arg1) { if (arg0 & 0x10) { @@ -616,11 +616,11 @@ s32 func_80054D74(s32 arg0, s32 arg1) { return 0; } -INCLUDE_ASM(s32, "code_2e230_len_2190", func_80054DA8); +INCLUDE_ASM(s32, "2e230_len_2190", func_80054DA8); -INCLUDE_ASM(void, "code_2e230_len_2190", snd_read_rom, s32 arg0, s32* arg1, s32 arg2); +INCLUDE_ASM(void, "2e230_len_2190", snd_read_rom, s32 arg0, s32* arg1, s32 arg2); -INCLUDE_ASM(s32, "code_2e230_len_2190", snd_memset); +INCLUDE_ASM(s32, "2e230_len_2190", snd_memset); void snd_bcopy(s8* src, s8 *dest, s32 size) { if (size > 0) { diff --git a/src/code_303c0_len_3e10.c b/src/303c0_len_3e10.c similarity index 100% rename from src/code_303c0_len_3e10.c rename to src/303c0_len_3e10.c diff --git a/src/code_30450.c b/src/30450.c similarity index 93% rename from src/code_30450.c rename to src/30450.c index 22afd6810d..f3a207f93b 100644 --- a/src/code_30450.c +++ b/src/30450.c @@ -350,9 +350,9 @@ s32 snd_load_song(s32 songID, s32 playerIndex) { } } -INCLUDE_ASM(s32, "code_30450", func_8005591C); +INCLUDE_ASM(s32, "30450", func_8005591C); -INCLUDE_ASM(s32, "code_30450", func_80055970); +INCLUDE_ASM(s32, "30450", func_80055970); s32 func_800559C4(UNK_TYPE arg0) { return func_8004DA0C(arg0); @@ -366,29 +366,29 @@ void func_800559FC(void) { func_8004DAE0(); } -INCLUDE_ASM(s32, "code_30450", func_80055A18); +INCLUDE_ASM(s32, "30450", func_80055A18); -INCLUDE_ASM(s32, "code_30450", func_80055A6C); +INCLUDE_ASM(s32, "30450", func_80055A6C); -INCLUDE_ASM(s32, "code_30450", func_80055ABC); +INCLUDE_ASM(s32, "30450", func_80055ABC); -INCLUDE_ASM(s32, "code_30450", func_80055AF0); +INCLUDE_ASM(s32, "30450", func_80055AF0); -INCLUDE_ASM(s32, "code_30450", func_80055B28); +INCLUDE_ASM(s32, "30450", func_80055B28); -INCLUDE_ASM(s32, "code_30450", func_80055B80); +INCLUDE_ASM(s32, "30450", func_80055B80); -INCLUDE_ASM(s32, "code_30450", func_80055BB8); +INCLUDE_ASM(s32, "30450", func_80055BB8); -INCLUDE_ASM(s32, "code_30450", func_80055BF0); +INCLUDE_ASM(s32, "30450", func_80055BF0); -INCLUDE_ASM(s32, "code_30450", func_80055C2C); +INCLUDE_ASM(s32, "30450", func_80055C2C); -INCLUDE_ASM(s32, "code_30450", func_80055C64); +INCLUDE_ASM(s32, "30450", func_80055C64); -INCLUDE_ASM(s32, "code_30450", func_80055C94); +INCLUDE_ASM(s32, "30450", func_80055C94); -INCLUDE_ASM(s32, "code_30450", func_80055CC4); +INCLUDE_ASM(s32, "30450", func_80055CC4); s32 func_80055CE8(s32 songName, s32* arg1, BGMPlayer** player); // We need to figure out what currentTrackData is a list of @@ -409,7 +409,7 @@ s32 func_80055CE8(s32 songName, s32* arg1, BGMPlayer** player) { return ret; } #else -INCLUDE_ASM(s32, "code_30450", func_80055CE8, s32 songName, s32* arg1, BGMPlayer** player); +INCLUDE_ASM(s32, "30450", func_80055CE8, s32 songName, s32* arg1, BGMPlayer** player); #endif s32 func_80055D38(s32 songName, f32 arg1) { @@ -565,9 +565,9 @@ void func_800560A8(void) { D_8009A5C0->unk_9C = 1; } -INCLUDE_ASM(s32, "code_30450", func_800560BC); +INCLUDE_ASM(s32, "30450", func_800560BC); -INCLUDE_ASM(void, "code_30450", func_8005610C, void); +INCLUDE_ASM(void, "30450", func_8005610C, void); void func_80056144(UnkFuncAl arg0, s32 arg1) { D_8009A5C0->unk_A4[arg1] = arg0; diff --git a/src/code_31650.c b/src/31650.c similarity index 79% rename from src/code_31650.c rename to src/31650.c index 2384fc0245..afe342bbb9 100644 --- a/src/code_31650.c +++ b/src/31650.c @@ -13,7 +13,7 @@ s32 D_80078E60[] = { 0x7FFF7FFC, 0x7FF57FE8, 0x7FD77FC0, 0x7FA57F84, 0x7F5F7F34, }; -INCLUDE_ASM(s32, "code_31650", func_80056250); +INCLUDE_ASM(s32, "31650", func_80056250); void func_800565A4(void) { UnkAl0** sym = &D_80078E50; @@ -23,7 +23,7 @@ void func_800565A4(void) { } } -INCLUDE_ASM(Acmd*, "code_31650", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen); +INCLUDE_ASM(Acmd*, "31650", alAudioFrame, Acmd* cmdList, s32* cmdLen, s16* outBuf, s32 outLen); void func_80056D34(void) { D_80078E58 = 1; @@ -43,7 +43,7 @@ void func_80056D5C(s8 arg0) { D_80078E5C = 1; } #else -INCLUDE_ASM(s32, "code_31650", func_80056D5C); +INCLUDE_ASM(s32, "31650", func_80056D5C); #endif void func_80056D78(u8 arg0, u16 arg1) { @@ -66,7 +66,7 @@ void func_80056DCC(u8 arg0, u8 arg1) { func_8005904C(temp->unk_08, arg1); } -INCLUDE_ASM(s32, "code_31650", func_80056E34); +INCLUDE_ASM(s32, "31650", func_80056E34); void func_80056EC0(u8 arg0, s8 arg1) { UnkAl7C* al7C = &D_80078E54->unk_1C[arg0]; @@ -74,7 +74,7 @@ void func_80056EC0(u8 arg0, s8 arg1) { al7C->unk_78 = arg1; } -INCLUDE_ASM(void, "code_31650", func_80056EE8, u8 arg0); +INCLUDE_ASM(void, "31650", func_80056EE8, u8 arg0); void func_80056F78(u8 arg0) { UnkAl7C* al7C = &D_80078E54->unk_1C[arg0]; @@ -82,10 +82,10 @@ void func_80056F78(u8 arg0) { al7C->unk_70 = 1; } -INCLUDE_ASM(void, "code_31650", func_80056FA4, u8 arg0, u8 arg1, s32 arg2, f32 arg3, s16 arg4, u8 arg5, u8 arg6, +INCLUDE_ASM(void, "31650", func_80056FA4, u8 arg0, u8 arg1, s32 arg2, f32 arg3, s16 arg4, u8 arg5, u8 arg6, s32 arg7); -INCLUDE_ASM(void, "code_31650", func_80057224, u8 arg0, Instrument* arg1); +INCLUDE_ASM(void, "31650", func_80057224, u8 arg0, Instrument* arg1); void func_80057344(u8 arg0, f32 arg1) { UnkAl7C* al7C = &D_80078E54->unk_1C[arg0]; @@ -93,15 +93,15 @@ void func_80057344(u8 arg0, f32 arg1) { al7C->unk_3C = arg1; } -INCLUDE_ASM(void, "code_31650", func_8005736C, u8 arg0, s16 arg1, s32 arg2, u8 arg3, u8 arg4); +INCLUDE_ASM(void, "31650", func_8005736C, u8 arg0, s16 arg1, s32 arg2, u8 arg3, u8 arg4); -INCLUDE_ASM(void, "code_31650", func_80057548, u8 arg0, u8 arg1, u8 arg2); +INCLUDE_ASM(void, "31650", func_80057548, u8 arg0, u8 arg1, u8 arg2); -INCLUDE_ASM(void, "code_31650", func_800576EC, u8 arg0, s32 arg1, s32 arg2); +INCLUDE_ASM(void, "31650", func_800576EC, u8 arg0, s32 arg1, s32 arg2); -INCLUDE_ASM(s32, "code_31650", func_80057874); +INCLUDE_ASM(s32, "31650", func_80057874); -INCLUDE_ASM(s32, "code_31650", func_800579D8); +INCLUDE_ASM(s32, "31650", func_800579D8); s32 func_80057B64(u8 arg0) { UnkAl7C* al7C = &D_80078E54->unk_1C[arg0]; @@ -139,9 +139,9 @@ s16 func_80057C2C(u8 arg0) { return al7C->unk_56; } -INCLUDE_ASM(s32, "code_31650", func_80057C54); +INCLUDE_ASM(s32, "31650", func_80057C54); -INCLUDE_ASM(s32, "code_31650", func_80057D0C); +INCLUDE_ASM(s32, "31650", func_80057D0C); void func_80057DC8(s32 arg0) { s32* sym; @@ -208,7 +208,7 @@ void func_80057ED0(s16 arg0) { D_800A3FE8 = 0; } -INCLUDE_ASM(void, "code_31650", alHeapInit, ALHeap* hp, u8* base, s32 len); +INCLUDE_ASM(void, "31650", alHeapInit, ALHeap* hp, u8* base, s32 len); void* alHeapAlloc(ALHeap* heap, s32 arg1, s32 size) { void* ret = NULL; @@ -232,4 +232,4 @@ void alCopy(void* src, void* dst, s32 size) { } } -INCLUDE_ASM(s32, "code_31650", func_80058004); +INCLUDE_ASM(s32, "31650", func_80058004); diff --git a/src/3169f0.c b/src/3169f0.c new file mode 100644 index 0000000000..2d6e547932 --- /dev/null +++ b/src/3169f0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3169f0", func_80200000); diff --git a/src/316C00.c b/src/316C00.c new file mode 100644 index 0000000000..b1bc3b0f0e --- /dev/null +++ b/src/316C00.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "316C00", func_802AE000_316C00); diff --git a/src/316a70.c b/src/316a70.c new file mode 100644 index 0000000000..b38c89e36e --- /dev/null +++ b/src/316a70.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "316a70", func_80200080); diff --git a/src/316d90.c b/src/316d90.c new file mode 100644 index 0000000000..88ba19bf96 --- /dev/null +++ b/src/316d90.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "316d90", func_802AE000); diff --git a/src/316f30.c b/src/316f30.c new file mode 100644 index 0000000000..9d3d136d37 --- /dev/null +++ b/src/316f30.c @@ -0,0 +1,26 @@ +#include "common.h" +#include "ld_addrs.h" + +void func_80200000(void); +void func_80200080(void); +void func_802AE000(void); + +void func_802B2000(void) { + dma_copy(_3169F0_ROM_START, _3169F0_ROM_END, _3169F0_VRAM); + func_80200000(); +} + +void func_802B203C(void) { + dma_copy(_316A70_ROM_START, _316A70_ROM_END, _316A70_VRAM); + func_80200080(); +} + +void func_802B2078(void) { + dma_copy(_316C00_ROM_START, _316C00_ROM_END, _316C00_VRAM); + func_802AE000(); +} + +void func_802B20B4(void) { + dma_copy(_316D90_ROM_START, _316D90_ROM_END, _316D90_VRAM); + func_802AE000(); +} diff --git a/src/code_3251D0.c b/src/3251D0.c similarity index 100% rename from src/code_3251D0.c rename to src/3251D0.c diff --git a/src/325AD0.c b/src/325AD0.c new file mode 100644 index 0000000000..9a6af3ea3a --- /dev/null +++ b/src/325AD0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "325AD0", func_E0200000); + +INCLUDE_ASM(s32, "325AD0", func_E0200044); + +INCLUDE_ASM(s32, "325AD0", func_E02000AC); diff --git a/src/325EE0.c b/src/325EE0.c new file mode 100644 index 0000000000..a877b7322c --- /dev/null +++ b/src/325EE0.c @@ -0,0 +1,81 @@ +#include "common.h" + +INCLUDE_ASM(s32, "325EE0", func_E0200410); + +INCLUDE_ASM(s32, "325EE0", func_E0200420); + +INCLUDE_ASM(s32, "325EE0", func_E0200430); + +INCLUDE_ASM(s32, "325EE0", func_E0200440); + +INCLUDE_ASM(s32, "325EE0", func_E0200450); + +INCLUDE_ASM(s32, "325EE0", func_E0200460); + +INCLUDE_ASM(s32, "325EE0", func_E0200470); + +INCLUDE_ASM(s32, "325EE0", func_E0200480); + +INCLUDE_ASM(s32, "325EE0", func_E0200490); + +INCLUDE_ASM(s32, "325EE0", func_E02004A0); + +INCLUDE_ASM(s32, "325EE0", func_E02004B0); + +INCLUDE_ASM(s32, "325EE0", func_E02004C0); + +INCLUDE_ASM(s32, "325EE0", func_E02004D0); + +INCLUDE_ASM(s32, "325EE0", func_E02004E0); + +INCLUDE_ASM(s32, "325EE0", func_E02004F0); + +INCLUDE_ASM(s32, "325EE0", func_E0200500); + +INCLUDE_ASM(s32, "325EE0", func_E0200510); + +INCLUDE_ASM(s32, "325EE0", func_E0200520); + +INCLUDE_ASM(s32, "325EE0", func_E0200530); + +INCLUDE_ASM(s32, "325EE0", func_E0200540); + +INCLUDE_ASM(s32, "325EE0", func_E0200550); + +INCLUDE_ASM(s32, "325EE0", func_E0200560); + +INCLUDE_ASM(s32, "325EE0", func_E0200570); + +INCLUDE_ASM(s32, "325EE0", func_E0200580); + +INCLUDE_ASM(s32, "325EE0", func_E0200590); + +INCLUDE_ASM(s32, "325EE0", func_E02005A0); + +INCLUDE_ASM(s32, "325EE0", func_E02005B0); + +INCLUDE_ASM(s32, "325EE0", func_E02005C0); + +INCLUDE_ASM(s32, "325EE0", func_E02005D0); + +INCLUDE_ASM(s32, "325EE0", func_E02005E0); + +INCLUDE_ASM(s32, "325EE0", func_E02005F0); + +INCLUDE_ASM(s32, "325EE0", func_E0200600); + +INCLUDE_ASM(s32, "325EE0", func_E0200610); + +INCLUDE_ASM(s32, "325EE0", func_E0200620); + +INCLUDE_ASM(s32, "325EE0", func_E0200630); + +INCLUDE_ASM(s32, "325EE0", func_E0200640); + +INCLUDE_ASM(s32, "325EE0", func_E0200650); + +INCLUDE_ASM(s32, "325EE0", func_E0200660); + +INCLUDE_ASM(s32, "325EE0", func_E0200670); + +INCLUDE_ASM(s32, "325EE0", func_E0200680); diff --git a/src/3278F0.c b/src/3278F0.c new file mode 100644 index 0000000000..4170e206f7 --- /dev/null +++ b/src/3278F0.c @@ -0,0 +1,16 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3278F0", func_E0002000); + +void func_E00021B4(void) { +} + +INCLUDE_ASM(s32, "3278F0", func_E00021BC); + +INCLUDE_ASM(s32, "3278F0", func_E00022BC); + +INCLUDE_ASM(s32, "3278F0", func_E0002300); + +void func_E0002738(void) { + func_E02004A0(); +} diff --git a/src/328110.c b/src/328110.c new file mode 100644 index 0000000000..30bd301333 --- /dev/null +++ b/src/328110.c @@ -0,0 +1,18 @@ +#include "common.h" + +INCLUDE_ASM(s32, "328110", func_E000C000); + +INCLUDE_ASM(s32, "328110", func_E000C094); + +INCLUDE_ASM(s32, "328110", func_E000C0C8); + +INCLUDE_ASM(s32, "328110", func_E000C160); + +void func_E000C64C(void) { +} + +INCLUDE_ASM(s32, "328110", func_E000C654); + +INCLUDE_ASM(s32, "328110", func_E000C754); + +INCLUDE_ASM(s32, "328110", func_E000C798); diff --git a/src/32C110.c b/src/32C110.c new file mode 100644 index 0000000000..f08bb9a00d --- /dev/null +++ b/src/32C110.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "32C110", func_E000E000); + +void func_E000E16C(void) { +} + +INCLUDE_ASM(s32, "32C110", func_E000E174); + +INCLUDE_ASM(s32, "32C110", func_E000E244); + +INCLUDE_ASM(s32, "32C110", func_E000E288); diff --git a/src/32C7A0.c b/src/32C7A0.c new file mode 100644 index 0000000000..323d5a24df --- /dev/null +++ b/src/32C7A0.c @@ -0,0 +1,18 @@ +#include "common.h" + +INCLUDE_ASM(s32, "32C7A0", func_E0010000); + +INCLUDE_ASM(s32, "32C7A0", func_E0010104); + +INCLUDE_ASM(s32, "32C7A0", func_E00101E8); + +void func_E00103EC(void) { +} + +INCLUDE_ASM(s32, "32C7A0", func_E00103F4); + +INCLUDE_ASM(s32, "32C7A0", func_E00104B0); + +INCLUDE_ASM(s32, "32C7A0", func_E00104F4); + +INCLUDE_ASM(s32, "32C7A0", func_E0010510); diff --git a/src/32DD10.c b/src/32DD10.c new file mode 100644 index 0000000000..6c753a951d --- /dev/null +++ b/src/32DD10.c @@ -0,0 +1,18 @@ +#include "common.h" + +INCLUDE_ASM(s32, "32DD10", func_E0012000); + +INCLUDE_ASM(s32, "32DD10", func_E0012104); + +INCLUDE_ASM(s32, "32DD10", func_E0012204); + +void func_E0012440(void) { +} + +INCLUDE_ASM(s32, "32DD10", func_E0012448); + +INCLUDE_ASM(s32, "32DD10", func_E0012504); + +INCLUDE_ASM(s32, "32DD10", func_E0012548); + +INCLUDE_ASM(s32, "32DD10", func_E0012564); diff --git a/src/32E490.c b/src/32E490.c new file mode 100644 index 0000000000..20f18c3a82 --- /dev/null +++ b/src/32E490.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "32E490", func_E0014000); + +void func_E0014258(void) { +} + +INCLUDE_ASM(s32, "32E490", func_E0014260); + +INCLUDE_ASM(s32, "32E490", func_E001449C); + +INCLUDE_ASM(s32, "32E490", func_E00144E0); diff --git a/src/32EE30.c b/src/32EE30.c new file mode 100644 index 0000000000..442f8246d3 --- /dev/null +++ b/src/32EE30.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "32EE30", func_E0016000); + +void func_E0016220(void) { +} + +INCLUDE_ASM(s32, "32EE30", func_E0016228); + +INCLUDE_ASM(s32, "32EE30", func_E0016410); + +INCLUDE_ASM(s32, "32EE30", func_E0016454); diff --git a/src/32F580.c b/src/32F580.c new file mode 100644 index 0000000000..0b407cb845 --- /dev/null +++ b/src/32F580.c @@ -0,0 +1,16 @@ +#include "common.h" + +INCLUDE_ASM(s32, "32F580", func_E0018000); + +INCLUDE_ASM(s32, "32F580", func_E0018078); + +void func_E00182AC(void) { +} + +INCLUDE_ASM(s32, "32F580", func_E00182B4); + +INCLUDE_ASM(s32, "32F580", func_E0018378); + +INCLUDE_ASM(s32, "32F580", func_E00183BC); + +INCLUDE_ASM(s32, "32F580", func_E00183D8); diff --git a/src/32FE30.c b/src/32FE30.c new file mode 100644 index 0000000000..fea2537799 --- /dev/null +++ b/src/32FE30.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "32FE30", func_E001A000); + +void func_E001A21C(void) { +} + +INCLUDE_ASM(s32, "32FE30", func_E001A224); + +INCLUDE_ASM(s32, "32FE30", func_E001A3FC); + +INCLUDE_ASM(s32, "32FE30", func_E001A440); diff --git a/src/330910.c b/src/330910.c new file mode 100644 index 0000000000..9f0695fe90 --- /dev/null +++ b/src/330910.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "330910", func_E001C000); + +void func_E001C120(void) { +} + +INCLUDE_ASM(s32, "330910", func_E001C128); + +INCLUDE_ASM(s32, "330910", func_E001C200); + +INCLUDE_ASM(s32, "330910", func_E001C30C); diff --git a/src/331940.c b/src/331940.c new file mode 100644 index 0000000000..96973da188 --- /dev/null +++ b/src/331940.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "331940", func_E001E000); + +void func_E001E370(void) { +} + +INCLUDE_ASM(s32, "331940", func_E001E378); + +INCLUDE_ASM(s32, "331940", func_E001E6E8); + +INCLUDE_ASM(s32, "331940", func_E001E730); diff --git a/src/333EC0.c b/src/333EC0.c new file mode 100644 index 0000000000..fb86a4af65 --- /dev/null +++ b/src/333EC0.c @@ -0,0 +1,14 @@ +#include "common.h" + +INCLUDE_ASM(s32, "333EC0", func_E0020000); + +INCLUDE_ASM(s32, "333EC0", func_E00202CC); + +void func_E0020460(void) { +} + +INCLUDE_ASM(s32, "333EC0", func_E0020468); + +INCLUDE_ASM(s32, "333EC0", func_E002058C); + +INCLUDE_ASM(s32, "333EC0", func_E00205D0); diff --git a/src/33450.c b/src/33450.c new file mode 100644 index 0000000000..ce208979fd --- /dev/null +++ b/src/33450.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "33450", func_80058050); + +INCLUDE_ASM(s32, "33450", func_80058B20); + +INCLUDE_ASM(s32, "33450", func_80058C6C); diff --git a/src/337240.c b/src/337240.c new file mode 100644 index 0000000000..1ff5fa0e82 --- /dev/null +++ b/src/337240.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "337240", func_E0022000); + +void func_E0022544(void) { +} + +INCLUDE_ASM(s32, "337240", func_E002254C); + +INCLUDE_ASM(s32, "337240", func_E0022960); + +INCLUDE_ASM(s32, "337240", func_E0022998); diff --git a/src/339250.c b/src/339250.c new file mode 100644 index 0000000000..73c349d7b0 --- /dev/null +++ b/src/339250.c @@ -0,0 +1,16 @@ +#include "common.h" + +INCLUDE_ASM(s32, "339250", func_E0024000); + +void func_E0024180(void) { +} + +INCLUDE_ASM(s32, "339250", func_E0024188); + +INCLUDE_ASM(s32, "339250", func_E00242E0); + +INCLUDE_ASM(s32, "339250", func_E0024324); + +INCLUDE_ASM(s32, "339250", func_E00243BC); + +INCLUDE_ASM(s32, "339250", func_E0024454); diff --git a/src/33B180.c b/src/33B180.c new file mode 100644 index 0000000000..678f5c986e --- /dev/null +++ b/src/33B180.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "33B180", func_E0026000); + +void func_E0026184(void) { +} + +INCLUDE_ASM(s32, "33B180", func_E002618C); + +INCLUDE_ASM(s32, "33B180", func_E00264B0); + +INCLUDE_ASM(s32, "33B180", func_E00264F4); diff --git a/src/33CDF0.c b/src/33CDF0.c new file mode 100644 index 0000000000..4700543c72 --- /dev/null +++ b/src/33CDF0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "33CDF0", func_E0028000); + +void func_E0028240(void) { +} + +INCLUDE_ASM(s32, "33CDF0", func_E0028248); + +INCLUDE_ASM(s32, "33CDF0", func_E00284E8); + +INCLUDE_ASM(s32, "33CDF0", func_E002852C); diff --git a/src/33E8C0.c b/src/33E8C0.c new file mode 100644 index 0000000000..3999a1d36b --- /dev/null +++ b/src/33E8C0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "33E8C0", func_E002A000); + +void func_E002A284(void) { +} + +INCLUDE_ASM(s32, "33E8C0", func_E002A28C); + +INCLUDE_ASM(s32, "33E8C0", func_E002A380); + +INCLUDE_ASM(s32, "33E8C0", func_E002A3C4); diff --git a/src/33FE80.c b/src/33FE80.c new file mode 100644 index 0000000000..29734d40e7 --- /dev/null +++ b/src/33FE80.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "33FE80", func_E002C000); + +void func_E002C234(void) { +} + +INCLUDE_ASM(s32, "33FE80", func_E002C23C); + +INCLUDE_ASM(s32, "33FE80", func_E002C3D0); + +INCLUDE_ASM(s32, "33FE80", func_E002C414); diff --git a/src/3419E0.c b/src/3419E0.c new file mode 100644 index 0000000000..53d925336b --- /dev/null +++ b/src/3419E0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3419E0", func_E002E000); + +void func_E002E248(void) { +} + +INCLUDE_ASM(s32, "3419E0", func_E002E250); + +INCLUDE_ASM(s32, "3419E0", func_E002E330); + +INCLUDE_ASM(s32, "3419E0", func_E002E368); diff --git a/src/code_341d0.c b/src/341d0.c similarity index 90% rename from src/code_341d0.c rename to src/341d0.c index 7cd0d42f44..90f99b8875 100644 --- a/src/code_341d0.c +++ b/src/341d0.c @@ -12,36 +12,36 @@ extern EffectInstance* D_800B4398[96]; //effectInstanceList extern Effect D_800A4000[15]; extern void* D_80059C80; -INCLUDE_ASM(s32, "code_341d0", func_80058DD0); +INCLUDE_ASM(s32, "341d0", func_80058DD0); -INCLUDE_ASM(s32, "code_341d0", func_80058E84); +INCLUDE_ASM(s32, "341d0", func_80058E84); -INCLUDE_ASM(s32, "code_341d0", func_80058F88); +INCLUDE_ASM(s32, "341d0", func_80058F88); -INCLUDE_ASM(s32, "code_341d0", func_80059008); +INCLUDE_ASM(s32, "341d0", func_80059008); -INCLUDE_ASM(s32, "code_341d0", func_8005904C); +INCLUDE_ASM(s32, "341d0", func_8005904C); -INCLUDE_ASM(s32, "code_341d0", func_80059310); +INCLUDE_ASM(s32, "341d0", func_80059310); -INCLUDE_ASM(s32, "code_341d0", func_800598A0); +INCLUDE_ASM(s32, "341d0", func_800598A0); -INCLUDE_ASM(s32, "code_341d0", func_80059AB8); +INCLUDE_ASM(s32, "341d0", func_80059AB8); -INCLUDE_ASM(s32, "code_341d0", func_80059BD4); +INCLUDE_ASM(s32, "341d0", func_80059BD4); /// Used for unbound function points in effect structs. void stub_effect_delegate(EffectInstance* effectInst) { } -INCLUDE_ASM(s32, "code_341d0", set_effect_pos_offset); +INCLUDE_ASM(s32, "341d0", set_effect_pos_offset); -INCLUDE_ASM(s32, "code_341d0", clear_effect_data); +INCLUDE_ASM(s32, "341d0", clear_effect_data); void func_80059D48(void) { } -INCLUDE_ASM(s32, "code_341d0", update_effects); +INCLUDE_ASM(s32, "341d0", update_effects); s32 render_effects(void) { EffectInstance** curEffectInst; @@ -61,7 +61,7 @@ s32 render_effects(void) { } } -INCLUDE_ASM(s32, "code_341d0", func_80059F94); +INCLUDE_ASM(s32, "341d0", func_80059F94); EffectInstance* func_8005A2BC(EffectBlueprint* effectBp) { EffectInstance* newEffectInst; diff --git a/src/342140.c b/src/342140.c new file mode 100644 index 0000000000..ce55b1c455 --- /dev/null +++ b/src/342140.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "342140", func_E0030000); + +void func_E0030728(void) { +} + +INCLUDE_ASM(s32, "342140", func_E0030730); + +INCLUDE_ASM(s32, "342140", func_E0030A24); + +INCLUDE_ASM(s32, "342140", func_E0030A68); diff --git a/src/343680.c b/src/343680.c new file mode 100644 index 0000000000..e36397643a --- /dev/null +++ b/src/343680.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "343680", func_E0032000); + +void func_E00321D0(void) { +} + +INCLUDE_ASM(s32, "343680", func_E00321D8); + +INCLUDE_ASM(s32, "343680", func_E0032420); + +INCLUDE_ASM(s32, "343680", func_E003245C); diff --git a/src/344A10.c b/src/344A10.c new file mode 100644 index 0000000000..691bb40f01 --- /dev/null +++ b/src/344A10.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "344A10", func_E0034000); + +void func_E0034108(void) { +} + +INCLUDE_ASM(s32, "344A10", func_E0034110); + +INCLUDE_ASM(s32, "344A10", func_E00342C8); + +INCLUDE_ASM(s32, "344A10", func_E0034310); diff --git a/src/3454E0.c b/src/3454E0.c new file mode 100644 index 0000000000..0380cfe8e9 --- /dev/null +++ b/src/3454E0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3454E0", func_E0036000); + +void func_E00360DC(void) { +} + +INCLUDE_ASM(s32, "3454E0", func_E00360E4); + +INCLUDE_ASM(s32, "3454E0", func_E00361D8); + +void func_E003621C(void) { +} + +INCLUDE_ASM(s32, "3454E0", func_E0036224); diff --git a/src/34DD20.c b/src/34DD20.c new file mode 100644 index 0000000000..7745091462 --- /dev/null +++ b/src/34DD20.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "34DD20", func_E0038000); + +void func_E003841C(void) { +} + +INCLUDE_ASM(s32, "34DD20", func_E0038424); + +INCLUDE_ASM(s32, "34DD20", func_E0038704); + +INCLUDE_ASM(s32, "34DD20", func_E0038748); diff --git a/src/34EC80.c b/src/34EC80.c new file mode 100644 index 0000000000..a6d567ee32 --- /dev/null +++ b/src/34EC80.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "34EC80", func_E003A000); + +void func_E003A1D4(void) { +} + +INCLUDE_ASM(s32, "34EC80", func_E003A1DC); + +INCLUDE_ASM(s32, "34EC80", func_E003A310); + +INCLUDE_ASM(s32, "34EC80", func_E003A354); diff --git a/src/34F4C0.c b/src/34F4C0.c new file mode 100644 index 0000000000..e5fa7478d6 --- /dev/null +++ b/src/34F4C0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "34F4C0", func_E003C000); + +void func_E003C23C(void) { +} + +INCLUDE_ASM(s32, "34F4C0", func_E003C244); + +void func_E003C474(void) { +} + +INCLUDE_ASM(s32, "34F4C0", func_E003C47C); + +INCLUDE_ASM(s32, "34F4C0", func_E003C498); diff --git a/src/352440.c b/src/352440.c new file mode 100644 index 0000000000..bf62d53c78 --- /dev/null +++ b/src/352440.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "352440", func_E003E000); + +void func_E003E3F8(void) { +} + +INCLUDE_ASM(s32, "352440", func_E003E400); + +INCLUDE_ASM(s32, "352440", func_E003E5F4); + +INCLUDE_ASM(s32, "352440", func_E003E638); diff --git a/src/353300.c b/src/353300.c new file mode 100644 index 0000000000..640e3febb1 --- /dev/null +++ b/src/353300.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "353300", func_E0040000); + +void func_E0040148(void) { +} + +INCLUDE_ASM(s32, "353300", func_E0040150); + +INCLUDE_ASM(s32, "353300", func_E0040210); + +INCLUDE_ASM(s32, "353300", func_E0040348); diff --git a/src/3547A0.c b/src/3547A0.c new file mode 100644 index 0000000000..e5494c3f5d --- /dev/null +++ b/src/3547A0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3547A0", func_E0042000); + +void func_E004222C(void) { +} + +INCLUDE_ASM(s32, "3547A0", func_E0042234); + +INCLUDE_ASM(s32, "3547A0", func_E0042374); + +INCLUDE_ASM(s32, "3547A0", func_E00423B8); diff --git a/src/354F60.c b/src/354F60.c new file mode 100644 index 0000000000..c1157bc7be --- /dev/null +++ b/src/354F60.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "354F60", func_E0044000); + +void func_E004441C(void) { +} + +INCLUDE_ASM(s32, "354F60", func_E0044424); + +INCLUDE_ASM(s32, "354F60", func_E00448E4); + +INCLUDE_ASM(s32, "354F60", func_E004491C); diff --git a/src/355EE0.c b/src/355EE0.c new file mode 100644 index 0000000000..2f2c4ab793 --- /dev/null +++ b/src/355EE0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "355EE0", func_E0046000); + +void func_E0046158(void) { +} + +INCLUDE_ASM(s32, "355EE0", func_E0046160); + +INCLUDE_ASM(s32, "355EE0", func_E004627C); + +INCLUDE_ASM(s32, "355EE0", func_E00462C0); diff --git a/src/356980.c b/src/356980.c new file mode 100644 index 0000000000..154305706c --- /dev/null +++ b/src/356980.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "356980", func_E0048000); + +void func_E0048128(void) { +} + +INCLUDE_ASM(s32, "356980", func_E0048130); + +INCLUDE_ASM(s32, "356980", func_E00481D4); + +INCLUDE_ASM(s32, "356980", func_E0048218); diff --git a/src/3584C0.c b/src/3584C0.c new file mode 100644 index 0000000000..4de72118d4 --- /dev/null +++ b/src/3584C0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3584C0", func_E004A000); + +void func_E004A328(void) { +} + +INCLUDE_ASM(s32, "3584C0", func_E004A330); + +INCLUDE_ASM(s32, "3584C0", func_E004A748); + +INCLUDE_ASM(s32, "3584C0", func_E004A78C); diff --git a/src/359F20.c b/src/359F20.c new file mode 100644 index 0000000000..6c1cb81820 --- /dev/null +++ b/src/359F20.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "359F20", func_E004C000); + +void func_E004C204(void) { +} + +INCLUDE_ASM(s32, "359F20", func_E004C20C); + +INCLUDE_ASM(s32, "359F20", func_E004C364); + +INCLUDE_ASM(s32, "359F20", func_E004C3A8); diff --git a/src/35B9D0.c b/src/35B9D0.c new file mode 100644 index 0000000000..cd516fdfe5 --- /dev/null +++ b/src/35B9D0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "35B9D0", func_E004E000); + +void func_E004E15C(void) { +} + +INCLUDE_ASM(s32, "35B9D0", func_E004E164); + +INCLUDE_ASM(s32, "35B9D0", func_E004E1D0); + +INCLUDE_ASM(s32, "35B9D0", func_E004E214); diff --git a/src/35BFD0.c b/src/35BFD0.c new file mode 100644 index 0000000000..0a6f197311 --- /dev/null +++ b/src/35BFD0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "35BFD0", func_E0050000); + +void func_E00501D0(void) { +} + +INCLUDE_ASM(s32, "35BFD0", func_E00501D8); + +INCLUDE_ASM(s32, "35BFD0", func_E00502C4); + +INCLUDE_ASM(s32, "35BFD0", func_E0050308); diff --git a/src/35CA80.c b/src/35CA80.c new file mode 100644 index 0000000000..053e1486e1 --- /dev/null +++ b/src/35CA80.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "35CA80", func_E0052000); + +void func_E00520E8(void) { +} + +INCLUDE_ASM(s32, "35CA80", func_E00520F0); + +INCLUDE_ASM(s32, "35CA80", func_E005241C); + +INCLUDE_ASM(s32, "35CA80", func_E0052460); diff --git a/src/35DA00.c b/src/35DA00.c new file mode 100644 index 0000000000..2c9a5b6c9d --- /dev/null +++ b/src/35DA00.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "35DA00", func_E0056000); + +void func_E0056304(void) { +} + +INCLUDE_ASM(s32, "35DA00", func_E005630C); + +INCLUDE_ASM(s32, "35DA00", func_E0056B8C); + +INCLUDE_ASM(s32, "35DA00", func_E0056BD0); diff --git a/src/35E920.c b/src/35E920.c new file mode 100644 index 0000000000..6fff959685 --- /dev/null +++ b/src/35E920.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "35E920", func_E0058000); + +void func_E00581AC(void) { +} + +INCLUDE_ASM(s32, "35E920", func_E00581B4); + +INCLUDE_ASM(s32, "35E920", func_E0058490); + +INCLUDE_ASM(s32, "35E920", func_E00584D4); diff --git a/src/3602C0.c b/src/3602C0.c new file mode 100644 index 0000000000..9c400de08f --- /dev/null +++ b/src/3602C0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3602C0", func_E005A000); + +void func_E005A1F4(void) { +} + +INCLUDE_ASM(s32, "3602C0", func_E005A1FC); + +INCLUDE_ASM(s32, "3602C0", func_E005A3B0); + +INCLUDE_ASM(s32, "3602C0", func_E005A3F4); diff --git a/src/360F40.c b/src/360F40.c new file mode 100644 index 0000000000..9441bed478 --- /dev/null +++ b/src/360F40.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "360F40", func_E005C000); + +void func_E005C178(void) { +} + +INCLUDE_ASM(s32, "360F40", func_E005C180); + +INCLUDE_ASM(s32, "360F40", func_E005C2B4); + +INCLUDE_ASM(s32, "360F40", func_E005C2F8); diff --git a/src/3625C0.c b/src/3625C0.c new file mode 100644 index 0000000000..3e608bd196 --- /dev/null +++ b/src/3625C0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3625C0", func_E005E000); + +void func_E005E1B0(void) { +} + +INCLUDE_ASM(s32, "3625C0", func_E005E1B8); + +void func_E005E310(void) { +} + +INCLUDE_ASM(s32, "3625C0", func_E005E318); + +INCLUDE_ASM(s32, "3625C0", func_E005E334); diff --git a/src/362a0_len_2f70.c b/src/362a0_len_2f70.c new file mode 100644 index 0000000000..b365cc2202 --- /dev/null +++ b/src/362a0_len_2f70.c @@ -0,0 +1,83 @@ +#include "common.h" + +extern s16 D_800D91DC; + +INCLUDE_ASM(s32, "362a0_len_2f70", allocate_hit_tables); + +void func_8005AF84(void) { +} + +void func_8005AF8C(void) { +} + +void initialize_collision(void) { + gCollisionData.numColliders = 0; + D_800D91DC = 0; + collision_heap_create(); +} + +INCLUDE_ASM(s32, "362a0_len_2f70", load_hit_asset); + +INCLUDE_ASM(s32, "362a0_len_2f70", load_collision); + +INCLUDE_ASM(s32, "362a0_len_2f70", load_stage_collision); + +INCLUDE_ASM(s32, "362a0_len_2f70", load_hit_data); + +INCLUDE_ASM(void, "362a0_len_2f70", parent_collider_to_model, s32 colliderID, s16 modelIndex); + +INCLUDE_ASM(s32, "362a0_len_2f70", _add_hit_vert_to_buffer); + +s32 _get_hit_vert_index_from_buffer(f32** buffer, f32* vert, s32* bufferSize) { + s32 i; + + for (i = 0; i < *bufferSize; i++) { + if (*buffer == vert) { + break; + } + buffer++; + } + + return i; +} + +INCLUDE_ASM(void, "362a0_len_2f70", update_collider_transform, s16 colliderID); + +// Simon says there's a struct size issue here which is causing the subu/addu issue +#ifdef NON_MATCHING +s32 get_collider_type_by_id(s32 colliderID) { + if (colliderID & 0x4000) { + return 0; + } else { + return gCollisionData.collider_list[colliderID].flags; + } +} +#else +INCLUDE_ASM(s32, "362a0_len_2f70", get_collider_type_by_id); +#endif + +INCLUDE_ASM(s32, "362a0_len_2f70", get_flat_collider_normal); + +INCLUDE_ASM(void, "362a0_len_2f70", get_collider_center, s32 colliderID, f32* x, f32* y, f32* z); + +INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_triangle_general); + +INCLUDE_ASM(s32, "362a0_len_2f70", test_down_ray_triangle); + +INCLUDE_ASM(s32, "362a0_len_2f70", test_up_ray_triangle); + +INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_colliders); + +INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_zones); + +INCLUDE_ASM(s32, "362a0_len_2f70", test_up_ray_collider); + +INCLUDE_ASM(s32, "362a0_len_2f70", test_ray_entities); + +INCLUDE_ASM(s32, "362a0_len_2f70", func_8005DB00); + +INCLUDE_ASM(s32, "362a0_len_2f70", func_8005DD54); + +s32 func_8005DDF0(void) { + return ~gCurrentEncounter.unk_08 != 0; +} diff --git a/src/363160.c b/src/363160.c new file mode 100644 index 0000000000..ed17465de9 --- /dev/null +++ b/src/363160.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "363160", func_E0060000); + +void func_E00601D8(void) { +} + +INCLUDE_ASM(s32, "363160", func_E00601E0); + +INCLUDE_ASM(s32, "363160", func_E006040C); + +INCLUDE_ASM(s32, "363160", func_E0060450); diff --git a/src/364300.c b/src/364300.c new file mode 100644 index 0000000000..15e009d58c --- /dev/null +++ b/src/364300.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "364300", func_E0062000); + +void func_E0062218(void) { +} + +INCLUDE_ASM(s32, "364300", func_E0062220); + +INCLUDE_ASM(s32, "364300", func_E00624A8); + +INCLUDE_ASM(s32, "364300", func_E00624EC); diff --git a/src/364F10.c b/src/364F10.c new file mode 100644 index 0000000000..b87cee527a --- /dev/null +++ b/src/364F10.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "364F10", func_E0064000); + +void func_E006419C(void) { +} + +INCLUDE_ASM(s32, "364F10", func_E00641A4); + +INCLUDE_ASM(s32, "364F10", func_E00643DC); + +INCLUDE_ASM(s32, "364F10", func_E0064414); diff --git a/src/366030.c b/src/366030.c new file mode 100644 index 0000000000..e18ff96f22 --- /dev/null +++ b/src/366030.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "366030", func_E0066000); + +void func_E0066490(void) { +} + +INCLUDE_ASM(s32, "366030", func_E0066498); + +INCLUDE_ASM(s32, "366030", func_E006672C); + +INCLUDE_ASM(s32, "366030", func_E0066770); diff --git a/src/36A8D0.c b/src/36A8D0.c new file mode 100644 index 0000000000..3df89a77f1 --- /dev/null +++ b/src/36A8D0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "36A8D0", func_E0068000); + +void func_E0068140(void) { +} + +INCLUDE_ASM(s32, "36A8D0", func_E0068148); + +INCLUDE_ASM(s32, "36A8D0", func_E00681D8); + +INCLUDE_ASM(s32, "36A8D0", func_E0068234); diff --git a/src/36D020.c b/src/36D020.c new file mode 100644 index 0000000000..ebe858c245 --- /dev/null +++ b/src/36D020.c @@ -0,0 +1,20 @@ +#include "common.h" + +INCLUDE_ASM(s32, "36D020", func_E006A000); + +INCLUDE_ASM(s32, "36D020", func_E006A0BC); + +INCLUDE_ASM(s32, "36D020", func_E006A1E8); + +void func_E006A45C(void) { +} + +INCLUDE_ASM(s32, "36D020", func_E006A464); + +INCLUDE_ASM(s32, "36D020", func_E006A580); + +INCLUDE_ASM(s32, "36D020", func_E006A814); + +INCLUDE_ASM(s32, "36D020", func_E006A85C); + +INCLUDE_ASM(s32, "36D020", func_E006A94C); diff --git a/src/36E1D0.c b/src/36E1D0.c new file mode 100644 index 0000000000..7d7b3385e3 --- /dev/null +++ b/src/36E1D0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "36E1D0", func_E006C000); + +void func_E006C298(void) { +} + +INCLUDE_ASM(s32, "36E1D0", func_E006C2A0); + +INCLUDE_ASM(s32, "36E1D0", func_E006C5A0); + +INCLUDE_ASM(s32, "36E1D0", func_E006C5E8); diff --git a/src/372790.c b/src/372790.c new file mode 100644 index 0000000000..1aa633527c --- /dev/null +++ b/src/372790.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "372790", func_E006E000); + +void func_E006E354(void) { +} + +INCLUDE_ASM(s32, "372790", func_E006E35C); + +INCLUDE_ASM(s32, "372790", func_E006E6E4); + +INCLUDE_ASM(s32, "372790", func_E006E764); diff --git a/src/3740B0.c b/src/3740B0.c new file mode 100644 index 0000000000..41b8b9c245 --- /dev/null +++ b/src/3740B0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3740B0", func_E0070000); + +void func_E00701EC(void) { +} + +INCLUDE_ASM(s32, "3740B0", func_E00701F4); + +INCLUDE_ASM(s32, "3740B0", func_E00706F0); + +void func_E0070738(void) { +} + +INCLUDE_ASM(s32, "3740B0", func_E0070740); diff --git a/src/374E50.c b/src/374E50.c new file mode 100644 index 0000000000..2fe0883838 --- /dev/null +++ b/src/374E50.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "374E50", func_E0072000); + +void func_E0072148(void) { +} + +INCLUDE_ASM(s32, "374E50", func_E0072150); + +INCLUDE_ASM(s32, "374E50", func_E007238C); + +INCLUDE_ASM(s32, "374E50", func_E00723D4); diff --git a/src/376460.c b/src/376460.c new file mode 100644 index 0000000000..8269f03943 --- /dev/null +++ b/src/376460.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "376460", func_E0074000); + +void func_E00741E0(void) { +} + +INCLUDE_ASM(s32, "376460", func_E00741E8); + +INCLUDE_ASM(s32, "376460", func_E0074598); + +INCLUDE_ASM(s32, "376460", func_E00745E0); diff --git a/src/377070.c b/src/377070.c new file mode 100644 index 0000000000..c3cdf75697 --- /dev/null +++ b/src/377070.c @@ -0,0 +1,18 @@ +#include "common.h" + +INCLUDE_ASM(s32, "377070", func_E0076000); + +void func_E0076370(void) { +} + +INCLUDE_ASM(s32, "377070", func_E0076378); + +INCLUDE_ASM(s32, "377070", func_E0076808); + +void func_E007684C(void) { +} + +void func_E0076854(void) { +} + +INCLUDE_ASM(s32, "377070", func_E007685C); diff --git a/src/37A3F0.c b/src/37A3F0.c new file mode 100644 index 0000000000..ee67d7981b --- /dev/null +++ b/src/37A3F0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "37A3F0", func_E0078000); + +void func_E0078124(void) { +} + +INCLUDE_ASM(s32, "37A3F0", func_E007812C); + +INCLUDE_ASM(s32, "37A3F0", func_E0078210); + +void func_E0078274(void) { +} + +INCLUDE_ASM(s32, "37A3F0", func_E007827C); diff --git a/src/37C540.c b/src/37C540.c new file mode 100644 index 0000000000..8c976c362d --- /dev/null +++ b/src/37C540.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "37C540", func_E007A000); + +void func_E007A504(void) { +} + +INCLUDE_ASM(s32, "37C540", func_E007A50C); + +INCLUDE_ASM(s32, "37C540", func_E007A840); + +void func_E007A884(void) { +} + +INCLUDE_ASM(s32, "37C540", func_E007A88C); diff --git a/src/37D490.c b/src/37D490.c new file mode 100644 index 0000000000..50767da8fb --- /dev/null +++ b/src/37D490.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "37D490", func_E007C000); + +void func_E007C128(void) { +} + +INCLUDE_ASM(s32, "37D490", func_E007C130); + +INCLUDE_ASM(s32, "37D490", func_E007C1B0); + +INCLUDE_ASM(s32, "37D490", func_E007C1F4); diff --git a/src/37F720.c b/src/37F720.c new file mode 100644 index 0000000000..af017b8eea --- /dev/null +++ b/src/37F720.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "37F720", func_E007E000); + +void func_E007E1FC(void) { +} + +INCLUDE_ASM(s32, "37F720", func_E007E204); + +INCLUDE_ASM(s32, "37F720", func_E007E508); + +INCLUDE_ASM(s32, "37F720", func_E007E54C); diff --git a/src/3812C0.c b/src/3812C0.c new file mode 100644 index 0000000000..fb0ba78951 --- /dev/null +++ b/src/3812C0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3812C0", func_E0080000); + +void func_E00801C8(void) { +} + +INCLUDE_ASM(s32, "3812C0", func_E00801D0); + +void func_E0080424(void) { +} + +INCLUDE_ASM(s32, "3812C0", func_E008042C); + +INCLUDE_ASM(s32, "3812C0", func_E0080448); diff --git a/src/385640.c b/src/385640.c new file mode 100644 index 0000000000..95f7b28fa9 --- /dev/null +++ b/src/385640.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(s32, "385640", func_E0082000); + +void func_E00821B0(void) { +} + +INCLUDE_ASM(s32, "385640", func_E00821B8); + +void func_E0082520(void) { +} + +INCLUDE_ASM(s32, "385640", func_E0082528); + +INCLUDE_ASM(s32, "385640", func_E0082580); + +INCLUDE_ASM(s32, "385640", func_E00826C4); + +INCLUDE_ASM(s32, "385640", func_E00828B4); + +INCLUDE_ASM(s32, "385640", func_E0082A84); diff --git a/src/3889D0.c b/src/3889D0.c new file mode 100644 index 0000000000..a5fe18c6b6 --- /dev/null +++ b/src/3889D0.c @@ -0,0 +1,18 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3889D0", func_E0084000); + +INCLUDE_ASM(s32, "3889D0", func_E008403C); + +INCLUDE_ASM(s32, "3889D0", func_E0084060); + +INCLUDE_ASM(s32, "3889D0", func_E0084084); + +void func_E0084658(void) { +} + +INCLUDE_ASM(s32, "3889D0", func_E0084660); + +INCLUDE_ASM(s32, "3889D0", func_E00848E4); + +INCLUDE_ASM(s32, "3889D0", func_E0084928); diff --git a/src/389850.c b/src/389850.c new file mode 100644 index 0000000000..03e3be936a --- /dev/null +++ b/src/389850.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "389850", func_E0086000); + +void func_E0086270(void) { +} + +INCLUDE_ASM(s32, "389850", func_E0086278); + +void func_E0086390(void) { +} + +INCLUDE_ASM(s32, "389850", func_E0086398); + +INCLUDE_ASM(s32, "389850", func_E00863B4); diff --git a/src/38ADF0.c b/src/38ADF0.c new file mode 100644 index 0000000000..eb550b28c6 --- /dev/null +++ b/src/38ADF0.c @@ -0,0 +1,14 @@ +#include "common.h" + +INCLUDE_ASM(s32, "38ADF0", func_E0088000); + +INCLUDE_ASM(s32, "38ADF0", func_E008817C); + +void func_E00885A0(void) { +} + +INCLUDE_ASM(s32, "38ADF0", func_E00885A8); + +INCLUDE_ASM(s32, "38ADF0", func_E00887A8); + +INCLUDE_ASM(s32, "38ADF0", func_E00887E0); diff --git a/src/38C5F0.c b/src/38C5F0.c new file mode 100644 index 0000000000..4d85924b12 --- /dev/null +++ b/src/38C5F0.c @@ -0,0 +1,16 @@ +#include "common.h" + +INCLUDE_ASM(s32, "38C5F0", func_E008A000); + +INCLUDE_ASM(s32, "38C5F0", func_E008A188); + +void func_E008A288(void) { +} + +INCLUDE_ASM(s32, "38C5F0", func_E008A290); + +INCLUDE_ASM(s32, "38C5F0", func_E008A53C); + +INCLUDE_ASM(s32, "38C5F0", func_E008A6E4); + +INCLUDE_ASM(s32, "38C5F0", func_E008A728); diff --git a/src/38DE00.c b/src/38DE00.c new file mode 100644 index 0000000000..5269641d08 --- /dev/null +++ b/src/38DE00.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "38DE00", func_E008C000); + +void func_E008C3F4(void) { +} + +INCLUDE_ASM(s32, "38DE00", func_E008C3FC); + +INCLUDE_ASM(s32, "38DE00", func_E008C6B8); + +INCLUDE_ASM(s32, "38DE00", func_E008C6FC); diff --git a/src/38EE60.c b/src/38EE60.c new file mode 100644 index 0000000000..f1d6a9a483 --- /dev/null +++ b/src/38EE60.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "38EE60", func_E008E000); + +void func_E008E1FC(void) { +} + +INCLUDE_ASM(s32, "38EE60", func_E008E204); + +INCLUDE_ASM(s32, "38EE60", func_E008E498); + +INCLUDE_ASM(s32, "38EE60", func_E008E4E0); diff --git a/src/38F900.c b/src/38F900.c new file mode 100644 index 0000000000..94bfaf9614 --- /dev/null +++ b/src/38F900.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "38F900", func_E0090000); + +void func_E00901C0(void) { +} + +INCLUDE_ASM(s32, "38F900", func_E00901C8); + +void func_E0090420(void) { +} + +INCLUDE_ASM(s32, "38F900", func_E0090428); + +INCLUDE_ASM(s32, "38F900", func_E0090444); diff --git a/src/391D30.c b/src/391D30.c new file mode 100644 index 0000000000..53676ca8f7 --- /dev/null +++ b/src/391D30.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "391D30", func_E0092000); + +void func_E00921AC(void) { +} + +INCLUDE_ASM(s32, "391D30", func_E00921B4); + +INCLUDE_ASM(s32, "391D30", func_E0092258); + +INCLUDE_ASM(s32, "391D30", func_E00922A0); diff --git a/src/code_39210_len_aa0.c b/src/39210_len_aa0.c similarity index 80% rename from src/code_39210_len_aa0.c rename to src/39210_len_aa0.c index 6b22aa4441..209df53e71 100644 --- a/src/code_39210_len_aa0.c +++ b/src/39210_len_aa0.c @@ -28,8 +28,8 @@ void get_npc_pos(s32 arg0, f32* outX, f32* outY, f32* outZ, s32* arg4) { } } -INCLUDE_ASM(s32, "code_39210_len_aa0", func_8005DECC); +INCLUDE_ASM(s32, "39210_len_aa0", func_8005DECC); -INCLUDE_ASM(s32, "code_39210_len_aa0", func_8005DFD4); +INCLUDE_ASM(s32, "39210_len_aa0", func_8005DFD4); -INCLUDE_ASM(s32, "code_39210_len_aa0", func_8005E12C); +INCLUDE_ASM(s32, "39210_len_aa0", func_8005E12C); diff --git a/src/3928D0.c b/src/3928D0.c new file mode 100644 index 0000000000..6fb7c994df --- /dev/null +++ b/src/3928D0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3928D0", func_E0094000); + +void func_E0094190(void) { +} + +INCLUDE_ASM(s32, "3928D0", func_E0094198); + +INCLUDE_ASM(s32, "3928D0", func_E00942C0); + +INCLUDE_ASM(s32, "3928D0", func_E00942FC); diff --git a/src/394280.c b/src/394280.c new file mode 100644 index 0000000000..bef8a1c5b0 --- /dev/null +++ b/src/394280.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "394280", func_E0096000); + +void func_E00960EC(void) { +} + +INCLUDE_ASM(s32, "394280", func_E00960F4); + +INCLUDE_ASM(s32, "394280", func_E0096178); + +INCLUDE_ASM(s32, "394280", func_E00961BC); diff --git a/src/395BB0.c b/src/395BB0.c new file mode 100644 index 0000000000..7dfadea165 --- /dev/null +++ b/src/395BB0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "395BB0", func_E0098000); + +void func_E0098168(void) { +} + +INCLUDE_ASM(s32, "395BB0", func_E0098170); + +INCLUDE_ASM(s32, "395BB0", func_E009829C); + +INCLUDE_ASM(s32, "395BB0", func_E00982EC); diff --git a/src/3965B0.c b/src/3965B0.c new file mode 100644 index 0000000000..1b6b52b538 --- /dev/null +++ b/src/3965B0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3965B0", func_E009A000); + +void func_E009A138(void) { +} + +INCLUDE_ASM(s32, "3965B0", func_E009A140); + +INCLUDE_ASM(s32, "3965B0", func_E009A398); + +INCLUDE_ASM(s32, "3965B0", func_E009A3E0); diff --git a/src/3981F0.c b/src/3981F0.c new file mode 100644 index 0000000000..fbd379eabc --- /dev/null +++ b/src/3981F0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3981F0", func_E009C000); + +void func_E009C100(void) { +} + +INCLUDE_ASM(s32, "3981F0", func_E009C108); + +INCLUDE_ASM(s32, "3981F0", func_E009C1DC); + +INCLUDE_ASM(s32, "3981F0", func_E009C220); diff --git a/src/39FF20.c b/src/39FF20.c new file mode 100644 index 0000000000..c121d04834 --- /dev/null +++ b/src/39FF20.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "39FF20", func_E009E000); + +void func_E009E1DC(void) { +} + +INCLUDE_ASM(s32, "39FF20", func_E009E1E4); + +INCLUDE_ASM(s32, "39FF20", func_E009E3DC); + +INCLUDE_ASM(s32, "39FF20", func_E009E424); diff --git a/src/3A2290.c b/src/3A2290.c new file mode 100644 index 0000000000..4963a46887 --- /dev/null +++ b/src/3A2290.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A2290", func_E00A0000); diff --git a/src/3A2990.c b/src/3A2990.c new file mode 100644 index 0000000000..4b214afd73 --- /dev/null +++ b/src/3A2990.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A2990", func_E00A2000); + +void func_E00A2118(void) { +} + +INCLUDE_ASM(s32, "3A2990", func_E00A2120); + +INCLUDE_ASM(s32, "3A2990", func_E00A21EC); + +void func_E00A2234(void) { +} + +INCLUDE_ASM(s32, "3A2990", func_E00A223C); diff --git a/src/3A37E0.c b/src/3A37E0.c new file mode 100644 index 0000000000..b57a8ecc84 --- /dev/null +++ b/src/3A37E0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A37E0", func_E00A4000); + +void func_E00A41A4(void) { +} + +INCLUDE_ASM(s32, "3A37E0", func_E00A41AC); + +INCLUDE_ASM(s32, "3A37E0", func_E00A45DC); + +void func_E00A4648(void) { +} + +INCLUDE_ASM(s32, "3A37E0", func_E00A4650); diff --git a/src/3A5550.c b/src/3A5550.c new file mode 100644 index 0000000000..de6747b564 --- /dev/null +++ b/src/3A5550.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A5550", func_E00A6000); + +void func_E00A611C(void) { +} + +INCLUDE_ASM(s32, "3A5550", func_E00A6124); + +INCLUDE_ASM(s32, "3A5550", func_E00A6358); + +void func_E00A639C(void) { +} + +INCLUDE_ASM(s32, "3A5550", func_E00A63A4); diff --git a/src/3A70F0.c b/src/3A70F0.c new file mode 100644 index 0000000000..4bf4b77ac6 --- /dev/null +++ b/src/3A70F0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A70F0", func_E00A8000); + +void func_E00A80FC(void) { +} + +INCLUDE_ASM(s32, "3A70F0", func_E00A8104); + +INCLUDE_ASM(s32, "3A70F0", func_E00A82D4); + +void func_E00A8318(void) { +} + +INCLUDE_ASM(s32, "3A70F0", func_E00A8320); diff --git a/src/3AA920.c b/src/3AA920.c new file mode 100644 index 0000000000..8be307ad98 --- /dev/null +++ b/src/3AA920.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3AA920", func_E00AA000); + +void func_E00AA104(void) { +} + +INCLUDE_ASM(s32, "3AA920", func_E00AA10C); + +INCLUDE_ASM(s32, "3AA920", func_E00AA3C0); + +INCLUDE_ASM(s32, "3AA920", func_E00AA404); diff --git a/src/3AEE20.c b/src/3AEE20.c new file mode 100644 index 0000000000..6efa11277a --- /dev/null +++ b/src/3AEE20.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3AEE20", func_E00AC000); + +void func_E00AC11C(void) { +} + +INCLUDE_ASM(s32, "3AEE20", func_E00AC124); + +void func_E00AC280(void) { +} + +INCLUDE_ASM(s32, "3AEE20", func_E00AC288); + +INCLUDE_ASM(s32, "3AEE20", func_E00AC2A4); diff --git a/src/3B2350.c b/src/3B2350.c new file mode 100644 index 0000000000..6ac4e6aa98 --- /dev/null +++ b/src/3B2350.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B2350", func_E00AE000); + +void func_E00AE1AC(void) { +} + +INCLUDE_ASM(s32, "3B2350", func_E00AE1B4); + +INCLUDE_ASM(s32, "3B2350", func_E00AE4FC); + +void func_E00AE544(void) { +} + +INCLUDE_ASM(s32, "3B2350", func_E00AE54C); diff --git a/src/3B3EB0.c b/src/3B3EB0.c new file mode 100644 index 0000000000..13c68fb97f --- /dev/null +++ b/src/3B3EB0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B3EB0", func_E00B0000); + +void func_E00B011C(void) { +} + +INCLUDE_ASM(s32, "3B3EB0", func_E00B0124); + +INCLUDE_ASM(s32, "3B3EB0", func_E00B01F8); + +INCLUDE_ASM(s32, "3B3EB0", func_E00B0234); diff --git a/src/3B4790.c b/src/3B4790.c new file mode 100644 index 0000000000..df8b864af2 --- /dev/null +++ b/src/3B4790.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B4790", func_E00B2000); + +void func_E00B21DC(void) { +} + +INCLUDE_ASM(s32, "3B4790", func_E00B21E4); + +INCLUDE_ASM(s32, "3B4790", func_E00B2460); + +void func_E00B24A8(void) { +} + +INCLUDE_ASM(s32, "3B4790", func_E00B24B0); diff --git a/src/3B5CF0.c b/src/3B5CF0.c new file mode 100644 index 0000000000..7cf6938a20 --- /dev/null +++ b/src/3B5CF0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B5CF0", func_E00B4000); + +void func_E00B4134(void) { +} + +INCLUDE_ASM(s32, "3B5CF0", func_E00B413C); + +INCLUDE_ASM(s32, "3B5CF0", func_E00B452C); + +void func_E00B4574(void) { +} + +INCLUDE_ASM(s32, "3B5CF0", func_E00B457C); diff --git a/src/3B7160.c b/src/3B7160.c new file mode 100644 index 0000000000..885f02a401 --- /dev/null +++ b/src/3B7160.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B7160", func_E00B6000); + +void func_E00B6178(void) { +} + +INCLUDE_ASM(s32, "3B7160", func_E00B6180); + +INCLUDE_ASM(s32, "3B7160", func_E00B629C); + +void func_E00B62D8(void) { +} + +INCLUDE_ASM(s32, "3B7160", func_E00B62E0); diff --git a/src/3B7B80.c b/src/3B7B80.c new file mode 100644 index 0000000000..f63fc1d166 --- /dev/null +++ b/src/3B7B80.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B7B80", func_E00B8000); + +void func_E00B812C(void) { +} + +INCLUDE_ASM(s32, "3B7B80", func_E00B8134); + +INCLUDE_ASM(s32, "3B7B80", func_E00B81B8); + +void func_E00B8200(void) { +} + +INCLUDE_ASM(s32, "3B7B80", func_E00B8208); diff --git a/src/3B8BD0.c b/src/3B8BD0.c new file mode 100644 index 0000000000..bb6f3fe6bc --- /dev/null +++ b/src/3B8BD0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B8BD0", func_E00BA000); + +void func_E00BA16C(void) { +} + +INCLUDE_ASM(s32, "3B8BD0", func_E00BA174); + +INCLUDE_ASM(s32, "3B8BD0", func_E00BA5DC); + +void func_E00BA618(void) { +} + +INCLUDE_ASM(s32, "3B8BD0", func_E00BA620); diff --git a/src/3BA030.c b/src/3BA030.c new file mode 100644 index 0000000000..55797d6e76 --- /dev/null +++ b/src/3BA030.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3BA030", func_E00BC000); + +void func_E00BC1D0(void) { +} + +INCLUDE_ASM(s32, "3BA030", func_E00BC1D8); + +INCLUDE_ASM(s32, "3BA030", func_E00BC238); + +INCLUDE_ASM(s32, "3BA030", func_E00BC2E8); + +void func_E00BC36C(void) { +} + +INCLUDE_ASM(s32, "3BA030", func_E00BC374); diff --git a/src/3BBF60.c b/src/3BBF60.c new file mode 100644 index 0000000000..d0630789c2 --- /dev/null +++ b/src/3BBF60.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3BBF60", func_E00BE000); + +void func_E00BE39C(void) { +} + +INCLUDE_ASM(s32, "3BBF60", func_E00BE3A4); + +INCLUDE_ASM(s32, "3BBF60", func_E00BE578); + +void func_E00BE5B4(void) { +} + +INCLUDE_ASM(s32, "3BBF60", func_E00BE5BC); diff --git a/src/3BCD60.c b/src/3BCD60.c new file mode 100644 index 0000000000..2dd8c577fd --- /dev/null +++ b/src/3BCD60.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3BCD60", func_E00C0000); + +void func_E00C0158(void) { +} + +INCLUDE_ASM(s32, "3BCD60", func_E00C0160); + +INCLUDE_ASM(s32, "3BCD60", func_E00C0710); + +void func_E00C0758(void) { +} + +INCLUDE_ASM(s32, "3BCD60", func_E00C0760); diff --git a/src/3C11D0.c b/src/3C11D0.c new file mode 100644 index 0000000000..9fb9a8deb9 --- /dev/null +++ b/src/3C11D0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3C11D0", func_E00C2000); + +void func_E00C2124(void) { +} + +INCLUDE_ASM(s32, "3C11D0", func_E00C212C); + +INCLUDE_ASM(s32, "3C11D0", func_E00C21CC); + +void func_E00C2214(void) { +} + +INCLUDE_ASM(s32, "3C11D0", func_E00C221C); diff --git a/src/3CADF0.c b/src/3CADF0.c new file mode 100644 index 0000000000..d645e46cd0 --- /dev/null +++ b/src/3CADF0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CADF0", func_E00C4000); + +void func_E00C4170(void) { +} + +INCLUDE_ASM(s32, "3CADF0", func_E00C4178); + +INCLUDE_ASM(s32, "3CADF0", func_E00C42C4); + +void func_E00C4300(void) { +} + +INCLUDE_ASM(s32, "3CADF0", func_E00C4308); diff --git a/src/3CC9E0.c b/src/3CC9E0.c new file mode 100644 index 0000000000..4c7d9b7be6 --- /dev/null +++ b/src/3CC9E0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CC9E0", func_E00C6000); + +void func_E00C6394(void) { +} + +INCLUDE_ASM(s32, "3CC9E0", func_E00C639C); + +INCLUDE_ASM(s32, "3CC9E0", func_E00C6768); + +INCLUDE_ASM(s32, "3CC9E0", func_E00C67B0); diff --git a/src/3CF3A0.c b/src/3CF3A0.c new file mode 100644 index 0000000000..9094b7a78a --- /dev/null +++ b/src/3CF3A0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CF3A0", func_E00C8000); + +void func_E00C8218(void) { +} + +INCLUDE_ASM(s32, "3CF3A0", func_E00C8220); + +INCLUDE_ASM(s32, "3CF3A0", func_E00C8404); + +void func_E00C844C(void) { +} + +INCLUDE_ASM(s32, "3CF3A0", func_E00C8454); diff --git a/src/3D0500.c b/src/3D0500.c new file mode 100644 index 0000000000..bf51877200 --- /dev/null +++ b/src/3D0500.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D0500", func_E00CA000); + +void func_E00CA240(void) { +} + +INCLUDE_ASM(s32, "3D0500", func_E00CA248); + +INCLUDE_ASM(s32, "3D0500", func_E00CA484); + +INCLUDE_ASM(s32, "3D0500", func_E00CA4CC); diff --git a/src/3D1690.c b/src/3D1690.c new file mode 100644 index 0000000000..c0a67ade91 --- /dev/null +++ b/src/3D1690.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D1690", func_E00CC000); + +void func_E00CC250(void) { +} + +INCLUDE_ASM(s32, "3D1690", func_E00CC258); + +INCLUDE_ASM(s32, "3D1690", func_E00CC980); + +void func_E00CC9C8(void) { +} + +INCLUDE_ASM(s32, "3D1690", func_E00CC9D0); diff --git a/src/3D2AC0.c b/src/3D2AC0.c new file mode 100644 index 0000000000..1eeb64d87d --- /dev/null +++ b/src/3D2AC0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D2AC0", func_E00CE000); + +void func_E00CE21C(void) { +} + +INCLUDE_ASM(s32, "3D2AC0", func_E00CE224); + +INCLUDE_ASM(s32, "3D2AC0", func_E00CE428); + +void func_E00CE470(void) { +} + +INCLUDE_ASM(s32, "3D2AC0", func_E00CE478); diff --git a/src/3D3E20.c b/src/3D3E20.c new file mode 100644 index 0000000000..5861ee0b8c --- /dev/null +++ b/src/3D3E20.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D3E20", func_E00D0000); + +void func_E00D018C(void) { +} + +INCLUDE_ASM(s32, "3D3E20", func_E00D0194); + +INCLUDE_ASM(s32, "3D3E20", func_E00D0448); + +INCLUDE_ASM(s32, "3D3E20", func_E00D048C); diff --git a/src/3D4970.c b/src/3D4970.c new file mode 100644 index 0000000000..6ed7e69fee --- /dev/null +++ b/src/3D4970.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D4970", func_E00D2000); + +void func_E00D2118(void) { +} + +INCLUDE_ASM(s32, "3D4970", func_E00D2120); + +INCLUDE_ASM(s32, "3D4970", func_E00D2234); + +void func_E00D227C(void) { +} + +INCLUDE_ASM(s32, "3D4970", func_E00D2284); diff --git a/src/3D5020.c b/src/3D5020.c new file mode 100644 index 0000000000..b66e38f2d9 --- /dev/null +++ b/src/3D5020.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D5020", func_E00D6000); + +void func_E00D6718(void) { +} + +INCLUDE_ASM(s32, "3D5020", func_E00D6720); + +INCLUDE_ASM(s32, "3D5020", func_E00D693C); + +void func_E00D6978(void) { +} + +INCLUDE_ASM(s32, "3D5020", func_E00D6980); diff --git a/src/code_3D67C0.c b/src/3D67C0.c similarity index 69% rename from src/code_3D67C0.c rename to src/3D67C0.c index 98566e1720..dee7984625 100644 --- a/src/code_3D67C0.c +++ b/src/3D67C0.c @@ -1,16 +1,16 @@ #include "common.h" -INCLUDE_ASM(s32, "code_3D67C0", func_E00D8000); +INCLUDE_ASM(s32, "3D67C0", func_E00D8000); void func_E00D8120(void) { } -INCLUDE_ASM(s32, "code_3D67C0", func_E00D8128); +INCLUDE_ASM(s32, "3D67C0", func_E00D8128); void func_E00D825C(void) { } -INCLUDE_ASM(s32, "code_3D67C0", func_E00D8264); +INCLUDE_ASM(s32, "3D67C0", func_E00D8264); void func_E00D8280(void) { } @@ -45,6 +45,6 @@ void func_E00D8288(s32 l, s32 r, s32 t, s32 b) { gDPFillRectangle(gMasterGfxPos++, l, r, t, b); } -INCLUDE_ASM(s32, "code_3D67C0", func_E00D8334); +INCLUDE_ASM(s32, "3D67C0", func_E00D8334); -INCLUDE_ASM(s32, "code_3D67C0", func_E00D8630); +INCLUDE_ASM(s32, "3D67C0", func_E00D8630); diff --git a/src/3D7240.c b/src/3D7240.c new file mode 100644 index 0000000000..11aea62020 --- /dev/null +++ b/src/3D7240.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D7240", func_E00DA000); + +void func_E00DA0FC(void) { +} + +INCLUDE_ASM(s32, "3D7240", func_E00DA104); + +INCLUDE_ASM(s32, "3D7240", func_E00DA1E0); + +void func_E00DA228(void) { +} + +INCLUDE_ASM(s32, "3D7240", func_E00DA230); diff --git a/src/3D7A70.c b/src/3D7A70.c new file mode 100644 index 0000000000..74c19e0665 --- /dev/null +++ b/src/3D7A70.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D7A70", func_E00DC000); + +void func_E00DC190(void) { +} + +INCLUDE_ASM(s32, "3D7A70", func_E00DC198); + +INCLUDE_ASM(s32, "3D7A70", func_E00DC2C0); + +void func_E00DC2FC(void) { +} + +INCLUDE_ASM(s32, "3D7A70", func_E00DC304); diff --git a/src/3D8720.c b/src/3D8720.c new file mode 100644 index 0000000000..e0506c53a3 --- /dev/null +++ b/src/3D8720.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D8720", func_E00DE000); + +void func_E00DE11C(void) { +} + +INCLUDE_ASM(s32, "3D8720", func_E00DE124); + +INCLUDE_ASM(s32, "3D8720", func_E00DE260); + +INCLUDE_ASM(s32, "3D8720", func_E00DE2A8); diff --git a/src/3DB460.c b/src/3DB460.c new file mode 100644 index 0000000000..86a260f74e --- /dev/null +++ b/src/3DB460.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3DB460", func_E00E0000); + +void func_E00E01D0(void) { +} + +INCLUDE_ASM(s32, "3DB460", func_E00E01D8); + +INCLUDE_ASM(s32, "3DB460", func_E00E05B0); + +void func_E00E05F8(void) { +} + +INCLUDE_ASM(s32, "3DB460", func_E00E0600); diff --git a/src/3DC310.c b/src/3DC310.c new file mode 100644 index 0000000000..80d30f28a5 --- /dev/null +++ b/src/3DC310.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3DC310", func_E00E2000); + +void func_E00E212C(void) { +} + +INCLUDE_ASM(s32, "3DC310", func_E00E2134); + +INCLUDE_ASM(s32, "3DC310", func_E00E21C8); + +void func_E00E2210(void) { +} + +INCLUDE_ASM(s32, "3DC310", func_E00E2218); diff --git a/src/3DE000.c b/src/3DE000.c new file mode 100644 index 0000000000..9a7bcecc66 --- /dev/null +++ b/src/3DE000.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3DE000", func_E00E4000); + +void func_E00E4288(void) { +} + +INCLUDE_ASM(s32, "3DE000", func_E00E4290); + +INCLUDE_ASM(s32, "3DE000", func_E00E490C); + +void func_E00E4954(void) { +} + +INCLUDE_ASM(s32, "3DE000", func_E00E495C); diff --git a/src/3E0930.c b/src/3E0930.c new file mode 100644 index 0000000000..36860b00ae --- /dev/null +++ b/src/3E0930.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3E0930", func_E00E6000); + +void func_E00E617C(void) { +} + +INCLUDE_ASM(s32, "3E0930", func_E00E6184); + +INCLUDE_ASM(s32, "3E0930", func_E00E64D4); + +void func_E00E651C(void) { +} + +INCLUDE_ASM(s32, "3E0930", func_E00E6524); diff --git a/src/3E1690.c b/src/3E1690.c new file mode 100644 index 0000000000..0ad7336bac --- /dev/null +++ b/src/3E1690.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3E1690", func_E00E8000); + +void func_E00E825C(void) { +} + +INCLUDE_ASM(s32, "3E1690", func_E00E8264); + +INCLUDE_ASM(s32, "3E1690", func_E00E8374); + +INCLUDE_ASM(s32, "3E1690", func_E00E83BC); diff --git a/src/3E1EE0.c b/src/3E1EE0.c new file mode 100644 index 0000000000..d83f476cc9 --- /dev/null +++ b/src/3E1EE0.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3E1EE0", func_E00EA000); + +void func_E00EA190(void) { +} + +INCLUDE_ASM(s32, "3E1EE0", func_E00EA198); + +INCLUDE_ASM(s32, "3E1EE0", func_E00EA520); + +void func_E00EA664(void) { +} + +INCLUDE_ASM(s32, "3E1EE0", func_E00EA66C); diff --git a/src/3E43A0.c b/src/3E43A0.c new file mode 100644 index 0000000000..7e05c16ed4 --- /dev/null +++ b/src/3E43A0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3E43A0", func_E010A000); + +void func_E010A184(void) { +} + +INCLUDE_ASM(s32, "3E43A0", func_E010A18C); + +INCLUDE_ASM(s32, "3E43A0", func_E010A4A0); + +INCLUDE_ASM(s32, "3E43A0", func_E010A4E8); diff --git a/src/3E54C0.c b/src/3E54C0.c new file mode 100644 index 0000000000..a8303aacf5 --- /dev/null +++ b/src/3E54C0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3E54C0", func_E010C000); + +void func_E010C190(void) { +} + +INCLUDE_ASM(s32, "3E54C0", func_E010C198); + +INCLUDE_ASM(s32, "3E54C0", func_E010C354); + +INCLUDE_ASM(s32, "3E54C0", func_E010C39C); diff --git a/src/3EB4E0.c b/src/3EB4E0.c new file mode 100644 index 0000000000..b0a994d9a1 --- /dev/null +++ b/src/3EB4E0.c @@ -0,0 +1,14 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3EB4E0", func_E010E000); + +INCLUDE_ASM(s32, "3EB4E0", func_E010E32C); + +void func_E010E4A0(void) { +} + +INCLUDE_ASM(s32, "3EB4E0", func_E010E4A8); + +INCLUDE_ASM(s32, "3EB4E0", func_E010E510); + +INCLUDE_ASM(s32, "3EB4E0", func_E010E558); diff --git a/src/3F83F0.c b/src/3F83F0.c new file mode 100644 index 0000000000..4cacff458d --- /dev/null +++ b/src/3F83F0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3F83F0", func_E0110000); + +void func_E0110224(void) { +} + +INCLUDE_ASM(s32, "3F83F0", func_E011022C); + +INCLUDE_ASM(s32, "3F83F0", func_E01103A4); + +INCLUDE_ASM(s32, "3F83F0", func_E01103EC); diff --git a/src/3F9E50.c b/src/3F9E50.c new file mode 100644 index 0000000000..76ae780696 --- /dev/null +++ b/src/3F9E50.c @@ -0,0 +1,14 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3F9E50", func_E0112000); + +void func_E01121B8(void) { +} + +INCLUDE_ASM(s32, "3F9E50", func_E01121C0); + +INCLUDE_ASM(s32, "3F9E50", func_E01122E8); + +INCLUDE_ASM(s32, "3F9E50", func_E0112330); + +INCLUDE_ASM(s32, "3F9E50", func_E01124CC); diff --git a/src/3FEAE0.c b/src/3FEAE0.c new file mode 100644 index 0000000000..d259c35bb5 --- /dev/null +++ b/src/3FEAE0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3FEAE0", func_E0114000); + +void func_E01140D4(void) { +} + +INCLUDE_ASM(s32, "3FEAE0", func_E01140DC); + +INCLUDE_ASM(s32, "3FEAE0", func_E0114340); + +INCLUDE_ASM(s32, "3FEAE0", func_E0114388); diff --git a/src/code_3bf0_len_6f0.c b/src/3bf0_len_6f0.c similarity index 91% rename from src/code_3bf0_len_6f0.c rename to src/3bf0_len_6f0.c index 432db9c131..967f7326d4 100644 --- a/src/code_3bf0_len_6f0.c +++ b/src/3bf0_len_6f0.c @@ -23,4 +23,4 @@ void func_80028838(void) { D_8009A6A6 = 0; } -INCLUDE_ASM(s32, "code_3bf0_len_6f0", update_input); +INCLUDE_ASM(s32, "3bf0_len_6f0", update_input); diff --git a/src/402640.c b/src/402640.c new file mode 100644 index 0000000000..f009131e07 --- /dev/null +++ b/src/402640.c @@ -0,0 +1,14 @@ +#include "common.h" + +INCLUDE_ASM(s32, "402640", func_E0116000); + +void func_E0116184(void) { +} + +INCLUDE_ASM(s32, "402640", func_E011618C); + +INCLUDE_ASM(s32, "402640", func_E01166A0); + +INCLUDE_ASM(s32, "402640", func_E01166E8); + +INCLUDE_ASM(s32, "402640", func_E0116884); diff --git a/src/403400.c b/src/403400.c new file mode 100644 index 0000000000..21fa5dc0af --- /dev/null +++ b/src/403400.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "403400", func_E0118000); + +void func_E01182EC(void) { +} + +INCLUDE_ASM(s32, "403400", func_E01182F4); + +INCLUDE_ASM(s32, "403400", func_E0118454); + +INCLUDE_ASM(s32, "403400", func_E011849C); diff --git a/src/code_404220.c b/src/404220.c similarity index 75% rename from src/code_404220.c rename to src/404220.c index 7bd1ca4983..e5e3f890a3 100644 --- a/src/code_404220.c +++ b/src/404220.c @@ -1,16 +1,16 @@ #include "common.h" -INCLUDE_ASM(s32, "code_404220", func_E011A000); +INCLUDE_ASM(s32, "404220", func_E011A000); void func_E011A0FC(void) { } -INCLUDE_ASM(s32, "code_404220", func_E011A104); +INCLUDE_ASM(s32, "404220", func_E011A104); void func_E011A398(void) { } -INCLUDE_ASM(s32, "code_404220", func_E011A3A0); +INCLUDE_ASM(s32, "404220", func_E011A3A0); #ifdef NON_MATCHING // gfx gbi macro issue void func_E011A3BC(s16 alpha) { @@ -26,9 +26,9 @@ void func_E011A3BC(s16 alpha) { } } #else -INCLUDE_ASM(s32, "code_404220", func_E011A3BC); +INCLUDE_ASM(s32, "404220", func_E011A3BC); #endif -INCLUDE_ASM(s32, "code_404220", func_E011A48C); +INCLUDE_ASM(s32, "404220", func_E011A48C); -INCLUDE_ASM(s32, "code_404220", func_E011A700); +INCLUDE_ASM(s32, "404220", func_E011A700); diff --git a/src/406B40.c b/src/406B40.c new file mode 100644 index 0000000000..500302fbc3 --- /dev/null +++ b/src/406B40.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "406B40", func_E011C000); + +void func_E011C0F4(void) { +} + +INCLUDE_ASM(s32, "406B40", func_E011C0FC); + +INCLUDE_ASM(s32, "406B40", func_E011C17C); + +INCLUDE_ASM(s32, "406B40", func_E011C1C4); diff --git a/src/409990.c b/src/409990.c new file mode 100644 index 0000000000..838016256b --- /dev/null +++ b/src/409990.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "409990", func_E011E000); + +void func_E011E18C(void) { +} + +INCLUDE_ASM(s32, "409990", func_E011E194); + +INCLUDE_ASM(s32, "409990", func_E011E530); + +INCLUDE_ASM(s32, "409990", func_E011E578); diff --git a/src/40B3F0.c b/src/40B3F0.c new file mode 100644 index 0000000000..9567bd8b47 --- /dev/null +++ b/src/40B3F0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40B3F0", func_E0120000); + +void func_E0120134(void) { +} + +INCLUDE_ASM(s32, "40B3F0", func_E012013C); + +INCLUDE_ASM(s32, "40B3F0", func_E012039C); + +INCLUDE_ASM(s32, "40B3F0", func_E01203E4); diff --git a/src/40C5A0.c b/src/40C5A0.c new file mode 100644 index 0000000000..60bd07c441 --- /dev/null +++ b/src/40C5A0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40C5A0", func_E0122000); + +void func_E0122174(void) { +} + +INCLUDE_ASM(s32, "40C5A0", func_E012217C); + +INCLUDE_ASM(s32, "40C5A0", func_E01226C4); + +INCLUDE_ASM(s32, "40C5A0", func_E012270C); diff --git a/src/412730.c b/src/412730.c new file mode 100644 index 0000000000..ee2e03e1ba --- /dev/null +++ b/src/412730.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "412730", func_E0124000); + +void func_E01242FC(void) { +} + +INCLUDE_ASM(s32, "412730", func_E0124304); + +INCLUDE_ASM(s32, "412730", func_E012448C); + +INCLUDE_ASM(s32, "412730", func_E01244C4); diff --git a/src/413360.c b/src/413360.c new file mode 100644 index 0000000000..a2b7a289b9 --- /dev/null +++ b/src/413360.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "413360", func_E0126000); + +void func_E012612C(void) { +} + +INCLUDE_ASM(s32, "413360", func_E0126134); + +INCLUDE_ASM(s32, "413360", func_E01264A4); + +INCLUDE_ASM(s32, "413360", func_E01264EC); diff --git a/src/414BA0.c b/src/414BA0.c new file mode 100644 index 0000000000..e223a79c89 --- /dev/null +++ b/src/414BA0.c @@ -0,0 +1,12 @@ +#include "common.h" + +INCLUDE_ASM(s32, "414BA0", func_E0128000); + +void func_E0128128(void) { +} + +INCLUDE_ASM(s32, "414BA0", func_E0128130); + +INCLUDE_ASM(s32, "414BA0", func_E0128198); + +INCLUDE_ASM(s32, "414BA0", func_E01281E0); diff --git a/src/code_415D90.c b/src/415D90.c similarity index 92% rename from src/code_415D90.c rename to src/415D90.c index f9a5fce56a..da53e352ae 100644 --- a/src/code_415D90.c +++ b/src/415D90.c @@ -174,17 +174,17 @@ void func_802A10B8(void) { free_icon(D_802AD058); } -INCLUDE_ASM(s32, "code_415D90", func_802A11B0); +INCLUDE_ASM(s32, "415D90", func_802A11B0); -INCLUDE_ASM(s32, "code_415D90", draw_battle_wheel); +INCLUDE_ASM(s32, "415D90", draw_battle_wheel); -INCLUDE_ASM(s32, "code_415D90", func_802A2684); +INCLUDE_ASM(s32, "415D90", func_802A2684); void func_802A27D0(void) { battle_menu_moveState = 10; } -INCLUDE_ASM(s32, "code_415D90", func_802A27E4); +INCLUDE_ASM(s32, "415D90", func_802A27E4); void func_802A2910(void) { s32* moveOptionIconIDs; @@ -270,9 +270,9 @@ void func_802A2C58(void) { battle_menu_moveState = 30; } -INCLUDE_ASM(s32, "code_415D90", func_802A2C84); +INCLUDE_ASM(s32, "415D90", func_802A2C84); -INCLUDE_ASM(s32, "code_415D90", func_802A3C98); +INCLUDE_ASM(s32, "415D90", func_802A3C98); void func_802A43DC(s32 arg0, s32 arg1, s32 arg2) { s32 phi_a0; @@ -305,7 +305,7 @@ void func_802A4448(s32 arg0, s32 arg1, s32 arg2) { draw_icon_0(icon); } -INCLUDE_ASM(s32, "code_415D90", func_802A4494); +INCLUDE_ASM(s32, "415D90", func_802A4494); void func_802A4534(s32 arg0, s32 arg1, s32 arg2) { s32 temp2 = arg2; @@ -325,14 +325,14 @@ void func_802A4534(s32 arg0, s32 arg1, s32 arg2) { draw_msg(phi_s0, temp1, temp2 + D_802AB344[get_msg_lines(phi_s0) - 1], 255, 0xF, 0); } -INCLUDE_ASM(s32, "code_415D90", func_802A45D8); +INCLUDE_ASM(s32, "415D90", func_802A45D8); void func_802A4718(void) { D_802AD604 = 10; } -//INCLUDE_ASM(s32, "code_415D90", func_802A472C); +//INCLUDE_ASM(s32, "415D90", func_802A472C); void func_802A472C(void) { s32* temp = &D_802AD628; s32 i; @@ -350,9 +350,9 @@ void func_802A472C(void) { free_icon(D_802AD620); } -INCLUDE_ASM(s32, "code_415D90", func_802A47E0); +INCLUDE_ASM(s32, "415D90", func_802A47E0); -INCLUDE_ASM(s32, "code_415D90", func_802A48FC); +INCLUDE_ASM(s32, "415D90", func_802A48FC); void func_802A4A10(void) { set_window_update(6, 5); @@ -361,9 +361,9 @@ void func_802A4A10(void) { D_802AD604 = 30; } -INCLUDE_ASM(s32, "code_415D90", func_802A4A54); +INCLUDE_ASM(s32, "415D90", func_802A4A54); -INCLUDE_ASM(s32, "code_415D90", func_802A5290); +INCLUDE_ASM(s32, "415D90", func_802A5290); void func_802A56F8(s32 arg0, s32 arg1, s32 arg2) { draw_msg(0x1D0043, arg1 + 0xF, arg2 + 2, D_802AD624, 0x33, 1); @@ -386,10 +386,10 @@ void func_802A5738(s32 arg0, s32 arg1, s32 arg2) { } } #else -INCLUDE_ASM(s32, "code_415D90", func_802A5738); +INCLUDE_ASM(s32, "415D90", func_802A5738); #endif -INCLUDE_ASM(s32, "code_415D90", func_802A57C8); +INCLUDE_ASM(s32, "415D90", func_802A57C8); s32 can_switch_to_player(void) { BattleStatus* battleStatus = &gBattleStatus; @@ -475,21 +475,21 @@ s32 func_802A58D0(void) { return !ret; } -INCLUDE_ASM(s32, "code_415D90", update_player_menu); +INCLUDE_ASM(s32, "415D90", update_player_menu); -INCLUDE_ASM(s32, "code_415D90", func_802A8180); +INCLUDE_ASM(s32, "415D90", func_802A8180); -INCLUDE_ASM(s32, "code_415D90", update_partner_menu); +INCLUDE_ASM(s32, "415D90", update_partner_menu); -INCLUDE_ASM(s32, "code_415D90", func_802A9AE8); +INCLUDE_ASM(s32, "415D90", func_802A9AE8); s32 func_802A9B30(void) { return (gBattleStatus.flags2 & 4) <= 0; } -INCLUDE_ASM(s32, "code_415D90", func_802A9B44); +INCLUDE_ASM(s32, "415D90", func_802A9B44); -INCLUDE_ASM(s32, "code_415D90", func_802AA05C); +INCLUDE_ASM(s32, "415D90", func_802AA05C); // void func_802AA05C(void) { // switch (gBattleStatus.battleState) { // case 1: @@ -519,7 +519,7 @@ s32 func_802AA0A4(void) { return (gBattleStatus.flags2 & 2) <= 0; } -INCLUDE_ASM(s32, "code_415D90", func_802AA0B8); // look into m2c bug +INCLUDE_ASM(s32, "415D90", func_802AA0B8); // look into m2c bug void func_802AA640(void) { switch (gBattleStatus.battleState) { @@ -546,9 +546,9 @@ void func_802AA640(void) { } } -INCLUDE_ASM(s32, "code_415D90", update_targeting_enemies); +INCLUDE_ASM(s32, "415D90", update_targeting_enemies); -INCLUDE_ASM(s32, "code_415D90", func_802AACD8); +INCLUDE_ASM(s32, "415D90", func_802AACD8); void func_802AB330(void) { } diff --git a/src/4219F0.c b/src/4219F0.c new file mode 100644 index 0000000000..912c62e99a --- /dev/null +++ b/src/4219F0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4219F0", func_802A9000_4219F0); + +INCLUDE_ASM(s32, "4219F0", func_802A9120_421B10); + +INCLUDE_ASM(s32, "4219F0", func_802A9234_421C24); + +INCLUDE_ASM(s32, "4219F0", func_802A9544_421F34); + +INCLUDE_ASM(s32, "4219F0", func_802A9590_421F80); diff --git a/src/422000.c b/src/422000.c new file mode 100644 index 0000000000..373aa2d798 --- /dev/null +++ b/src/422000.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "422000", func_802A9000_422000); + +INCLUDE_ASM(s32, "422000", func_802A9258_422258); + +INCLUDE_ASM(s32, "422000", func_802A936C_42236C); + +INCLUDE_ASM(s32, "422000", func_802A99D4_4229D4); + +INCLUDE_ASM(s32, "422000", func_802A9A30_422A30); diff --git a/src/422AD0.c b/src/422AD0.c new file mode 100644 index 0000000000..efdec0a1fc --- /dev/null +++ b/src/422AD0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "422AD0", func_802A9000_422AD0); + +INCLUDE_ASM(s32, "422AD0", func_802A92A0_422D70); + +INCLUDE_ASM(s32, "422AD0", func_802A9378_422E48); + +INCLUDE_ASM(s32, "422AD0", func_802A96F4_4231C4); + +INCLUDE_ASM(s32, "422AD0", func_802A9894_423364); diff --git a/src/4233F0.c b/src/4233F0.c new file mode 100644 index 0000000000..63a08196eb --- /dev/null +++ b/src/4233F0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4233F0", func_802A9000_4233F0); + +INCLUDE_ASM(s32, "4233F0", func_802A91B0_4235A0); + +INCLUDE_ASM(s32, "4233F0", func_802A92DC_4236CC); + +INCLUDE_ASM(s32, "4233F0", func_802A96B8_423AA8); + +INCLUDE_ASM(s32, "4233F0", func_802A97FC_423BEC); diff --git a/src/423C70.c b/src/423C70.c new file mode 100644 index 0000000000..d8ad6e597f --- /dev/null +++ b/src/423C70.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "423C70", func_802A9000_423C70); + +INCLUDE_ASM(s32, "423C70", func_802A91E0_423E50); + +INCLUDE_ASM(s32, "423C70", func_802A92F0_423F60); + +INCLUDE_ASM(s32, "423C70", func_802A9744_4243B4); + +INCLUDE_ASM(s32, "423C70", func_802A9898_424508); diff --git a/src/425590.c b/src/425590.c new file mode 100644 index 0000000000..5d2ad9b98c --- /dev/null +++ b/src/425590.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "425590", func_802A9000_425590); + +INCLUDE_ASM(s32, "425590", func_802A9110_4256A0); + +INCLUDE_ASM(s32, "425590", func_802A91F8_425788); + +INCLUDE_ASM(s32, "425590", func_802A94A4_425A34); + +INCLUDE_ASM(s32, "425590", func_802A9544_425AD4); diff --git a/src/425B50.c b/src/425B50.c new file mode 100644 index 0000000000..3c381f23d7 --- /dev/null +++ b/src/425B50.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "425B50", func_802A9000_425B50); + +INCLUDE_ASM(s32, "425B50", func_802A916C_425CBC); + +INCLUDE_ASM(s32, "425B50", func_802A9228_425D78); + +INCLUDE_ASM(s32, "425B50", func_802A94D8_426028); + +INCLUDE_ASM(s32, "425B50", func_802A959C_4260EC); diff --git a/src/426170.c b/src/426170.c new file mode 100644 index 0000000000..4523675c55 --- /dev/null +++ b/src/426170.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "426170", func_802A9000_426170); + +INCLUDE_ASM(s32, "426170", func_802A9170_4262E0); + +INCLUDE_ASM(s32, "426170", func_802A928C_4263FC); + +INCLUDE_ASM(s32, "426170", func_802A96DC_42684C); + +INCLUDE_ASM(s32, "426170", func_802A97BC_42692C); diff --git a/src/4269D0.c b/src/4269D0.c new file mode 100644 index 0000000000..f46dd38cdb --- /dev/null +++ b/src/4269D0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4269D0", func_802A9000_4269D0); + +INCLUDE_ASM(s32, "4269D0", func_802A9178_426B48); + +INCLUDE_ASM(s32, "4269D0", func_802A9294_426C64); + +INCLUDE_ASM(s32, "4269D0", func_802A9834_427204); + +INCLUDE_ASM(s32, "4269D0", func_802A9914_4272E4); diff --git a/src/4273B0.c b/src/4273B0.c new file mode 100644 index 0000000000..e9854f7248 --- /dev/null +++ b/src/4273B0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4273B0", func_802A9000_4273B0); + +INCLUDE_ASM(s32, "4273B0", func_802A9170_427520); + +INCLUDE_ASM(s32, "4273B0", func_802A928C_42763C); + +INCLUDE_ASM(s32, "4273B0", func_802A955C_42790C); + +INCLUDE_ASM(s32, "4273B0", func_802A963C_4279EC); diff --git a/src/427A70.c b/src/427A70.c new file mode 100644 index 0000000000..0d47d9775a --- /dev/null +++ b/src/427A70.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "427A70", func_802A9000_427A70); + +INCLUDE_ASM(s32, "427A70", func_802A9170_427BE0); + +INCLUDE_ASM(s32, "427A70", func_802A928C_427CFC); + +INCLUDE_ASM(s32, "427A70", func_802A96EC_42815C); + +INCLUDE_ASM(s32, "427A70", func_802A97CC_42823C); diff --git a/src/4282E0.c b/src/4282E0.c new file mode 100644 index 0000000000..3178014c68 --- /dev/null +++ b/src/4282E0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4282E0", func_802A9000_4282E0); + +INCLUDE_ASM(s32, "4282E0", func_802A91B8_428498); + +INCLUDE_ASM(s32, "4282E0", func_802A92D4_4285B4); + +INCLUDE_ASM(s32, "4282E0", func_802A9664_428944); + +INCLUDE_ASM(s32, "4282E0", func_802A9708_4289E8); diff --git a/src/428A70.c b/src/428A70.c new file mode 100644 index 0000000000..b5d51f52ac --- /dev/null +++ b/src/428A70.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "428A70", func_802A9000_428A70); + +INCLUDE_ASM(s32, "428A70", func_802A9184_428BF4); + +INCLUDE_ASM(s32, "428A70", func_802A9278_428CE8); + +INCLUDE_ASM(s32, "428A70", func_802A96EC_42915C); + +INCLUDE_ASM(s32, "428A70", func_802A9810_429280); diff --git a/src/429320.c b/src/429320.c new file mode 100644 index 0000000000..dd8acec07f --- /dev/null +++ b/src/429320.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "429320", func_802A9000_429320); + +INCLUDE_ASM(s32, "429320", func_802A9178_429498); + +INCLUDE_ASM(s32, "429320", func_802A9294_4295B4); + +INCLUDE_ASM(s32, "429320", func_802A984C_429B6C); + +INCLUDE_ASM(s32, "429320", func_802A992C_429C4C); diff --git a/src/429D20.c b/src/429D20.c new file mode 100644 index 0000000000..5bd553f639 --- /dev/null +++ b/src/429D20.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "429D20", func_802A9000_429D20); + +INCLUDE_ASM(s32, "429D20", func_802A911C_429E3C); + +INCLUDE_ASM(s32, "429D20", func_802A9208_429F28); + +INCLUDE_ASM(s32, "429D20", func_802A9634_42A354); + +INCLUDE_ASM(s32, "429D20", func_802A9720_42A440); diff --git a/src/42A4F0.c b/src/42A4F0.c new file mode 100644 index 0000000000..5cf72570ac --- /dev/null +++ b/src/42A4F0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42A4F0", func_802A9000_42A4F0); + +INCLUDE_ASM(s32, "42A4F0", func_802A9398_42A888); + +INCLUDE_ASM(s32, "42A4F0", func_802A948C_42A97C); + +INCLUDE_ASM(s32, "42A4F0", func_802AA014_42B504); + +INCLUDE_ASM(s32, "42A4F0", func_802AA0D8_42B5C8); diff --git a/src/42C6F0.c b/src/42C6F0.c new file mode 100644 index 0000000000..d89d881ec3 --- /dev/null +++ b/src/42C6F0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42C6F0", func_802A9000_42C6F0); + +INCLUDE_ASM(s32, "42C6F0", func_802A9138_42C828); + +INCLUDE_ASM(s32, "42C6F0", func_802A9228_42C918); + +INCLUDE_ASM(s32, "42C6F0", func_802A9718_42CE08); + +INCLUDE_ASM(s32, "42C6F0", func_802A9764_42CE54); diff --git a/src/42CF10.c b/src/42CF10.c new file mode 100644 index 0000000000..e8f65fd3a4 --- /dev/null +++ b/src/42CF10.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42CF10", func_802A9000_42CF10); + +INCLUDE_ASM(s32, "42CF10", func_802A9210_42D120); + +INCLUDE_ASM(s32, "42CF10", func_802A9310_42D220); + +INCLUDE_ASM(s32, "42CF10", func_802A98D0_42D7E0); + +INCLUDE_ASM(s32, "42CF10", func_802A9A54_42D964); diff --git a/src/42DA10.c b/src/42DA10.c new file mode 100644 index 0000000000..52c679eab0 --- /dev/null +++ b/src/42DA10.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42DA10", func_802A9000_42DA10); + +INCLUDE_ASM(s32, "42DA10", func_802A91A0_42DBB0); + +INCLUDE_ASM(s32, "42DA10", func_802A92A0_42DCB0); + +INCLUDE_ASM(s32, "42DA10", func_802A97F8_42E208); + +INCLUDE_ASM(s32, "42DA10", func_802A98E0_42E2F0); diff --git a/src/42E3A0.c b/src/42E3A0.c new file mode 100644 index 0000000000..02bdee51c8 --- /dev/null +++ b/src/42E3A0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42E3A0", func_802A9000_42E3A0); + +INCLUDE_ASM(s32, "42E3A0", func_802A917C_42E51C); + +INCLUDE_ASM(s32, "42E3A0", func_802A9298_42E638); + +INCLUDE_ASM(s32, "42E3A0", func_802A98B0_42EC50); + +INCLUDE_ASM(s32, "42E3A0", func_802A9990_42ED30); diff --git a/src/42EE20.c b/src/42EE20.c new file mode 100644 index 0000000000..42700644c8 --- /dev/null +++ b/src/42EE20.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42EE20", func_802A9000_42EE20); + +INCLUDE_ASM(s32, "42EE20", func_802A916C_42EF8C); + +INCLUDE_ASM(s32, "42EE20", func_802A9254_42F074); + +INCLUDE_ASM(s32, "42EE20", func_802A973C_42F55C); + +INCLUDE_ASM(s32, "42EE20", func_802A981C_42F63C); diff --git a/src/42F6E0.c b/src/42F6E0.c new file mode 100644 index 0000000000..e849ea4638 --- /dev/null +++ b/src/42F6E0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42F6E0", func_802A9000_42F6E0); + +INCLUDE_ASM(s32, "42F6E0", func_802A91A0_42F880); + +INCLUDE_ASM(s32, "42F6E0", func_802A92A0_42F980); + +INCLUDE_ASM(s32, "42F6E0", func_802A97AC_42FE8C); + +INCLUDE_ASM(s32, "42F6E0", func_802A9894_42FF74); diff --git a/src/code_42e0_len_1f60.c b/src/42e0_len_1f60.c similarity index 100% rename from src/code_42e0_len_1f60.c rename to src/42e0_len_1f60.c diff --git a/src/430020.c b/src/430020.c new file mode 100644 index 0000000000..10e2046fc2 --- /dev/null +++ b/src/430020.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "430020", func_802A9000_430020); + +INCLUDE_ASM(s32, "430020", func_802A917C_43019C); + +INCLUDE_ASM(s32, "430020", func_802A9298_4302B8); + +INCLUDE_ASM(s32, "430020", func_802A97FC_43081C); + +INCLUDE_ASM(s32, "430020", func_802A98DC_4308FC); diff --git a/src/code_43F0.c b/src/43F0.c similarity index 94% rename from src/code_43F0.c rename to src/43F0.c index 7caf15e0f2..8572e1bdba 100644 --- a/src/code_43F0.c +++ b/src/43F0.c @@ -71,13 +71,13 @@ HeapNode* _heap_create(s32* addr, u32 size) { } } -INCLUDE_ASM(s32, "code_43F0", _heap_malloc); +INCLUDE_ASM(s32, "43F0", _heap_malloc); -INCLUDE_ASM(s32, "code_43F0", _heap_malloc_tail); +INCLUDE_ASM(s32, "43F0", _heap_malloc_tail); -INCLUDE_ASM(s32, "code_43F0", _heap_free); +INCLUDE_ASM(s32, "43F0", _heap_free); -INCLUDE_ASM(s32, "code_43F0", _heap_realloc); +INCLUDE_ASM(s32, "43F0", _heap_realloc); f32 cosine(s16 arg0) { s16 temp360; @@ -110,7 +110,7 @@ s32 sign(s32 val) { return sign; } -INCLUDE_ASM(s32, "code_43F0", int_to_string); +INCLUDE_ASM(s32, "43F0", int_to_string); // should maybe be called bzero void mem_clear(s8* data, s32 numBytes) { @@ -300,7 +300,7 @@ f32 get_clamped_angle_diff(f32 a, f32 b) { return b - a; } -INCLUDE_ASM(f32, "code_43F0", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); +INCLUDE_ASM(f32, "43F0", atan2, f32 startX, f32 startZ, f32 endX, f32 endZ); f32 get_player_normal_yaw(void) { return atan2(0, 0, gGameStatusPtr->playerTraceNormal.x, gGameStatusPtr->playerTraceNormal.z); @@ -380,13 +380,13 @@ f32 cos_deg(f32 angle) { return coss(_wrap_trig_lookup_value(angle * 182.04445f)) * 3.051851e-05; } -INCLUDE_ASM(f32, "code_43F0", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); +INCLUDE_ASM(f32, "43F0", update_lerp, Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); //void func_8002A904(u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); -INCLUDE_ASM(void, "code_43F0", func_8002A904, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, +INCLUDE_ASM(void, "43F0", func_8002A904, u8 arg0, u8 arg1, u8 arg2, u8 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7); -INCLUDE_ASM(s32, "code_43F0", func_8002AAC4); +INCLUDE_ASM(s32, "43F0", func_8002AAC4); // void func_8002AAC4(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u16 arg4, u16 arg5, u16 arg6, u16 arg7) { // s16 phi_t0; // s16 phi_t1; @@ -410,4 +410,4 @@ INCLUDE_ASM(s32, "code_43F0", func_8002AAC4); // func_8002A904(arg4, arg5, arg6, arg7, phi_t0, phi_t1, phi_t2, phi_t3); // } -INCLUDE_ASM(s32, "code_43F0", func_8002AB5C); +INCLUDE_ASM(s32, "43F0", func_8002AB5C); diff --git a/src/code_4DF30.c b/src/4DF30.c similarity index 81% rename from src/code_4DF30.c rename to src/4DF30.c index 8533fd5ee8..dc0f39764e 100644 --- a/src/code_4DF30.c +++ b/src/4DF30.c @@ -4,7 +4,7 @@ extern s32 D_800DC060; extern Stage* D_800DC064; -INCLUDE_ASM(s32, "code_4DF30", func_80072B30); +INCLUDE_ASM(s32, "4DF30", func_80072B30); void func_80072BB0(void) { func_80072B30(); @@ -35,10 +35,10 @@ void load_battle_section(void) { gBattleStatus.unk_460 = 0; } #else -INCLUDE_ASM(s32, "code_4DF30", load_battle_section); +INCLUDE_ASM(s32, "4DF30", load_battle_section); #endif -INCLUDE_ASM(s32, "code_4DF30", load_battle); +INCLUDE_ASM(s32, "4DF30", load_battle); void set_battle_stage(s32 arg0) { gBattleStatus.unk_47C = arg0; @@ -55,6 +55,6 @@ void func_80072CF4(void) { func_80072CEC(1.0f, 1.1f, 1.2f); } -INCLUDE_ASM(s32, "code_4DF30", setup_demo_player); +INCLUDE_ASM(s32, "4DF30", setup_demo_player); -INCLUDE_ASM(s32, "code_4DF30", load_demo_battle); +INCLUDE_ASM(s32, "4DF30", load_demo_battle); diff --git a/src/4ac90_len_3910.c b/src/4ac90_len_3910.c new file mode 100644 index 0000000000..a9e3ffffd3 --- /dev/null +++ b/src/4ac90_len_3910.c @@ -0,0 +1,279 @@ +#include "common.h" + +extern EffectTableEntry gEffectTable[135]; + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006F890); + +INCLUDE_ASM(void, "4ac90_len_3910", func_8006F8F0, f32 arg0, f32 arg1, f32 arg2); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006F950); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006F9B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FA10); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FA70); + +INCLUDE_ASM(s32, "4ac90_len_3910", fx_walk_large); + +INCLUDE_ASM(void, "4ac90_len_3910", fx_walk_normal, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FB90); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FBF0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FC50); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FCB0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FD10); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FD70); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FDD0); + +INCLUDE_ASM(void, "4ac90_len_3910", func_8006FE30, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, + f32 arg6, f32 arg7); + +INCLUDE_ASM(void, "4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, + f32 arg6, s32 arg7, s32* arg8); + +INCLUDE_ASM(void, "4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FF50); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FFB0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070010); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070070); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800700D0); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070130, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070190, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, f32 arg5, + s32 arg6, s32 arg7); + +INCLUDE_ASM(void, "4ac90_len_3910", func_800701F0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070250); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800702B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070310); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070370); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800703D0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070430); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070490); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800704F0); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070550, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, + s32 arg6, s32 arg7); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800705B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070610); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070670); + +INCLUDE_ASM(void, "4ac90_len_3910", func_800706D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070730); + +INCLUDE_ASM(s32, "4ac90_len_3910", fx_sweat); + +INCLUDE_ASM(s32, "4ac90_len_3910", fx_sleep_bubble); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070850); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800708B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070910); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070970, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); + +INCLUDE_ASM(void, "4ac90_len_3910", func_800709D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070A30); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070A90, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070AF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070B50, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070BB0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070C10); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070C70); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80070CD0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070D30); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070D90); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070DF0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070E50); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070EB0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070F10); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070F70); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80070FD0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071030, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80071090, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800710F0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071150); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800711B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071210); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071270); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800712D0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071330); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071390); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800713F0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071450); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800714B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071510); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071570); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800715D0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071630); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071690); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800716F0); + +INCLUDE_ASM(Effect*, "4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800717B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071810); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071870); + +INCLUDE_ASM(void, "4ac90_len_3910", func_800718D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071930); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071990); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800719F0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071A50); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071AB0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071B10); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071B70); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071BD0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071C30); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071C90); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071CF0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071D50); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071DB0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071E10); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071E70); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071ED0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071F30); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80071F90); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80071FF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072050); + +INCLUDE_ASM(void, "4ac90_len_3910", func_800720B0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072110); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072170); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800721D0); + +INCLUDE_ASM(UNK_TYPE, "4ac90_len_3910", func_80072230, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, + s32 arg5); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072290); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800722F0); + +INCLUDE_ASM(UNK_TYPE, "4ac90_len_3910", func_80072350, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, + f32 arg5, f32 arg6, s32 arg7, s32 arg8); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800723B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072410); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072470); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800724D0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072530); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072590); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800725F0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072650); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800726B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072710); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072770); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800727D0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072830); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072890); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800728F0); + +INCLUDE_ASM(void, "4ac90_len_3910", func_80072950, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 time); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_800729B0); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072A10); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072A70); + +INCLUDE_ASM(s32, "4ac90_len_3910", func_80072AD0); diff --git a/src/code_6000.c b/src/6000.c similarity index 100% rename from src/code_6000.c rename to src/6000.c diff --git a/src/code_6240_len_c00.c b/src/6240_len_c00.c similarity index 58% rename from src/code_6240_len_c00.c rename to src/6240_len_c00.c index c24fd00e2e..70b5281505 100644 --- a/src/code_6240_len_c00.c +++ b/src/6240_len_c00.c @@ -27,13 +27,13 @@ s32 get_spirits_rescued(void) { extern s32 D_800D95E8[]; -INCLUDE_ASM(s32, "code_6240_len_c00", fio_calc_header_checksum); +INCLUDE_ASM(s32, "6240_len_c00", fio_calc_header_checksum); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_validate_header_checksums); +INCLUDE_ASM(s32, "6240_len_c00", fio_validate_header_checksums); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_has_valid_backup); +INCLUDE_ASM(s32, "6240_len_c00", fio_has_valid_backup); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_flush_backups); +INCLUDE_ASM(s32, "6240_len_c00", fio_flush_backups); #ifdef NON_MATCHING s32 fio_calc_file_checksum(s32* saveData) { @@ -49,35 +49,35 @@ s32 fio_calc_file_checksum(s32* saveData) { return sum; } #else -INCLUDE_ASM(s32, "code_6240_len_c00", fio_calc_file_checksum); +INCLUDE_ASM(s32, "6240_len_c00", fio_calc_file_checksum); #endif -INCLUDE_ASM(s32, "code_6240_len_c00", fio_validate_file_checksum); +INCLUDE_ASM(s32, "6240_len_c00", fio_validate_file_checksum); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_fetch_saved_file_info); +INCLUDE_ASM(s32, "6240_len_c00", fio_fetch_saved_file_info); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_load_game); +INCLUDE_ASM(s32, "6240_len_c00", fio_load_game); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_save_game); +INCLUDE_ASM(s32, "6240_len_c00", fio_save_game); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_erase_game); +INCLUDE_ASM(s32, "6240_len_c00", fio_erase_game); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_deserialize_state); +INCLUDE_ASM(s32, "6240_len_c00", fio_deserialize_state); void func_8002B608(void) { gGameStatusPtr->entryID = 10; fio_serialize_state(); } -INCLUDE_ASM(void, "code_6240_len_c00", fio_serialize_state); +INCLUDE_ASM(void, "6240_len_c00", fio_serialize_state); void fio_init_flash(void) { osFlashInit(); } -INCLUDE_ASM(s32, "code_6240_len_c00", fio_read_flash); +INCLUDE_ASM(s32, "6240_len_c00", fio_read_flash); -INCLUDE_ASM(s32, "code_6240_len_c00", fio_write_flash); +INCLUDE_ASM(s32, "6240_len_c00", fio_write_flash); void fio_erase_flash(s32 pageNum) { osFlashSectorErase(pageNum * 128); diff --git a/src/code_6e40_len_500.c b/src/6e40_len_500.c similarity index 92% rename from src/code_6e40_len_500.c rename to src/6e40_len_500.c index dba9d6c9c3..845e5dfb63 100644 --- a/src/code_6e40_len_500.c +++ b/src/6e40_len_500.c @@ -11,7 +11,7 @@ void initialize_curtains(void) { void update_curtains(void) { } -INCLUDE_ASM(s32, "code_6e40_len_500", render_curtains); +INCLUDE_ASM(s32, "6e40_len_500", render_curtains); void set_curtain_scale_goal(f32 scale) { gCurtainScaleGoal = scale; diff --git a/src/7340_len_b00.c b/src/7340_len_b00.c new file mode 100644 index 0000000000..7c565b434e --- /dev/null +++ b/src/7340_len_b00.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(s32, "7340_len_b00", crash_delay_msec); + +INCLUDE_ASM(s32, "7340_len_b00", func_8002BFB0); + +INCLUDE_ASM(s32, "7340_len_b00", func_8002C054); + +INCLUDE_ASM(s32, "7340_len_b00", func_8002C1D4); + +INCLUDE_ASM(s32, "7340_len_b00", crash_printf_string); + +INCLUDE_ASM(s32, "7340_len_b00", crash_print_fpr); + +INCLUDE_ASM(s32, "7340_len_b00", func_8002C324); + +INCLUDE_ASM(s32, "7340_len_b00", crash_show_handler); + +INCLUDE_ASM(s32, "7340_len_b00", func_8002C7B0); + +INCLUDE_ASM(s32, "7340_len_b00", crash_monitor_thread); + +INCLUDE_ASM(s32, "7340_len_b00", func_8002C890); + +INCLUDE_ASM(s32, "7340_len_b00", crash_create_monitor); + +INCLUDE_ASM(s32, "7340_len_b00", func_8002C94C); diff --git a/src/759b0_len_61b0.c b/src/759b0_len_61b0.c new file mode 100644 index 0000000000..115cb8e08c --- /dev/null +++ b/src/759b0_len_61b0.c @@ -0,0 +1,37 @@ +#include "common.h" + +PlayerStatus* gPlayerStatusPtr = &gPlayerStatus; // maybe wPlayerStatus + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DC500); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DC778); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DCB7C, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DCE70); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DD04C); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DD228); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DD44C); + +void func_800DD5B4(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { + f32 temp = (arg2 * arg4) + (arg3 * arg5); + + *arg0 = (arg2 - (temp * arg4)) * 0.5f; + *arg1 = (arg3 - (temp * arg5)) * 0.5f; +} + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DD618); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DD8FC); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DDAE4); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DDC44, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f32 arg5, + f32 arg6, f32 arg7); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DDCEC); + +INCLUDE_ASM(s32, "759b0_len_61b0", func_800DDD94); diff --git a/src/code_77480.c b/src/77480.c similarity index 88% rename from src/code_77480.c rename to src/77480.c index 0335949a22..c310a7f070 100644 --- a/src/code_77480.c +++ b/src/77480.c @@ -8,22 +8,22 @@ extern s32 D_8010C958; void func_800E0514(void); -INCLUDE_ASM(s32, "code_77480", test_below_player); +INCLUDE_ASM(s32, "77480", test_below_player); -INCLUDE_ASM(s32, "code_77480", func_800DE46C); +INCLUDE_ASM(s32, "77480", func_800DE46C); -INCLUDE_ASM(s32, "code_77480", trace_below_player); +INCLUDE_ASM(s32, "77480", trace_below_player); -INCLUDE_ASM(s32, "code_77480", collision_check_above); +INCLUDE_ASM(s32, "77480", collision_check_above); -INCLUDE_ASM(s32, "code_77480", trace_above_player); +INCLUDE_ASM(s32, "77480", trace_above_player); -INCLUDE_ASM(s32, "code_77480", do_lateral_collision, s32 arg0, PlayerStatus* arg1, f32* arg2, f32* arg3, f32* arg4, +INCLUDE_ASM(s32, "77480", do_lateral_collision, s32 arg0, PlayerStatus* arg1, f32* arg2, f32* arg3, f32* arg4, f32 arg5, f32 arg6); -INCLUDE_ASM(s32, "code_77480", func_800DEE5C); +INCLUDE_ASM(s32, "77480", func_800DEE5C); -INCLUDE_ASM(s32, "code_77480", func_800DF15C, PlayerStatus* arg0, f32* arg1, f32* arg2, f32* arg3, s32 arg4, f32 arg5, +INCLUDE_ASM(s32, "77480", func_800DF15C, PlayerStatus* arg0, f32* arg1, f32* arg2, f32* arg3, s32 arg4, f32 arg5, s32* arg6); void func_800DF3FC(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { @@ -33,7 +33,7 @@ void func_800DF3FC(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) *arg1 = (arg3 - (temp * arg5)) * 0.5f; } -INCLUDE_ASM(s32, "code_77480", test_player_lateral); +INCLUDE_ASM(s32, "77480", test_player_lateral); void update_player(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -122,7 +122,7 @@ void update_player(void) { playerStatus->animFlags &= ~8; } -INCLUDE_ASM(s32, "code_77480", check_input_use_partner); +INCLUDE_ASM(s32, "77480", check_input_use_partner); void func_800DFAAC(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -213,7 +213,7 @@ s32 func_800DFCF4(void) { return 1; } -INCLUDE_ASM(s32, "code_77480", func_800DFD48); +INCLUDE_ASM(s32, "77480", func_800DFD48); void func_800DFEFC(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -245,7 +245,7 @@ void func_800DFF78(void) { } } -INCLUDE_ASM(s32, "code_77480", func_800DFFCC); +INCLUDE_ASM(s32, "77480", func_800DFFCC); // dist_to_player2D f32 func_800E0088(f32 x, f32 z) { @@ -325,7 +325,7 @@ void func_800E0260(void) { func_800E0330(); } -INCLUDE_ASM(s32, "code_77480", func_800E0294); +INCLUDE_ASM(s32, "77480", func_800E0294); void func_800E0330(void) { if ((gPlayerStatusPtr->animFlags & 0x100) && (D_8010C93C != 0)) { @@ -338,7 +338,7 @@ void func_800E0374(void) { gPlayerStatusPtr->animFlags &= ~0x100; } -INCLUDE_ASM(s32, "code_77480", func_800E0398); +INCLUDE_ASM(s32, "77480", func_800E0398); void func_800E04D0(void) { if ((gPlayerStatusPtr->animFlags & 0x40) && (D_8010C920 != 0)) { @@ -364,7 +364,7 @@ s32 func_800E0538(void) { return ret; } -INCLUDE_ASM(s32, "code_77480", func_800E0580); +INCLUDE_ASM(s32, "77480", func_800E0580); void func_800E0658(void) { if ((gPlayerStatusPtr->animFlags & 0x20) && (D_8010C940 != 0)) { @@ -381,9 +381,9 @@ void func_800E06C0(s32 arg0) { D_8010C950 = (arg0 == 1); } -INCLUDE_ASM(s32, "code_77480", func_800E06D8); +INCLUDE_ASM(s32, "77480", func_800E06D8); -INCLUDE_ASM(s32, "code_77480", check_for_interactables); +INCLUDE_ASM(s32, "77480", check_for_interactables); void func_800E0AD0(void) { if ((gPlayerStatusPtr->animFlags & 0x10) && (D_8010C958 != 0)) { @@ -410,9 +410,9 @@ void update_partner_timers(void) { } } -INCLUDE_ASM(s32, "code_77480", func_800E0B90); +INCLUDE_ASM(s32, "77480", func_800E0B90); -INCLUDE_ASM(s32, "code_77480", get_player_back_anim); +INCLUDE_ASM(s32, "77480", get_player_back_anim); void render_player(void) { if (!gGameStatusPtr->disableScripts) { @@ -420,12 +420,12 @@ void render_player(void) { } } -INCLUDE_ASM(void, "code_77480", render_player_model); +INCLUDE_ASM(void, "77480", render_player_model); -INCLUDE_ASM(s32, "code_77480", appendGfx_player); +INCLUDE_ASM(s32, "77480", appendGfx_player); /// Only used when speedy spinning. -INCLUDE_ASM(s32, "code_77480", appendGfx_player_spin); +INCLUDE_ASM(s32, "77480", appendGfx_player_spin); -INCLUDE_ASM(s32, "code_77480", update_player_shadow); +INCLUDE_ASM(s32, "77480", update_player_shadow); diff --git a/src/code_7B440.c b/src/7B440.c similarity index 94% rename from src/code_7B440.c rename to src/7B440.c index 143a5ecdb8..8fb90825d0 100644 --- a/src/code_7B440.c +++ b/src/7B440.c @@ -37,7 +37,7 @@ void update_player_input(void) { } } -INCLUDE_ASM(s32, "code_7B440", func_800E205C); +INCLUDE_ASM(s32, "7B440", func_800E205C); void func_800E22E4(s32* arg0) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -71,6 +71,6 @@ void input_to_move_vector(f32* angle, f32* magnitude) { *magnitude = mag; } -INCLUDE_ASM(s32, "code_7B440", func_800E23FC); +INCLUDE_ASM(s32, "7B440", func_800E23FC); -INCLUDE_ASM(s32, "code_7B440", func_800E24F8); +INCLUDE_ASM(s32, "7B440", func_800E24F8); diff --git a/src/code_7bb60_len_41b0.c b/src/7bb60_len_41b0.c similarity index 90% rename from src/code_7bb60_len_41b0.c rename to src/7bb60_len_41b0.c index 7ba5ff7bf1..3fd99ceece 100644 --- a/src/code_7bb60_len_41b0.c +++ b/src/7bb60_len_41b0.c @@ -63,15 +63,15 @@ void move_player(s32 duration, f32 heading, f32 speed) { } } -INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_main_above); +INCLUDE_ASM(s32, "7bb60_len_41b0", collision_main_above); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E29C8); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E29C8); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E2BB0); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E2BB0); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", update_fall_state); +INCLUDE_ASM(s32, "7bb60_len_41b0", update_fall_state); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E2F60); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E2F60); void gravity_use_fall_params(void) { f32* floats = D_800F7B60; @@ -105,9 +105,9 @@ void func_800E3100(void) { } } -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E315C); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E315C); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", phys_player_land); +INCLUDE_ASM(s32, "7bb60_len_41b0", phys_player_land); f32 integrate_gravity(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -133,9 +133,9 @@ f32 func_800E34D8(void) { return ret; } -INCLUDE_ASM(f32, "code_7bb60_len_41b0", func_800E3514, f32 arg0, f32* arg1); +INCLUDE_ASM(f32, "7bb60_len_41b0", func_800E3514, f32 arg0, f32* arg1); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_main_lateral); +INCLUDE_ASM(s32, "7bb60_len_41b0", collision_main_lateral); //something weird with hitID #ifdef NON_MATCHING @@ -163,7 +163,7 @@ s32 collision_check_player_intersecting_world(s32 arg0, s32 arg1, f32 arg2) { return ret; } #else -INCLUDE_ASM(s32, "code_7bb60_len_41b0", collision_check_player_intersecting_world, s32 arg0, s32 arg1, f32 arg2); +INCLUDE_ASM(s32, "7bb60_len_41b0", collision_check_player_intersecting_world, s32 arg0, s32 arg1, f32 arg2); #endif s32 func_800E4404(s32 arg0, s32 arg1, f32 arg2, f32* outX, f32* outY, f32* outZ) { @@ -213,11 +213,11 @@ void func_800E4508(void) { } } -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E45E0); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E45E0); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E46C8); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E46C8); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4744); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E4744); void func_800E4AD8(s32 arg0) { Camera* currentCamera = &gCameras[gCurrentCameraID]; @@ -231,7 +231,7 @@ void func_800E4B40(s32 arg0, f32* arg1, f32* arg2, f32* arg3) { func_800E4404(arg0, 0, gPlayerStatus.spriteFacingAngle - 90.0f + currentCamera->currentYaw, arg1, arg2, arg3); } -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E4BB8); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E4BB8); void func_800E4F10(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -305,11 +305,11 @@ void func_800E5150(void) { gCollisionStatus.unk_0A = func_800E5174(); } -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5174); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5174); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", can_player_interact); +INCLUDE_ASM(s32, "7bb60_len_41b0", can_player_interact); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5348); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5348); void func_800E546C(void) { f32 angle = 0.0f; @@ -335,17 +335,17 @@ void func_800E5520(void) { D_8010C9B0 = 0; } -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5530); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5530); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E58F0); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E58F0); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5938); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5938); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E59A0); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E59A0); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5A2C); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5A2C); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E5C78); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E5C78); void set_action_state(s32 actionState) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -478,7 +478,7 @@ s32 check_input_hammer(void) { return FALSE; } -INCLUDE_ASM(s32, "code_7bb60_len_41b0", check_input_jump); +INCLUDE_ASM(s32, "7bb60_len_41b0", check_input_jump); void check_input_spin(void) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -531,7 +531,7 @@ void func_800E63A4(s32 arg0) { playerStatus->animFlags &= ~0x2000; gGameStatusPtr->peachFlags &= ~0x2; playerStatus->peachDisguise = 0; - free_npc_by_index(D_8010C96C); + npc_free_by_index(D_8010C96C); set_action_state(ACTION_STATE_IDLE); playerStatus->colliderHeight = 55; playerStatus->colliderDiameter = 38; @@ -585,7 +585,7 @@ void func_800E6500(void) { } } -INCLUDE_ASM(Npc*, "code_7bb60_len_41b0", make_disguise_npc, s32 peachDisguise); +INCLUDE_ASM(Npc*, "7bb60_len_41b0", make_disguise_npc, s32 peachDisguise); -INCLUDE_ASM(s32, "code_7bb60_len_41b0", func_800E66C4); +INCLUDE_ASM(s32, "7bb60_len_41b0", func_800E66C4); diff --git a/src/code_7fd10_len_b40.c b/src/7fd10_len_b40.c similarity index 89% rename from src/code_7fd10_len_b40.c rename to src/7fd10_len_b40.c index 341668808d..a8582faf3d 100644 --- a/src/code_7fd10_len_b40.c +++ b/src/7fd10_len_b40.c @@ -46,20 +46,20 @@ s32 func_800E6904(void) { return 0; } #else -INCLUDE_ASM(s32, "code_7fd10_len_b40", func_800E6904); +INCLUDE_ASM(s32, "7fd10_len_b40", func_800E6904); #endif -INCLUDE_ASM(s32, "code_7fd10_len_b40", can_pause); +INCLUDE_ASM(s32, "7fd10_len_b40", can_pause); void func_800E6B68(void) { D_8010CD00 = 0; } -INCLUDE_ASM(s32, "code_7fd10_len_b40", setup_partner_popup); +INCLUDE_ASM(s32, "7fd10_len_b40", setup_partner_popup); -INCLUDE_ASM(s32, "code_7fd10_len_b40", setup_item_popup); +INCLUDE_ASM(s32, "7fd10_len_b40", setup_item_popup); -INCLUDE_ASM(s32, "code_7fd10_len_b40", check_input_open_menus); +INCLUDE_ASM(s32, "7fd10_len_b40", check_input_open_menus); void check_input_status_menu(void) { PlayerStatus* playerStatus = &gPlayerStatus; diff --git a/src/code_80850_len_3060.c b/src/80850_len_3060.c similarity index 99% rename from src/code_80850_len_3060.c rename to src/80850_len_3060.c index 584542eafd..e7906b2529 100644 --- a/src/code_80850_len_3060.c +++ b/src/80850_len_3060.c @@ -386,11 +386,11 @@ void initialize_status_menu(void) { func_800F0D5C(); } -INCLUDE_ASM(s32, "code_80850_len_3060", status_menu_draw_number); +INCLUDE_ASM(s32, "80850_len_3060", status_menu_draw_number); -INCLUDE_ASM(s32, "code_80850_len_3060", status_menu_draw_stat); +INCLUDE_ASM(s32, "80850_len_3060", status_menu_draw_stat); -INCLUDE_ASM(s32, "code_80850_len_3060", update_status_menu); +INCLUDE_ASM(s32, "80850_len_3060", update_status_menu); void coin_counter_draw_content(UNK_TYPE arg0, s32 posX, s32 posY) { UiStatus* uiStatus = &gUIStatus; @@ -1080,7 +1080,7 @@ s32 is_ability_active(s32 arg0) { } */ #else -INCLUDE_ASM(s32, "code_80850_len_3060", is_ability_active, s32 arg0); +INCLUDE_ASM(s32, "80850_len_3060", is_ability_active, s32 arg0); #endif s32 is_partner_ability_active(void) { diff --git a/src/8560.c b/src/8560.c new file mode 100644 index 0000000000..755771a436 --- /dev/null +++ b/src/8560.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "8560", func_8002D160); diff --git a/src/code_8800.c b/src/8800.c similarity index 66% rename from src/code_8800.c rename to src/8800.c index 7443611065..79ad449ee4 100644 --- a/src/code_8800.c +++ b/src/8800.c @@ -1,16 +1,16 @@ #include "common.h" -INCLUDE_ASM(s32, "code_8800", update_cameras); +INCLUDE_ASM(s32, "8800", update_cameras); -INCLUDE_ASM(s32, "code_8800", render_frame); +INCLUDE_ASM(s32, "8800", render_frame); -INCLUDE_ASM(s32, "code_8800", create_cameras_a); +INCLUDE_ASM(s32, "8800", create_cameras_a); -INCLUDE_ASM(s32, "code_8800", create_cameras_b); +INCLUDE_ASM(s32, "8800", create_cameras_b); -INCLUDE_ASM(s32, "code_8800", initialize_next_camera); +INCLUDE_ASM(s32, "8800", initialize_next_camera); -INCLUDE_ASM(void, "code_8800", set_cam_viewport, s16 id, s16 x, s16 y, s16 width, s16 height); +INCLUDE_ASM(void, "8800", set_cam_viewport, s16 id, s16 x, s16 y, s16 width, s16 height); void get_cam_viewport(s32 camID, u16* x, u16* y, u16* width, u16* height) { *width = CAM(camID)->viewportW; @@ -19,7 +19,7 @@ void get_cam_viewport(s32 camID, u16* x, u16* y, u16* width, u16* height) { *y = CAM(camID)->viewportStartY; } -INCLUDE_ASM(void, "code_8800", get_screen_coords, Cam camID, f32 x, f32 y, f32 z, f32* outX, f32* outY, f32* outZ); +INCLUDE_ASM(void, "8800", get_screen_coords, Cam camID, f32 x, f32 y, f32 z, f32* outX, f32* outY, f32* outZ); s32 func_8002E754(s32 camID, s32 x, s32 y) { s32 startX = CAM(camID)->viewportStartX; @@ -47,4 +47,4 @@ void func_8002E7CC(s32 camID, s32* x, s32* y, s32* width, s32* height) { *height = CAM(camID)->viewportStartY + CAM(camID)->viewportH; } -INCLUDE_ASM(s32, "code_8800", func_8002E82C); +INCLUDE_ASM(s32, "8800", func_8002E82C); diff --git a/src/891b0_len_fb0.c b/src/891b0_len_fb0.c new file mode 100644 index 0000000000..bef1948264 --- /dev/null +++ b/src/891b0_len_fb0.c @@ -0,0 +1,20 @@ +#include "common.h" + +void func_800EFD00(void) { +} + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800EFD08); + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800EFE2C); + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0248); + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0490); + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0864); + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800F09EC); + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0B3C); + +INCLUDE_ASM(s32, "891b0_len_fb0", func_800F0C9C); diff --git a/src/code_8a160_len_700.c b/src/8a160_len_700.c similarity index 78% rename from src/code_8a160_len_700.c rename to src/8a160_len_700.c index 2da26d300a..c9104b96a4 100644 --- a/src/code_8a160_len_700.c +++ b/src/8a160_len_700.c @@ -18,7 +18,7 @@ typedef struct { extern struct_func_800F0CB0 D_8010D000[]; -INCLUDE_ASM(s32, "code_8a160_len_700", func_800F0CB0); +INCLUDE_ASM(s32, "8a160_len_700", func_800F0CB0); void func_800F0D5C(void) { struct_func_800F0CB0* temp = &D_8010D000[0]; @@ -29,6 +29,6 @@ void func_800F0D5C(void) { } } -INCLUDE_ASM(s32, "code_8a160_len_700", func_800F0D80); +INCLUDE_ASM(s32, "8a160_len_700", func_800F0D80); -INCLUDE_ASM(s32, "code_8a160_len_700", func_800F102C); +INCLUDE_ASM(s32, "8a160_len_700", func_800F102C); diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c new file mode 100644 index 0000000000..f659b3626b --- /dev/null +++ b/src/8a860_len_3f30.c @@ -0,0 +1,35 @@ +#include "common.h" + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F13B0); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F1538); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F16CC); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F1A10); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F3680); + +INCLUDE_ASM(s32, "8a860_len_3f30", draw_submenu_title); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F48F4); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4944); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4C1C); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4C6C); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4CF0); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4D28); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4E40); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F4FC4); + +INCLUDE_ASM(s32, "8a860_len_3f30", func_800F513C); + +void func_800F52BC(void) { + func_800F1A10(); +} diff --git a/src/8e790_len_2850.c b/src/8e790_len_2850.c new file mode 100644 index 0000000000..2ca526203d --- /dev/null +++ b/src/8e790_len_2850.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "8e790_len_2850", draw_box); diff --git a/src/9d10_len_1080.c b/src/9d10_len_1080.c new file mode 100644 index 0000000000..74e06a3410 --- /dev/null +++ b/src/9d10_len_1080.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "9d10_len_1080", do_camera_type_4); + +INCLUDE_ASM(s32, "9d10_len_1080", do_camera_type_2); + +INCLUDE_ASM(s32, "9d10_len_1080", do_camera_type_1); + +INCLUDE_ASM(s32, "9d10_len_1080", do_camera_type_0); diff --git a/src/B0E0.c b/src/B0E0.c new file mode 100644 index 0000000000..c48afc8c1a --- /dev/null +++ b/src/B0E0.c @@ -0,0 +1,18 @@ +#include "common.h" + +INCLUDE_ASM(s32, "B0E0", do_camera_type_unused); + +INCLUDE_ASM(s32, "B0E0", do_camera_type_5); + +INCLUDE_ASM(s32, "B0E0", func_80030210); + +INCLUDE_ASM(s32, "B0E0", func_8003034C); + +void func_80030450(void) { +} + +INCLUDE_ASM(s32, "B0E0", test_ray_zone_aabb); + +INCLUDE_ASM(s32, "B0E0", update_camera_from_zone); + +INCLUDE_ASM(s32, "B0E0", do_camera_type_3); diff --git a/src/B4580.c b/src/B4580.c new file mode 100644 index 0000000000..5afff8c139 --- /dev/null +++ b/src/B4580.c @@ -0,0 +1,105 @@ +#include "common.h" + +INCLUDE_ASM(s32, "B4580", func_8011DE80); + +INCLUDE_ASM(s32, "B4580", func_8011DFD0); + +INCLUDE_ASM(s32, "B4580", func_8011E014); + +INCLUDE_ASM(s32, "B4580", func_8011E058); + +INCLUDE_ASM(s32, "B4580", func_8011E09C); + +INCLUDE_ASM(s32, "B4580", func_8011E0DC); + +INCLUDE_ASM(s32, "B4580", func_8011E150); + +INCLUDE_ASM(s32, "B4580", func_8011E1C4); + +INCLUDE_ASM(s32, "B4580", func_8011E224); + +INCLUDE_ASM(s32, "B4580", func_8011E310); + +INCLUDE_ASM(s32, "B4580", func_8011E398); + +INCLUDE_ASM(s32, "B4580", func_8011E400); + +INCLUDE_ASM(s32, "B4580", func_8011E438); + +INCLUDE_ASM(s32, "B4580", func_8011E4B8); + +INCLUDE_ASM(s32, "B4580", func_8011E5E0); + +INCLUDE_ASM(s32, "B4580", func_8011E718); + +INCLUDE_ASM(s32, "B4580", func_8011E8BC); + +INCLUDE_ASM(s32, "B4580", func_8011EA54); + +INCLUDE_ASM(s32, "B4580", func_8011EBF0); + +INCLUDE_ASM(s32, "B4580", func_8011F058); + +INCLUDE_ASM(s32, "B4580", func_8011F118); + +INCLUDE_ASM(s32, "B4580", func_8011F304); + +INCLUDE_ASM(s32, "B4580", func_8011F3E8); + +INCLUDE_ASM(s32, "B4580", func_8011F4D4); + +INCLUDE_ASM(s32, "B4580", func_8011FA54); + +INCLUDE_ASM(s32, "B4580", func_8011FF74); + +INCLUDE_ASM(s32, "B4580", func_8011FF98); + +INCLUDE_ASM(s32, "B4580", func_8011FFB4); + +AnimatedMesh* get_anim_mesh(s32 animModelID) { + return (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; +} + +AnimatedMesh* func_80120000(s32 animModelID, s32 arg1, s32 arg2) { + AnimatedMesh* ret = (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; + + ret->unk_2D4 = arg2; + ret->unk_2D8 = arg1; + return ret; +} + +INCLUDE_ASM(s32, "B4580", func_80120028); + +INCLUDE_ASM(s32, "B4580", func_8012003C); + +INCLUDE_ASM(s32, "B4580", func_8012004C); + +INCLUDE_ASM(s32, "B4580", func_80120064); + +INCLUDE_ASM(s32, "B4580", func_8012008C); + +INCLUDE_ASM(s32, "B4580", func_8012009C); + +INCLUDE_ASM(s32, "B4580", func_801200B8); + +INCLUDE_ASM(s32, "B4580", func_801200EC); + +INCLUDE_ASM(s32, "B4580", func_80120118); + +INCLUDE_ASM(s32, "B4580", play_model_animation); + +INCLUDE_ASM(s32, "B4580", func_80120198); + +INCLUDE_ASM(s32, "B4580", func_80120234); + +INCLUDE_ASM(s32, "B4580", func_801203AC); + +INCLUDE_ASM(s32, "B4580", func_80120420); + +INCLUDE_ASM(s32, "B4580", func_80120474); + +INCLUDE_ASM(s32, "B4580", func_80120530); + +INCLUDE_ASM(s32, "B4580", func_80120678); + +INCLUDE_ASM(s32, "B4580", func_801206F8); diff --git a/src/B9D60.c b/src/B9D60.c new file mode 100644 index 0000000000..7adbfe9ea2 --- /dev/null +++ b/src/B9D60.c @@ -0,0 +1,112 @@ +#include "common.h" + +extern Gfx D_8014C500[]; +extern s32 D_801512F4; // message images? +extern s16 D_80155C98; + +void clear_character_set(void) { + D_80155C98 = -1; +} + +INCLUDE_ASM(s32, "B9D60", clear_printers); + +INCLUDE_ASM(s32, "B9D60", load_font_data); + +INCLUDE_ASM(s32, "B9D60", load_font); + +INCLUDE_ASM(s32, "B9D60", update_messages); + +INCLUDE_ASM(s32, "B9D60", _update_message); + +INCLUDE_ASM(s32, "B9D60", render_messages); + +INCLUDE_ASM(s32, "B9D60", func_80124434); + +INCLUDE_ASM(s32, "B9D60", func_80124570); + +INCLUDE_ASM(s32, "B9D60", initialize_printer); + +INCLUDE_ASM(s32, "B9D60", dma_load_string); + +INCLUDE_ASM(s32, "B9D60", load_message_to_buffer); + +PrintContext* load_string(s32 stringID, s32* a1) { + return _load_string(stringID, a1, 0); +} + +INCLUDE_ASM(s32, "B9D60", _load_string); + +INCLUDE_ASM(s32, "B9D60", load_message_to_printer); + +INCLUDE_ASM(s32, "B9D60", clamp_printer_coords); + +s32 cancel_message(PrintContext* printContext) { + if ((printContext->stateFlags & 2) == 0) { + return 0; + } + + printContext->stateFlags |= 1; + return 1; +} + +void set_message_images(s32* images) { + D_801512F4 = images; +} + +INCLUDE_ASM(s32, "B9D60", set_message_string); + +INCLUDE_ASM(s32, "B9D60", set_message_value); + +void close_message(PrintContext* printContext) { + printContext->stateFlags &= ~0x40; +} + +INCLUDE_ASM(s32, "B9D60", func_80125C84); + +INCLUDE_ASM(s32, "B9D60", get_char_width); + +INCLUDE_ASM(s32, "B9D60", get_string_properties); + +INCLUDE_ASM(s32, "B9D60", get_string_width); + +INCLUDE_ASM(s32, "B9D60", get_msg_lines); + +INCLUDE_ASM(s32, "B9D60", draw_msg); + +INCLUDE_ASM(s32, "B9D60", func_80126790); + +INCLUDE_ASM(s32, "B9D60", func_80126EAC); + +INCLUDE_ASM(s32, "B9D60", func_80126F78); + +INCLUDE_ASM(s32, "B9D60", draw_digit); + +INCLUDE_ASM(s32, "B9D60", draw_number); + +void func_80127B70(s32 arg0) { + func_80127D90(arg0, 0, 0, 0, 0, 4, 0); +} + +INCLUDE_ASM(s32, "B9D60", func_80127BA4); + +INCLUDE_ASM(s32, "B9D60", func_80127D90); + + +void func_8012C2E0(void) { + gDPPipeSync(gMasterGfxPos++); + gSPDisplayList(gMasterGfxPos++, D_8014C500); +} + +INCLUDE_ASM(s32, "B9D60", func_8012C324); + +INCLUDE_ASM(s32, "B9D60", func_8012C9A8); + +INCLUDE_ASM(s32, "B9D60", func_8012CA08); + +INCLUDE_ASM(s32, "B9D60", _draw_message_box); + +INCLUDE_ASM(s32, "B9D60", func_8012D3DC); + +INCLUDE_ASM(s32, "B9D60", func_8012DB58); + +INCLUDE_ASM(s32, "B9D60", func_8012E8E0); diff --git a/src/code_C50A0.c b/src/C50A0.c similarity index 51% rename from src/code_C50A0.c rename to src/C50A0.c index 8ad3360f82..de7b5adcc4 100644 --- a/src/code_C50A0.c +++ b/src/C50A0.c @@ -5,41 +5,41 @@ ItemEntity** D_801565A0; // item entity list extern s16 D_801565A4; extern s16 D_801565A8; -INCLUDE_ASM(s32, "code_C50A0", func_8012E9A0); +INCLUDE_ASM(s32, "C50A0", func_8012E9A0); -INCLUDE_ASM(s32, "code_C50A0", func_8012EC94); +INCLUDE_ASM(s32, "C50A0", func_8012EC94); -INCLUDE_ASM(s32, "code_C50A0", func_8012F500); +INCLUDE_ASM(s32, "C50A0", func_8012F500); -INCLUDE_ASM(s32, "code_C50A0", func_8012FE10); +INCLUDE_ASM(s32, "C50A0", func_8012FE10); -INCLUDE_ASM(s32, "code_C50A0", func_8012FE78); +INCLUDE_ASM(s32, "C50A0", func_8012FE78); -INCLUDE_ASM(s32, "code_C50A0", func_801309F0); +INCLUDE_ASM(s32, "C50A0", func_801309F0); -INCLUDE_ASM(s32, "code_C50A0", func_80130A04); +INCLUDE_ASM(s32, "C50A0", func_80130A04); -INCLUDE_ASM(s32, "code_C50A0", func_80130ACC); +INCLUDE_ASM(s32, "C50A0", func_80130ACC); -INCLUDE_ASM(s32, "code_C50A0", draw_coin_sparkles); +INCLUDE_ASM(s32, "C50A0", draw_coin_sparkles); ItemEntity* get_item_entity(s32 itemEntityIndex) { return D_801565A0[itemEntityIndex]; } -INCLUDE_ASM(s32, "code_C50A0", func_80130F70); +INCLUDE_ASM(s32, "C50A0", func_80130F70); -INCLUDE_ASM(s32, "code_C50A0", func_80130FAC); +INCLUDE_ASM(s32, "C50A0", func_80130FAC); -INCLUDE_ASM(s32, "code_C50A0", clear_item_entity_data); +INCLUDE_ASM(s32, "C50A0", clear_item_entity_data); -INCLUDE_ASM(s32, "code_C50A0", init_item_entity_list); +INCLUDE_ASM(s32, "C50A0", init_item_entity_list); -INCLUDE_ASM(s32, "code_C50A0", func_80131128); +INCLUDE_ASM(s32, "C50A0", func_80131128); s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 facingAngleSign, s32 pickupVar); -INCLUDE_ASM(s32, "code_C50A0", make_item_entity, s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, +INCLUDE_ASM(s32, "C50A0", make_item_entity, s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 facingAngleSign, s32 pickupVar); s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupVar) { @@ -50,29 +50,29 @@ s32 make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, return make_item_entity(itemID, x, y, z, itemSpawnMode, pickupDelay, -1, pickupVar); } -INCLUDE_ASM(s32, "code_C50A0", init_got_item); +INCLUDE_ASM(s32, "C50A0", init_got_item); -INCLUDE_ASM(s32, "code_C50A0", func_80131DD4); +INCLUDE_ASM(s32, "C50A0", func_80131DD4); -INCLUDE_ASM(s32, "code_C50A0", update_item_entities); +INCLUDE_ASM(s32, "C50A0", update_item_entities); -INCLUDE_ASM(s32, "code_C50A0", appendGfx_item_entity); +INCLUDE_ASM(s32, "C50A0", appendGfx_item_entity); -INCLUDE_ASM(s32, "code_C50A0", draw_item_entities); +INCLUDE_ASM(s32, "C50A0", draw_item_entities); -INCLUDE_ASM(s32, "code_C50A0", func_80132D94); +INCLUDE_ASM(s32, "C50A0", func_80132D94); -INCLUDE_ASM(s32, "code_C50A0", render_item_entities); +INCLUDE_ASM(s32, "C50A0", render_item_entities); -INCLUDE_ASM(s32, "code_C50A0", remove_item_entity_by_reference); +INCLUDE_ASM(s32, "C50A0", remove_item_entity_by_reference); -INCLUDE_ASM(s32, "code_C50A0", remove_item_entity_by_index); +INCLUDE_ASM(s32, "C50A0", remove_item_entity_by_index); -INCLUDE_ASM(s32, "code_C50A0", func_80133A94); +INCLUDE_ASM(s32, "C50A0", func_80133A94); -INCLUDE_ASM(s32, "code_C50A0", test_item_player_collision); +INCLUDE_ASM(s32, "C50A0", test_item_player_collision); -INCLUDE_ASM(s32, "code_C50A0", func_80133FC8); +INCLUDE_ASM(s32, "C50A0", func_80133FC8); void set_item_entity_flags(s32 index, s32 flags) { ItemEntity* itemEntity = D_801565A0[index]; @@ -121,11 +121,11 @@ s32 func_80134240(void) { return D_80155D88; } -INCLUDE_ASM(s32, "code_C50A0", update_item_entity_collectable); +INCLUDE_ASM(s32, "C50A0", update_item_entity_collectable); -INCLUDE_ASM(s32, "code_C50A0", func_8013559C); +INCLUDE_ASM(s32, "C50A0", func_8013559C); -INCLUDE_ASM(s32, "code_C50A0", update_item_entity_static); +INCLUDE_ASM(s32, "C50A0", update_item_entity_static); void func_801356C4(void) { } @@ -136,12 +136,12 @@ void func_801356CC(void) { void func_801356D4(void) { } -INCLUDE_ASM(s32, "code_C50A0", update_item_entity_temp); +INCLUDE_ASM(s32, "C50A0", update_item_entity_temp); -INCLUDE_ASM(s32, "code_C50A0", func_801363A0); +INCLUDE_ASM(s32, "C50A0", func_801363A0); -INCLUDE_ASM(s32, "code_C50A0", func_8013673C); +INCLUDE_ASM(s32, "C50A0", func_8013673C); -INCLUDE_ASM(s32, "code_C50A0", func_801369D0); +INCLUDE_ASM(s32, "C50A0", func_801369D0); -INCLUDE_ASM(s32, "code_C50A0", func_80136A08); +INCLUDE_ASM(s32, "C50A0", func_80136A08); diff --git a/src/CEE40.c b/src/CEE40.c new file mode 100644 index 0000000000..1bf6d97a04 --- /dev/null +++ b/src/CEE40.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "CEE40", func_80138740); + +INCLUDE_ASM(void, "CEE40", func_80138D88, s32 param0, s32 param1, s32 param2, s32 param3, f32 param4); + +INCLUDE_ASM(s32, "CEE40", func_80138E54); + +INCLUDE_ASM(s32, "CEE40", func_80139F10); diff --git a/src/code_DF950.c b/src/DF950.c similarity index 82% rename from src/code_DF950.c rename to src/DF950.c index faebf98c99..50acd60786 100644 --- a/src/code_DF950.c +++ b/src/DF950.c @@ -68,18 +68,18 @@ s32 D_8014F6B4[] = { 0x000001C1, 0x000001C2, 0x000001C3, 0x000001C4, 0x000001C5, extern s32 D_80159AD4; -INCLUDE_ASM(void, "code_DF950", sfx_compute_spatialized_sound_params_2, f32 posX, f32 posY, f32 posZ, s16* volume, s16* pan, u32 sourceFlags); +INCLUDE_ASM(void, "DF950", sfx_compute_spatialized_sound_params_2, f32 posX, f32 posY, f32 posZ, s16* volume, s16* pan, u32 sourceFlags); void sfx_reset_door_sounds(void) { gCurrentDoorSoundsSet = 0; D_80151308 = 0; } -INCLUDE_ASM(void, "code_DF950", sfx_clear_sounds); +INCLUDE_ASM(void, "DF950", sfx_clear_sounds); -INCLUDE_ASM(s32, "code_DF950", func_80149670); +INCLUDE_ASM(s32, "DF950", func_80149670); -INCLUDE_ASM(void, "code_DF950", sfx_update_looping_sound_params); +INCLUDE_ASM(void, "DF950", sfx_update_looping_sound_params); void func_801497FC(s32 arg0) { func_800561E4(); @@ -90,23 +90,23 @@ s32 func_80149828(void) { return D_80159AD4; } -INCLUDE_ASM(s32, "code_DF950", sfx_stop_env_sounds); +INCLUDE_ASM(s32, "DF950", sfx_stop_env_sounds); -INCLUDE_ASM(s32, "code_DF950", sfx_get_env_sound_instance); +INCLUDE_ASM(s32, "DF950", sfx_get_env_sound_instance); -INCLUDE_ASM(s32, "code_DF950", sfx_play_sound_looping); +INCLUDE_ASM(s32, "DF950", sfx_play_sound_looping); -INCLUDE_ASM(s32, "code_DF950", sfx_register_looping_sound_at_position); +INCLUDE_ASM(s32, "DF950", sfx_register_looping_sound_at_position); -INCLUDE_ASM(s32, "code_DF950", sfx_adjust_env_sound_pos, s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4); +INCLUDE_ASM(s32, "DF950", sfx_adjust_env_sound_pos, s32 soundID, s32 arg1, f32 arg2, f32 arg3, f32 arg4); -INCLUDE_ASM(s32, "code_DF950", func_80149A6C); +INCLUDE_ASM(s32, "DF950", func_80149A6C); -INCLUDE_ASM(s32, "code_DF950", sfx_play_sound_with_params); +INCLUDE_ASM(s32, "DF950", sfx_play_sound_with_params); -INCLUDE_ASM(s32, "code_DF950", sfx_adjust_env_sound_params); +INCLUDE_ASM(s32, "DF950", sfx_adjust_env_sound_params); -INCLUDE_ASM(s32, "code_DF950", sfx_stop_sound); +INCLUDE_ASM(s32, "DF950", sfx_stop_sound); void sfx_play_sound(s32 soundID) { sfx_play_sound_with_params(soundID, 0, 0, 0); @@ -126,11 +126,11 @@ void sfx_play_sound_at_npc(s32 soundID, s32 arg1, s32 npcID) { } } -INCLUDE_ASM(s32, "code_DF950", sfx_play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, +INCLUDE_ASM(s32, "DF950", sfx_play_sound_at_position, s32 soundID, s32 value2, f32 posX, f32 posY, f32 posZ); -INCLUDE_ASM(s32, "code_DF950", sfx_get_spatialized_sound_params); +INCLUDE_ASM(s32, "DF950", sfx_get_spatialized_sound_params); -INCLUDE_ASM(s32, "code_DF950", sfx_compute_spatialized_sound_params_0); +INCLUDE_ASM(s32, "DF950", sfx_compute_spatialized_sound_params_0); -INCLUDE_ASM(s32, "code_DF950", sfx_compute_spatialized_sound_params_1); +INCLUDE_ASM(s32, "DF950", sfx_compute_spatialized_sound_params_1); diff --git a/src/code_E20110.c b/src/E20110.c similarity index 53% rename from src/code_E20110.c rename to src/E20110.c index 41ab2ef0d6..2d4eade45b 100644 --- a/src/code_E20110.c +++ b/src/E20110.c @@ -1,20 +1,20 @@ #include "common.h" -#define NAMESPACE code_E20110 +#define NAMESPACE E20110 extern s32 D_8010C958; #include "common/UnkAngleFunc1.inc.c" -INCLUDE_ASM(s32, "code_E20110", func_802B70B4_E201C4); +INCLUDE_ASM(s32, "E20110", func_802B70B4_E201C4); -INCLUDE_ASM(s32, "code_E20110", func_802B71E8_E202F8); +INCLUDE_ASM(s32, "E20110", func_802B71E8_E202F8); -INCLUDE_ASM(s32, "code_E20110", func_802B7450_E20560); +INCLUDE_ASM(s32, "E20110", func_802B7450_E20560); -INCLUDE_ASM(s32, "code_E20110", func_802B75E8_E206F8); +INCLUDE_ASM(s32, "E20110", func_802B75E8_E206F8); -INCLUDE_ASM(s32, "code_E20110", func_802B7728_E20838); +INCLUDE_ASM(s32, "E20110", func_802B7728_E20838); void func_802B79C8_E20AD8(void) { func_802B75E8_E206F8(); diff --git a/src/code_E21870.c b/src/E21870.c similarity index 64% rename from src/code_E21870.c rename to src/E21870.c index 3e9e341e40..295d4ddb35 100644 --- a/src/code_E21870.c +++ b/src/E21870.c @@ -12,10 +12,10 @@ s32 func_802B7000_2(void) { return 1; } -INCLUDE_ASM(s32, "code_E21870", func_802B704C); +INCLUDE_ASM(s32, "E21870", func_802B704C); -INCLUDE_ASM(s32, "code_E21870", func_802B7140); +INCLUDE_ASM(s32, "E21870", func_802B7140); -INCLUDE_ASM(s32, "code_E21870", func_802B71D4); +INCLUDE_ASM(s32, "E21870", func_802B71D4); -INCLUDE_ASM(s32, "code_E21870", func_802B74F0); +INCLUDE_ASM(s32, "E21870", func_802B74F0); diff --git a/src/E225B0.c b/src/E225B0.c new file mode 100644 index 0000000000..4c12b1c60d --- /dev/null +++ b/src/E225B0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E225B0", func_802B7000_E225B0); + +INCLUDE_ASM(s32, "E225B0", func_802B72C0_E22870); + +INCLUDE_ASM(s32, "E225B0", func_802B735C_E2290C); diff --git a/src/E23260.c b/src/E23260.c new file mode 100644 index 0000000000..13e2b55c5c --- /dev/null +++ b/src/E23260.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E23260", func_802B6000_E23260); + +INCLUDE_ASM(s32, "E23260", func_802B61E4_E23444); diff --git a/src/E236E0.c b/src/E236E0.c new file mode 100644 index 0000000000..ea5592b891 --- /dev/null +++ b/src/E236E0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E236E0", func_802B6000_E236E0); + +INCLUDE_ASM(s32, "E236E0", func_802B6288_E23968); + +INCLUDE_ASM(s32, "E236E0", func_802B6550_E23C30); + +INCLUDE_ASM(s32, "E236E0", func_802B65E8_E23CC8); + +INCLUDE_ASM(s32, "E236E0", func_802B6738_E23E18); diff --git a/src/E24040.c b/src/E24040.c new file mode 100644 index 0000000000..a779920d0f --- /dev/null +++ b/src/E24040.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E24040", func_802B6000_E24040); + +INCLUDE_ASM(s32, "E24040", func_802B60B4_E240F4); + +INCLUDE_ASM(s32, "E24040", func_802B6198_E241D8); + +INCLUDE_ASM(s32, "E24040", func_802B6294_E242D4); + +INCLUDE_ASM(s32, "E24040", func_802B6348_E24388); + +INCLUDE_ASM(s32, "E24040", func_802B647C_E244BC); + +INCLUDE_ASM(s32, "E24040", func_802B6508_E24548); diff --git a/src/E245D0.c b/src/E245D0.c new file mode 100644 index 0000000000..01fb607c7e --- /dev/null +++ b/src/E245D0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E245D0", func_802B6000_E245D0); + +INCLUDE_ASM(s32, "E245D0", func_802B6198_E24768); + +INCLUDE_ASM(s32, "E245D0", func_802B6230_E24800); diff --git a/src/E24920.c b/src/E24920.c new file mode 100644 index 0000000000..9982640010 --- /dev/null +++ b/src/E24920.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E24920", func_802B6000_E24920); + +INCLUDE_ASM(s32, "E24920", func_802B61C0_E24AE0); + +INCLUDE_ASM(s32, "E24920", func_802B62CC_E24BEC); + +INCLUDE_ASM(s32, "E24920", func_802B644C_E24D6C); diff --git a/src/E24ED0.c b/src/E24ED0.c new file mode 100644 index 0000000000..543859b716 --- /dev/null +++ b/src/E24ED0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E24ED0", func_802B6000_E24ED0); + +INCLUDE_ASM(s32, "E24ED0", func_802B6048_E24F18); + +INCLUDE_ASM(s32, "E24ED0", func_802B62A4_E25174); + +INCLUDE_ASM(s32, "E24ED0", func_802B66A8_E25578); + +INCLUDE_ASM(s32, "E24ED0", func_802B6820_E256F0); diff --git a/src/E25D60.c b/src/E25D60.c new file mode 100644 index 0000000000..88412e5676 --- /dev/null +++ b/src/E25D60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E25D60", func_802B6000_E25D60); diff --git a/src/E26710.c b/src/E26710.c new file mode 100644 index 0000000000..7419c81d6f --- /dev/null +++ b/src/E26710.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E26710", func_802B6000_E26710); + +INCLUDE_ASM(s32, "E26710", func_802B65F8_E26D08); diff --git a/src/E26DE0.c b/src/E26DE0.c new file mode 100644 index 0000000000..c002120462 --- /dev/null +++ b/src/E26DE0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E26DE0", func_802B6000_E26DE0); + +INCLUDE_ASM(s32, "E26DE0", func_802B6648_E27428); diff --git a/src/E27510.c b/src/E27510.c new file mode 100644 index 0000000000..385a66a541 --- /dev/null +++ b/src/E27510.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E27510", func_802B6000_E27510); + +INCLUDE_ASM(s32, "E27510", func_802B6060_E27570); diff --git a/src/E27C90.c b/src/E27C90.c new file mode 100644 index 0000000000..1b5bfcd7fb --- /dev/null +++ b/src/E27C90.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E27C90", func_802B6000_E27C90); diff --git a/src/E27F40.c b/src/E27F40.c new file mode 100644 index 0000000000..02c9c1eda2 --- /dev/null +++ b/src/E27F40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E27F40", func_802B6000_E27F40); diff --git a/src/E287F0.c b/src/E287F0.c new file mode 100644 index 0000000000..2d5d577017 --- /dev/null +++ b/src/E287F0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E287F0", func_802B6000_E287F0); diff --git a/src/E28A30.c b/src/E28A30.c new file mode 100644 index 0000000000..6a2801a8a4 --- /dev/null +++ b/src/E28A30.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E28A30", func_802B6000_E28A30); + +INCLUDE_ASM(s32, "E28A30", func_802B609C_E28ACC); + +INCLUDE_ASM(s32, "E28A30", func_802B6350_E28D80); + +INCLUDE_ASM(s32, "E28A30", func_802B63D4_E28E04); + +INCLUDE_ASM(s32, "E28A30", func_802B6478_E28EA8); + +INCLUDE_ASM(s32, "E28A30", func_802B6508_E28F38); + +INCLUDE_ASM(s32, "E28A30", func_802B6638_E29068); diff --git a/src/E291A0.c b/src/E291A0.c new file mode 100644 index 0000000000..ccc822d596 --- /dev/null +++ b/src/E291A0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E291A0", func_802B6000_E291A0); diff --git a/src/E29470.c b/src/E29470.c new file mode 100644 index 0000000000..3f040395d9 --- /dev/null +++ b/src/E29470.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E29470", func_802B6000_E29470); + +INCLUDE_ASM(s32, "E29470", func_802B60A4_E29514); diff --git a/src/E2A340.c b/src/E2A340.c new file mode 100644 index 0000000000..a3433ab6ba --- /dev/null +++ b/src/E2A340.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E2A340", func_802B6000_E2A340); diff --git a/src/E2A6B0.c b/src/E2A6B0.c new file mode 100644 index 0000000000..46c6fec415 --- /dev/null +++ b/src/E2A6B0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E2A6B0", func_802B6000_E2A6B0); + +INCLUDE_ASM(s32, "E2A6B0", func_802B6120_E2A7D0); + +INCLUDE_ASM(s32, "E2A6B0", func_802B6CF0_E2B3A0); diff --git a/src/code_EA0900.c b/src/EA0900.c similarity index 81% rename from src/code_EA0900.c rename to src/EA0900.c index 60ac0245aa..60701b99af 100644 --- a/src/code_EA0900.c +++ b/src/EA0900.c @@ -1,6 +1,6 @@ #include "common.h" -#define NAMESPACE code_EA0900 +#define NAMESPACE EA0900 #include "world/common/DeadUnkTexturePanFunc.inc.c" diff --git a/src/EA0C10.c b/src/EA0C10.c new file mode 100644 index 0000000000..fb2850b686 --- /dev/null +++ b/src/EA0C10.c @@ -0,0 +1,72 @@ +#include "common.h" + +const char* ascii_EA6D70 = "kzn_11"; +const char* ascii_EA6D78 = "kzn_18"; + +INCLUDE_ASM(s32, "EA0C10", func_80240310_EA0C10); + +INCLUDE_ASM(s32, "EA0C10", func_8024037C_EA0C7C); + +INCLUDE_ASM(s32, "EA0C10", func_802403EC_EA0CEC); + +INCLUDE_ASM(s32, "EA0C10", func_802404C4_EA0DC4); + +INCLUDE_ASM(s32, "EA0C10", func_80240518_EA0E18); + +INCLUDE_ASM(s32, "EA0C10", func_802406CC_EA0FCC); + +INCLUDE_ASM(s32, "EA0C10", func_8024097C_EA127C); + +INCLUDE_ASM(s32, "EA0C10", func_80240C5C_EA155C); + +INCLUDE_ASM(s32, "EA0C10", func_80240CC8_EA15C8); + +INCLUDE_ASM(s32, "EA0C10", func_80240DC4_EA16C4); + +INCLUDE_ASM(s32, "EA0C10", func_80241804_EA2104); + +INCLUDE_ASM(s32, "EA0C10", func_80241894_EA2194); + +INCLUDE_ASM(s32, "EA0C10", func_80241994_EA2294); + +INCLUDE_ASM(s32, "EA0C10", func_802419F4_EA22F4); + +INCLUDE_ASM(s32, "EA0C10", func_80241AE0_EA23E0); + +INCLUDE_ASM(s32, "EA0C10", func_80241D68_EA2668); + +INCLUDE_ASM(s32, "EA0C10", func_80241DE4_EA26E4); + +INCLUDE_ASM(s32, "EA0C10", func_80241F18_EA2818); + +INCLUDE_ASM(s32, "EA0C10", func_8024207C_EA297C); + +INCLUDE_ASM(s32, "EA0C10", func_802420FC_EA29FC); + +INCLUDE_ASM(s32, "EA0C10", func_80242568_EA2E68); + +INCLUDE_ASM(s32, "EA0C10", func_802425B0_EA2EB0); + +INCLUDE_ASM(s32, "EA0C10", func_80242608_EA2F08); + +INCLUDE_ASM(s32, "EA0C10", func_8024267C_EA2F7C); + +INCLUDE_ASM(s32, "EA0C10", func_80242730_EA3030); + +INCLUDE_ASM(s32, "EA0C10", func_80242794_EA3094); + +INCLUDE_ASM(s32, "EA0C10", func_802427F0_EA30F0); + +INCLUDE_ASM(s32, "EA0C10", func_802429C0_EA32C0); + +INCLUDE_ASM(s32, "EA0C10", func_80242A14_EA3314); + +INCLUDE_ASM(s32, "EA0C10", func_80242A4C_EA334C); + +INCLUDE_ASM(s32, "EA0C10", func_80242AE8_EA33E8); + +INCLUDE_ASM(s32, "EA0C10", func_80242BD8_EA34D8); + +INCLUDE_ASM(s32, "EA0C10", func_80242D64_EA3664); + +INCLUDE_ASM(s32, "EA0C10", func_80242DA8_EA36A8); diff --git a/src/EA36E0.c b/src/EA36E0.c new file mode 100644 index 0000000000..74f6baba6f --- /dev/null +++ b/src/EA36E0.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EA36E0", func_80242DE0_EA36E0); + +INCLUDE_ASM(s32, "EA36E0", func_80242E00_EA3700); + +INCLUDE_ASM(s32, "EA36E0", func_80242E2C_EA372C); + +INCLUDE_ASM(s32, "EA36E0", func_80242EC4_EA37C4); + +INCLUDE_ASM(s32, "EA36E0", func_80242F64_EA3864); + +INCLUDE_ASM(s32, "EA36E0", func_80242F9C_EA389C); + +INCLUDE_ASM(s32, "EA36E0", func_80243054_EA3954); + +INCLUDE_ASM(s32, "EA36E0", func_802430E4_EA39E4); diff --git a/src/EA6FD0.c b/src/EA6FD0.c new file mode 100644 index 0000000000..88e6958fd8 --- /dev/null +++ b/src/EA6FD0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EA6FD0", func_80240000_EA6FD0); diff --git a/src/EA7010.c b/src/EA7010.c new file mode 100644 index 0000000000..ab4dc32a2e --- /dev/null +++ b/src/EA7010.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EA7010", func_80240040_EA7010); + +INCLUDE_ASM(s32, "EA7010", func_80240164_EA7134); diff --git a/src/EA7320.c b/src/EA7320.c new file mode 100644 index 0000000000..26121b3625 --- /dev/null +++ b/src/EA7320.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EA7320", func_80240350_EA7320); + +INCLUDE_ASM(s32, "EA7320", func_8024036C_EA733C); + +INCLUDE_ASM(s32, "EA7320", func_80240388_EA7358); diff --git a/src/EA8AE0.c b/src/EA8AE0.c new file mode 100644 index 0000000000..70b508a7ad --- /dev/null +++ b/src/EA8AE0.c @@ -0,0 +1,59 @@ +#include "common.h" + +#define NAMESPACE EA8AE0 + +#include "world/common/DeadUnkTexturePanFunc.inc.c" + +#include "world/common/DeadUnkTexturePanFunc2.inc.c" + +INCLUDE_ASM(s32, "EA8AE0", func_8024030C_EA8DEC); + +INCLUDE_ASM(s32, "EA8AE0", func_80240358_EA8E38); + +INCLUDE_ASM(s32, "EA8AE0", func_802404B8_EA8F98); + +INCLUDE_ASM(s32, "EA8AE0", func_802408C8_EA93A8); + +INCLUDE_ASM(s32, "EA8AE0", func_80240908_EA93E8); + +INCLUDE_ASM(s32, "EA8AE0", func_80240A14_EA94F4); + +INCLUDE_ASM(s32, "EA8AE0", func_80240B00_EA95E0); + +INCLUDE_ASM(s32, "EA8AE0", func_80240BD4_EA96B4); + +INCLUDE_ASM(s32, "EA8AE0", func_80240CD8_EA97B8); + +INCLUDE_ASM(s32, "EA8AE0", func_80240DA4_EA9884); + +INCLUDE_ASM(s32, "EA8AE0", func_80240E2C_EA990C); + +INCLUDE_ASM(s32, "EA8AE0", func_802413C0_EA9EA0); + +INCLUDE_ASM(s32, "EA8AE0", func_802413FC_EA9EDC); + +INCLUDE_ASM(s32, "EA8AE0", func_8024140C_EA9EEC); + +INCLUDE_ASM(s32, "EA8AE0", func_80241468_EA9F48); + +INCLUDE_ASM(s32, "EA8AE0", func_8024151C_EA9FFC); + +INCLUDE_ASM(s32, "EA8AE0", func_80241580_EAA060); + +INCLUDE_ASM(s32, "EA8AE0", func_802415DC_EAA0BC); + +INCLUDE_ASM(s32, "EA8AE0", func_802417AC_EAA28C); + +INCLUDE_ASM(s32, "EA8AE0", func_80241800_EAA2E0); + +INCLUDE_ASM(s32, "EA8AE0", func_80241838_EAA318); + +INCLUDE_ASM(s32, "EA8AE0", func_802418D4_EAA3B4); + +INCLUDE_ASM(s32, "EA8AE0", func_802419C4_EAA4A4); + +INCLUDE_ASM(s32, "EA8AE0", func_80241B50_EAA630); + +INCLUDE_ASM(s32, "EA8AE0", func_80241B94_EAA674); + +INCLUDE_ASM(s32, "EA8AE0", func_80241BC0_EAA6A0); diff --git a/src/code_EB0E60.c b/src/EB0E60.c similarity index 81% rename from src/code_EB0E60.c rename to src/EB0E60.c index 5c9b5dac7c..5d2c74f32b 100644 --- a/src/code_EB0E60.c +++ b/src/EB0E60.c @@ -1,6 +1,6 @@ #include "common.h" -#define NAMESPACE code_EB0E60 +#define NAMESPACE EB0E60 #include "world/common/DeadUnkTexturePanFunc.inc.c" diff --git a/src/EB1170.c b/src/EB1170.c new file mode 100644 index 0000000000..edf9b300c7 --- /dev/null +++ b/src/EB1170.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EB1170", func_80240310_EB1170); + +INCLUDE_ASM(s32, "EB1170", func_802403C4_EB1224); + +INCLUDE_ASM(s32, "EB1170", func_80240428_EB1288); + +INCLUDE_ASM(s32, "EB1170", func_80240484_EB12E4); + +INCLUDE_ASM(s32, "EB1170", func_80240654_EB14B4); + +INCLUDE_ASM(s32, "EB1170", func_802406A8_EB1508); + +INCLUDE_ASM(s32, "EB1170", func_802406E0_EB1540); + +INCLUDE_ASM(s32, "EB1170", func_8024077C_EB15DC); + +INCLUDE_ASM(s32, "EB1170", func_8024086C_EB16CC); + +INCLUDE_ASM(s32, "EB1170", func_802409F8_EB1858); + +INCLUDE_ASM(s32, "EB1170", func_80240A3C_EB189C); + +INCLUDE_ASM(s32, "EB1170", func_80240A68_EB18C8); + +INCLUDE_ASM(s32, "EB1170", func_80240A8C_EB18EC); diff --git a/src/code_EB5130.c b/src/EB5130.c similarity index 60% rename from src/code_EB5130.c rename to src/EB5130.c index 7c642558de..52770ff29c 100644 --- a/src/code_EB5130.c +++ b/src/EB5130.c @@ -1,9 +1,9 @@ #include "common.h" -#define NAMESPACE code_EB5130 +#define NAMESPACE EB5130 #include "world/common/DeadUnkTexturePanFunc.inc.c" #include "world/common/DeadUnkTexturePanFunc2.inc.c" -INCLUDE_ASM(s32, "code_EB5130", func_8024030C_EB543C); +INCLUDE_ASM(s32, "EB5130", func_8024030C_EB543C); diff --git a/src/EB5470.c b/src/EB5470.c new file mode 100644 index 0000000000..15053061d9 --- /dev/null +++ b/src/EB5470.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EB5470", func_80240340_EB5470); + +INCLUDE_ASM(s32, "EB5470", func_8024036C_EB549C); diff --git a/src/code_EB7230.c b/src/EB7230.c similarity index 81% rename from src/code_EB7230.c rename to src/EB7230.c index ffdffed38e..0720fd2ba3 100644 --- a/src/code_EB7230.c +++ b/src/EB7230.c @@ -1,6 +1,6 @@ #include "common.h" -#define NAMESPACE code_EB7230 +#define NAMESPACE EB7230 #include "world/common/DeadUnkTexturePanFunc.inc.c" diff --git a/src/EB7540.c b/src/EB7540.c new file mode 100644 index 0000000000..5479929816 --- /dev/null +++ b/src/EB7540.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EB7540", func_80240310_EB7540); + +INCLUDE_ASM(s32, "EB7540", func_802403D8_EB7608); + +INCLUDE_ASM(s32, "EB7540", func_80240478_EB76A8); + +INCLUDE_ASM(s32, "EB7540", func_80240504_EB7734); + +INCLUDE_ASM(s32, "EB7540", func_80240520_EB7750); diff --git a/src/code_EB8E50.c b/src/EB8E50.c similarity index 83% rename from src/code_EB8E50.c rename to src/EB8E50.c index b3718fef4e..e8ee3c69f6 100644 --- a/src/code_EB8E50.c +++ b/src/EB8E50.c @@ -8,4 +8,4 @@ const char* ascii_EC2020 = "flo_16"; const char* ascii_EC2028 = "flo_09"; const char* ascii_EC2030 = "flo_08"; -INCLUDE_ASM(s32, "code_EB8E50", func_80240000_EB8E50); +INCLUDE_ASM(s32, "EB8E50", func_80240000_EB8E50); diff --git a/src/EB8E90.c b/src/EB8E90.c new file mode 100644 index 0000000000..909e747d02 --- /dev/null +++ b/src/EB8E90.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EB8E90", func_80240040_EB8E90); + +INCLUDE_ASM(s32, "EB8E90", func_80240198_EB8FE8); + +INCLUDE_ASM(s32, "EB8E90", func_80240440_EB9290); + +INCLUDE_ASM(s32, "EB8E90", func_80240500_EB9350); + +INCLUDE_ASM(s32, "EB8E90", func_802406BC_EB950C); + +INCLUDE_ASM(s32, "EB8E90", func_80240770_EB95C0); + +INCLUDE_ASM(s32, "EB8E90", func_802407E4_EB9634); + +INCLUDE_ASM(s32, "EB8E90", func_8024085C_EB96AC); + +INCLUDE_ASM(s32, "EB8E90", func_8024098C_EB97DC); + +INCLUDE_ASM(s32, "EB8E90", func_80240AAC_EB98FC); + +INCLUDE_ASM(s32, "EB8E90", func_80240B14_EB9964); + +INCLUDE_ASM(s32, "EB8E90", func_80240BD4_EB9A24); + +INCLUDE_ASM(s32, "EB8E90", func_80240EFC_EB9D4C); diff --git a/src/EB9D90.c b/src/EB9D90.c new file mode 100644 index 0000000000..677050aa33 --- /dev/null +++ b/src/EB9D90.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EB9D90", func_80240F40_EB9D90); + +INCLUDE_ASM(s32, "EB9D90", func_80240FB0_EB9E00); + +INCLUDE_ASM(s32, "EB9D90", func_802410E4_EB9F34); + +INCLUDE_ASM(s32, "EB9D90", func_8024121C_EBA06C); + +INCLUDE_ASM(s32, "EB9D90", func_802413AC_EBA1FC); + +INCLUDE_ASM(s32, "EB9D90", func_802413CC_EBA21C); + +INCLUDE_ASM(s32, "EB9D90", func_802413EC_EBA23C); diff --git a/src/code_EC2200.c b/src/EC2200.c similarity index 84% rename from src/code_EC2200.c rename to src/EC2200.c index e1e2678ded..ce6d5ad3e6 100644 --- a/src/code_EC2200.c +++ b/src/EC2200.c @@ -1,6 +1,6 @@ #include "common.h" -#define NAMESPACE code_EC2200 +#define NAMESPACE EC2200 const char* ascii_EC7170 = "flo_09"; const char* ascii_EC7178 = "flo_22"; diff --git a/src/EC2240.c b/src/EC2240.c new file mode 100644 index 0000000000..5fa0f72d85 --- /dev/null +++ b/src/EC2240.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EC2240", func_80240040_EC2240); + +INCLUDE_ASM(s32, "EC2240", func_802400F4_EC22F4); + +INCLUDE_ASM(s32, "EC2240", func_80240158_EC2358); diff --git a/src/EC2610.c b/src/EC2610.c new file mode 100644 index 0000000000..8e3b6f0267 --- /dev/null +++ b/src/EC2610.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EC2610", func_80240410_EC2610); + +INCLUDE_ASM(s32, "EC2610", func_80240480_EC2680); diff --git a/src/EC71B0.c b/src/EC71B0.c new file mode 100644 index 0000000000..345f42333b --- /dev/null +++ b/src/EC71B0.c @@ -0,0 +1,11 @@ +#include "common.h" + +#define NAMESPACE EC71B0 + +#include "world/common/DeadUnkTexturePanFunc.inc.c" + +#include "world/common/DeadUnkTexturePanFunc2.inc.c" + +INCLUDE_ASM(s32, "EC71B0", func_8024030C_EC74BC); + +INCLUDE_ASM(s32, "EC71B0", func_80240344_EC74F4); diff --git a/src/EC7590.c b/src/EC7590.c new file mode 100644 index 0000000000..3ea8a2c239 --- /dev/null +++ b/src/EC7590.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EC7590", func_802403E0_EC7590); + +INCLUDE_ASM(s32, "EC7590", func_80240450_EC7600); + +INCLUDE_ASM(s32, "EC7590", func_8024061C_EC77CC); + +INCLUDE_ASM(s32, "EC7590", func_802406D0_EC7880); diff --git a/src/EC9D00.c b/src/EC9D00.c new file mode 100644 index 0000000000..4b02ac7ba4 --- /dev/null +++ b/src/EC9D00.c @@ -0,0 +1,37 @@ +#include "common.h" + +#define NAMESPACE EC9D00 + +INCLUDE_ASM(s32, "EC9D00", func_80240000_EC9D00); + +INCLUDE_ASM(s32, "EC9D00", func_8024001C_EC9D1C); + +INCLUDE_ASM(s32, "EC9D00", func_8024003C_EC9D3C); + +INCLUDE_ASM(s32, "EC9D00", func_80240068_EC9D68); + +INCLUDE_ASM(s32, "EC9D00", func_802400D4_EC9DD4); + +INCLUDE_ASM(s32, "EC9D00", func_80240120_EC9E20); + +INCLUDE_ASM(s32, "EC9D00", func_802401CC_EC9ECC); + +INCLUDE_ASM(s32, "EC9D00", func_8024041C_ECA11C); + +INCLUDE_ASM(s32, "EC9D00", func_80240448_ECA148); + +INCLUDE_ASM(s32, "EC9D00", func_80240480_ECA180); + +INCLUDE_ASM(s32, "EC9D00", func_80240510_ECA210); + +INCLUDE_ASM(s32, "EC9D00", func_80240544_ECA244); + +INCLUDE_ASM(s32, "EC9D00", func_802405A8_ECA2A8); + +INCLUDE_ASM(s32, "EC9D00", func_80240600_ECA300); + +INCLUDE_ASM(s32, "EC9D00", func_80240B38_ECA838); + +#include "world/common/DeadUnkPartnerPosFuncs.inc.c" + +INCLUDE_ASM(s32, "EC9D00", func_80240D08_ECAA08); diff --git a/src/code_ECAA40.c b/src/ECAA40.c similarity index 64% rename from src/code_ECAA40.c rename to src/ECAA40.c index 9e8894b4f3..dcb1e90996 100644 --- a/src/code_ECAA40.c +++ b/src/ECAA40.c @@ -1,5 +1,5 @@ #include "common.h" -#define NAMESPACE code_ECAA40 +#define NAMESPACE ECAA40 #include "common/DeadUnk1.inc.c" diff --git a/src/ECAA80.c b/src/ECAA80.c new file mode 100644 index 0000000000..4beb2153b8 --- /dev/null +++ b/src/ECAA80.c @@ -0,0 +1,25 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ECAA80", func_80240D80_ECAA80); + +INCLUDE_ASM(s32, "ECAA80", func_80241364_ECB064); + +INCLUDE_ASM(s32, "ECAA80", func_802414C8_ECB1C8); + +INCLUDE_ASM(s32, "ECAA80", func_8024150C_ECB20C); + +INCLUDE_ASM(s32, "ECAA80", func_80241770_ECB470); + +INCLUDE_ASM(s32, "ECAA80", func_802417CC_ECB4CC); + +INCLUDE_ASM(s32, "ECAA80", func_8024199C_ECB69C); + +INCLUDE_ASM(s32, "ECAA80", func_802419F0_ECB6F0); + +INCLUDE_ASM(s32, "ECAA80", func_80241A28_ECB728); + +INCLUDE_ASM(s32, "ECAA80", func_80241AC4_ECB7C4); + +INCLUDE_ASM(s32, "ECAA80", func_80241B88_ECB888); + +INCLUDE_ASM(s32, "ECAA80", func_80241BF8_ECB8F8); diff --git a/src/ECB930.c b/src/ECB930.c new file mode 100644 index 0000000000..4ef0712bdd --- /dev/null +++ b/src/ECB930.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ECB930", func_80241C30_ECB930); + +INCLUDE_ASM(s32, "ECB930", func_80241CA0_ECB9A0); diff --git a/src/ECBB70.c b/src/ECBB70.c new file mode 100644 index 0000000000..801890bb2b --- /dev/null +++ b/src/ECBB70.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ECBB70", func_80241E70_ECBB70); diff --git a/src/code_ECFFF0.c b/src/ECFFF0.c similarity index 64% rename from src/code_ECFFF0.c rename to src/ECFFF0.c index 204497657a..c811e194c8 100644 --- a/src/code_ECFFF0.c +++ b/src/ECFFF0.c @@ -1,5 +1,5 @@ #include "common.h" -#define NAMESPACE code_ECFFF0 +#define NAMESPACE ECFFF0 #include "common/DeadUnk1.inc.c" diff --git a/src/ED0030.c b/src/ED0030.c new file mode 100644 index 0000000000..4778580efa --- /dev/null +++ b/src/ED0030.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ED0030", func_80240040_ED0030); diff --git a/src/ED00D0.c b/src/ED00D0.c new file mode 100644 index 0000000000..052b7a2f8c --- /dev/null +++ b/src/ED00D0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ED00D0", func_802400E0_ED00D0); + +INCLUDE_ASM(s32, "ED00D0", func_80240150_ED0140); diff --git a/src/ED0310.c b/src/ED0310.c new file mode 100644 index 0000000000..101bbe3960 --- /dev/null +++ b/src/ED0310.c @@ -0,0 +1,25 @@ +#include "common.h" + +#define NAMESPACE ED0310 + +INCLUDE_ASM(s32, "ED0310", func_80240320_ED0310); + +INCLUDE_ASM(s32, "ED0310", func_802404D0_ED04C0); + +INCLUDE_ASM(s32, "ED0310", func_80240AF8_ED0AE8); + +INCLUDE_ASM(s32, "ED0310", func_80240BB8_ED0BA8); + +INCLUDE_ASM(s32, "ED0310", func_80240EFC_ED0EEC); + +INCLUDE_ASM(s32, "ED0310", func_80240F74_ED0F64); + +#include "world/common/DeadUnkNpcAIFunc14.inc.c" + +INCLUDE_ASM(s32, "ED0310", func_80241114_ED1104); + +INCLUDE_ASM(s32, "ED0310", func_80241178_ED1168); + +INCLUDE_ASM(s32, "ED0310", func_80241508_ED14F8); + +INCLUDE_ASM(s32, "ED0310", func_8024162C_ED161C); diff --git a/src/ED4220.c b/src/ED4220.c new file mode 100644 index 0000000000..13af97594c --- /dev/null +++ b/src/ED4220.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ED4220", func_80240000_ED4220); diff --git a/src/code_ED4260.c b/src/ED4260.c similarity index 64% rename from src/code_ED4260.c rename to src/ED4260.c index e8258450a2..7bacf87e9a 100644 --- a/src/code_ED4260.c +++ b/src/ED4260.c @@ -1,5 +1,5 @@ #include "common.h" -#define NAMESPACE code_ED4260 +#define NAMESPACE ED4260 #include "common/DeadUnk1.inc.c" diff --git a/src/ED42A0.c b/src/ED42A0.c new file mode 100644 index 0000000000..198819568e --- /dev/null +++ b/src/ED42A0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ED42A0", func_80240080_ED42A0); + +INCLUDE_ASM(s32, "ED42A0", func_80240134_ED4354); + +INCLUDE_ASM(s32, "ED42A0", func_80240198_ED43B8); + +INCLUDE_ASM(s32, "ED42A0", func_802402BC_ED44DC); diff --git a/src/ED46D0.c b/src/ED46D0.c new file mode 100644 index 0000000000..dd9aad7281 --- /dev/null +++ b/src/ED46D0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ED46D0", func_802404B0_ED46D0); + +INCLUDE_ASM(s32, "ED46D0", func_80240B10_ED4D30); diff --git a/src/code_ED510.c b/src/ED510.c similarity index 91% rename from src/code_ED510.c rename to src/ED510.c index d45aab59ff..9624ab0635 100644 --- a/src/code_ED510.c +++ b/src/ED510.c @@ -24,7 +24,7 @@ ApiStatus TranslateModel(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "code_ED510", TranslateModel, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", TranslateModel, ScriptInstance* script, s32 isInitialCall); #endif ApiStatus RotateModel(ScriptInstance* script, s32 isInitialCall) { @@ -74,7 +74,7 @@ ApiStatus ScaleModel(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "code_ED510", ScaleModel, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", ScaleModel, ScriptInstance* script, s32 isInitialCall); #endif ApiStatus GetModelIndex(ScriptInstance* script, s32 isInitialCall) { @@ -161,7 +161,7 @@ ApiStatus func_802C90FC(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "code_ED510", func_802C90FC); +INCLUDE_ASM(s32, "ED510", func_802C90FC); #endif ApiStatus func_802C91A4(ScriptInstance* script, s32 isInitialCall) { @@ -266,10 +266,10 @@ ApiStatus SetModelFlags(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "code_ED510", SetModelFlags, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", SetModelFlags, ScriptInstance* script, s32 isInitialCall); #endif -INCLUDE_ASM(s32, "code_ED510", func_802C95A0); +INCLUDE_ASM(s32, "ED510", func_802C95A0); ApiStatus func_802C971C(ScriptInstance* script, s32 isInitialCall) { func_8011B37C((u16)get_variable(script, *script->ptrReadPos)); @@ -289,11 +289,11 @@ ApiStatus func_802C9748(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ED510", TranslateGroup, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", TranslateGroup, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ED510", RotateGroup, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", RotateGroup, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ED510", ScaleGroup, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", ScaleGroup, ScriptInstance* script, s32 isInitialCall); ApiStatus func_802C9B40(ScriptInstance* script, s32 isInitialCall) { Bytecode* thisPos = script->ptrReadPos; @@ -304,7 +304,7 @@ ApiStatus func_802C9B40(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ED510", EnableGroup, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", EnableGroup, ScriptInstance* script, s32 isInitialCall); ApiStatus func_802C9C70(ScriptInstance* script, s32 isInitialCall) { Bytecode* thisPos = script->ptrReadPos; @@ -316,13 +316,13 @@ ApiStatus func_802C9C70(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ED510", modify_collider_family_flags); +INCLUDE_ASM(s32, "ED510", modify_collider_family_flags); -INCLUDE_ASM(s32, "code_ED510", ModifyColliderFlags, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", ModifyColliderFlags, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ED510", ResetFromLava, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ED510", ResetFromLava, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ED510", func_802C9FD4); +INCLUDE_ASM(s32, "ED510", func_802C9FD4); ApiStatus GetColliderCenter(ScriptInstance* script, s32 isInitialCall) { f32 x, y, z; @@ -351,11 +351,11 @@ ApiStatus UpdateColliderTransform(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ED510", set_zone_enabled); +INCLUDE_ASM(s32, "ED510", set_zone_enabled); -INCLUDE_ASM(ApiStatus, "code_ED510", SetZoneEnabled, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "ED510", SetZoneEnabled, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ED510", goto_map); +INCLUDE_ASM(s32, "ED510", goto_map); ApiStatus GotoMap(ScriptInstance* script, s32 isInitialCall) { goto_map(script, 0); diff --git a/src/ED5540.c b/src/ED5540.c new file mode 100644 index 0000000000..bb689029ab --- /dev/null +++ b/src/ED5540.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ED5540", func_80241320_ED5540); + +INCLUDE_ASM(s32, "ED5540", func_80241390_ED55B0); diff --git a/src/ED8E20.c b/src/ED8E20.c new file mode 100644 index 0000000000..16e018f632 --- /dev/null +++ b/src/ED8E20.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ED8E20", func_80240000_ED8E20); + +INCLUDE_ASM(s32, "ED8E20", func_80240020_ED8E40); + +INCLUDE_ASM(s32, "ED8E20", func_80240034_ED8E54); + +INCLUDE_ASM(s32, "ED8E20", func_802400F0_ED8F10); + +INCLUDE_ASM(s32, "ED8E20", func_80240208_ED9028); + +INCLUDE_ASM(s32, "ED8E20", func_80240274_ED9094); + +INCLUDE_ASM(s32, "ED8E20", func_80240318_ED9138); diff --git a/src/EDBFE0.c b/src/EDBFE0.c new file mode 100644 index 0000000000..48a6663949 --- /dev/null +++ b/src/EDBFE0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EDBFE0", func_80240000_EDBFE0); diff --git a/src/EDC020.c b/src/EDC020.c new file mode 100644 index 0000000000..29f9f48006 --- /dev/null +++ b/src/EDC020.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EDC020", func_80240040_EDC020); + +INCLUDE_ASM(s32, "EDC020", func_802400B0_EDC090); + +INCLUDE_ASM(s32, "EDC020", func_8024027C_EDC25C); + +INCLUDE_ASM(s32, "EDC020", func_80240330_EDC310); + +INCLUDE_ASM(s32, "EDC020", func_80240394_EDC374); + +INCLUDE_ASM(s32, "EDC020", func_802403F0_EDC3D0); + +INCLUDE_ASM(s32, "EDC020", func_802405C0_EDC5A0); + +INCLUDE_ASM(s32, "EDC020", func_80240614_EDC5F4); + +INCLUDE_ASM(s32, "EDC020", func_8024064C_EDC62C); diff --git a/src/EDE9C0.c b/src/EDE9C0.c new file mode 100644 index 0000000000..d9ed8b66d9 --- /dev/null +++ b/src/EDE9C0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EDE9C0", func_80240000_EDE9C0); diff --git a/src/EDEA00.c b/src/EDEA00.c new file mode 100644 index 0000000000..503833bdcc --- /dev/null +++ b/src/EDEA00.c @@ -0,0 +1,53 @@ +#include "common.h" + +#define NAMESPACE EDEA00 + +INCLUDE_ASM(s32, "EDEA00", func_80240040_EDEA00); + +INCLUDE_ASM(s32, "EDEA00", func_802401C4_EDEB84); + +INCLUDE_ASM(s32, "EDEA00", func_80240374_EDED34); + +INCLUDE_ASM(s32, "EDEA00", func_8024099C_EDF35C); + +INCLUDE_ASM(s32, "EDEA00", func_80240A5C_EDF41C); + +INCLUDE_ASM(s32, "EDEA00", func_80240DA0_EDF760); + +INCLUDE_ASM(s32, "EDEA00", func_80240E18_EDF7D8); + +#include "world/common/DeadUnkNpcAIFunc14.inc.c" + +INCLUDE_ASM(s32, "EDEA00", func_80240FB8_EDF978); + +INCLUDE_ASM(s32, "EDEA00", func_8024101C_EDF9DC); + +INCLUDE_ASM(s32, "EDEA00", func_802413AC_EDFD6C); + +INCLUDE_ASM(s32, "EDEA00", func_802414D0_EDFE90); + +INCLUDE_ASM(s32, "EDEA00", func_802416E8_EE00A8); + +INCLUDE_ASM(s32, "EDEA00", func_80241730_EE00F0); + +INCLUDE_ASM(s32, "EDEA00", func_80241B94_EE0554); + +INCLUDE_ASM(s32, "EDEA00", func_80241DE4_EE07A4); + +INCLUDE_ASM(s32, "EDEA00", func_802422F0_EE0CB0); + +INCLUDE_ASM(s32, "EDEA00", func_8024236C_EE0D2C); + +INCLUDE_ASM(s32, "EDEA00", func_802424A0_EE0E60); + +INCLUDE_ASM(s32, "EDEA00", func_80242604_EE0FC4); + +INCLUDE_ASM(s32, "EDEA00", func_80242684_EE1044); + +INCLUDE_ASM(s32, "EDEA00", func_80242AF0_EE14B0); + +INCLUDE_ASM(s32, "EDEA00", pause_interp_text_scroll_EE1DD8); + +INCLUDE_ASM(s32, "EDEA00", func_80243470_EE1E30); + +INCLUDE_ASM(s32, "EDEA00", func_80243584_EE1F44); diff --git a/src/EE2040.c b/src/EE2040.c new file mode 100644 index 0000000000..4ff9ea96dd --- /dev/null +++ b/src/EE2040.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EE2040", func_80243680_EE2040); diff --git a/src/EE65B0.c b/src/EE65B0.c new file mode 100644 index 0000000000..b1eea3131f --- /dev/null +++ b/src/EE65B0.c @@ -0,0 +1,21 @@ +#include "common.h" + +#define NAMESPACE EE65B0 + +#include "world/common/DeadUnkTexturePanFunc.inc.c" + +#include "world/common/DeadUnkTexturePanFunc2.inc.c" + +INCLUDE_ASM(s32, "EE65B0", func_8024030C_EE68BC); + +INCLUDE_ASM(s32, "EE65B0", func_80240340_EE68F0); + +INCLUDE_ASM(s32, "EE65B0", func_802403D4_EE6984); + +INCLUDE_ASM(s32, "EE65B0", func_8024042C_EE69DC); + +INCLUDE_ASM(s32, "EE65B0", func_8024046C_EE6A1C); + +INCLUDE_ASM(s32, "EE65B0", func_80240504_EE6AB4); + +INCLUDE_ASM(s32, "EE65B0", func_802407D4_EE6D84); diff --git a/src/EE70C0.c b/src/EE70C0.c new file mode 100644 index 0000000000..17a86021b5 --- /dev/null +++ b/src/EE70C0.c @@ -0,0 +1,35 @@ +#include "common.h" + +#define NAMESPACE EE70C0 + +INCLUDE_ASM(s32, "EE70C0", func_80240B10_EE70C0); + +INCLUDE_ASM(s32, "EE70C0", func_80240CC0_EE7270); + +INCLUDE_ASM(s32, "EE70C0", func_802412E8_EE7898); + +INCLUDE_ASM(s32, "EE70C0", func_802413A8_EE7958); + +INCLUDE_ASM(s32, "EE70C0", func_802416EC_EE7C9C); + +INCLUDE_ASM(s32, "EE70C0", func_80241764_EE7D14); + +#include "world/common/DeadUnkNpcAIFunc14.inc.c" + +INCLUDE_ASM(s32, "EE70C0", func_80241904_EE7EB4); + +INCLUDE_ASM(s32, "EE70C0", func_80241968_EE7F18); + +INCLUDE_ASM(s32, "EE70C0", func_80241CF8_EE82A8); + +INCLUDE_ASM(s32, "EE70C0", func_80241E1C_EE83CC); + +INCLUDE_ASM(s32, "EE70C0", func_80242034_EE85E4); + +INCLUDE_ASM(s32, "EE70C0", func_80242090_EE8640); + +INCLUDE_ASM(s32, "EE70C0", func_80242260_EE8810); + +INCLUDE_ASM(s32, "EE70C0", func_802422B4_EE8864); + +INCLUDE_ASM(s32, "EE70C0", func_802422EC_EE889C); diff --git a/src/EE8940.c b/src/EE8940.c new file mode 100644 index 0000000000..73c79c2743 --- /dev/null +++ b/src/EE8940.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EE8940", func_80242390_EE8940); diff --git a/src/code_EED100.c b/src/EED100.c similarity index 64% rename from src/code_EED100.c rename to src/EED100.c index 904c846176..48bbb27cc5 100644 --- a/src/code_EED100.c +++ b/src/EED100.c @@ -1,5 +1,5 @@ #include "common.h" -#define NAMESPACE code_EED100 +#define NAMESPACE EED100 #include "common/DeadUnk1.inc.c" diff --git a/src/EED140.c b/src/EED140.c new file mode 100644 index 0000000000..1eb4a256e0 --- /dev/null +++ b/src/EED140.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EED140", func_80240040_EED140); diff --git a/src/EED1E0.c b/src/EED1E0.c new file mode 100644 index 0000000000..219e729feb --- /dev/null +++ b/src/EED1E0.c @@ -0,0 +1,39 @@ +#include "common.h" + +#define NAMESPACE EED1E0 + +INCLUDE_ASM(s32, "EED1E0", func_802400E0_EED1E0); + +INCLUDE_ASM(s32, "EED1E0", func_802400FC_EED1FC); + +INCLUDE_ASM(s32, "EED1E0", func_8024011C_EED21C); + +INCLUDE_ASM(s32, "EED1E0", func_80240148_EED248); + +INCLUDE_ASM(s32, "EED1E0", func_802401B4_EED2B4); + +INCLUDE_ASM(s32, "EED1E0", func_80240200_EED300); + +INCLUDE_ASM(s32, "EED1E0", func_802402AC_EED3AC); + +INCLUDE_ASM(s32, "EED1E0", func_802404FC_EED5FC); + +INCLUDE_ASM(s32, "EED1E0", func_80240528_EED628); + +INCLUDE_ASM(s32, "EED1E0", func_80240560_EED660); + +INCLUDE_ASM(s32, "EED1E0", func_802405F0_EED6F0); + +INCLUDE_ASM(s32, "EED1E0", func_80240624_EED724); + +INCLUDE_ASM(s32, "EED1E0", func_80240688_EED788); + +INCLUDE_ASM(s32, "EED1E0", func_802406E0_EED7E0); + +INCLUDE_ASM(s32, "EED1E0", func_80240C18_EEDD18); + +#include "world/common/DeadUnkPartnerPosFuncs.inc.c" + +INCLUDE_ASM(s32, "EED1E0", func_80240DE8_EEDEE8); + +INCLUDE_ASM(s32, "EED1E0", func_80240E18_EEDF18); diff --git a/src/EEDF50.c b/src/EEDF50.c new file mode 100644 index 0000000000..f500fa472f --- /dev/null +++ b/src/EEDF50.c @@ -0,0 +1,33 @@ +#include "common.h" + +#define NAMESPACE EEDF50 + +INCLUDE_ASM(s32, "EEDF50", func_80240E50_EEDF50); + +INCLUDE_ASM(s32, "EEDF50", func_80241000_EEE100); + +INCLUDE_ASM(s32, "EEDF50", func_80241628_EEE728); + +INCLUDE_ASM(s32, "EEDF50", func_802416E8_EEE7E8); + +INCLUDE_ASM(s32, "EEDF50", func_80241A2C_EEEB2C); + +INCLUDE_ASM(s32, "EEDF50", func_80241AA4_EEEBA4); + +#include "world/common/DeadUnkNpcAIFunc14.inc.c" + +INCLUDE_ASM(s32, "EEDF50", func_80241C44_EEED44); + +INCLUDE_ASM(s32, "EEDF50", func_80241CA8_EEEDA8); + +INCLUDE_ASM(s32, "EEDF50", func_80242038_EEF138); + +INCLUDE_ASM(s32, "EEDF50", func_8024215C_EEF25C); + +INCLUDE_ASM(s32, "EEDF50", func_80242374_EEF474); + +INCLUDE_ASM(s32, "EEDF50", func_802424A4_EEF5A4); + +INCLUDE_ASM(s32, "EEDF50", func_80242724_EEF824); + +INCLUDE_ASM(s32, "EEDF50", func_80242780_EEF880); diff --git a/src/EEFAA0.c b/src/EEFAA0.c new file mode 100644 index 0000000000..bbf1cf9198 --- /dev/null +++ b/src/EEFAA0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EEFAA0", func_802429A0_EEFAA0); diff --git a/src/EF2610.c b/src/EF2610.c new file mode 100644 index 0000000000..5c6f9588d3 --- /dev/null +++ b/src/EF2610.c @@ -0,0 +1,5 @@ +#include "common.h" + +#define NAMESPACE EF2610 + +#include "common/DeadUnk1.inc.c" diff --git a/src/code_EF2650.c b/src/EF2650.c similarity index 100% rename from src/code_EF2650.c rename to src/EF2650.c diff --git a/src/EF2680.c b/src/EF2680.c new file mode 100644 index 0000000000..eacee392b1 --- /dev/null +++ b/src/EF2680.c @@ -0,0 +1,45 @@ +#include "common.h" + +#define NAMESPACE EF2680 + +INCLUDE_ASM(s32, "EF2680", func_80240070_EF2680); + +INCLUDE_ASM(s32, "EF2680", func_80240220_EF2830); + +INCLUDE_ASM(s32, "EF2680", func_80240848_EF2E58); + +INCLUDE_ASM(s32, "EF2680", func_80240908_EF2F18); + +INCLUDE_ASM(s32, "EF2680", func_80240C4C_EF325C); + +INCLUDE_ASM(s32, "EF2680", func_80240CC4_EF32D4); + +#include "world/common/DeadUnkNpcAIFunc14.inc.c" + +INCLUDE_ASM(s32, "EF2680", func_80240E64_EF3474); + +INCLUDE_ASM(s32, "EF2680", func_80240EC8_EF34D8); + +INCLUDE_ASM(s32, "EF2680", func_80241258_EF3868); + +INCLUDE_ASM(s32, "EF2680", func_8024137C_EF398C); + +INCLUDE_ASM(s32, "EF2680", func_80241594_EF3BA4); + +INCLUDE_ASM(s32, "EF2680", func_802415DC_EF3BEC); + +INCLUDE_ASM(s32, "EF2680", func_80241A40_EF4050); + +INCLUDE_ASM(s32, "EF2680", func_80241C90_EF42A0); + +INCLUDE_ASM(s32, "EF2680", func_8024219C_EF47AC); + +INCLUDE_ASM(s32, "EF2680", func_80242218_EF4828); + +INCLUDE_ASM(s32, "EF2680", func_8024234C_EF495C); + +INCLUDE_ASM(s32, "EF2680", func_802424B0_EF4AC0); + +INCLUDE_ASM(s32, "EF2680", func_80242530_EF4B40); + +INCLUDE_ASM(s32, "EF2680", func_8024299C_EF4FAC); diff --git a/src/code_EF7A80.c b/src/EF7A80.c similarity index 70% rename from src/code_EF7A80.c rename to src/EF7A80.c index 11eaf1ec95..9a66765a39 100644 --- a/src/code_EF7A80.c +++ b/src/EF7A80.c @@ -1,6 +1,6 @@ #include "common.h" -#define NAMESPACE code_EF7A80 +#define NAMESPACE EF7A80 #include "world/common/DeadUnkTexturePanFunc.inc.c" @@ -8,6 +8,6 @@ #include "common/DeadUnk1.inc.c" -INCLUDE_ASM(s32, "code_EF7A80", func_80240340_EF7DC0); +INCLUDE_ASM(s32, "EF7A80", func_80240340_EF7DC0); #include "common/DeadUnkFloatFunc.inc.c" diff --git a/src/EF7FB0.c b/src/EF7FB0.c new file mode 100644 index 0000000000..a499c6af48 --- /dev/null +++ b/src/EF7FB0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EF7FB0", func_80240530_EF7FB0); diff --git a/src/EF8010.c b/src/EF8010.c new file mode 100644 index 0000000000..6c76685c3e --- /dev/null +++ b/src/EF8010.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EF8010", func_80240590_EF8010); + +INCLUDE_ASM(s32, "EF8010", func_80240600_EF8080); diff --git a/src/EFEB00.c b/src/EFEB00.c new file mode 100644 index 0000000000..b16f7d87b0 --- /dev/null +++ b/src/EFEB00.c @@ -0,0 +1,21 @@ +#include "common.h" + +#define NAMESPACE EFEB00 + +#include "world/common/DeadUnkTexturePanFunc.inc.c" + +#include "world/common/DeadUnkTexturePanFunc2.inc.c" + +#include "common/DeadUnk1.inc.c" + +INCLUDE_ASM(s32, "EFEB00", func_80240340_EFEE40); + +INCLUDE_ASM(s32, "EFEB00", func_802404D0_EFEFD0); + +INCLUDE_ASM(s32, "EFEB00", func_80240540_EFF040); + +INCLUDE_ASM(s32, "EFEB00", func_80240660_EFF160); + +INCLUDE_ASM(s32, "EFEB00", func_80240784_EFF284); + +INCLUDE_ASM(s32, "EFEB00", func_802407B0_EFF2B0); diff --git a/src/code_F5750.c b/src/F5750.c similarity index 86% rename from src/code_F5750.c rename to src/F5750.c index 4f09487a35..706067bcc5 100644 --- a/src/code_F5750.c +++ b/src/F5750.c @@ -127,7 +127,7 @@ ApiStatus SetPlayerAnimation(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "code_F5750", SetPlayerAnimation, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "F5750", SetPlayerAnimation, ScriptInstance* script, s32 isInitialCall); #endif ApiStatus SetPlayerActionState(ScriptInstance* script, s32 isInitialCall) { @@ -167,11 +167,11 @@ ApiStatus PlayerMoveTo(ScriptInstance* script, s32 isInitialCall) { return script->functionTemp[0].s < 0; } -INCLUDE_ASM(s32, "code_F5750", func_802D1270); +INCLUDE_ASM(s32, "F5750", func_802D1270); -INCLUDE_ASM(s32, "code_F5750", func_802D1380); +INCLUDE_ASM(s32, "F5750", func_802D1380); -INCLUDE_ASM(s32, "code_F5750", player_jump); +INCLUDE_ASM(s32, "F5750", player_jump); ApiStatus PlayerJump(ScriptInstance* script, s32 isInitialCall) { return player_jump(script, isInitialCall, 0); @@ -229,7 +229,7 @@ ApiStatus InterpPlayerYaw(ScriptInstance* script, s32 isInitialCall) { } } -INCLUDE_ASM(s32, "code_F5750", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "F5750", PlayerFaceNpc, ScriptInstance* script, s32 isInitialCall); ApiStatus GetPlayerTargetYaw(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gPlayerStatus.targetYaw); @@ -309,16 +309,16 @@ ApiStatus DisablePartner(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(ApiStatus, "code_F5750", UseEntryHeading, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", UseEntryHeading, ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D2148(ScriptInstance* script, s32 isInitialCall) { gPlayerStatus.flags &= ~0x4000000; return ApiStatus_DONE2; } -INCLUDE_ASM(ApiStatus, "code_F5750", UseExitHeading, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", UseExitHeading, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_F5750", func_802D23F8); +INCLUDE_ASM(s32, "F5750", func_802D23F8); ApiStatus WaitForPlayerTouchingFloor(ScriptInstance* script, s32 isInitialCall) { if ((gCollisionStatus.currentFloor >= 0) && (func_802D23F8() != 0)) { @@ -352,7 +352,7 @@ ApiStatus WaitForPlayerInputEnabled(ScriptInstance* script, s32 isInitialCall) { return !(gPlayerStatus.flags & 0x2000) * ApiStatus_DONE2; } -INCLUDE_ASM(ApiStatus, "code_F5750", func_802D2520, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", func_802D2520, ScriptInstance* script, s32 isInitialCall); ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) { s32 temp = *script->ptrReadPos; @@ -361,7 +361,7 @@ ApiStatus func_802D286C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_F5750", func_802D2884); +INCLUDE_ASM(s32, "F5750", func_802D2884); ApiStatus DisablePulseStone(ScriptInstance* script, s32 isInitialCall) { PlayerStatus* playerStatus = &gPlayerStatus; @@ -450,21 +450,21 @@ ApiStatus PlaySoundAtPlayer(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_F5750", func_802D2D30); +INCLUDE_ASM(s32, "F5750", func_802D2D30); -INCLUDE_ASM(s32, "code_F5750", func_802D2ED4); +INCLUDE_ASM(s32, "F5750", func_802D2ED4); -INCLUDE_ASM(s32, "code_F5750", func_802D2F34); +INCLUDE_ASM(s32, "F5750", func_802D2F34); -INCLUDE_ASM(s32, "code_F5750", func_802D2FCC); +INCLUDE_ASM(s32, "F5750", func_802D2FCC); -INCLUDE_ASM(s32, "code_F5750", func_802D3028); +INCLUDE_ASM(s32, "F5750", func_802D3028); -INCLUDE_ASM(s32, "code_F5750", func_802D31E0); +INCLUDE_ASM(s32, "F5750", func_802D31E0); -INCLUDE_ASM(s32, "code_F5750", func_802D3398); +INCLUDE_ASM(s32, "F5750", func_802D3398); -INCLUDE_ASM(s32, "code_F5750", func_802D33D4); +INCLUDE_ASM(s32, "F5750", func_802D33D4); ApiStatus func_802D3474(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -536,46 +536,46 @@ ApiStatus func_802D354C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(ApiStatus, "code_F5750", func_802D3624, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", func_802D3624, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_F5750", func_802D3674); +INCLUDE_ASM(s32, "F5750", func_802D3674); -INCLUDE_ASM(ApiStatus, "code_F5750", func_802D36E0, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", func_802D36E0, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_F5750", func_802D378C); +INCLUDE_ASM(s32, "F5750", func_802D378C); -INCLUDE_ASM(ApiStatus, "code_F5750", func_802D3840, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", func_802D3840, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(ApiStatus, "code_F5750", func_802D38EC, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", func_802D38EC, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_F5750", func_802D3998); +INCLUDE_ASM(s32, "F5750", func_802D3998); -INCLUDE_ASM(ApiStatus, "code_F5750", func_802D39FC, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", func_802D39FC, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_F5750", func_802D3A60); +INCLUDE_ASM(s32, "F5750", func_802D3A60); -INCLUDE_ASM(ApiStatus, "code_F5750", func_802D3C58, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "F5750", func_802D3C58, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_F5750", func_802D3EB8); +INCLUDE_ASM(s32, "F5750", func_802D3EB8); -INCLUDE_ASM(s32, "code_F5750", func_802D3F74); +INCLUDE_ASM(s32, "F5750", func_802D3F74); -INCLUDE_ASM(s32, "code_F5750", func_802D3FC8); +INCLUDE_ASM(s32, "F5750", func_802D3FC8); -INCLUDE_ASM(s32, "code_F5750", func_802D4050); +INCLUDE_ASM(s32, "F5750", func_802D4050); UnkF5750* func_802D4164(s32 index) { return (*D_802DB7C0)[index]; } -INCLUDE_ASM(s32, "code_F5750", func_802D417C); +INCLUDE_ASM(s32, "F5750", func_802D417C); void func_802D420C(UnkF5750* arg0); -INCLUDE_ASM(void, "code_F5750", func_802D420C, UnkF5750* arg0); +INCLUDE_ASM(void, "F5750", func_802D420C, UnkF5750* arg0); -INCLUDE_ASM(s32, "code_F5750", func_802D42AC); +INCLUDE_ASM(s32, "F5750", func_802D42AC); -INCLUDE_ASM(s32, "code_F5750", func_802D4364); +INCLUDE_ASM(s32, "F5750", func_802D4364); void func_802D43AC(s32 index, f32 arg1, f32 arg2, f32 arg3) { UnkF5750* temp = (*D_802DB7C0)[index]; @@ -593,10 +593,10 @@ void func_802D43D0(s32 index, s32 arg1, s32 arg2, s32 arg3) { temp->unk_18 = arg3; } -INCLUDE_ASM(s32, "code_F5750", func_802D43F4); +INCLUDE_ASM(s32, "F5750", func_802D43F4); -INCLUDE_ASM(s32, "code_F5750", func_802D4434); +INCLUDE_ASM(s32, "F5750", func_802D4434); -INCLUDE_ASM(s32, "code_F5750", func_802D4488); +INCLUDE_ASM(s32, "F5750", func_802D4488); -INCLUDE_ASM(s32, "code_F5750", func_802D4560); +INCLUDE_ASM(s32, "F5750", func_802D4560); diff --git a/src/code_FBE10.c b/src/FBE10.c similarity index 85% rename from src/code_FBE10.c rename to src/FBE10.c index 531817746b..2e8c9acfbc 100644 --- a/src/code_FBE10.c +++ b/src/FBE10.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM(void, "code_FBE10", func_802D7460, f32 x, f32 y, f32 z, s32 arg3); +INCLUDE_ASM(void, "FBE10", func_802D7460, f32 x, f32 y, f32 z, s32 arg3); -INCLUDE_ASM(void, "code_FBE10", func_802D74C0, f32 x, f32 y, f32 z, s32 arg3); +INCLUDE_ASM(void, "FBE10", func_802D74C0, f32 x, f32 y, f32 z, s32 arg3); ApiStatus func_802D7520(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -26,9 +26,9 @@ ApiStatus func_802D75D8(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_FBE10", func_802D7690); +INCLUDE_ASM(s32, "FBE10", func_802D7690); -INCLUDE_ASM(s32, "code_FBE10", ShowEmote, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "FBE10", ShowEmote, ScriptInstance* script, s32 isInitialCall); ApiStatus RemoveEffect(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -116,10 +116,10 @@ ApiStatus Spawn802D9D50(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_FBE10", func_802D7E08); +INCLUDE_ASM(s32, "FBE10", func_802D7E08); -INCLUDE_ASM(ApiStatus, "code_FBE10", ShowSleepBubble, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "FBE10", ShowSleepBubble, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(ApiStatus, "code_FBE10", func_802D8248, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "FBE10", func_802D8248, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(ApiStatus, "code_FBE10", PlayEffect, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "FBE10", PlayEffect, ScriptInstance* script, s32 isInitialCall); diff --git a/src/code_a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c similarity index 65% rename from src/code_a5dd0_len_114e0.c rename to src/a5dd0_len_114e0.c index 835ca7eddd..b03fd8e68e 100644 --- a/src/code_a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -35,15 +35,15 @@ extern s32 texPannerAuxU[MAX_TEX_PANNERS]; extern s32 texPannerAuxV[MAX_TEX_PANNERS]; extern s32 D_8014AFB0; -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_entities); +INCLUDE_ASM(s32, "a5dd0_len_114e0", update_entities); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_shadows); +INCLUDE_ASM(s32, "a5dd0_len_114e0", update_shadows); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_entity_updatecmd); +INCLUDE_ASM(s32, "a5dd0_len_114e0", set_entity_updatecmd); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", step_entity_updatecmd); +INCLUDE_ASM(s32, "a5dd0_len_114e0", step_entity_updatecmd); -INCLUDE_ASM(void, "code_a5dd0_len_114e0", exec_entity_updatecmd, Entity* entity); +INCLUDE_ASM(void, "a5dd0_len_114e0", exec_entity_updatecmd, Entity* entity); void func_8010FD98(s32 arg0, s32 alpha) { if (alpha >= 255) { @@ -64,15 +64,15 @@ void entity_model_set_shadow_color(s32 alpha) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0x00, 0x00, 0x00, alpha); } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_entities); +INCLUDE_ASM(s32, "a5dd0_len_114e0", render_entities); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_shadows); +INCLUDE_ASM(s32, "a5dd0_len_114e0", render_shadows); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_entity_transform_matrix); +INCLUDE_ASM(s32, "a5dd0_len_114e0", update_entity_transform_matrix); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_shadow_transform_matrix); +INCLUDE_ASM(s32, "a5dd0_len_114e0", update_shadow_transform_matrix); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", update_entity_inverse_rotation_matrix); +INCLUDE_ASM(s32, "a5dd0_len_114e0", update_entity_inverse_rotation_matrix); Entity* get_entity_by_index(s32 index) { return (*gCurrentEntityListPtr)[index & 0xFFF]; @@ -183,11 +183,11 @@ s32 func_8011085C(s32 shadowIndex) { (**currentShadowListPtr)[shadowIndex] = NULL; } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", entity_get_collision_flags); +INCLUDE_ASM(s32, "a5dd0_len_114e0", entity_get_collision_flags); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801109DC); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_801109DC); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", test_player_entity_aabb); +INCLUDE_ASM(s32, "a5dd0_len_114e0", test_player_entity_aabb); s32 is_player_action_state(ActionState actionState) { return actionState == gPlayerActionState; @@ -224,41 +224,41 @@ void load_area_specific_entity_data(void) { } } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", clear_entity_data); +INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_entity_data); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80110E58); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80110E58); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80110F10); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80110F10); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801110B4); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_801110B4); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", is_entity_data_loaded); +INCLUDE_ASM(s32, "a5dd0_len_114e0", is_entity_data_loaded); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_simple_entity_data); +INCLUDE_ASM(s32, "a5dd0_len_114e0", load_simple_entity_data); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_split_entity_data); +INCLUDE_ASM(s32, "a5dd0_len_114e0", load_split_entity_data); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80111790); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80111790); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801117DC); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_801117DC); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", create_entity, StaticEntityData* data, s32 x, s32 y, s32 z, s32 arg4, +INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity, StaticEntityData* data, s32 x, s32 y, s32 z, s32 arg4, s32 flags); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", create_shadow_from_data); +INCLUDE_ASM(s32, "a5dd0_len_114e0", create_shadow_from_data); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", MakeEntity, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "a5dd0_len_114e0", MakeEntity, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80111E9C); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80111E9C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", UseDynamicShadow); +INCLUDE_ASM(s32, "a5dd0_len_114e0", UseDynamicShadow); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", AssignScript, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignScript, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", AssignAreaFlag, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignAreaFlag, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", AssignBlockFlag, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignBlockFlag, ScriptInstance* script, s32 isInitialCall); ApiStatus AssignFlag(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -273,32 +273,32 @@ ApiStatus AssignFlag(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE1; } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", AssignPanelFlag, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignPanelFlag, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", AssignCrateFlag, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignCrateFlag, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", create_entity_shadow); +INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity_shadow); -INCLUDE_ASM(Shadow*, "code_a5dd0_len_114e0", create_shadow_type, s32 type, f32 x, f32 y, f32 z); +INCLUDE_ASM(Shadow*, "a5dd0_len_114e0", create_shadow_type, s32 type, f32 x, f32 y, f32 z); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112328); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112328); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112344); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112344); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801125E8); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_801125E8); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_standard_shadow_scale); +INCLUDE_ASM(s32, "a5dd0_len_114e0", set_standard_shadow_scale); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_npc_shadow_scale); +INCLUDE_ASM(s32, "a5dd0_len_114e0", set_npc_shadow_scale); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_peach_shadow_scale); +INCLUDE_ASM(s32, "a5dd0_len_114e0", set_peach_shadow_scale); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B20); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112B20); void NOP_state(void) { } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112B98); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112B98); typedef struct GameMode { /* 0x00 */ u16 flags; @@ -313,7 +313,7 @@ extern GameMode gMainGameState[2]; // TODO rename // regalloc? #ifndef NON_MATCHING -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", set_next_game_mode); +INCLUDE_ASM(s32, "a5dd0_len_114e0", set_next_game_mode); #else GameMode* set_next_game_mode(GameMode* arg0) { GameMode* gameMode; @@ -410,7 +410,7 @@ void func_80112E4C(s32 i) { } #ifndef NON_MATCHING -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", step_current_game_mode); +INCLUDE_ASM(s32, "a5dd0_len_114e0", step_current_game_mode); #else void step_current_game_mode(void) { GameMode* gameMode; @@ -429,78 +429,78 @@ void step_current_game_mode(void) { #endif // similar to step_current_game_mode, but calls unk_0C -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112EEC); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112EEC); // similar to step_current_game_mode, but calls render -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_ui); +INCLUDE_ASM(s32, "a5dd0_len_114e0", render_ui); // calls renderAux and render -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80112FC4); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112FC4); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", appendGfx_model); +INCLUDE_ASM(s32, "a5dd0_len_114e0", appendGfx_model); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80114B58); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80114B58); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_tile_header); +INCLUDE_ASM(s32, "a5dd0_len_114e0", load_tile_header); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80115498); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80115498); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_model_property); +INCLUDE_ASM(s32, "a5dd0_len_114e0", get_model_property); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", _load_model_textures); +INCLUDE_ASM(s32, "a5dd0_len_114e0", _load_model_textures); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_model_textures); +INCLUDE_ASM(s32, "a5dd0_len_114e0", load_model_textures); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", mdl_get_child_count); +INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_get_child_count); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", clear_model_data); +INCLUDE_ASM(s32, "a5dd0_len_114e0", clear_model_data); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", init_model_data); +INCLUDE_ASM(s32, "a5dd0_len_114e0", init_model_data); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", calculate_model_sizes); +INCLUDE_ASM(s32, "a5dd0_len_114e0", calculate_model_sizes); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", mdl_create_model); +INCLUDE_ASM(s32, "a5dd0_len_114e0", mdl_create_model); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80116674); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80116674); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80116698); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80116698); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", render_models); +INCLUDE_ASM(s32, "a5dd0_len_114e0", render_models); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", appendGfx_model_group); +INCLUDE_ASM(s32, "a5dd0_len_114e0", appendGfx_model_group); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80117D00); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80117D00); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_80117E74); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80117E74); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011800C); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011800C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_801180E8); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_801180E8); Model* get_model_from_list_index(s32 listIndex) { return (*gCurrentModelListPtr)[listIndex]; } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_data_for_models); +INCLUDE_ASM(s32, "a5dd0_len_114e0", load_data_for_models); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", load_model_transforms); +INCLUDE_ASM(s32, "a5dd0_len_114e0", load_model_transforms); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_model_list_index_from_tree_index, s32 treeIndex); +INCLUDE_ASM(s32, "a5dd0_len_114e0", get_model_list_index_from_tree_index, s32 treeIndex); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B090); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B090); -INCLUDE_ASM(void, "code_a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY, +INCLUDE_ASM(void, "a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B1C0); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B1C0); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B1D8); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B1D8); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B37C); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B37C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B5D0); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B5D0); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B660); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B660); void clone_model(u16 srcModelID, u16 newModelID) { ModelList** modelList = &gCurrentModelListPtr; @@ -521,9 +521,9 @@ void clone_model(u16 srcModelID, u16 newModelID) { newModel->modelID = newModelID; } -INCLUDE_ASM(void, "code_a5dd0_len_114e0", func_8011B7C0, u16 arg0, s32 arg1, s32 arg2); +INCLUDE_ASM(void, "a5dd0_len_114e0", func_8011B7C0, u16 arg0, s32 arg1, s32 arg2); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011B950); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B950); void func_8011BAE8(void) { s32 i; @@ -605,46 +605,46 @@ void set_aux_pan_v(s32 texPannerID, s32 value) { texPannerAuxV[texPannerID] = value; } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BC7C); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BC7C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCB4); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BCB4); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCD0); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BCD0); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BCEC); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BCEC); /// @returns TRUE if mtx is NULL or identity. -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", is_identity_fixed_mtx); +INCLUDE_ASM(s32, "a5dd0_len_114e0", is_identity_fixed_mtx); -INCLUDE_ASM(void, "code_a5dd0_len_114e0", set_background_color_blend, u8 r, u8 g, u8 b, u8 a); +INCLUDE_ASM(void, "a5dd0_len_114e0", set_background_color_blend, u8 r, u8 g, u8 b, u8 a); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", get_background_color_blend); +INCLUDE_ASM(s32, "a5dd0_len_114e0", get_background_color_blend); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BEB4); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BEB4); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BF14); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BF14); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BF98); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BF98); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011BFD4); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011BFD4); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C028); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C028); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C0DC); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C0DC); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C130); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C130); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C164); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C164); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C2B0); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C2B0); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C2EC); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C2EC); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C32C); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C32C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011C80C); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011C80C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011CFBC); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011CFBC); void func_8011D72C(Gfx** arg0, u16 treeIndex) { Model* model = get_model_from_list_index(get_model_list_index_from_tree_index(treeIndex)); @@ -670,13 +670,13 @@ void func_8011D72C(Gfx** arg0, u16 treeIndex) { } } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D7E4); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011D7E4); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D82C); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011D82C); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D890); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011D890); -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D8D0); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011D8D0); RenderTaskEntry* queue_render_task(RenderTask* task) { RenderTaskEntry* entry = D_801533A0[D_801533AC]; @@ -697,4 +697,4 @@ RenderTaskEntry* queue_render_task(RenderTask* task) { return entry; } -INCLUDE_ASM(s32, "code_a5dd0_len_114e0", func_8011D9B8); +INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011D9B8); diff --git a/src/ad90_len_2880.c b/src/ad90_len_2880.c new file mode 100644 index 0000000000..af89803fe4 --- /dev/null +++ b/src/ad90_len_2880.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "ad90_len_2880", do_camera_type_6); diff --git a/src/code_b72b0_len_15ed0.c b/src/b72b0_len_15ed0.c similarity index 97% rename from src/code_b72b0_len_15ed0.c rename to src/b72b0_len_15ed0.c index c11ba36b9a..11f25f9dc9 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/b72b0_len_15ed0.c @@ -210,17 +210,17 @@ void make_mtx_flipZ(Matrix4f mtx) { mtx[3][3] = 1.0f; } -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", appendGfx_entity_model); +INCLUDE_ASM(s32, "b72b0_len_15ed0", appendGfx_entity_model); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_shadow); +INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_shadow); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_main); +INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_main); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_extra1); +INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_extra1); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_extra2); +INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_extra2); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", draw_entity_model_extra3); +INCLUDE_ASM(s32, "b72b0_len_15ed0", draw_entity_model_extra3); void func_80122D7C(s32 idx, u32* arg1) { u32* phi_a1; diff --git a/src/battle/battle.h b/src/battle/battle.h index 4aa913b36f..5977b97dce 100644 --- a/src/battle/battle.h +++ b/src/battle/battle.h @@ -198,9 +198,9 @@ #define ACTOR_TYPE_COUNT 0xD4 #define AREA(id) \ - .dmaStart = &code_##id##_ROM_START, \ - .dmaEnd = &code_##id##_ROM_END, \ - .dmaDest = &code_##id##_VRAM + .dmaStart = battle_##id##_ROM_START, \ + .dmaEnd = battle_##id##_ROM_END, \ + .dmaDest = battle_##id##_VRAM typedef struct ActorPartDesc { /* 0x00 */ s32 flags; diff --git a/src/battle/item/coconut/coconut.c b/src/battle/item/coconut/coconut.c index bb09cad37b..e529763436 100644 --- a/src/battle/item/coconut/coconut.c +++ b/src/battle/item/coconut/coconut.c @@ -21,7 +21,7 @@ Gfx N(displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(coconut_pal_png)), + gsDPLoadTLUT_pal16(0, &N(coconut_pal)), gsDPLoadTextureTile_4b(&N(coconut_png), G_IM_FMT_CI, N(coconut_png_width), N(coconut_png_height), 0, 0, N(coconut_png_width) - 1, N(coconut_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), diff --git a/src/battle/item/dusty_hammer/dusty_hammer.c b/src/battle/item/dusty_hammer/dusty_hammer.c index 602de8c382..ab70a3cd89 100644 --- a/src/battle/item/dusty_hammer/dusty_hammer.c +++ b/src/battle/item/dusty_hammer/dusty_hammer.c @@ -20,7 +20,7 @@ Gfx N(displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(dusty_hammer_pal_png)), + gsDPLoadTLUT_pal16(0, &N(dusty_hammer_pal)), gsDPLoadTextureTile_4b(&N(dusty_hammer_png), G_IM_FMT_CI, N(dusty_hammer_png_width), N(dusty_hammer_png_height), 0, 0, N(dusty_hammer_png_width) - 1, N(dusty_hammer_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), diff --git a/src/battle/item/egg_missile/egg_missile.c b/src/battle/item/egg_missile/egg_missile.c index df9e8ef91b..29c7234f55 100644 --- a/src/battle/item/egg_missile/egg_missile.c +++ b/src/battle/item/egg_missile/egg_missile.c @@ -23,7 +23,7 @@ Gfx N(frame1_displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(egg_missile1_pal_png)), + gsDPLoadTLUT_pal16(0, &N(egg_missile1_pal)), gsDPLoadTextureTile_4b(&N(egg_missile1_png), G_IM_FMT_CI, N(egg_missile1_png_width), N(egg_missile1_png_height), 0, 0, N(egg_missile1_png_width) - 1, N(egg_missile1_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), @@ -45,7 +45,7 @@ Gfx N(frame2_displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(egg_missile2_pal_png)), + gsDPLoadTLUT_pal16(0, &N(egg_missile2_pal)), gsDPLoadTextureTile_4b(&N(egg_missile2_png), G_IM_FMT_CI, N(egg_missile2_png_width), 0, 0, 0, N(egg_missile2_png_width) - 1, N(egg_missile2_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), @@ -67,7 +67,7 @@ Gfx N(frame3_displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(egg_missile3_pal_png)), + gsDPLoadTLUT_pal16(0, &N(egg_missile3_pal)), gsDPLoadTextureTile_4b(&N(egg_missile3_png), G_IM_FMT_CI, N(egg_missile3_png_width), 0, 0, 0, N(egg_missile3_png_width) - 1, N(egg_missile3_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), @@ -89,7 +89,7 @@ Gfx N(frame4_displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(egg_missile4_pal_png)), + gsDPLoadTLUT_pal16(0, &N(egg_missile4_pal)), gsDPLoadTextureTile_4b(&N(egg_missile4_png), G_IM_FMT_CI, N(egg_missile4_png_width), 0, 0, 0, N(egg_missile4_png_width) - 1, N(egg_missile4_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), diff --git a/src/battle/item/insecticide_herb/insecticide_herb.c b/src/battle/item/insecticide_herb/insecticide_herb.c index 6b5a9076af..b7d9a7d30f 100644 --- a/src/battle/item/insecticide_herb/insecticide_herb.c +++ b/src/battle/item/insecticide_herb/insecticide_herb.c @@ -20,7 +20,7 @@ Gfx N(displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(insecticide_herb_pal_png)), + gsDPLoadTLUT_pal16(0, &N(insecticide_herb_pal)), gsDPLoadTextureTile_4b(&N(insecticide_herb_png), G_IM_FMT_CI, N(insecticide_herb_png_width), N(insecticide_herb_png_height), 0, 0, N(insecticide_herb_png_width) - 1, N(insecticide_herb_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), diff --git a/src/battle/item/mystery/mystery.c b/src/battle/item/mystery/mystery.c index f93ccca18d..38a23955fe 100644 --- a/src/battle/item/mystery/mystery.c +++ b/src/battle/item/mystery/mystery.c @@ -20,7 +20,7 @@ Gfx N(displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(mystery_pal_png)), + gsDPLoadTLUT_pal16(0, &N(mystery_pal)), gsDPLoadTextureTile_4b(&N(mystery_png), G_IM_FMT_CI, N(mystery_png_width), N(mystery_png_height), 0, 0, N(mystery_png_width) - 1, N(mystery_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), diff --git a/src/battle/item/pebble/pebble.c b/src/battle/item/pebble/pebble.c index 45a2e85cf3..b401f29989 100644 --- a/src/battle/item/pebble/pebble.c +++ b/src/battle/item/pebble/pebble.c @@ -20,7 +20,7 @@ Gfx N(displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(pebble_pal_png)), + gsDPLoadTLUT_pal16(0, &N(pebble_pal)), gsDPLoadTextureTile_4b(&N(pebble_png), G_IM_FMT_CI, N(pebble_png_width), N(pebble_png_height), 0, 0, N(pebble_png_width) - 1, N(pebble_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), diff --git a/src/battle/item/sleepy_sheep/sleepy_sheep.c b/src/battle/item/sleepy_sheep/sleepy_sheep.c index 545fec2e80..62921285aa 100644 --- a/src/battle/item/sleepy_sheep/sleepy_sheep.c +++ b/src/battle/item/sleepy_sheep/sleepy_sheep.c @@ -22,8 +22,8 @@ Gfx N(frame1_displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(sleepy_sheep1_pal_png)), - gsDPLoadTextureTile_4b(&N(sleepy_sheep1_png), G_IM_FMT_CI, N(sleepy_sheep1_png_width), N(sleepy_sheep1_png_height), 0, 0, N(sleepy_sheep1_png_width) - 1, N(sleepy_sheep1_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsDPLoadTLUT_pal16(0, N(sleepy_sheep1_pal)), + gsDPLoadTextureTile_4b(N(sleepy_sheep1_png), G_IM_FMT_CI, N(sleepy_sheep1_png_width), N(sleepy_sheep1_png_height), 0, 0, N(sleepy_sheep1_png_width) - 1, N(sleepy_sheep1_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), @@ -44,8 +44,8 @@ Gfx N(frame2_displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(sleepy_sheep2_pal_png)), - gsDPLoadTextureTile_4b(&N(sleepy_sheep2_png), G_IM_FMT_CI, N(sleepy_sheep2_png_width), N(sleepy_sheep2_png_height), 0, 0, N(sleepy_sheep2_png_width) - 1, N(sleepy_sheep2_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsDPLoadTLUT_pal16(0, N(sleepy_sheep2_pal)), + gsDPLoadTextureTile_4b(N(sleepy_sheep2_png), G_IM_FMT_CI, N(sleepy_sheep2_png_width), N(sleepy_sheep2_png_height), 0, 0, N(sleepy_sheep2_png_width) - 1, N(sleepy_sheep2_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), @@ -66,8 +66,8 @@ Gfx N(frame3_displayList)[] = { gsDPSetTextureFilter(G_TF_AVERAGE), gsDPSetTextureConvert(G_TC_FILT), gsDPSetTextureLUT(G_TT_RGBA16), - gsDPLoadTLUT_pal16(0, &N(sleepy_sheep3_pal_png)), - gsDPLoadTextureTile_4b(&N(sleepy_sheep3_png), G_IM_FMT_CI, N(sleepy_sheep3_png_width), N(sleepy_sheep3_png_height), 0, 0, N(sleepy_sheep3_png_width) - 1, N(sleepy_sheep3_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), + gsDPLoadTLUT_pal16(0, N(sleepy_sheep3_pal)), + gsDPLoadTextureTile_4b(N(sleepy_sheep3_png), G_IM_FMT_CI, N(sleepy_sheep3_png_width), N(sleepy_sheep3_png_height), 0, 0, N(sleepy_sheep3_png_width) - 1, N(sleepy_sheep3_png_height) - 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD), gsSPClearGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_SHADING_SMOOTH), gsSPVertex(N(model), ARRAY_COUNT(N(model)), 0), diff --git a/src/battle/move/auto_jump_765C20.c b/src/battle/move/auto_jump/765C20.c similarity index 100% rename from src/battle/move/auto_jump_765C20.c rename to src/battle/move/auto_jump/765C20.c diff --git a/src/battle/move/auto_multibounce_76A830.c b/src/battle/move/auto_multibounce/76A830.c similarity index 100% rename from src/battle/move/auto_multibounce_76A830.c rename to src/battle/move/auto_multibounce/76A830.c diff --git a/src/battle/move/auto_smash_763540.c b/src/battle/move/auto_smash/763540.c similarity index 100% rename from src/battle/move/auto_smash_763540.c rename to src/battle/move/auto_smash/763540.c diff --git a/src/battle/move/d_down_jump_781920.c b/src/battle/move/d_down_jump/781920.c similarity index 100% rename from src/battle/move/d_down_jump_781920.c rename to src/battle/move/d_down_jump/781920.c diff --git a/src/battle/move/d_down_pound_74AD90.c b/src/battle/move/d_down_pound/74AD90.c similarity index 100% rename from src/battle/move/d_down_pound_74AD90.c rename to src/battle/move/d_down_pound/74AD90.c diff --git a/src/battle/move/dizzy_stomp_748DD0.c b/src/battle/move/dizzy_stomp/748DD0.c similarity index 100% rename from src/battle/move/dizzy_stomp_748DD0.c rename to src/battle/move/dizzy_stomp/748DD0.c diff --git a/src/battle/move/earthquake_jump_785B20.c b/src/battle/move/earthquake_jump/785B20.c similarity index 100% rename from src/battle/move/earthquake_jump_785B20.c rename to src/battle/move/earthquake_jump/785B20.c diff --git a/src/battle/move/hammer_7345A0.c b/src/battle/move/hammer/7345A0.c similarity index 100% rename from src/battle/move/hammer_7345A0.c rename to src/battle/move/hammer/7345A0.c diff --git a/src/battle/move/hammer_charge_0_74F130.c b/src/battle/move/hammer_charge_0/74F130.c similarity index 100% rename from src/battle/move/hammer_charge_0_74F130.c rename to src/battle/move/hammer_charge_0/74F130.c diff --git a/src/battle/move/hammer_charge_1_7595B0.c b/src/battle/move/hammer_charge_1/7595B0.c similarity index 100% rename from src/battle/move/hammer_charge_1_7595B0.c rename to src/battle/move/hammer_charge_1/7595B0.c diff --git a/src/battle/move/hammer_charge_2_75E5D0.c b/src/battle/move/hammer_charge_2/75E5D0.c similarity index 100% rename from src/battle/move/hammer_charge_2_75E5D0.c rename to src/battle/move/hammer_charge_2/75E5D0.c diff --git a/src/battle/move/hammer_throw_752450.c b/src/battle/move/hammer_throw/752450.c similarity index 100% rename from src/battle/move/hammer_throw_752450.c rename to src/battle/move/hammer_throw/752450.c diff --git a/src/battle/move/jump_73D860.c b/src/battle/move/jump/73D860.c similarity index 100% rename from src/battle/move/jump_73D860.c rename to src/battle/move/jump/73D860.c diff --git a/src/battle/move/jump_charge_0_74D570.c b/src/battle/move/jump_charge_0/74D570.c similarity index 100% rename from src/battle/move/jump_charge_0_74D570.c rename to src/battle/move/jump_charge_0/74D570.c diff --git a/src/battle/move/jump_charge_1_75C980.c b/src/battle/move/jump_charge_1/75C980.c similarity index 100% rename from src/battle/move/jump_charge_1_75C980.c rename to src/battle/move/jump_charge_1/75C980.c diff --git a/src/battle/move/jump_charge_2_761920.c b/src/battle/move/jump_charge_2/761920.c similarity index 100% rename from src/battle/move/jump_charge_2_761920.c rename to src/battle/move/jump_charge_2/761920.c diff --git a/src/battle/move/mega_jump_770F30.c b/src/battle/move/mega_jump/770F30.c similarity index 100% rename from src/battle/move/mega_jump_770F30.c rename to src/battle/move/mega_jump/770F30.c diff --git a/src/battle/move/mega_quake_756780.c b/src/battle/move/mega_quake/756780.c similarity index 100% rename from src/battle/move/mega_quake_756780.c rename to src/battle/move/mega_quake/756780.c diff --git a/src/battle/move/mega_smash_777690.c b/src/battle/move/mega_smash/777690.c similarity index 100% rename from src/battle/move/mega_smash_777690.c rename to src/battle/move/mega_smash/777690.c diff --git a/src/battle/move/multibounce_740CC0.c b/src/battle/move/multibounce/740CC0.c similarity index 100% rename from src/battle/move/multibounce_740CC0.c rename to src/battle/move/multibounce/740CC0.c diff --git a/src/battle/move/power_bounce_743DF0.c b/src/battle/move/power_bounce/743DF0.c similarity index 75% rename from src/battle/move/power_bounce_743DF0.c rename to src/battle/move/power_bounce/743DF0.c index 233c86d558..d94efe324e 100644 --- a/src/battle/move/power_bounce_743DF0.c +++ b/src/battle/move/power_bounce/743DF0.c @@ -26,12 +26,12 @@ ApiStatus func_802A10E4_743ED4(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "battle/move/power_bounce_743DF0", func_802A10E4_743ED4); +INCLUDE_ASM(s32, "battle/move/power_bounce/743DF0", func_802A10E4_743ED4); #endif -INCLUDE_ASM(s32, "battle/move/power_bounce_743DF0", func_802A1194_743F84); +INCLUDE_ASM(s32, "battle/move/power_bounce/743DF0", func_802A1194_743F84); -INCLUDE_ASM(s32, "battle/move/power_bounce_743DF0", func_802A11A4_743F94); +INCLUDE_ASM(s32, "battle/move/power_bounce/743DF0", func_802A11A4_743F94); -INCLUDE_ASM(s32, "battle/move/power_bounce_743DF0", func_802A11C0_743FB0); +INCLUDE_ASM(s32, "battle/move/power_bounce/743DF0", func_802A11C0_743FB0); diff --git a/src/battle/move/power_jump_76D760.c b/src/battle/move/power_jump/76D760.c similarity index 100% rename from src/battle/move/power_jump_76D760.c rename to src/battle/move/power_jump/76D760.c diff --git a/src/battle/move/power_quake_767C90.c b/src/battle/move/power_quake/767C90.c similarity index 100% rename from src/battle/move/power_quake_767C90.c rename to src/battle/move/power_quake/767C90.c diff --git a/src/battle/move/power_smash_772BA0.c b/src/battle/move/power_smash/772BA0.c similarity index 100% rename from src/battle/move/power_smash_772BA0.c rename to src/battle/move/power_smash/772BA0.c diff --git a/src/battle/move/quake_hammer_73AED0.c b/src/battle/move/quake_hammer/73AED0.c similarity index 100% rename from src/battle/move/quake_hammer_73AED0.c rename to src/battle/move/quake_hammer/73AED0.c diff --git a/src/battle/move/shell_crack_77F240.c b/src/battle/move/shell_crack/77F240.c similarity index 73% rename from src/battle/move/shell_crack_77F240.c rename to src/battle/move/shell_crack/77F240.c index 2c9f782bd7..1aa8e1a8dc 100644 --- a/src/battle/move/shell_crack_77F240.c +++ b/src/battle/move/shell_crack/77F240.c @@ -6,4 +6,4 @@ #include "world/common/IsRightOnEquipped.inc.c" -INCLUDE_ASM(s32, "battle/move/shell_crack_77F240", func_802A10A4_77F2E4); +INCLUDE_ASM(s32, "battle/move/shell_crack/77F240", func_802A10A4_77F2E4); diff --git a/src/battle/move/shrink_smash_77CB80.c b/src/battle/move/shrink_smash/77CB80.c similarity index 100% rename from src/battle/move/shrink_smash_77CB80.c rename to src/battle/move/shrink_smash/77CB80.c diff --git a/src/battle/move/shrink_stomp_783BA0.c b/src/battle/move/shrink_stomp/783BA0.c similarity index 100% rename from src/battle/move/shrink_stomp_783BA0.c rename to src/battle/move/shrink_stomp/783BA0.c diff --git a/src/battle/move/sleep_stomp_746E10.c b/src/battle/move/sleep_stomp/746E10.c similarity index 100% rename from src/battle/move/sleep_stomp_746E10.c rename to src/battle/move/sleep_stomp/746E10.c diff --git a/src/battle/move/spin_smash_737890.c b/src/battle/move/spin_smash/737890.c similarity index 100% rename from src/battle/move/spin_smash_737890.c rename to src/battle/move/spin_smash/737890.c diff --git a/src/battle/move/super_jump_76F330.c b/src/battle/move/super_jump/76F330.c similarity index 100% rename from src/battle/move/super_jump_76F330.c rename to src/battle/move/super_jump/76F330.c diff --git a/src/battle/move/super_smash_775100.c b/src/battle/move/super_smash/775100.c similarity index 100% rename from src/battle/move/super_smash_775100.c rename to src/battle/move/super_smash/775100.c diff --git a/src/battle/move/unknown_move_779C90.c b/src/battle/move/unknown_move/779C90.c similarity index 65% rename from src/battle/move/unknown_move_779C90.c rename to src/battle/move/unknown_move/779C90.c index 0fe45ffd84..a9d9f512bd 100644 --- a/src/battle/move/unknown_move_779C90.c +++ b/src/battle/move/unknown_move/779C90.c @@ -4,4 +4,4 @@ #include "world/common/UnkMoveFunc1.inc.c" -INCLUDE_ASM(s32, "battle/move/unknown_move_779C90", func_802A10E4_779D74); +INCLUDE_ASM(s32, "battle/move/unknown_move/779C90", func_802A10E4_779D74); diff --git a/src/battle/partner/goombario_6F10E0.c b/src/battle/partner/6F10E0.c similarity index 88% rename from src/battle/partner/goombario_6F10E0.c rename to src/battle/partner/6F10E0.c index e845d8ebef..bd817241b2 100644 --- a/src/battle/partner/goombario_6F10E0.c +++ b/src/battle/partner/6F10E0.c @@ -35,9 +35,9 @@ ApiStatus func_80238000_6F10E0(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_802380E4_6F11C4); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_802380E4_6F11C4); -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_8023817C_6F125C); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_8023817C_6F125C); ApiStatus func_80238A20_6F1B00(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -101,15 +101,15 @@ ApiStatus func_80238B60_6F1C40(ScriptInstance* script, s32 isInitialCall) { } -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238BCC_6F1CAC); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_80238BCC_6F1CAC); -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238E04_6F1EE4); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_80238E04_6F1EE4); -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238E48_6F1F28); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_80238E48_6F1F28); -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238E74_6F1F54); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_80238E74_6F1F54); -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_80238EDC_6F1FBC); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_80238EDC_6F1FBC); ApiStatus func_8023903C_6F211C(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -143,7 +143,7 @@ ApiStatus func_802390B0_6F2190(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/partner/goombario_6F10E0", func_802390C8_6F21A8); +INCLUDE_ASM(s32, "battle/partner/6F10E0", func_802390C8_6F21A8); ApiStatus func_80239190_6F2270(ScriptInstance* script, s32 isInitialCall) { if (D_8023CDA4 == 0) { diff --git a/src/battle/partner/kooper_6F5E80.c b/src/battle/partner/6F5E80.c similarity index 97% rename from src/battle/partner/kooper_6F5E80.c rename to src/battle/partner/6F5E80.c index e231e5a08b..ac483e929d 100644 --- a/src/battle/partner/kooper_6F5E80.c +++ b/src/battle/partner/6F5E80.c @@ -37,7 +37,7 @@ ApiStatus func_80238000_6F5E80(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -INCLUDE_ASM(s32, "battle/partner/kooper_6F5E80", func_80238114_6F5F94); +INCLUDE_ASM(s32, "battle/partner/6F5E80", func_80238114_6F5F94); ApiStatus N(AverageTargetDizzyChance)(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/battle/partner/6FAD10.c b/src/battle/partner/6FAD10.c new file mode 100644 index 0000000000..a62918178f --- /dev/null +++ b/src/battle/partner/6FAD10.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238000_6FAD10); + +INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238244_6FAF54); + +INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238358_6FB068); + +INCLUDE_ASM(s32, "battle/partner/6FAD10", func_8023849C_6FB1AC); + +INCLUDE_ASM(s32, "battle/partner/6FAD10", func_80238590_6FB2A0); diff --git a/src/battle/partner/parakarry_6FFD80.c b/src/battle/partner/6FFD80.c similarity index 88% rename from src/battle/partner/parakarry_6FFD80.c rename to src/battle/partner/6FFD80.c index 29b1191cf7..cfc661788f 100644 --- a/src/battle/partner/parakarry_6FFD80.c +++ b/src/battle/partner/6FFD80.c @@ -1,7 +1,7 @@ #include "common.h" #include "battle/battle.h" -INCLUDE_ASM(s32, "battle/partner/parakarry_6FFD80", func_80238000_6FFD80); +INCLUDE_ASM(s32, "battle/partner/6FFD80", func_80238000_6FFD80); ApiStatus func_80238C88_700A08(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; @@ -60,9 +60,9 @@ ApiStatus func_80238CE0_700A60(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/partner/parakarry_6FFD80", func_80238E24_700BA4); +INCLUDE_ASM(s32, "battle/partner/6FFD80", func_80238E24_700BA4); -INCLUDE_ASM(s32, "battle/partner/parakarry_6FFD80", func_802390B4_700E34); +INCLUDE_ASM(s32, "battle/partner/6FFD80", func_802390B4_700E34); ApiStatus func_802397C8_701548(ScriptInstance* script, s32 isInitialCall) { script->varTable[15] = ((script->varTable[0] * 100) / 2499) + 2; diff --git a/src/battle/partner/watt_703AF0.c b/src/battle/partner/703AF0.c similarity index 50% rename from src/battle/partner/watt_703AF0.c rename to src/battle/partner/703AF0.c index fd577890f9..5a06dcbb2c 100644 --- a/src/battle/partner/watt_703AF0.c +++ b/src/battle/partner/703AF0.c @@ -2,41 +2,41 @@ #include "common.h" -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238000_703AF0); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238000_703AF0); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238370_703E60); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238370_703E60); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_802383C0_703EB0); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_802383C0_703EB0); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_802383D4_703EC4); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_802383D4_703EC4); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_802383E4_703ED4); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_802383E4_703ED4); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_802383F8_703EE8); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_802383F8_703EE8); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238408_703EF8); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238408_703EF8); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238434_703F24); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238434_703F24); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238478_703F68); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238478_703F68); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_802384B0_703FA0); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_802384B0_703FA0); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238570_704060); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238570_704060); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_8023859C_70408C); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_8023859C_70408C); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238668_704158); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238668_704158); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238784_704274); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238784_704274); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238810_704300); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238810_704300); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238B3C_70462C); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238B3C_70462C); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238C08_7046F8); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238C08_7046F8); -INCLUDE_ASM(s32, "battle/partner/watt_703AF0", func_80238C84_704774); +INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238C84_704774); ApiStatus N(AverageTargetParalyzeChance)(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/battle/partner/707CA0.c b/src/battle/partner/707CA0.c new file mode 100644 index 0000000000..240bf323ab --- /dev/null +++ b/src/battle/partner/707CA0.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_80238000_707CA0); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_80238114_707DB4); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_802381EC_707E8C); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_802382A4_707F44); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_80238328_707FC8); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_80238388_708028); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_80238480_708120); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_80238540_7081E0); + +INCLUDE_ASM(s32, "battle/partner/707CA0", func_80238E30_708AD0); diff --git a/src/battle/partner/70BD10.c b/src/battle/partner/70BD10.c new file mode 100644 index 0000000000..3d874cd5f0 --- /dev/null +++ b/src/battle/partner/70BD10.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80238000_70BD10); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_8023803C_70BD4C); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80238A6C_70C77C); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80238B50_70C860); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80238C14_70C924); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80238C58_70C968); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80238D48_70CA58); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80238D8C_70CA9C); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_8023906C_70CD7C); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80239140_70CE50); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_80239F84_70DC94); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_8023A19C_70DEAC); + +INCLUDE_ASM(s32, "battle/partner/70BD10", func_8023A1B0_70DEC0); diff --git a/src/battle/partner/bow_710EF0.c b/src/battle/partner/710EF0.c similarity index 96% rename from src/battle/partner/bow_710EF0.c rename to src/battle/partner/710EF0.c index 55b37c1f0f..6635411688 100644 --- a/src/battle/partner/bow_710EF0.c +++ b/src/battle/partner/710EF0.c @@ -24,7 +24,7 @@ ApiStatus func_80238014_710F04(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(ApiStatus, "battle/partner/bow_710EF0", func_8023808C_710F7C, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "battle/partner/710EF0", func_8023808C_710F7C, ScriptInstance* script, s32 isInitialCall); ApiStatus func_802380E4_710FD4(ScriptInstance* script, s32 isInitialCall) { BattleStatus* battleStatus = &gBattleStatus; diff --git a/src/battle/partner/twink_714CF0.c b/src/battle/partner/714CF0.c similarity index 91% rename from src/battle/partner/twink_714CF0.c rename to src/battle/partner/714CF0.c index 5b8a561dc1..0c32f7d835 100644 --- a/src/battle/partner/twink_714CF0.c +++ b/src/battle/partner/714CF0.c @@ -31,5 +31,5 @@ ApiStatus func_80238028_714D18(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } #else -INCLUDE_ASM(s32, "battle/partner/twink_714CF0", func_80238028_714D18); +INCLUDE_ASM(s32, "battle/partner/714CF0", func_80238028_714D18); #endif diff --git a/src/battle/partner/bombette_6FAD10.c b/src/battle/partner/bombette_6FAD10.c deleted file mode 100644 index 15dbab519c..0000000000 --- a/src/battle/partner/bombette_6FAD10.c +++ /dev/null @@ -1,225 +0,0 @@ -#include "common.h" -#include "battle/battle.h" - -ApiStatus func_80238000_6FAD10(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; - Bytecode* args = script->ptrReadPos; - s32 x = get_variable(script, *args++); - s32 y = get_variable(script, *args++); - s32 z = get_variable(script, *args++); - s16 selectedMoveID; - s32 soundID; - - func_80070130(0, x, y, z); - selectedMoveID = battleStatus->selectedMoveID; - - switch (selectedMoveID) { - case 146: - if (script->varTable[10] > 0) { - func_800701F0(1, x, y + 20, z); - } else { - func_800701F0(0, x, y + 20, z); - } - sfx_play_sound(8214); - break; - case 147: - if (script->varTable[10] > 0) { - func_800701F0(1, x, y + 20, z); - } else { - func_800701F0(0, x, y + 20, z); - } - sfx_play_sound(8215); - break; - case 148: - if (script->varTable[10] > 0) { - func_800701F0(2, x, y + 20, z); - } else { - func_800701F0(1, x, y + 20, z); - } - sfx_play_sound(8215); - break; - default: - func_800701F0(0, x, y + 20, z); - sfx_play_sound(8214); - break; - } - - return ApiStatus_DONE2; -} - -ApiStatus func_80238244_6FAF54(ScriptInstance* script, s32 isInitialCall) { - BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = battleStatus->partnerActor; - ActorMovement* partnerActorMovement = &partnerActor->walk; - - if (isInitialCall) { - partnerActor->walk.currentPos.x = partnerActor->currentPos.x; - partnerActor->walk.currentPos.y = partnerActor->currentPos.y; - partnerActor->walk.currentPos.z = partnerActor->currentPos.z; - } - - add_xz_vec3f(&partnerActorMovement->currentPos, partnerActor->walk.speed, partnerActor->walk.angle); - - if (partnerActor->walk.speed < 4.0f) { - play_movement_dust_effects(0, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, - partnerActor->walk.currentPos.z, partnerActor->walk.angle); - } else { - play_movement_dust_effects(1, partnerActor->walk.currentPos.x, partnerActor->walk.currentPos.y, - partnerActor->walk.currentPos.z, partnerActor->walk.angle); - } - - partnerActorMovement->speed /= 1.5; - - partnerActor->currentPos.x = partnerActorMovement->currentPos.x; - partnerActor->currentPos.y = partnerActorMovement->currentPos.y; - partnerActor->currentPos.z = partnerActorMovement->currentPos.z; - - if (partnerActorMovement->speed < 1.0) { - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} - -ApiStatus func_80238358_6FB068(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = battleStatus->partnerActor; - s32 var0 = get_variable(script, *args++); - s32 var1 = 0; - - switch (partnerActor->staticActorData->level) { - case 0: - if (var0 < 36) { - var1 = 1; - } else if (var0 < 61) { - var1 = 2; - } else if (var0 < 81) { - var1 = 3; - } else if (var0 < 100) { - var1 = 4; - } else { - var1 = 5; - } - break; - case 1: - if (var0 < 36) { - var1 = 1; - } else if (var0 < 61) { - var1 = 3; - } else if (var0 < 81) { - var1 = 4; - } else if (var0 < 100) { - var1 = 5; - } else { - var1 = 6; - } - break; - case 2: - if (var0 < 36) { - var1 = 1; - } else if (var0 < 61) { - var1 = 3; - } else if (var0 < 81) { - var1 = 5; - } else if (var0 < 100) { - var1 = 6; - } else { - var1 = 7; - } - break; - } - - - if (!(var0 < 100)) { - script->varTable[0] = 1; - } else { - script->varTable[0] = 0; - } - - script->varTable[15] = var1; - - return ApiStatus_DONE2; -} - -ApiStatus func_8023849C_6FB1AC(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = battleStatus->partnerActor; - s32 var0 = get_variable(script, *args++); - s32 var1 = 0; - - switch (partnerActor->staticActorData->level) { - case 1: - if (var0 < 36) { - var1 = 1; - } else if (var0 < 61) { - var1 = 3; - } else if (var0 < 81) { - var1 = 4; - } else if (var0 < 100) { - var1 = 5; - } else { - var1 = 6; - } - break; - case 2: - if (var0 < 36) { - var1 = 1; - } else if (var0 < 61) { - var1 = 3; - } else if (var0 < 81) { - var1 = 5; - } else if (var0 < 100) { - var1 = 6; - } else { - var1 = 7; - } - } - - - if (!(var0 < 100)) { - script->varTable[0] = 1; - } else { - script->varTable[0] = 0; - } - - script->varTable[15] = var1; - - return ApiStatus_DONE2; -} - -ApiStatus func_80238590_6FB2A0(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - BattleStatus* battleStatus = &gBattleStatus; - Actor* partnerActor = battleStatus->partnerActor; - s32 var0 = get_variable(script, *args++); - s32 var1 = 0; - - switch (partnerActor->staticActorData->level) { - case 2: - if (var0 < 36) { - var1 = 1; - } else if (var0 < 61) { - var1 = 3; - } else if (var0 < 81) { - var1 = 5; - } else if (var0 < 100) { - var1 = 6; - } else { - var1 = 7; - } - break; - } - - - if (!(var0 < 100)) { - script->varTable[0] = TRUE; - } else { - script->varTable[0] = FALSE; - } - - script->varTable[15] = var1; - - return ApiStatus_DONE2; -} diff --git a/src/battle/partner/lakilester_70BD10.c b/src/battle/partner/lakilester_70BD10.c deleted file mode 100644 index 17c3a03f82..0000000000 --- a/src/battle/partner/lakilester_70BD10.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80238000_70BD10); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_8023803C_70BD4C); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80238A6C_70C77C); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80238B50_70C860); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80238C14_70C924); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80238C58_70C968); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80238D48_70CA58); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80238D8C_70CA9C); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_8023906C_70CD7C); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80239140_70CE50); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_80239F84_70DC94); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_8023A19C_70DEAC); - -INCLUDE_ASM(s32, "battle/partner/lakilester_70BD10", func_8023A1B0_70DEC0); diff --git a/src/battle/partner/sushie_707CA0.c b/src/battle/partner/sushie_707CA0.c deleted file mode 100644 index 8a8b1dba2e..0000000000 --- a/src/battle/partner/sushie_707CA0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_80238000_707CA0); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_80238114_707DB4); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_802381EC_707E8C); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_802382A4_707F44); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_80238328_707FC8); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_80238388_708028); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_80238480_708120); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_80238540_7081E0); - -INCLUDE_ASM(s32, "battle/partner/sushie_707CA0", func_80238E30_708AD0); diff --git a/src/battle/star/chill_out_7900D0.c b/src/battle/star/chill_out/7900D0.c similarity index 92% rename from src/battle/star/chill_out_7900D0.c rename to src/battle/star/chill_out/7900D0.c index 12f0d1d6d5..5b50f53e83 100644 --- a/src/battle/star/chill_out_7900D0.c +++ b/src/battle/star/chill_out/7900D0.c @@ -12,7 +12,7 @@ extern s32 D_802A2CC0; #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A1494_790564); +INCLUDE_ASM(s32, "battle/star/chill_out/7900D0", func_802A1494_790564); #include "common/SetNpcCollision32.inc.c" @@ -59,4 +59,4 @@ ApiStatus func_802A163C_79070C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "battle/star/chill_out_7900D0", func_802A16F4_7907C4); +INCLUDE_ASM(s32, "battle/star/chill_out/7900D0", func_802A16F4_7907C4); diff --git a/src/battle/star/focus_789E60.c b/src/battle/star/focus/789E60.c similarity index 95% rename from src/battle/star/focus_789E60.c rename to src/battle/star/focus/789E60.c index 43609eb249..cf6a920975 100644 --- a/src/battle/star/focus_789E60.c +++ b/src/battle/star/focus/789E60.c @@ -10,7 +10,7 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/focus_789E60", func_802A1494_78A2F4); +INCLUDE_ASM(s32, "battle/star/focus/789E60", func_802A1494_78A2F4); #include "common/SetNpcCollision32.inc.c" diff --git a/src/battle/star/lullaby_78D150.c b/src/battle/star/lullaby/78D150.c similarity index 94% rename from src/battle/star/lullaby_78D150.c rename to src/battle/star/lullaby/78D150.c index 421f3876c9..37bdda6952 100644 --- a/src/battle/star/lullaby_78D150.c +++ b/src/battle/star/lullaby/78D150.c @@ -10,7 +10,7 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/lullaby_78D150", func_802A1494_78D5E4); +INCLUDE_ASM(s32, "battle/star/lullaby/78D150", func_802A1494_78D5E4); #include "common/SetNpcCollision32.inc.c" diff --git a/src/battle/star/peach_beam_7997B0.c b/src/battle/star/peach_beam/7997B0.c similarity index 87% rename from src/battle/star/peach_beam_7997B0.c rename to src/battle/star/peach_beam/7997B0.c index 14dc08c9ea..e138d8010d 100644 --- a/src/battle/star/peach_beam_7997B0.c +++ b/src/battle/star/peach_beam/7997B0.c @@ -10,11 +10,11 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A1494_799C44); +INCLUDE_ASM(s32, "battle/star/peach_beam/7997B0", func_802A1494_799C44); #include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_beam_7997B0", func_802A1518_799CC8); +INCLUDE_ASM(s32, "battle/star/peach_beam/7997B0", func_802A1518_799CC8); ApiStatus func_802A2468_79AC18(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = D_802A3838; diff --git a/src/battle/star/peach_dash_79D8A0.c b/src/battle/star/peach_dash/79D8A0.c similarity index 93% rename from src/battle/star/peach_dash_79D8A0.c rename to src/battle/star/peach_dash/79D8A0.c index 4f737176d5..dea6ebd8d5 100644 --- a/src/battle/star/peach_dash_79D8A0.c +++ b/src/battle/star/peach_dash/79D8A0.c @@ -10,7 +10,7 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_dash_79D8A0", func_802A1494_79DD34); +INCLUDE_ASM(s32, "battle/star/peach_dash/79D8A0", func_802A1494_79DD34); #include "common/SetNpcCollision32.inc.c" diff --git a/src/battle/star/peach_focus_79BFA0.c b/src/battle/star/peach_focus/79BFA0.c similarity index 88% rename from src/battle/star/peach_focus_79BFA0.c rename to src/battle/star/peach_focus/79BFA0.c index 942a62cb5e..b855a8b0dd 100644 --- a/src/battle/star/peach_focus_79BFA0.c +++ b/src/battle/star/peach_focus/79BFA0.c @@ -10,7 +10,7 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/peach_focus_79BFA0", func_802A1494_79C434); +INCLUDE_ASM(s32, "battle/star/peach_focus/79BFA0", func_802A1494_79C434); #include "common/SetNpcCollision32.inc.c" diff --git a/src/battle/star/refresh_78B600.c b/src/battle/star/refresh/78B600.c similarity index 76% rename from src/battle/star/refresh_78B600.c rename to src/battle/star/refresh/78B600.c index f93973ce69..ce3fe02aec 100644 --- a/src/battle/star/refresh_78B600.c +++ b/src/battle/star/refresh/78B600.c @@ -10,11 +10,11 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1494_78BA94); +INCLUDE_ASM(s32, "battle/star/refresh/78B600", func_802A1494_78BA94); #include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A1518_78BB18); +INCLUDE_ASM(s32, "battle/star/refresh/78B600", func_802A1518_78BB18); ApiStatus func_802A17D4_78BDD4(ScriptInstance* script, s32 isInitialCall) { Actor* actor = gBattleStatus.playerActor; @@ -39,6 +39,6 @@ ApiStatus func_802A17D4_78BDD4(ScriptInstance* script, s32 isInitialCall) { #include "common/AddFP.inc.c" -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A18E8_78BEE8); +INCLUDE_ASM(s32, "battle/star/refresh/78B600", func_802A18E8_78BEE8); -INCLUDE_ASM(s32, "battle/star/refresh_78B600", func_802A19A8_78BFA8); +INCLUDE_ASM(s32, "battle/star/refresh/78B600", func_802A19A8_78BFA8); diff --git a/src/battle/star/smooch_791D90.c b/src/battle/star/smooch/791D90.c similarity index 71% rename from src/battle/star/smooch_791D90.c rename to src/battle/star/smooch/791D90.c index 887ecf32a0..cadd438db3 100644 --- a/src/battle/star/smooch_791D90.c +++ b/src/battle/star/smooch/791D90.c @@ -10,10 +10,10 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A1494_792224); +INCLUDE_ASM(s32, "battle/star/smooch/791D90", func_802A1494_792224); #include "common/SetNpcCollision32.inc.c" #include "common/AddHP.inc.c" -INCLUDE_ASM(s32, "battle/star/smooch_791D90", func_802A156C_7922FC); +INCLUDE_ASM(s32, "battle/star/smooch/791D90", func_802A156C_7922FC); diff --git a/src/battle/star/star_beam_796FC0.c b/src/battle/star/star_beam/796FC0.c similarity index 87% rename from src/battle/star/star_beam_796FC0.c rename to src/battle/star/star_beam/796FC0.c index e866397ac6..1661d72b2b 100644 --- a/src/battle/star/star_beam_796FC0.c +++ b/src/battle/star/star_beam/796FC0.c @@ -10,11 +10,11 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A1494_797454); +INCLUDE_ASM(s32, "battle/star/star_beam/796FC0", func_802A1494_797454); #include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/star_beam_796FC0", func_802A1518_7974D8); +INCLUDE_ASM(s32, "battle/star/star_beam/796FC0", func_802A1518_7974D8); ApiStatus func_802A2468_798428(ScriptInstance* script, s32 isInitialCall) { script->varTable[0] = D_802A3838; diff --git a/src/battle/star/star_storm_78E7D0.c b/src/battle/star/star_storm/78E7D0.c similarity index 61% rename from src/battle/star/star_storm_78E7D0.c rename to src/battle/star/star_storm/78E7D0.c index d7e47d21b1..975097e12e 100644 --- a/src/battle/star/star_storm_78E7D0.c +++ b/src/battle/star/star_storm/78E7D0.c @@ -10,10 +10,10 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1494_78EC64); +INCLUDE_ASM(s32, "battle/star/star_storm/78E7D0", func_802A1494_78EC64); #include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1518_78ECE8); +INCLUDE_ASM(s32, "battle/star/star_storm/78E7D0", func_802A1518_78ECE8); -INCLUDE_ASM(s32, "battle/star/star_storm_78E7D0", func_802A1628_78EDF8); +INCLUDE_ASM(s32, "battle/star/star_storm/78E7D0", func_802A1628_78EDF8); diff --git a/src/battle/star/time_out_793D20.c b/src/battle/star/time_out/793D20.c similarity index 81% rename from src/battle/star/time_out_793D20.c rename to src/battle/star/time_out/793D20.c index dab6ab6cdc..6042b46793 100644 --- a/src/battle/star/time_out_793D20.c +++ b/src/battle/star/time_out/793D20.c @@ -10,6 +10,6 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/time_out_793D20", func_802A1494_7941B4); +INCLUDE_ASM(s32, "battle/star/time_out/793D20", func_802A1494_7941B4); #include "common/SetNpcCollision32.inc.c" diff --git a/src/battle/star/up_and_away_7952E0.c b/src/battle/star/up_and_away/7952E0.c similarity index 55% rename from src/battle/star/up_and_away_7952E0.c rename to src/battle/star/up_and_away/7952E0.c index a632521f2e..41595b5ef3 100644 --- a/src/battle/star/up_and_away_7952E0.c +++ b/src/battle/star/up_and_away/7952E0.c @@ -10,12 +10,12 @@ #include "common/UnkBackgroundFunc.inc.c" -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1494_795774); +INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A1494_795774); #include "common/SetNpcCollision32.inc.c" -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1518_7957F8); +INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A1518_7957F8); -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A15B4_795894); +INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A15B4_795894); -INCLUDE_ASM(s32, "battle/star/up_and_away_7952E0", func_802A1628_795908); +INCLUDE_ASM(s32, "battle/star/up_and_away/7952E0", func_802A1628_795908); diff --git a/src/cd180_len_38f0.c b/src/cd180_len_38f0.c new file mode 100644 index 0000000000..312bb984d6 --- /dev/null +++ b/src/cd180_len_38f0.c @@ -0,0 +1,34 @@ +#include "common.h" + +INCLUDE_ASM(s32, "cd180_len_38f0", _render_transition_stencil); + +INCLUDE_ASM(void, "cd180_len_38f0", set_transition_stencil_zoom_0, s32 arg0, f32 arg1); + +INCLUDE_ASM(void, "cd180_len_38f0", set_transition_stencil_zoom_1, s32 arg0, f32 arg1); + +INCLUDE_ASM(void, "cd180_len_38f0", func_80137DC0, s32 arg0, f32* arg1, f32* arg2); + +INCLUDE_ASM(s32, "cd180_len_38f0", set_transition_stencil_color, s32 arg0, u8 arg1, u8 arg2, u8 arg3); + +INCLUDE_ASM(void, "cd180_len_38f0", set_transition_stencil_center, s32 arg0, s32 arg1, s32 arg2, s32 arg3); + +INCLUDE_ASM(s32, "cd180_len_38f0", set_transition_stencil_center_worldpos); + +INCLUDE_ASM(s32, "cd180_len_38f0", set_transition_stencil_alpha); + +INCLUDE_ASM(s32, "cd180_len_38f0", clear_transition_stencil); + +INCLUDE_ASM(s32, "cd180_len_38f0", func_80138188); + +void func_80138198(void) { +} + +INCLUDE_ASM(s32, "cd180_len_38f0", render_transition_stencil_upper); + +INCLUDE_ASM(s32, "cd180_len_38f0", render_transition_stencil_lower); + +INCLUDE_ASM(s32, "cd180_len_38f0", set_map_transition_effect); + +INCLUDE_ASM(s32, "cd180_len_38f0", func_801382AC); + +INCLUDE_ASM(s32, "cd180_len_38f0", func_801385D4); diff --git a/src/code_101b90_len_8f0.c b/src/code_101b90_len_8f0.c deleted file mode 100644 index cd7562c1d9..0000000000 --- a/src/code_101b90_len_8f0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DEAA0); - -INCLUDE_ASM(s32, "code_101b90_len_8f0", load_sprite); - -INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DED60); - -INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DEEA0); - -INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DEFB4); - -INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DF00C); - -INCLUDE_ASM(s32, "code_101b90_len_8f0", func_802DF2D8); diff --git a/src/code_107830_len_e70.c b/src/code_107830_len_e70.c deleted file mode 100644 index 66025dc9db..0000000000 --- a/src/code_107830_len_e70.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E5FB0); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6064); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6118); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6178); - -void func_802E6194(void) { -} - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E619C); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E61B0); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6338); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6390); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E63A8); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6574); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6B6C); - -INCLUDE_ASM(s32, "code_107830_len_e70", func_802E6C24); diff --git a/src/code_1086a0_len_fc0.c b/src/code_1086a0_len_fc0.c deleted file mode 100644 index e3aa61b55e..0000000000 --- a/src/code_1086a0_len_fc0.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E6E20); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E6E90); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E6ED8); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7034); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E70B0); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E71F8); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7230); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E742C); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E75C0); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E75E4); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7AE4); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7C70); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7C8C); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7CB8); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7D28); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7D38); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", func_802E7D54); - -INCLUDE_ASM(s32, "code_1086a0_len_fc0", entity_init_Chest); diff --git a/src/code_121f0_len_1290.c b/src/code_121f0_len_1290.c deleted file mode 100644 index b383356a98..0000000000 --- a/src/code_121f0_len_1290.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_121f0_len_1290", begin_state_title_screen); - -INCLUDE_ASM(s32, "code_121f0_len_1290", step_title_screen); - -INCLUDE_ASM(s32, "code_121f0_len_1290", func_800375A4); - -INCLUDE_ASM(s32, "code_121f0_len_1290", title_append_gfx); - -void func_80037960(void) { -} - -INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_images); - -INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_logo); - -INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_press_start); - -INCLUDE_ASM(s32, "code_121f0_len_1290", title_draw_copyright); diff --git a/src/code_137ED0.c b/src/code_137ED0.c deleted file mode 100644 index 327733d56b..0000000000 --- a/src/code_137ED0.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" - -void pause_tabs_draw_invis(void) { -} - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_stats); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_badges); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_items); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_party); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_spirits); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_draw_map); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_init); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_handle_input); - -INCLUDE_ASM(s32, "code_137ED0", pause_tabs_update); - -void pause_tabs_cleanup(void) { - s32* iconIDs = gPauseMenuTabIconIDs; - s32 i; - - for (i = 0; i < ARRAY_COUNT(gPauseMenuTabIconIDs); i++) { - free_icon(iconIDs[i]); - } -} diff --git a/src/code_13E120.c b/src/code_13E120.c deleted file mode 100644 index 032bc7145f..0000000000 --- a/src/code_13E120.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_13E120", pause_partners_load_portrait); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_contents); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_title); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_movelist); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_movelist_title); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_draw_movelist_flower); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_init); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_handle_input); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_update); - -INCLUDE_ASM(s32, "code_13E120", pause_partners_cleanup); diff --git a/src/code_13FD40.c b/src/code_13FD40.c deleted file mode 100644 index 7236b71867..0000000000 --- a/src/code_13FD40.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_13FD40", pause_spirits_draw_contents); - -INCLUDE_ASM(s32, "code_13FD40", pause_spirits_draw_title); - -INCLUDE_ASM(s32, "code_13FD40", pause_spirits_init); - -INCLUDE_ASM(s32, "code_13FD40", pause_spirits_handle_input); - -INCLUDE_ASM(s32, "code_13FD40", pause_spirits_update); - -INCLUDE_ASM(s32, "code_13FD40", pause_spirits_cleanup); diff --git a/src/code_140C70.c b/src/code_140C70.c deleted file mode 100644 index 9a563af08c..0000000000 --- a/src/code_140C70.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_140C70", func_8024D930); - -INCLUDE_ASM(s32, "code_140C70", pause_map_draw_border_arrows); - -INCLUDE_ASM(s32, "code_140C70", pause_map_draw_contents); - -INCLUDE_ASM(s32, "code_140C70", pause_map_draw_title); - -INCLUDE_ASM(s32, "code_140C70", pause_map_init); - -INCLUDE_ASM(s32, "code_140C70", pause_map_handle_input); - -INCLUDE_ASM(s32, "code_140C70", pause_map_update); - -INCLUDE_ASM(s32, "code_140C70", pause_map_cleanup); diff --git a/src/code_163400.c b/src/code_163400.c deleted file mode 100644 index a7e62caa97..0000000000 --- a/src/code_163400.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_163400", func_80242BA0); - -INCLUDE_ASM(s32, "code_163400", func_80242D94); - -INCLUDE_ASM(s32, "code_163400", func_80242DEC); - -INCLUDE_ASM(s32, "code_163400", func_80242E00); - -INCLUDE_ASM(s32, "code_163400", func_80242F68); - -INCLUDE_ASM(s32, "code_163400", func_802431A0); - -INCLUDE_ASM(s32, "code_163400", func_8024330C); - -INCLUDE_ASM(s32, "code_163400", func_80243380); - -INCLUDE_ASM(s32, "code_163400", func_802433F4); - -INCLUDE_ASM(s32, "code_163400", func_80243468); - -INCLUDE_ASM(s32, "code_163400", func_802434DC); - -INCLUDE_ASM(s32, "code_163400", func_80243550); - -INCLUDE_ASM(s32, "code_163400", func_802435C4); - -INCLUDE_ASM(s32, "code_163400", func_80243628); - -INCLUDE_ASM(s32, "code_163400", func_8024368C); - -INCLUDE_ASM(s32, "code_163400", func_802436F0); - -INCLUDE_ASM(s32, "code_163400", func_80243754); - -INCLUDE_ASM(s32, "code_163400", func_802437B8); - -INCLUDE_ASM(s32, "code_163400", func_8024381C); - -INCLUDE_ASM(s32, "code_163400", func_80243898); - -INCLUDE_ASM(s32, "code_163400", func_80243908); - -INCLUDE_ASM(s32, "code_163400", func_80243B10); - -INCLUDE_ASM(s32, "code_163400", func_80243CCC); - -INCLUDE_ASM(s32, "code_163400", func_80243EEC); - -INCLUDE_ASM(s32, "code_163400", func_80244030); - -INCLUDE_ASM(s32, "code_163400", func_802440BC); - -INCLUDE_ASM(s32, "code_163400", func_802448E0); - -INCLUDE_ASM(s32, "code_163400", func_80244B00); - -INCLUDE_ASM(s32, "code_163400", func_80244BC4); diff --git a/src/code_165490.c b/src/code_165490.c deleted file mode 100644 index fb8cba3afa..0000000000 --- a/src/code_165490.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_165490", func_80244C30); - -INCLUDE_ASM(s32, "code_165490", func_80244CEC); - -INCLUDE_ASM(s32, "code_165490", func_80244D60); - -INCLUDE_ASM(s32, "code_165490", func_80244DD0); - -INCLUDE_ASM(s32, "code_165490", func_80244E54); - -INCLUDE_ASM(s32, "code_165490", func_80244F44); - -INCLUDE_ASM(s32, "code_165490", func_80244FD4); - -INCLUDE_ASM(s32, "code_165490", func_8024544C); - -INCLUDE_ASM(s32, "code_165490", func_80245588); - -INCLUDE_ASM(s32, "code_165490", func_802455D8); - -INCLUDE_ASM(s32, "code_165490", func_80245628); - -INCLUDE_ASM(s32, "code_165490", func_80245678); - -INCLUDE_ASM(s32, "code_165490", func_802456C8); - -INCLUDE_ASM(s32, "code_165490", func_80245718); - -INCLUDE_ASM(s32, "code_165490", func_80245768); - -INCLUDE_ASM(s32, "code_165490", func_802457B8); - -INCLUDE_ASM(s32, "code_165490", func_80245808); - -INCLUDE_ASM(s32, "code_165490", func_80245A40); - -INCLUDE_ASM(s32, "code_165490", func_80246B2C); - -INCLUDE_ASM(s32, "code_165490", func_80246CBC); diff --git a/src/code_167570.c b/src/code_167570.c deleted file mode 100644 index befd8c64eb..0000000000 --- a/src/code_167570.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_167570", func_80246D10); - -INCLUDE_ASM(s32, "code_167570", func_80246E24); - -INCLUDE_ASM(s32, "code_167570", func_80247198); - -INCLUDE_ASM(s32, "code_167570", func_802471EC); - -void func_80247D14(void) { -} - -void func_80247D1C(void) { -} diff --git a/src/code_168590.c b/src/code_168590.c deleted file mode 100644 index f104ec8249..0000000000 --- a/src/code_168590.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_168590", func_80247D30); - -INCLUDE_ASM(s32, "code_168590", func_80247FD0); - -INCLUDE_ASM(s32, "code_168590", func_80248024); - -void func_80248160(void) { -} - -void func_80248168(void) { -} - -INCLUDE_ASM(s32, "code_168590", func_80248170); - -INCLUDE_ASM(s32, "code_168590", func_802481B8); - -INCLUDE_ASM(s32, "code_168590", func_8024830C); - -INCLUDE_ASM(s32, "code_168590", func_80248A80); - -INCLUDE_ASM(s32, "code_168590", func_80248BF4); - -void func_80249324(void) { -} - -INCLUDE_ASM(s32, "code_168590", func_8024932C); diff --git a/src/code_169BE0.c b/src/code_169BE0.c deleted file mode 100644 index 50afc46992..0000000000 --- a/src/code_169BE0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_169BE0", func_80249380); - -INCLUDE_ASM(s32, "code_169BE0", func_8024997C); - -INCLUDE_ASM(s32, "code_169BE0", func_80249AA4); - -INCLUDE_ASM(s32, "code_169BE0", func_80249AB8); diff --git a/src/code_1776B0.c b/src/code_1776B0.c deleted file mode 100644 index 5d5a5fed81..0000000000 --- a/src/code_1776B0.c +++ /dev/null @@ -1,95 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(ApiStatus, "code_1776B0", func_80248DD0, ScriptInstance* script, s32 isInitialCall); - -INCLUDE_ASM(s32, "code_1776B0", func_80248DE4); - -INCLUDE_ASM(s32, "code_1776B0", func_80249804); - -INCLUDE_ASM(s32, "code_1776B0", func_8024A214); - -INCLUDE_ASM(s32, "code_1776B0", func_8024A990); - -INCLUDE_ASM(s32, "code_1776B0", func_8024AFE4); - -INCLUDE_ASM(s32, "code_1776B0", func_8024B5FC); - -INCLUDE_ASM(s32, "code_1776B0", func_8024B9A0); - -INCLUDE_ASM(s32, "code_1776B0", func_8024BDA4); - -INCLUDE_ASM(s32, "code_1776B0", func_8024C180); - -INCLUDE_ASM(s32, "code_1776B0", func_8024C570); - -INCLUDE_ASM(s32, "code_1776B0", func_8024C944); - -INCLUDE_ASM(s32, "code_1776B0", func_8024CB68); - -INCLUDE_ASM(s32, "code_1776B0", func_8024CE9C); - -INCLUDE_ASM(s32, "code_1776B0", use_cam_preset); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E3D8); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E40C); - -INCLUDE_ASM(s32, "code_1776B0", cam_target_actor); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E45C); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E484); - -INCLUDE_ASM(s32, "code_1776B0", move_cam_over); - -INCLUDE_ASM(s32, "code_1776B0", set_cam_target_pos); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E554); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E584); - -INCLUDE_ASM(s32, "code_1776B0", set_cam_zoom); - -INCLUDE_ASM(s32, "code_1776B0", add_cam_zoom); - -INCLUDE_ASM(s32, "code_1776B0", set_cam_zoffset); - -INCLUDE_ASM(s32, "code_1776B0", unfreeze_cam); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E60C); - -INCLUDE_ASM(s32, "code_1776B0", UseCamPreset); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E664); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E6B4); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E748); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E820); - -INCLUDE_ASM(s32, "code_1776B0", SetBattleCamTarget); - -INCLUDE_ASM(s32, "code_1776B0", func_8024E9B0); - -INCLUDE_ASM(s32, "code_1776B0", SetBattleCamOffsetZ); - -INCLUDE_ASM(s32, "code_1776B0", AddBattleCamOffsetZ); - -INCLUDE_ASM(s32, "code_1776B0", SetBattleCamYaw); - -INCLUDE_ASM(s32, "code_1776B0", BattleCamTargetActor); - -INCLUDE_ASM(s32, "code_1776B0", func_8024EB84); - -INCLUDE_ASM(s32, "code_1776B0", MoveBattleCamOver); - -INCLUDE_ASM(s32, "code_1776B0", SetBattleCamZoom); - -INCLUDE_ASM(s32, "code_1776B0", AddBattleCamZoom); - -INCLUDE_ASM(s32, "code_1776B0", func_8024ECF8); - -INCLUDE_ASM(s32, "code_1776B0", FreezeBattleCam); - -INCLUDE_ASM(s32, "code_1776B0", func_8024EDA4); diff --git a/src/code_17D6A0.c b/src/code_17D6A0.c deleted file mode 100644 index 8e60777b05..0000000000 --- a/src/code_17D6A0.c +++ /dev/null @@ -1,75 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_17D6A0", func_8024EDC0); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024EDEC); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024EE48); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024EEA8); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024EF08); - -INCLUDE_ASM(s32, "code_17D6A0", create_popup); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024EFA4); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024EFE0); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024F394); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024F5AC); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024F768); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024F7C8); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024F84C); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024F940); - -INCLUDE_ASM(s32, "code_17D6A0", show_battle_message); - -INCLUDE_ASM(s32, "code_17D6A0", show_variable_battle_message); - -INCLUDE_ASM(s32, "code_17D6A0", is_popup_displayed); - -INCLUDE_ASM(s32, "code_17D6A0", set_popup_duration); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024FAE8); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024FAFC); - -INCLUDE_ASM(s32, "code_17D6A0", close_action_command_instruction_popup); - -INCLUDE_ASM(s32, "code_17D6A0", func_8024FB3C); - -INCLUDE_ASM(s32, "code_17D6A0", func_80250818); - -INCLUDE_ASM(s32, "code_17D6A0", show_message_popup); - -INCLUDE_ASM(s32, "code_17D6A0", ShowMessageBox); - -INCLUDE_ASM(s32, "code_17D6A0", ShowVariableMessageBox); - -ApiStatus IsMessageBoxDisplayed(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 outVar = *args++; - - set_variable(script, outVar, is_popup_displayed()); - return ApiStatus_DONE2; -} - -ApiStatus WaitForMessageBoxDone(ScriptInstance* script, s32 isInitialCall) { - return !is_popup_displayed() * ApiStatus_DONE2; -} - -INCLUDE_ASM(s32, "code_17D6A0", ForceCloseMessageBox); - -INCLUDE_ASM(s32, "code_17D6A0", SetMessageBoxDuration); - -INCLUDE_ASM(s32, "code_17D6A0", func_80251434); - -INCLUDE_ASM(s32, "code_17D6A0", func_80251454); - -INCLUDE_ASM(s32, "code_17D6A0", func_80251474); diff --git a/src/code_18C790.c b/src/code_18C790.c deleted file mode 100644 index bffbd3fee5..0000000000 --- a/src/code_18C790.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_18C790", func_8025DEB0); - -INCLUDE_ASM(s32, "code_18C790", func_8025DEC4); - -INCLUDE_ASM(s32, "code_18C790", func_8025E030); - -INCLUDE_ASM(s32, "code_18C790", func_8025E044); - -INCLUDE_ASM(s32, "code_18C790", func_8025E108); - -INCLUDE_ASM(s32, "code_18C790", func_8025E14C); - -INCLUDE_ASM(s32, "code_18C790", func_8025E190); - -INCLUDE_ASM(s32, "code_18C790", func_8025FF8C); - -INCLUDE_ASM(s32, "code_18C790", func_802601BC); - -INCLUDE_ASM(s32, "code_18C790", func_80260948); - -INCLUDE_ASM(s32, "code_18C790", func_80260A20); diff --git a/src/code_190A10.c b/src/code_190A10.c deleted file mode 100644 index 07fd79a4f8..0000000000 --- a/src/code_190A10.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_190A10", func_80262130); - -INCLUDE_ASM(s32, "code_190A10", func_8026220C); diff --git a/src/code_20ec0_len_5040.c b/src/code_20ec0_len_5040.c deleted file mode 100644 index 93d8c24313..0000000000 --- a/src/code_20ec0_len_5040.c +++ /dev/null @@ -1,104 +0,0 @@ -#include "common.h" -#include "map.h" - -extern s32 D_800A0F40; - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045AC0); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045B10); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", update_merlee_messages); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045BC8); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", draw_merlee_messages); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045C88); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045CC4); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045D00); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045D7C); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", draw_merlee_message_string); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", draw_merlee_message); - -s32 is_merlee_message_done(void) { - return D_800A0F40; -} - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80045FB4); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80046030); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800465E0); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047608); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800476F4); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004778C); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800477F4); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047820); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047898); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800478F8); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047928); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800479A0); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047A00); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047A30); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047AA8); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047B08); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047B38); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047B84); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047BE4); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047C14); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047CA4); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047D00); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047D30); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047DC0); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047E1C); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047E4C); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047EDC); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047F28); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047F58); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80047FE8); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048034); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048064); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_800480F4); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048140); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048170); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_80048200); - -INCLUDE_ASM(s32, "code_20ec0_len_5040", func_8004824C); diff --git a/src/code_3169f0.c b/src/code_3169f0.c deleted file mode 100644 index d55e7653c6..0000000000 --- a/src/code_3169f0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3169f0", func_80200000); diff --git a/src/code_316C00.c b/src/code_316C00.c deleted file mode 100644 index e680528418..0000000000 --- a/src/code_316C00.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_316C00", func_802AE000_316C00); diff --git a/src/code_316a70.c b/src/code_316a70.c deleted file mode 100644 index c2fdcc5e33..0000000000 --- a/src/code_316a70.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_316a70", func_80200080); diff --git a/src/code_316d90.c b/src/code_316d90.c deleted file mode 100644 index 110e9772b3..0000000000 --- a/src/code_316d90.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_316d90", func_802AE000); diff --git a/src/code_316f30.c b/src/code_316f30.c deleted file mode 100644 index d881c837c5..0000000000 --- a/src/code_316f30.c +++ /dev/null @@ -1,26 +0,0 @@ -#include "common.h" -#include "ld_addrs.h" - -void func_80200000(void); -void func_80200080(void); -void func_802AE000(void); - -void func_802B2000(void) { - dma_copy(&code_code_3169F0_ROM_START, &code_code_3169F0_ROM_END, &code_code_3169F0_VRAM); - func_80200000(); -} - -void func_802B203C(void) { - dma_copy(&code_code_316A70_ROM_START, &code_code_316A70_ROM_END, &code_code_316A70_VRAM); - func_80200080(); -} - -void func_802B2078(void) { - dma_copy(&code_code_316C00_ROM_START, &code_code_316C00_ROM_END, &code_code_316C00_VRAM); - func_802AE000(); -} - -void func_802B20B4(void) { - dma_copy(&code_code_316D90_ROM_START, &code_code_316D90_ROM_END, &code_code_316D90_VRAM); - func_802AE000(); -} diff --git a/src/code_325AD0.c b/src/code_325AD0.c deleted file mode 100644 index 6ef70f07e6..0000000000 --- a/src/code_325AD0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_325AD0", func_E0200000); - -INCLUDE_ASM(s32, "code_325AD0", func_E0200044); - -INCLUDE_ASM(s32, "code_325AD0", func_E02000AC); diff --git a/src/code_325EE0.c b/src/code_325EE0.c deleted file mode 100644 index c816f22891..0000000000 --- a/src/code_325EE0.c +++ /dev/null @@ -1,81 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_325EE0", func_E0200410); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200420); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200430); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200440); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200450); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200460); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200470); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200480); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200490); - -INCLUDE_ASM(s32, "code_325EE0", func_E02004A0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02004B0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02004C0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02004D0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02004E0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02004F0); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200500); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200510); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200520); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200530); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200540); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200550); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200560); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200570); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200580); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200590); - -INCLUDE_ASM(s32, "code_325EE0", func_E02005A0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02005B0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02005C0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02005D0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02005E0); - -INCLUDE_ASM(s32, "code_325EE0", func_E02005F0); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200600); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200610); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200620); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200630); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200640); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200650); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200660); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200670); - -INCLUDE_ASM(s32, "code_325EE0", func_E0200680); diff --git a/src/code_3278F0.c b/src/code_3278F0.c deleted file mode 100644 index 20c565b473..0000000000 --- a/src/code_3278F0.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3278F0", func_E0002000); - -void func_E00021B4(void) { -} - -INCLUDE_ASM(s32, "code_3278F0", func_E00021BC); - -INCLUDE_ASM(s32, "code_3278F0", func_E00022BC); - -INCLUDE_ASM(s32, "code_3278F0", func_E0002300); - -void func_E0002738(void) { - func_E02004A0(); -} diff --git a/src/code_328110.c b/src/code_328110.c deleted file mode 100644 index 0ffedede7a..0000000000 --- a/src/code_328110.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_328110", func_E000C000); - -INCLUDE_ASM(s32, "code_328110", func_E000C094); - -INCLUDE_ASM(s32, "code_328110", func_E000C0C8); - -INCLUDE_ASM(s32, "code_328110", func_E000C160); - -void func_E000C64C(void) { -} - -INCLUDE_ASM(s32, "code_328110", func_E000C654); - -INCLUDE_ASM(s32, "code_328110", func_E000C754); - -INCLUDE_ASM(s32, "code_328110", func_E000C798); diff --git a/src/code_32C110.c b/src/code_32C110.c deleted file mode 100644 index 21a3ec2b0d..0000000000 --- a/src/code_32C110.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_32C110", func_E000E000); - -void func_E000E16C(void) { -} - -INCLUDE_ASM(s32, "code_32C110", func_E000E174); - -INCLUDE_ASM(s32, "code_32C110", func_E000E244); - -INCLUDE_ASM(s32, "code_32C110", func_E000E288); diff --git a/src/code_32C7A0.c b/src/code_32C7A0.c deleted file mode 100644 index 044c002689..0000000000 --- a/src/code_32C7A0.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_32C7A0", func_E0010000); - -INCLUDE_ASM(s32, "code_32C7A0", func_E0010104); - -INCLUDE_ASM(s32, "code_32C7A0", func_E00101E8); - -void func_E00103EC(void) { -} - -INCLUDE_ASM(s32, "code_32C7A0", func_E00103F4); - -INCLUDE_ASM(s32, "code_32C7A0", func_E00104B0); - -INCLUDE_ASM(s32, "code_32C7A0", func_E00104F4); - -INCLUDE_ASM(s32, "code_32C7A0", func_E0010510); diff --git a/src/code_32DD10.c b/src/code_32DD10.c deleted file mode 100644 index 46897cdc6f..0000000000 --- a/src/code_32DD10.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_32DD10", func_E0012000); - -INCLUDE_ASM(s32, "code_32DD10", func_E0012104); - -INCLUDE_ASM(s32, "code_32DD10", func_E0012204); - -void func_E0012440(void) { -} - -INCLUDE_ASM(s32, "code_32DD10", func_E0012448); - -INCLUDE_ASM(s32, "code_32DD10", func_E0012504); - -INCLUDE_ASM(s32, "code_32DD10", func_E0012548); - -INCLUDE_ASM(s32, "code_32DD10", func_E0012564); diff --git a/src/code_32E490.c b/src/code_32E490.c deleted file mode 100644 index 921d5d16ee..0000000000 --- a/src/code_32E490.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_32E490", func_E0014000); - -void func_E0014258(void) { -} - -INCLUDE_ASM(s32, "code_32E490", func_E0014260); - -INCLUDE_ASM(s32, "code_32E490", func_E001449C); - -INCLUDE_ASM(s32, "code_32E490", func_E00144E0); diff --git a/src/code_32EE30.c b/src/code_32EE30.c deleted file mode 100644 index 452bd95736..0000000000 --- a/src/code_32EE30.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_32EE30", func_E0016000); - -void func_E0016220(void) { -} - -INCLUDE_ASM(s32, "code_32EE30", func_E0016228); - -INCLUDE_ASM(s32, "code_32EE30", func_E0016410); - -INCLUDE_ASM(s32, "code_32EE30", func_E0016454); diff --git a/src/code_32F580.c b/src/code_32F580.c deleted file mode 100644 index aeadda39a4..0000000000 --- a/src/code_32F580.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_32F580", func_E0018000); - -INCLUDE_ASM(s32, "code_32F580", func_E0018078); - -void func_E00182AC(void) { -} - -INCLUDE_ASM(s32, "code_32F580", func_E00182B4); - -INCLUDE_ASM(s32, "code_32F580", func_E0018378); - -INCLUDE_ASM(s32, "code_32F580", func_E00183BC); - -INCLUDE_ASM(s32, "code_32F580", func_E00183D8); diff --git a/src/code_32FE30.c b/src/code_32FE30.c deleted file mode 100644 index 53bd6977e3..0000000000 --- a/src/code_32FE30.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_32FE30", func_E001A000); - -void func_E001A21C(void) { -} - -INCLUDE_ASM(s32, "code_32FE30", func_E001A224); - -INCLUDE_ASM(s32, "code_32FE30", func_E001A3FC); - -INCLUDE_ASM(s32, "code_32FE30", func_E001A440); diff --git a/src/code_330910.c b/src/code_330910.c deleted file mode 100644 index b4b8e55f77..0000000000 --- a/src/code_330910.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_330910", func_E001C000); - -void func_E001C120(void) { -} - -INCLUDE_ASM(s32, "code_330910", func_E001C128); - -INCLUDE_ASM(s32, "code_330910", func_E001C200); - -INCLUDE_ASM(s32, "code_330910", func_E001C30C); diff --git a/src/code_331940.c b/src/code_331940.c deleted file mode 100644 index 2e02153af1..0000000000 --- a/src/code_331940.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_331940", func_E001E000); - -void func_E001E370(void) { -} - -INCLUDE_ASM(s32, "code_331940", func_E001E378); - -INCLUDE_ASM(s32, "code_331940", func_E001E6E8); - -INCLUDE_ASM(s32, "code_331940", func_E001E730); diff --git a/src/code_333EC0.c b/src/code_333EC0.c deleted file mode 100644 index dbe8a1e632..0000000000 --- a/src/code_333EC0.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_333EC0", func_E0020000); - -INCLUDE_ASM(s32, "code_333EC0", func_E00202CC); - -void func_E0020460(void) { -} - -INCLUDE_ASM(s32, "code_333EC0", func_E0020468); - -INCLUDE_ASM(s32, "code_333EC0", func_E002058C); - -INCLUDE_ASM(s32, "code_333EC0", func_E00205D0); diff --git a/src/code_33450.c b/src/code_33450.c deleted file mode 100644 index 1fe6d2f79e..0000000000 --- a/src/code_33450.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_33450", func_80058050); - -INCLUDE_ASM(s32, "code_33450", func_80058B20); - -INCLUDE_ASM(s32, "code_33450", func_80058C6C); diff --git a/src/code_337240.c b/src/code_337240.c deleted file mode 100644 index d23200bf6a..0000000000 --- a/src/code_337240.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_337240", func_E0022000); - -void func_E0022544(void) { -} - -INCLUDE_ASM(s32, "code_337240", func_E002254C); - -INCLUDE_ASM(s32, "code_337240", func_E0022960); - -INCLUDE_ASM(s32, "code_337240", func_E0022998); diff --git a/src/code_339250.c b/src/code_339250.c deleted file mode 100644 index 1f7129ab02..0000000000 --- a/src/code_339250.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_339250", func_E0024000); - -void func_E0024180(void) { -} - -INCLUDE_ASM(s32, "code_339250", func_E0024188); - -INCLUDE_ASM(s32, "code_339250", func_E00242E0); - -INCLUDE_ASM(s32, "code_339250", func_E0024324); - -INCLUDE_ASM(s32, "code_339250", func_E00243BC); - -INCLUDE_ASM(s32, "code_339250", func_E0024454); diff --git a/src/code_33B180.c b/src/code_33B180.c deleted file mode 100644 index 12de8fd51b..0000000000 --- a/src/code_33B180.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_33B180", func_E0026000); - -void func_E0026184(void) { -} - -INCLUDE_ASM(s32, "code_33B180", func_E002618C); - -INCLUDE_ASM(s32, "code_33B180", func_E00264B0); - -INCLUDE_ASM(s32, "code_33B180", func_E00264F4); diff --git a/src/code_33CDF0.c b/src/code_33CDF0.c deleted file mode 100644 index e8b0c7fb43..0000000000 --- a/src/code_33CDF0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_33CDF0", func_E0028000); - -void func_E0028240(void) { -} - -INCLUDE_ASM(s32, "code_33CDF0", func_E0028248); - -INCLUDE_ASM(s32, "code_33CDF0", func_E00284E8); - -INCLUDE_ASM(s32, "code_33CDF0", func_E002852C); diff --git a/src/code_33E8C0.c b/src/code_33E8C0.c deleted file mode 100644 index 59c5c6f76d..0000000000 --- a/src/code_33E8C0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_33E8C0", func_E002A000); - -void func_E002A284(void) { -} - -INCLUDE_ASM(s32, "code_33E8C0", func_E002A28C); - -INCLUDE_ASM(s32, "code_33E8C0", func_E002A380); - -INCLUDE_ASM(s32, "code_33E8C0", func_E002A3C4); diff --git a/src/code_33FE80.c b/src/code_33FE80.c deleted file mode 100644 index 9612750d27..0000000000 --- a/src/code_33FE80.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_33FE80", func_E002C000); - -void func_E002C234(void) { -} - -INCLUDE_ASM(s32, "code_33FE80", func_E002C23C); - -INCLUDE_ASM(s32, "code_33FE80", func_E002C3D0); - -INCLUDE_ASM(s32, "code_33FE80", func_E002C414); diff --git a/src/code_3419E0.c b/src/code_3419E0.c deleted file mode 100644 index 815ae33fb9..0000000000 --- a/src/code_3419E0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3419E0", func_E002E000); - -void func_E002E248(void) { -} - -INCLUDE_ASM(s32, "code_3419E0", func_E002E250); - -INCLUDE_ASM(s32, "code_3419E0", func_E002E330); - -INCLUDE_ASM(s32, "code_3419E0", func_E002E368); diff --git a/src/code_342140.c b/src/code_342140.c deleted file mode 100644 index a10f1b5bcc..0000000000 --- a/src/code_342140.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_342140", func_E0030000); - -void func_E0030728(void) { -} - -INCLUDE_ASM(s32, "code_342140", func_E0030730); - -INCLUDE_ASM(s32, "code_342140", func_E0030A24); - -INCLUDE_ASM(s32, "code_342140", func_E0030A68); diff --git a/src/code_343680.c b/src/code_343680.c deleted file mode 100644 index 38d8aea253..0000000000 --- a/src/code_343680.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_343680", func_E0032000); - -void func_E00321D0(void) { -} - -INCLUDE_ASM(s32, "code_343680", func_E00321D8); - -INCLUDE_ASM(s32, "code_343680", func_E0032420); - -INCLUDE_ASM(s32, "code_343680", func_E003245C); diff --git a/src/code_344A10.c b/src/code_344A10.c deleted file mode 100644 index df1f9dafea..0000000000 --- a/src/code_344A10.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_344A10", func_E0034000); - -void func_E0034108(void) { -} - -INCLUDE_ASM(s32, "code_344A10", func_E0034110); - -INCLUDE_ASM(s32, "code_344A10", func_E00342C8); - -INCLUDE_ASM(s32, "code_344A10", func_E0034310); diff --git a/src/code_3454E0.c b/src/code_3454E0.c deleted file mode 100644 index 703751159e..0000000000 --- a/src/code_3454E0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3454E0", func_E0036000); - -void func_E00360DC(void) { -} - -INCLUDE_ASM(s32, "code_3454E0", func_E00360E4); - -INCLUDE_ASM(s32, "code_3454E0", func_E00361D8); - -void func_E003621C(void) { -} - -INCLUDE_ASM(s32, "code_3454E0", func_E0036224); diff --git a/src/code_34DD20.c b/src/code_34DD20.c deleted file mode 100644 index 48107b2848..0000000000 --- a/src/code_34DD20.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_34DD20", func_E0038000); - -void func_E003841C(void) { -} - -INCLUDE_ASM(s32, "code_34DD20", func_E0038424); - -INCLUDE_ASM(s32, "code_34DD20", func_E0038704); - -INCLUDE_ASM(s32, "code_34DD20", func_E0038748); diff --git a/src/code_34EC80.c b/src/code_34EC80.c deleted file mode 100644 index 6411b0d208..0000000000 --- a/src/code_34EC80.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_34EC80", func_E003A000); - -void func_E003A1D4(void) { -} - -INCLUDE_ASM(s32, "code_34EC80", func_E003A1DC); - -INCLUDE_ASM(s32, "code_34EC80", func_E003A310); - -INCLUDE_ASM(s32, "code_34EC80", func_E003A354); diff --git a/src/code_34F4C0.c b/src/code_34F4C0.c deleted file mode 100644 index 17b1bc189f..0000000000 --- a/src/code_34F4C0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_34F4C0", func_E003C000); - -void func_E003C23C(void) { -} - -INCLUDE_ASM(s32, "code_34F4C0", func_E003C244); - -void func_E003C474(void) { -} - -INCLUDE_ASM(s32, "code_34F4C0", func_E003C47C); - -INCLUDE_ASM(s32, "code_34F4C0", func_E003C498); diff --git a/src/code_352440.c b/src/code_352440.c deleted file mode 100644 index 0fa90d3ec7..0000000000 --- a/src/code_352440.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_352440", func_E003E000); - -void func_E003E3F8(void) { -} - -INCLUDE_ASM(s32, "code_352440", func_E003E400); - -INCLUDE_ASM(s32, "code_352440", func_E003E5F4); - -INCLUDE_ASM(s32, "code_352440", func_E003E638); diff --git a/src/code_353300.c b/src/code_353300.c deleted file mode 100644 index 7d2b73ff74..0000000000 --- a/src/code_353300.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_353300", func_E0040000); - -void func_E0040148(void) { -} - -INCLUDE_ASM(s32, "code_353300", func_E0040150); - -INCLUDE_ASM(s32, "code_353300", func_E0040210); - -INCLUDE_ASM(s32, "code_353300", func_E0040348); diff --git a/src/code_3547A0.c b/src/code_3547A0.c deleted file mode 100644 index 574961ff3b..0000000000 --- a/src/code_3547A0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3547A0", func_E0042000); - -void func_E004222C(void) { -} - -INCLUDE_ASM(s32, "code_3547A0", func_E0042234); - -INCLUDE_ASM(s32, "code_3547A0", func_E0042374); - -INCLUDE_ASM(s32, "code_3547A0", func_E00423B8); diff --git a/src/code_354F60.c b/src/code_354F60.c deleted file mode 100644 index b54e433d68..0000000000 --- a/src/code_354F60.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_354F60", func_E0044000); - -void func_E004441C(void) { -} - -INCLUDE_ASM(s32, "code_354F60", func_E0044424); - -INCLUDE_ASM(s32, "code_354F60", func_E00448E4); - -INCLUDE_ASM(s32, "code_354F60", func_E004491C); diff --git a/src/code_355EE0.c b/src/code_355EE0.c deleted file mode 100644 index a7ad6bd150..0000000000 --- a/src/code_355EE0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_355EE0", func_E0046000); - -void func_E0046158(void) { -} - -INCLUDE_ASM(s32, "code_355EE0", func_E0046160); - -INCLUDE_ASM(s32, "code_355EE0", func_E004627C); - -INCLUDE_ASM(s32, "code_355EE0", func_E00462C0); diff --git a/src/code_356980.c b/src/code_356980.c deleted file mode 100644 index 07b93118bb..0000000000 --- a/src/code_356980.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_356980", func_E0048000); - -void func_E0048128(void) { -} - -INCLUDE_ASM(s32, "code_356980", func_E0048130); - -INCLUDE_ASM(s32, "code_356980", func_E00481D4); - -INCLUDE_ASM(s32, "code_356980", func_E0048218); diff --git a/src/code_3584C0.c b/src/code_3584C0.c deleted file mode 100644 index 7226d38eb1..0000000000 --- a/src/code_3584C0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3584C0", func_E004A000); - -void func_E004A328(void) { -} - -INCLUDE_ASM(s32, "code_3584C0", func_E004A330); - -INCLUDE_ASM(s32, "code_3584C0", func_E004A748); - -INCLUDE_ASM(s32, "code_3584C0", func_E004A78C); diff --git a/src/code_359F20.c b/src/code_359F20.c deleted file mode 100644 index f641928019..0000000000 --- a/src/code_359F20.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_359F20", func_E004C000); - -void func_E004C204(void) { -} - -INCLUDE_ASM(s32, "code_359F20", func_E004C20C); - -INCLUDE_ASM(s32, "code_359F20", func_E004C364); - -INCLUDE_ASM(s32, "code_359F20", func_E004C3A8); diff --git a/src/code_35B9D0.c b/src/code_35B9D0.c deleted file mode 100644 index 24716cffac..0000000000 --- a/src/code_35B9D0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_35B9D0", func_E004E000); - -void func_E004E15C(void) { -} - -INCLUDE_ASM(s32, "code_35B9D0", func_E004E164); - -INCLUDE_ASM(s32, "code_35B9D0", func_E004E1D0); - -INCLUDE_ASM(s32, "code_35B9D0", func_E004E214); diff --git a/src/code_35BFD0.c b/src/code_35BFD0.c deleted file mode 100644 index 6586ae6130..0000000000 --- a/src/code_35BFD0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_35BFD0", func_E0050000); - -void func_E00501D0(void) { -} - -INCLUDE_ASM(s32, "code_35BFD0", func_E00501D8); - -INCLUDE_ASM(s32, "code_35BFD0", func_E00502C4); - -INCLUDE_ASM(s32, "code_35BFD0", func_E0050308); diff --git a/src/code_35CA80.c b/src/code_35CA80.c deleted file mode 100644 index 0ab1a440cb..0000000000 --- a/src/code_35CA80.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_35CA80", func_E0052000); - -void func_E00520E8(void) { -} - -INCLUDE_ASM(s32, "code_35CA80", func_E00520F0); - -INCLUDE_ASM(s32, "code_35CA80", func_E005241C); - -INCLUDE_ASM(s32, "code_35CA80", func_E0052460); diff --git a/src/code_35DA00.c b/src/code_35DA00.c deleted file mode 100644 index 844c6af9f2..0000000000 --- a/src/code_35DA00.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_35DA00", func_E0056000); - -void func_E0056304(void) { -} - -INCLUDE_ASM(s32, "code_35DA00", func_E005630C); - -INCLUDE_ASM(s32, "code_35DA00", func_E0056B8C); - -INCLUDE_ASM(s32, "code_35DA00", func_E0056BD0); diff --git a/src/code_35E920.c b/src/code_35E920.c deleted file mode 100644 index b78ae7803a..0000000000 --- a/src/code_35E920.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_35E920", func_E0058000); - -void func_E00581AC(void) { -} - -INCLUDE_ASM(s32, "code_35E920", func_E00581B4); - -INCLUDE_ASM(s32, "code_35E920", func_E0058490); - -INCLUDE_ASM(s32, "code_35E920", func_E00584D4); diff --git a/src/code_3602C0.c b/src/code_3602C0.c deleted file mode 100644 index 5590d450c8..0000000000 --- a/src/code_3602C0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3602C0", func_E005A000); - -void func_E005A1F4(void) { -} - -INCLUDE_ASM(s32, "code_3602C0", func_E005A1FC); - -INCLUDE_ASM(s32, "code_3602C0", func_E005A3B0); - -INCLUDE_ASM(s32, "code_3602C0", func_E005A3F4); diff --git a/src/code_360F40.c b/src/code_360F40.c deleted file mode 100644 index 13a801440a..0000000000 --- a/src/code_360F40.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_360F40", func_E005C000); - -void func_E005C178(void) { -} - -INCLUDE_ASM(s32, "code_360F40", func_E005C180); - -INCLUDE_ASM(s32, "code_360F40", func_E005C2B4); - -INCLUDE_ASM(s32, "code_360F40", func_E005C2F8); diff --git a/src/code_3625C0.c b/src/code_3625C0.c deleted file mode 100644 index cb4499552b..0000000000 --- a/src/code_3625C0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3625C0", func_E005E000); - -void func_E005E1B0(void) { -} - -INCLUDE_ASM(s32, "code_3625C0", func_E005E1B8); - -void func_E005E310(void) { -} - -INCLUDE_ASM(s32, "code_3625C0", func_E005E318); - -INCLUDE_ASM(s32, "code_3625C0", func_E005E334); diff --git a/src/code_362a0_len_2f70.c b/src/code_362a0_len_2f70.c deleted file mode 100644 index cea25e633c..0000000000 --- a/src/code_362a0_len_2f70.c +++ /dev/null @@ -1,83 +0,0 @@ -#include "common.h" - -extern s16 D_800D91DC; - -INCLUDE_ASM(s32, "code_362a0_len_2f70", allocate_hit_tables); - -void func_8005AF84(void) { -} - -void func_8005AF8C(void) { -} - -void initialize_collision(void) { - gCollisionData.numColliders = 0; - D_800D91DC = 0; - collision_heap_create(); -} - -INCLUDE_ASM(s32, "code_362a0_len_2f70", load_hit_asset); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", load_collision); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", load_stage_collision); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", load_hit_data); - -INCLUDE_ASM(void, "code_362a0_len_2f70", parent_collider_to_model, s32 colliderID, s16 modelIndex); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", _add_hit_vert_to_buffer); - -s32 _get_hit_vert_index_from_buffer(f32** buffer, f32* vert, s32* bufferSize) { - s32 i; - - for (i = 0; i < *bufferSize; i++) { - if (*buffer == vert) { - break; - } - buffer++; - } - - return i; -} - -INCLUDE_ASM(void, "code_362a0_len_2f70", update_collider_transform, s16 colliderID); - -// Simon says there's a struct size issue here which is causing the subu/addu issue -#ifdef NON_MATCHING -s32 get_collider_type_by_id(s32 colliderID) { - if (colliderID & 0x4000) { - return 0; - } else { - return gCollisionData.collider_list[colliderID].flags; - } -} -#else -INCLUDE_ASM(s32, "code_362a0_len_2f70", get_collider_type_by_id); -#endif - -INCLUDE_ASM(s32, "code_362a0_len_2f70", get_flat_collider_normal); - -INCLUDE_ASM(void, "code_362a0_len_2f70", get_collider_center, s32 colliderID, f32* x, f32* y, f32* z); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_triangle_general); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", test_down_ray_triangle); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", test_up_ray_triangle); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_colliders); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_zones); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", test_up_ray_collider); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", test_ray_entities); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005DB00); - -INCLUDE_ASM(s32, "code_362a0_len_2f70", func_8005DD54); - -s32 func_8005DDF0(void) { - return ~gCurrentEncounter.unk_08 != 0; -} diff --git a/src/code_363160.c b/src/code_363160.c deleted file mode 100644 index fb8e14a883..0000000000 --- a/src/code_363160.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_363160", func_E0060000); - -void func_E00601D8(void) { -} - -INCLUDE_ASM(s32, "code_363160", func_E00601E0); - -INCLUDE_ASM(s32, "code_363160", func_E006040C); - -INCLUDE_ASM(s32, "code_363160", func_E0060450); diff --git a/src/code_364300.c b/src/code_364300.c deleted file mode 100644 index 9ccfba5c4f..0000000000 --- a/src/code_364300.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_364300", func_E0062000); - -void func_E0062218(void) { -} - -INCLUDE_ASM(s32, "code_364300", func_E0062220); - -INCLUDE_ASM(s32, "code_364300", func_E00624A8); - -INCLUDE_ASM(s32, "code_364300", func_E00624EC); diff --git a/src/code_364F10.c b/src/code_364F10.c deleted file mode 100644 index 653d6144ce..0000000000 --- a/src/code_364F10.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_364F10", func_E0064000); - -void func_E006419C(void) { -} - -INCLUDE_ASM(s32, "code_364F10", func_E00641A4); - -INCLUDE_ASM(s32, "code_364F10", func_E00643DC); - -INCLUDE_ASM(s32, "code_364F10", func_E0064414); diff --git a/src/code_366030.c b/src/code_366030.c deleted file mode 100644 index d068ed052f..0000000000 --- a/src/code_366030.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_366030", func_E0066000); - -void func_E0066490(void) { -} - -INCLUDE_ASM(s32, "code_366030", func_E0066498); - -INCLUDE_ASM(s32, "code_366030", func_E006672C); - -INCLUDE_ASM(s32, "code_366030", func_E0066770); diff --git a/src/code_36A8D0.c b/src/code_36A8D0.c deleted file mode 100644 index 9626977654..0000000000 --- a/src/code_36A8D0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_36A8D0", func_E0068000); - -void func_E0068140(void) { -} - -INCLUDE_ASM(s32, "code_36A8D0", func_E0068148); - -INCLUDE_ASM(s32, "code_36A8D0", func_E00681D8); - -INCLUDE_ASM(s32, "code_36A8D0", func_E0068234); diff --git a/src/code_36D020.c b/src/code_36D020.c deleted file mode 100644 index f8aaf0dbc5..0000000000 --- a/src/code_36D020.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_36D020", func_E006A000); - -INCLUDE_ASM(s32, "code_36D020", func_E006A0BC); - -INCLUDE_ASM(s32, "code_36D020", func_E006A1E8); - -void func_E006A45C(void) { -} - -INCLUDE_ASM(s32, "code_36D020", func_E006A464); - -INCLUDE_ASM(s32, "code_36D020", func_E006A580); - -INCLUDE_ASM(s32, "code_36D020", func_E006A814); - -INCLUDE_ASM(s32, "code_36D020", func_E006A85C); - -INCLUDE_ASM(s32, "code_36D020", func_E006A94C); diff --git a/src/code_36E1D0.c b/src/code_36E1D0.c deleted file mode 100644 index e23ff3147d..0000000000 --- a/src/code_36E1D0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_36E1D0", func_E006C000); - -void func_E006C298(void) { -} - -INCLUDE_ASM(s32, "code_36E1D0", func_E006C2A0); - -INCLUDE_ASM(s32, "code_36E1D0", func_E006C5A0); - -INCLUDE_ASM(s32, "code_36E1D0", func_E006C5E8); diff --git a/src/code_372790.c b/src/code_372790.c deleted file mode 100644 index 7287e211b8..0000000000 --- a/src/code_372790.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_372790", func_E006E000); - -void func_E006E354(void) { -} - -INCLUDE_ASM(s32, "code_372790", func_E006E35C); - -INCLUDE_ASM(s32, "code_372790", func_E006E6E4); - -INCLUDE_ASM(s32, "code_372790", func_E006E764); diff --git a/src/code_3740B0.c b/src/code_3740B0.c deleted file mode 100644 index 85ecbd8204..0000000000 --- a/src/code_3740B0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3740B0", func_E0070000); - -void func_E00701EC(void) { -} - -INCLUDE_ASM(s32, "code_3740B0", func_E00701F4); - -INCLUDE_ASM(s32, "code_3740B0", func_E00706F0); - -void func_E0070738(void) { -} - -INCLUDE_ASM(s32, "code_3740B0", func_E0070740); diff --git a/src/code_374E50.c b/src/code_374E50.c deleted file mode 100644 index ebc9700fa2..0000000000 --- a/src/code_374E50.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_374E50", func_E0072000); - -void func_E0072148(void) { -} - -INCLUDE_ASM(s32, "code_374E50", func_E0072150); - -INCLUDE_ASM(s32, "code_374E50", func_E007238C); - -INCLUDE_ASM(s32, "code_374E50", func_E00723D4); diff --git a/src/code_376460.c b/src/code_376460.c deleted file mode 100644 index 2056469220..0000000000 --- a/src/code_376460.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_376460", func_E0074000); - -void func_E00741E0(void) { -} - -INCLUDE_ASM(s32, "code_376460", func_E00741E8); - -INCLUDE_ASM(s32, "code_376460", func_E0074598); - -INCLUDE_ASM(s32, "code_376460", func_E00745E0); diff --git a/src/code_377070.c b/src/code_377070.c deleted file mode 100644 index bcf1f19a95..0000000000 --- a/src/code_377070.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_377070", func_E0076000); - -void func_E0076370(void) { -} - -INCLUDE_ASM(s32, "code_377070", func_E0076378); - -INCLUDE_ASM(s32, "code_377070", func_E0076808); - -void func_E007684C(void) { -} - -void func_E0076854(void) { -} - -INCLUDE_ASM(s32, "code_377070", func_E007685C); diff --git a/src/code_37A3F0.c b/src/code_37A3F0.c deleted file mode 100644 index 936ff4cc7c..0000000000 --- a/src/code_37A3F0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_37A3F0", func_E0078000); - -void func_E0078124(void) { -} - -INCLUDE_ASM(s32, "code_37A3F0", func_E007812C); - -INCLUDE_ASM(s32, "code_37A3F0", func_E0078210); - -void func_E0078274(void) { -} - -INCLUDE_ASM(s32, "code_37A3F0", func_E007827C); diff --git a/src/code_37C540.c b/src/code_37C540.c deleted file mode 100644 index ccca34cd94..0000000000 --- a/src/code_37C540.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_37C540", func_E007A000); - -void func_E007A504(void) { -} - -INCLUDE_ASM(s32, "code_37C540", func_E007A50C); - -INCLUDE_ASM(s32, "code_37C540", func_E007A840); - -void func_E007A884(void) { -} - -INCLUDE_ASM(s32, "code_37C540", func_E007A88C); diff --git a/src/code_37D490.c b/src/code_37D490.c deleted file mode 100644 index 889845a983..0000000000 --- a/src/code_37D490.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_37D490", func_E007C000); - -void func_E007C128(void) { -} - -INCLUDE_ASM(s32, "code_37D490", func_E007C130); - -INCLUDE_ASM(s32, "code_37D490", func_E007C1B0); - -INCLUDE_ASM(s32, "code_37D490", func_E007C1F4); diff --git a/src/code_37F720.c b/src/code_37F720.c deleted file mode 100644 index 2abcdbcdfc..0000000000 --- a/src/code_37F720.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_37F720", func_E007E000); - -void func_E007E1FC(void) { -} - -INCLUDE_ASM(s32, "code_37F720", func_E007E204); - -INCLUDE_ASM(s32, "code_37F720", func_E007E508); - -INCLUDE_ASM(s32, "code_37F720", func_E007E54C); diff --git a/src/code_3812C0.c b/src/code_3812C0.c deleted file mode 100644 index 127a82b00c..0000000000 --- a/src/code_3812C0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3812C0", func_E0080000); - -void func_E00801C8(void) { -} - -INCLUDE_ASM(s32, "code_3812C0", func_E00801D0); - -void func_E0080424(void) { -} - -INCLUDE_ASM(s32, "code_3812C0", func_E008042C); - -INCLUDE_ASM(s32, "code_3812C0", func_E0080448); diff --git a/src/code_385640.c b/src/code_385640.c deleted file mode 100644 index 13238c9d86..0000000000 --- a/src/code_385640.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_385640", func_E0082000); - -void func_E00821B0(void) { -} - -INCLUDE_ASM(s32, "code_385640", func_E00821B8); - -void func_E0082520(void) { -} - -INCLUDE_ASM(s32, "code_385640", func_E0082528); - -INCLUDE_ASM(s32, "code_385640", func_E0082580); - -INCLUDE_ASM(s32, "code_385640", func_E00826C4); - -INCLUDE_ASM(s32, "code_385640", func_E00828B4); - -INCLUDE_ASM(s32, "code_385640", func_E0082A84); diff --git a/src/code_3889D0.c b/src/code_3889D0.c deleted file mode 100644 index 1d0717ca3f..0000000000 --- a/src/code_3889D0.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3889D0", func_E0084000); - -INCLUDE_ASM(s32, "code_3889D0", func_E008403C); - -INCLUDE_ASM(s32, "code_3889D0", func_E0084060); - -INCLUDE_ASM(s32, "code_3889D0", func_E0084084); - -void func_E0084658(void) { -} - -INCLUDE_ASM(s32, "code_3889D0", func_E0084660); - -INCLUDE_ASM(s32, "code_3889D0", func_E00848E4); - -INCLUDE_ASM(s32, "code_3889D0", func_E0084928); diff --git a/src/code_389850.c b/src/code_389850.c deleted file mode 100644 index 32772c4447..0000000000 --- a/src/code_389850.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_389850", func_E0086000); - -void func_E0086270(void) { -} - -INCLUDE_ASM(s32, "code_389850", func_E0086278); - -void func_E0086390(void) { -} - -INCLUDE_ASM(s32, "code_389850", func_E0086398); - -INCLUDE_ASM(s32, "code_389850", func_E00863B4); diff --git a/src/code_38ADF0.c b/src/code_38ADF0.c deleted file mode 100644 index a81a407e00..0000000000 --- a/src/code_38ADF0.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_38ADF0", func_E0088000); - -INCLUDE_ASM(s32, "code_38ADF0", func_E008817C); - -void func_E00885A0(void) { -} - -INCLUDE_ASM(s32, "code_38ADF0", func_E00885A8); - -INCLUDE_ASM(s32, "code_38ADF0", func_E00887A8); - -INCLUDE_ASM(s32, "code_38ADF0", func_E00887E0); diff --git a/src/code_38C5F0.c b/src/code_38C5F0.c deleted file mode 100644 index 530e7ba549..0000000000 --- a/src/code_38C5F0.c +++ /dev/null @@ -1,16 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_38C5F0", func_E008A000); - -INCLUDE_ASM(s32, "code_38C5F0", func_E008A188); - -void func_E008A288(void) { -} - -INCLUDE_ASM(s32, "code_38C5F0", func_E008A290); - -INCLUDE_ASM(s32, "code_38C5F0", func_E008A53C); - -INCLUDE_ASM(s32, "code_38C5F0", func_E008A6E4); - -INCLUDE_ASM(s32, "code_38C5F0", func_E008A728); diff --git a/src/code_38DE00.c b/src/code_38DE00.c deleted file mode 100644 index 5ab833e864..0000000000 --- a/src/code_38DE00.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_38DE00", func_E008C000); - -void func_E008C3F4(void) { -} - -INCLUDE_ASM(s32, "code_38DE00", func_E008C3FC); - -INCLUDE_ASM(s32, "code_38DE00", func_E008C6B8); - -INCLUDE_ASM(s32, "code_38DE00", func_E008C6FC); diff --git a/src/code_38EE60.c b/src/code_38EE60.c deleted file mode 100644 index bbaacb63c8..0000000000 --- a/src/code_38EE60.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_38EE60", func_E008E000); - -void func_E008E1FC(void) { -} - -INCLUDE_ASM(s32, "code_38EE60", func_E008E204); - -INCLUDE_ASM(s32, "code_38EE60", func_E008E498); - -INCLUDE_ASM(s32, "code_38EE60", func_E008E4E0); diff --git a/src/code_38F900.c b/src/code_38F900.c deleted file mode 100644 index a101ffc099..0000000000 --- a/src/code_38F900.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_38F900", func_E0090000); - -void func_E00901C0(void) { -} - -INCLUDE_ASM(s32, "code_38F900", func_E00901C8); - -void func_E0090420(void) { -} - -INCLUDE_ASM(s32, "code_38F900", func_E0090428); - -INCLUDE_ASM(s32, "code_38F900", func_E0090444); diff --git a/src/code_391D30.c b/src/code_391D30.c deleted file mode 100644 index 0a5d78d3e4..0000000000 --- a/src/code_391D30.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_391D30", func_E0092000); - -void func_E00921AC(void) { -} - -INCLUDE_ASM(s32, "code_391D30", func_E00921B4); - -INCLUDE_ASM(s32, "code_391D30", func_E0092258); - -INCLUDE_ASM(s32, "code_391D30", func_E00922A0); diff --git a/src/code_3928D0.c b/src/code_3928D0.c deleted file mode 100644 index d9c506443d..0000000000 --- a/src/code_3928D0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3928D0", func_E0094000); - -void func_E0094190(void) { -} - -INCLUDE_ASM(s32, "code_3928D0", func_E0094198); - -INCLUDE_ASM(s32, "code_3928D0", func_E00942C0); - -INCLUDE_ASM(s32, "code_3928D0", func_E00942FC); diff --git a/src/code_394280.c b/src/code_394280.c deleted file mode 100644 index d2e592cf52..0000000000 --- a/src/code_394280.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_394280", func_E0096000); - -void func_E00960EC(void) { -} - -INCLUDE_ASM(s32, "code_394280", func_E00960F4); - -INCLUDE_ASM(s32, "code_394280", func_E0096178); - -INCLUDE_ASM(s32, "code_394280", func_E00961BC); diff --git a/src/code_395BB0.c b/src/code_395BB0.c deleted file mode 100644 index e23e7a1a57..0000000000 --- a/src/code_395BB0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_395BB0", func_E0098000); - -void func_E0098168(void) { -} - -INCLUDE_ASM(s32, "code_395BB0", func_E0098170); - -INCLUDE_ASM(s32, "code_395BB0", func_E009829C); - -INCLUDE_ASM(s32, "code_395BB0", func_E00982EC); diff --git a/src/code_3965B0.c b/src/code_3965B0.c deleted file mode 100644 index 9987fdba67..0000000000 --- a/src/code_3965B0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3965B0", func_E009A000); - -void func_E009A138(void) { -} - -INCLUDE_ASM(s32, "code_3965B0", func_E009A140); - -INCLUDE_ASM(s32, "code_3965B0", func_E009A398); - -INCLUDE_ASM(s32, "code_3965B0", func_E009A3E0); diff --git a/src/code_3981F0.c b/src/code_3981F0.c deleted file mode 100644 index 54295c1c03..0000000000 --- a/src/code_3981F0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3981F0", func_E009C000); - -void func_E009C100(void) { -} - -INCLUDE_ASM(s32, "code_3981F0", func_E009C108); - -INCLUDE_ASM(s32, "code_3981F0", func_E009C1DC); - -INCLUDE_ASM(s32, "code_3981F0", func_E009C220); diff --git a/src/code_39FF20.c b/src/code_39FF20.c deleted file mode 100644 index 38ac9b97d5..0000000000 --- a/src/code_39FF20.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_39FF20", func_E009E000); - -void func_E009E1DC(void) { -} - -INCLUDE_ASM(s32, "code_39FF20", func_E009E1E4); - -INCLUDE_ASM(s32, "code_39FF20", func_E009E3DC); - -INCLUDE_ASM(s32, "code_39FF20", func_E009E424); diff --git a/src/code_3A2290.c b/src/code_3A2290.c deleted file mode 100644 index c79c457598..0000000000 --- a/src/code_3A2290.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3A2290", func_E00A0000); diff --git a/src/code_3A2990.c b/src/code_3A2990.c deleted file mode 100644 index c1fd1b6bb0..0000000000 --- a/src/code_3A2990.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3A2990", func_E00A2000); - -void func_E00A2118(void) { -} - -INCLUDE_ASM(s32, "code_3A2990", func_E00A2120); - -INCLUDE_ASM(s32, "code_3A2990", func_E00A21EC); - -void func_E00A2234(void) { -} - -INCLUDE_ASM(s32, "code_3A2990", func_E00A223C); diff --git a/src/code_3A37E0.c b/src/code_3A37E0.c deleted file mode 100644 index 1c20c558b2..0000000000 --- a/src/code_3A37E0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3A37E0", func_E00A4000); - -void func_E00A41A4(void) { -} - -INCLUDE_ASM(s32, "code_3A37E0", func_E00A41AC); - -INCLUDE_ASM(s32, "code_3A37E0", func_E00A45DC); - -void func_E00A4648(void) { -} - -INCLUDE_ASM(s32, "code_3A37E0", func_E00A4650); diff --git a/src/code_3A5550.c b/src/code_3A5550.c deleted file mode 100644 index 8dbcb247b5..0000000000 --- a/src/code_3A5550.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3A5550", func_E00A6000); - -void func_E00A611C(void) { -} - -INCLUDE_ASM(s32, "code_3A5550", func_E00A6124); - -INCLUDE_ASM(s32, "code_3A5550", func_E00A6358); - -void func_E00A639C(void) { -} - -INCLUDE_ASM(s32, "code_3A5550", func_E00A63A4); diff --git a/src/code_3A70F0.c b/src/code_3A70F0.c deleted file mode 100644 index e90bfb53f9..0000000000 --- a/src/code_3A70F0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3A70F0", func_E00A8000); - -void func_E00A80FC(void) { -} - -INCLUDE_ASM(s32, "code_3A70F0", func_E00A8104); - -INCLUDE_ASM(s32, "code_3A70F0", func_E00A82D4); - -void func_E00A8318(void) { -} - -INCLUDE_ASM(s32, "code_3A70F0", func_E00A8320); diff --git a/src/code_3AA920.c b/src/code_3AA920.c deleted file mode 100644 index 457f85631f..0000000000 --- a/src/code_3AA920.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3AA920", func_E00AA000); - -void func_E00AA104(void) { -} - -INCLUDE_ASM(s32, "code_3AA920", func_E00AA10C); - -INCLUDE_ASM(s32, "code_3AA920", func_E00AA3C0); - -INCLUDE_ASM(s32, "code_3AA920", func_E00AA404); diff --git a/src/code_3AEE20.c b/src/code_3AEE20.c deleted file mode 100644 index 331f47d1e4..0000000000 --- a/src/code_3AEE20.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3AEE20", func_E00AC000); - -void func_E00AC11C(void) { -} - -INCLUDE_ASM(s32, "code_3AEE20", func_E00AC124); - -void func_E00AC280(void) { -} - -INCLUDE_ASM(s32, "code_3AEE20", func_E00AC288); - -INCLUDE_ASM(s32, "code_3AEE20", func_E00AC2A4); diff --git a/src/code_3B2350.c b/src/code_3B2350.c deleted file mode 100644 index c27c42b165..0000000000 --- a/src/code_3B2350.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3B2350", func_E00AE000); - -void func_E00AE1AC(void) { -} - -INCLUDE_ASM(s32, "code_3B2350", func_E00AE1B4); - -INCLUDE_ASM(s32, "code_3B2350", func_E00AE4FC); - -void func_E00AE544(void) { -} - -INCLUDE_ASM(s32, "code_3B2350", func_E00AE54C); diff --git a/src/code_3B3EB0.c b/src/code_3B3EB0.c deleted file mode 100644 index ef7cd508d4..0000000000 --- a/src/code_3B3EB0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3B3EB0", func_E00B0000); - -void func_E00B011C(void) { -} - -INCLUDE_ASM(s32, "code_3B3EB0", func_E00B0124); - -INCLUDE_ASM(s32, "code_3B3EB0", func_E00B01F8); - -INCLUDE_ASM(s32, "code_3B3EB0", func_E00B0234); diff --git a/src/code_3B4790.c b/src/code_3B4790.c deleted file mode 100644 index 4ff72ebfaa..0000000000 --- a/src/code_3B4790.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3B4790", func_E00B2000); - -void func_E00B21DC(void) { -} - -INCLUDE_ASM(s32, "code_3B4790", func_E00B21E4); - -INCLUDE_ASM(s32, "code_3B4790", func_E00B2460); - -void func_E00B24A8(void) { -} - -INCLUDE_ASM(s32, "code_3B4790", func_E00B24B0); diff --git a/src/code_3B5CF0.c b/src/code_3B5CF0.c deleted file mode 100644 index 8efc896914..0000000000 --- a/src/code_3B5CF0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3B5CF0", func_E00B4000); - -void func_E00B4134(void) { -} - -INCLUDE_ASM(s32, "code_3B5CF0", func_E00B413C); - -INCLUDE_ASM(s32, "code_3B5CF0", func_E00B452C); - -void func_E00B4574(void) { -} - -INCLUDE_ASM(s32, "code_3B5CF0", func_E00B457C); diff --git a/src/code_3B7160.c b/src/code_3B7160.c deleted file mode 100644 index e4b5099875..0000000000 --- a/src/code_3B7160.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3B7160", func_E00B6000); - -void func_E00B6178(void) { -} - -INCLUDE_ASM(s32, "code_3B7160", func_E00B6180); - -INCLUDE_ASM(s32, "code_3B7160", func_E00B629C); - -void func_E00B62D8(void) { -} - -INCLUDE_ASM(s32, "code_3B7160", func_E00B62E0); diff --git a/src/code_3B7B80.c b/src/code_3B7B80.c deleted file mode 100644 index fd74a1e60c..0000000000 --- a/src/code_3B7B80.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3B7B80", func_E00B8000); - -void func_E00B812C(void) { -} - -INCLUDE_ASM(s32, "code_3B7B80", func_E00B8134); - -INCLUDE_ASM(s32, "code_3B7B80", func_E00B81B8); - -void func_E00B8200(void) { -} - -INCLUDE_ASM(s32, "code_3B7B80", func_E00B8208); diff --git a/src/code_3B8BD0.c b/src/code_3B8BD0.c deleted file mode 100644 index e7e9592c85..0000000000 --- a/src/code_3B8BD0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA000); - -void func_E00BA16C(void) { -} - -INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA174); - -INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA5DC); - -void func_E00BA618(void) { -} - -INCLUDE_ASM(s32, "code_3B8BD0", func_E00BA620); diff --git a/src/code_3BA030.c b/src/code_3BA030.c deleted file mode 100644 index fcaa167d42..0000000000 --- a/src/code_3BA030.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3BA030", func_E00BC000); - -void func_E00BC1D0(void) { -} - -INCLUDE_ASM(s32, "code_3BA030", func_E00BC1D8); - -INCLUDE_ASM(s32, "code_3BA030", func_E00BC238); - -INCLUDE_ASM(s32, "code_3BA030", func_E00BC2E8); - -void func_E00BC36C(void) { -} - -INCLUDE_ASM(s32, "code_3BA030", func_E00BC374); diff --git a/src/code_3BBF60.c b/src/code_3BBF60.c deleted file mode 100644 index f7401c8ce4..0000000000 --- a/src/code_3BBF60.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3BBF60", func_E00BE000); - -void func_E00BE39C(void) { -} - -INCLUDE_ASM(s32, "code_3BBF60", func_E00BE3A4); - -INCLUDE_ASM(s32, "code_3BBF60", func_E00BE578); - -void func_E00BE5B4(void) { -} - -INCLUDE_ASM(s32, "code_3BBF60", func_E00BE5BC); diff --git a/src/code_3BCD60.c b/src/code_3BCD60.c deleted file mode 100644 index 126a90a8f2..0000000000 --- a/src/code_3BCD60.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3BCD60", func_E00C0000); - -void func_E00C0158(void) { -} - -INCLUDE_ASM(s32, "code_3BCD60", func_E00C0160); - -INCLUDE_ASM(s32, "code_3BCD60", func_E00C0710); - -void func_E00C0758(void) { -} - -INCLUDE_ASM(s32, "code_3BCD60", func_E00C0760); diff --git a/src/code_3C11D0.c b/src/code_3C11D0.c deleted file mode 100644 index 105c448ced..0000000000 --- a/src/code_3C11D0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3C11D0", func_E00C2000); - -void func_E00C2124(void) { -} - -INCLUDE_ASM(s32, "code_3C11D0", func_E00C212C); - -INCLUDE_ASM(s32, "code_3C11D0", func_E00C21CC); - -void func_E00C2214(void) { -} - -INCLUDE_ASM(s32, "code_3C11D0", func_E00C221C); diff --git a/src/code_3CADF0.c b/src/code_3CADF0.c deleted file mode 100644 index c51e4cfa09..0000000000 --- a/src/code_3CADF0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3CADF0", func_E00C4000); - -void func_E00C4170(void) { -} - -INCLUDE_ASM(s32, "code_3CADF0", func_E00C4178); - -INCLUDE_ASM(s32, "code_3CADF0", func_E00C42C4); - -void func_E00C4300(void) { -} - -INCLUDE_ASM(s32, "code_3CADF0", func_E00C4308); diff --git a/src/code_3CC9E0.c b/src/code_3CC9E0.c deleted file mode 100644 index f0c212ef72..0000000000 --- a/src/code_3CC9E0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3CC9E0", func_E00C6000); - -void func_E00C6394(void) { -} - -INCLUDE_ASM(s32, "code_3CC9E0", func_E00C639C); - -INCLUDE_ASM(s32, "code_3CC9E0", func_E00C6768); - -INCLUDE_ASM(s32, "code_3CC9E0", func_E00C67B0); diff --git a/src/code_3CF3A0.c b/src/code_3CF3A0.c deleted file mode 100644 index 51bfd88df3..0000000000 --- a/src/code_3CF3A0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8000); - -void func_E00C8218(void) { -} - -INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8220); - -INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8404); - -void func_E00C844C(void) { -} - -INCLUDE_ASM(s32, "code_3CF3A0", func_E00C8454); diff --git a/src/code_3D0500.c b/src/code_3D0500.c deleted file mode 100644 index 3e7f6267a4..0000000000 --- a/src/code_3D0500.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D0500", func_E00CA000); - -void func_E00CA240(void) { -} - -INCLUDE_ASM(s32, "code_3D0500", func_E00CA248); - -INCLUDE_ASM(s32, "code_3D0500", func_E00CA484); - -INCLUDE_ASM(s32, "code_3D0500", func_E00CA4CC); diff --git a/src/code_3D1690.c b/src/code_3D1690.c deleted file mode 100644 index e6c0129190..0000000000 --- a/src/code_3D1690.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D1690", func_E00CC000); - -void func_E00CC250(void) { -} - -INCLUDE_ASM(s32, "code_3D1690", func_E00CC258); - -INCLUDE_ASM(s32, "code_3D1690", func_E00CC980); - -void func_E00CC9C8(void) { -} - -INCLUDE_ASM(s32, "code_3D1690", func_E00CC9D0); diff --git a/src/code_3D2AC0.c b/src/code_3D2AC0.c deleted file mode 100644 index 61d57a5441..0000000000 --- a/src/code_3D2AC0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE000); - -void func_E00CE21C(void) { -} - -INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE224); - -INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE428); - -void func_E00CE470(void) { -} - -INCLUDE_ASM(s32, "code_3D2AC0", func_E00CE478); diff --git a/src/code_3D3E20.c b/src/code_3D3E20.c deleted file mode 100644 index 877a4f4037..0000000000 --- a/src/code_3D3E20.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D3E20", func_E00D0000); - -void func_E00D018C(void) { -} - -INCLUDE_ASM(s32, "code_3D3E20", func_E00D0194); - -INCLUDE_ASM(s32, "code_3D3E20", func_E00D0448); - -INCLUDE_ASM(s32, "code_3D3E20", func_E00D048C); diff --git a/src/code_3D4970.c b/src/code_3D4970.c deleted file mode 100644 index 0dd44de42b..0000000000 --- a/src/code_3D4970.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D4970", func_E00D2000); - -void func_E00D2118(void) { -} - -INCLUDE_ASM(s32, "code_3D4970", func_E00D2120); - -INCLUDE_ASM(s32, "code_3D4970", func_E00D2234); - -void func_E00D227C(void) { -} - -INCLUDE_ASM(s32, "code_3D4970", func_E00D2284); diff --git a/src/code_3D5020.c b/src/code_3D5020.c deleted file mode 100644 index e148664429..0000000000 --- a/src/code_3D5020.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D5020", func_E00D6000); - -void func_E00D6718(void) { -} - -INCLUDE_ASM(s32, "code_3D5020", func_E00D6720); - -INCLUDE_ASM(s32, "code_3D5020", func_E00D693C); - -void func_E00D6978(void) { -} - -INCLUDE_ASM(s32, "code_3D5020", func_E00D6980); diff --git a/src/code_3D7240.c b/src/code_3D7240.c deleted file mode 100644 index c6abaf2792..0000000000 --- a/src/code_3D7240.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D7240", func_E00DA000); - -void func_E00DA0FC(void) { -} - -INCLUDE_ASM(s32, "code_3D7240", func_E00DA104); - -INCLUDE_ASM(s32, "code_3D7240", func_E00DA1E0); - -void func_E00DA228(void) { -} - -INCLUDE_ASM(s32, "code_3D7240", func_E00DA230); diff --git a/src/code_3D7A70.c b/src/code_3D7A70.c deleted file mode 100644 index d3299fe00d..0000000000 --- a/src/code_3D7A70.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D7A70", func_E00DC000); - -void func_E00DC190(void) { -} - -INCLUDE_ASM(s32, "code_3D7A70", func_E00DC198); - -INCLUDE_ASM(s32, "code_3D7A70", func_E00DC2C0); - -void func_E00DC2FC(void) { -} - -INCLUDE_ASM(s32, "code_3D7A70", func_E00DC304); diff --git a/src/code_3D8720.c b/src/code_3D8720.c deleted file mode 100644 index 837bf15c37..0000000000 --- a/src/code_3D8720.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3D8720", func_E00DE000); - -void func_E00DE11C(void) { -} - -INCLUDE_ASM(s32, "code_3D8720", func_E00DE124); - -INCLUDE_ASM(s32, "code_3D8720", func_E00DE260); - -INCLUDE_ASM(s32, "code_3D8720", func_E00DE2A8); diff --git a/src/code_3DB460.c b/src/code_3DB460.c deleted file mode 100644 index 85421c159a..0000000000 --- a/src/code_3DB460.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3DB460", func_E00E0000); - -void func_E00E01D0(void) { -} - -INCLUDE_ASM(s32, "code_3DB460", func_E00E01D8); - -INCLUDE_ASM(s32, "code_3DB460", func_E00E05B0); - -void func_E00E05F8(void) { -} - -INCLUDE_ASM(s32, "code_3DB460", func_E00E0600); diff --git a/src/code_3DC310.c b/src/code_3DC310.c deleted file mode 100644 index e0049bd390..0000000000 --- a/src/code_3DC310.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3DC310", func_E00E2000); - -void func_E00E212C(void) { -} - -INCLUDE_ASM(s32, "code_3DC310", func_E00E2134); - -INCLUDE_ASM(s32, "code_3DC310", func_E00E21C8); - -void func_E00E2210(void) { -} - -INCLUDE_ASM(s32, "code_3DC310", func_E00E2218); diff --git a/src/code_3DE000.c b/src/code_3DE000.c deleted file mode 100644 index d0e30e34d4..0000000000 --- a/src/code_3DE000.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3DE000", func_E00E4000); - -void func_E00E4288(void) { -} - -INCLUDE_ASM(s32, "code_3DE000", func_E00E4290); - -INCLUDE_ASM(s32, "code_3DE000", func_E00E490C); - -void func_E00E4954(void) { -} - -INCLUDE_ASM(s32, "code_3DE000", func_E00E495C); diff --git a/src/code_3E0930.c b/src/code_3E0930.c deleted file mode 100644 index 47d289863f..0000000000 --- a/src/code_3E0930.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3E0930", func_E00E6000); - -void func_E00E617C(void) { -} - -INCLUDE_ASM(s32, "code_3E0930", func_E00E6184); - -INCLUDE_ASM(s32, "code_3E0930", func_E00E64D4); - -void func_E00E651C(void) { -} - -INCLUDE_ASM(s32, "code_3E0930", func_E00E6524); diff --git a/src/code_3E1690.c b/src/code_3E1690.c deleted file mode 100644 index 1346ddb4b1..0000000000 --- a/src/code_3E1690.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3E1690", func_E00E8000); - -void func_E00E825C(void) { -} - -INCLUDE_ASM(s32, "code_3E1690", func_E00E8264); - -INCLUDE_ASM(s32, "code_3E1690", func_E00E8374); - -INCLUDE_ASM(s32, "code_3E1690", func_E00E83BC); diff --git a/src/code_3E1EE0.c b/src/code_3E1EE0.c deleted file mode 100644 index a01d166f8f..0000000000 --- a/src/code_3E1EE0.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA000); - -void func_E00EA190(void) { -} - -INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA198); - -INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA520); - -void func_E00EA664(void) { -} - -INCLUDE_ASM(s32, "code_3E1EE0", func_E00EA66C); diff --git a/src/code_3E43A0.c b/src/code_3E43A0.c deleted file mode 100644 index 07e124a2f9..0000000000 --- a/src/code_3E43A0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3E43A0", func_E010A000); - -void func_E010A184(void) { -} - -INCLUDE_ASM(s32, "code_3E43A0", func_E010A18C); - -INCLUDE_ASM(s32, "code_3E43A0", func_E010A4A0); - -INCLUDE_ASM(s32, "code_3E43A0", func_E010A4E8); diff --git a/src/code_3E54C0.c b/src/code_3E54C0.c deleted file mode 100644 index 18b4e6159d..0000000000 --- a/src/code_3E54C0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3E54C0", func_E010C000); - -void func_E010C190(void) { -} - -INCLUDE_ASM(s32, "code_3E54C0", func_E010C198); - -INCLUDE_ASM(s32, "code_3E54C0", func_E010C354); - -INCLUDE_ASM(s32, "code_3E54C0", func_E010C39C); diff --git a/src/code_3EB4E0.c b/src/code_3EB4E0.c deleted file mode 100644 index 0cefd02a9d..0000000000 --- a/src/code_3EB4E0.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3EB4E0", func_E010E000); - -INCLUDE_ASM(s32, "code_3EB4E0", func_E010E32C); - -void func_E010E4A0(void) { -} - -INCLUDE_ASM(s32, "code_3EB4E0", func_E010E4A8); - -INCLUDE_ASM(s32, "code_3EB4E0", func_E010E510); - -INCLUDE_ASM(s32, "code_3EB4E0", func_E010E558); diff --git a/src/code_3F83F0.c b/src/code_3F83F0.c deleted file mode 100644 index 1b1e7a0bc5..0000000000 --- a/src/code_3F83F0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3F83F0", func_E0110000); - -void func_E0110224(void) { -} - -INCLUDE_ASM(s32, "code_3F83F0", func_E011022C); - -INCLUDE_ASM(s32, "code_3F83F0", func_E01103A4); - -INCLUDE_ASM(s32, "code_3F83F0", func_E01103EC); diff --git a/src/code_3F9E50.c b/src/code_3F9E50.c deleted file mode 100644 index b3b240aebc..0000000000 --- a/src/code_3F9E50.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3F9E50", func_E0112000); - -void func_E01121B8(void) { -} - -INCLUDE_ASM(s32, "code_3F9E50", func_E01121C0); - -INCLUDE_ASM(s32, "code_3F9E50", func_E01122E8); - -INCLUDE_ASM(s32, "code_3F9E50", func_E0112330); - -INCLUDE_ASM(s32, "code_3F9E50", func_E01124CC); diff --git a/src/code_3FEAE0.c b/src/code_3FEAE0.c deleted file mode 100644 index 5403311b35..0000000000 --- a/src/code_3FEAE0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_3FEAE0", func_E0114000); - -void func_E01140D4(void) { -} - -INCLUDE_ASM(s32, "code_3FEAE0", func_E01140DC); - -INCLUDE_ASM(s32, "code_3FEAE0", func_E0114340); - -INCLUDE_ASM(s32, "code_3FEAE0", func_E0114388); diff --git a/src/code_402640.c b/src/code_402640.c deleted file mode 100644 index 1f52ef2db9..0000000000 --- a/src/code_402640.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_402640", func_E0116000); - -void func_E0116184(void) { -} - -INCLUDE_ASM(s32, "code_402640", func_E011618C); - -INCLUDE_ASM(s32, "code_402640", func_E01166A0); - -INCLUDE_ASM(s32, "code_402640", func_E01166E8); - -INCLUDE_ASM(s32, "code_402640", func_E0116884); diff --git a/src/code_403400.c b/src/code_403400.c deleted file mode 100644 index 93e77bbaf7..0000000000 --- a/src/code_403400.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_403400", func_E0118000); - -void func_E01182EC(void) { -} - -INCLUDE_ASM(s32, "code_403400", func_E01182F4); - -INCLUDE_ASM(s32, "code_403400", func_E0118454); - -INCLUDE_ASM(s32, "code_403400", func_E011849C); diff --git a/src/code_406B40.c b/src/code_406B40.c deleted file mode 100644 index 6d8fa48328..0000000000 --- a/src/code_406B40.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_406B40", func_E011C000); - -void func_E011C0F4(void) { -} - -INCLUDE_ASM(s32, "code_406B40", func_E011C0FC); - -INCLUDE_ASM(s32, "code_406B40", func_E011C17C); - -INCLUDE_ASM(s32, "code_406B40", func_E011C1C4); diff --git a/src/code_409990.c b/src/code_409990.c deleted file mode 100644 index 366dc8e783..0000000000 --- a/src/code_409990.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_409990", func_E011E000); - -void func_E011E18C(void) { -} - -INCLUDE_ASM(s32, "code_409990", func_E011E194); - -INCLUDE_ASM(s32, "code_409990", func_E011E530); - -INCLUDE_ASM(s32, "code_409990", func_E011E578); diff --git a/src/code_40B3F0.c b/src/code_40B3F0.c deleted file mode 100644 index 58bbc7b6b5..0000000000 --- a/src/code_40B3F0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_40B3F0", func_E0120000); - -void func_E0120134(void) { -} - -INCLUDE_ASM(s32, "code_40B3F0", func_E012013C); - -INCLUDE_ASM(s32, "code_40B3F0", func_E012039C); - -INCLUDE_ASM(s32, "code_40B3F0", func_E01203E4); diff --git a/src/code_40C5A0.c b/src/code_40C5A0.c deleted file mode 100644 index 43ca3d21a1..0000000000 --- a/src/code_40C5A0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_40C5A0", func_E0122000); - -void func_E0122174(void) { -} - -INCLUDE_ASM(s32, "code_40C5A0", func_E012217C); - -INCLUDE_ASM(s32, "code_40C5A0", func_E01226C4); - -INCLUDE_ASM(s32, "code_40C5A0", func_E012270C); diff --git a/src/code_412730.c b/src/code_412730.c deleted file mode 100644 index 56b3de6439..0000000000 --- a/src/code_412730.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_412730", func_E0124000); - -void func_E01242FC(void) { -} - -INCLUDE_ASM(s32, "code_412730", func_E0124304); - -INCLUDE_ASM(s32, "code_412730", func_E012448C); - -INCLUDE_ASM(s32, "code_412730", func_E01244C4); diff --git a/src/code_413360.c b/src/code_413360.c deleted file mode 100644 index 5e3cbd16da..0000000000 --- a/src/code_413360.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_413360", func_E0126000); - -void func_E012612C(void) { -} - -INCLUDE_ASM(s32, "code_413360", func_E0126134); - -INCLUDE_ASM(s32, "code_413360", func_E01264A4); - -INCLUDE_ASM(s32, "code_413360", func_E01264EC); diff --git a/src/code_414BA0.c b/src/code_414BA0.c deleted file mode 100644 index ef3d240873..0000000000 --- a/src/code_414BA0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_414BA0", func_E0128000); - -void func_E0128128(void) { -} - -INCLUDE_ASM(s32, "code_414BA0", func_E0128130); - -INCLUDE_ASM(s32, "code_414BA0", func_E0128198); - -INCLUDE_ASM(s32, "code_414BA0", func_E01281E0); diff --git a/src/code_4219F0.c b/src/code_4219F0.c deleted file mode 100644 index 68ae79a739..0000000000 --- a/src/code_4219F0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_4219F0", func_802A9000_4219F0); - -INCLUDE_ASM(s32, "code_4219F0", func_802A9120_421B10); - -INCLUDE_ASM(s32, "code_4219F0", func_802A9234_421C24); - -INCLUDE_ASM(s32, "code_4219F0", func_802A9544_421F34); - -INCLUDE_ASM(s32, "code_4219F0", func_802A9590_421F80); diff --git a/src/code_422000.c b/src/code_422000.c deleted file mode 100644 index 7fbcc8abca..0000000000 --- a/src/code_422000.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_422000", func_802A9000_422000); - -INCLUDE_ASM(s32, "code_422000", func_802A9258_422258); - -INCLUDE_ASM(s32, "code_422000", func_802A936C_42236C); - -INCLUDE_ASM(s32, "code_422000", func_802A99D4_4229D4); - -INCLUDE_ASM(s32, "code_422000", func_802A9A30_422A30); diff --git a/src/code_422AD0.c b/src/code_422AD0.c deleted file mode 100644 index ad3db861cd..0000000000 --- a/src/code_422AD0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_422AD0", func_802A9000_422AD0); - -INCLUDE_ASM(s32, "code_422AD0", func_802A92A0_422D70); - -INCLUDE_ASM(s32, "code_422AD0", func_802A9378_422E48); - -INCLUDE_ASM(s32, "code_422AD0", func_802A96F4_4231C4); - -INCLUDE_ASM(s32, "code_422AD0", func_802A9894_423364); diff --git a/src/code_4233F0.c b/src/code_4233F0.c deleted file mode 100644 index 6cf155e167..0000000000 --- a/src/code_4233F0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_4233F0", func_802A9000_4233F0); - -INCLUDE_ASM(s32, "code_4233F0", func_802A91B0_4235A0); - -INCLUDE_ASM(s32, "code_4233F0", func_802A92DC_4236CC); - -INCLUDE_ASM(s32, "code_4233F0", func_802A96B8_423AA8); - -INCLUDE_ASM(s32, "code_4233F0", func_802A97FC_423BEC); diff --git a/src/code_423C70.c b/src/code_423C70.c deleted file mode 100644 index 406011eebb..0000000000 --- a/src/code_423C70.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_423C70", func_802A9000_423C70); - -INCLUDE_ASM(s32, "code_423C70", func_802A91E0_423E50); - -INCLUDE_ASM(s32, "code_423C70", func_802A92F0_423F60); - -INCLUDE_ASM(s32, "code_423C70", func_802A9744_4243B4); - -INCLUDE_ASM(s32, "code_423C70", func_802A9898_424508); diff --git a/src/code_425590.c b/src/code_425590.c deleted file mode 100644 index 7b108b71dd..0000000000 --- a/src/code_425590.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_425590", func_802A9000_425590); - -INCLUDE_ASM(s32, "code_425590", func_802A9110_4256A0); - -INCLUDE_ASM(s32, "code_425590", func_802A91F8_425788); - -INCLUDE_ASM(s32, "code_425590", func_802A94A4_425A34); - -INCLUDE_ASM(s32, "code_425590", func_802A9544_425AD4); diff --git a/src/code_425B50.c b/src/code_425B50.c deleted file mode 100644 index d4537d347d..0000000000 --- a/src/code_425B50.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_425B50", func_802A9000_425B50); - -INCLUDE_ASM(s32, "code_425B50", func_802A916C_425CBC); - -INCLUDE_ASM(s32, "code_425B50", func_802A9228_425D78); - -INCLUDE_ASM(s32, "code_425B50", func_802A94D8_426028); - -INCLUDE_ASM(s32, "code_425B50", func_802A959C_4260EC); diff --git a/src/code_426170.c b/src/code_426170.c deleted file mode 100644 index 011da53585..0000000000 --- a/src/code_426170.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_426170", func_802A9000_426170); - -INCLUDE_ASM(s32, "code_426170", func_802A9170_4262E0); - -INCLUDE_ASM(s32, "code_426170", func_802A928C_4263FC); - -INCLUDE_ASM(s32, "code_426170", func_802A96DC_42684C); - -INCLUDE_ASM(s32, "code_426170", func_802A97BC_42692C); diff --git a/src/code_4269D0.c b/src/code_4269D0.c deleted file mode 100644 index 7e0f395517..0000000000 --- a/src/code_4269D0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_4269D0", func_802A9000_4269D0); - -INCLUDE_ASM(s32, "code_4269D0", func_802A9178_426B48); - -INCLUDE_ASM(s32, "code_4269D0", func_802A9294_426C64); - -INCLUDE_ASM(s32, "code_4269D0", func_802A9834_427204); - -INCLUDE_ASM(s32, "code_4269D0", func_802A9914_4272E4); diff --git a/src/code_4273B0.c b/src/code_4273B0.c deleted file mode 100644 index 3b7f318367..0000000000 --- a/src/code_4273B0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_4273B0", func_802A9000_4273B0); - -INCLUDE_ASM(s32, "code_4273B0", func_802A9170_427520); - -INCLUDE_ASM(s32, "code_4273B0", func_802A928C_42763C); - -INCLUDE_ASM(s32, "code_4273B0", func_802A955C_42790C); - -INCLUDE_ASM(s32, "code_4273B0", func_802A963C_4279EC); diff --git a/src/code_427A70.c b/src/code_427A70.c deleted file mode 100644 index 2d42cfa0f6..0000000000 --- a/src/code_427A70.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_427A70", func_802A9000_427A70); - -INCLUDE_ASM(s32, "code_427A70", func_802A9170_427BE0); - -INCLUDE_ASM(s32, "code_427A70", func_802A928C_427CFC); - -INCLUDE_ASM(s32, "code_427A70", func_802A96EC_42815C); - -INCLUDE_ASM(s32, "code_427A70", func_802A97CC_42823C); diff --git a/src/code_4282E0.c b/src/code_4282E0.c deleted file mode 100644 index 8d664bd4ca..0000000000 --- a/src/code_4282E0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_4282E0", func_802A9000_4282E0); - -INCLUDE_ASM(s32, "code_4282E0", func_802A91B8_428498); - -INCLUDE_ASM(s32, "code_4282E0", func_802A92D4_4285B4); - -INCLUDE_ASM(s32, "code_4282E0", func_802A9664_428944); - -INCLUDE_ASM(s32, "code_4282E0", func_802A9708_4289E8); diff --git a/src/code_428A70.c b/src/code_428A70.c deleted file mode 100644 index 5d372b366e..0000000000 --- a/src/code_428A70.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_428A70", func_802A9000_428A70); - -INCLUDE_ASM(s32, "code_428A70", func_802A9184_428BF4); - -INCLUDE_ASM(s32, "code_428A70", func_802A9278_428CE8); - -INCLUDE_ASM(s32, "code_428A70", func_802A96EC_42915C); - -INCLUDE_ASM(s32, "code_428A70", func_802A9810_429280); diff --git a/src/code_429320.c b/src/code_429320.c deleted file mode 100644 index 8ca58e24e4..0000000000 --- a/src/code_429320.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_429320", func_802A9000_429320); - -INCLUDE_ASM(s32, "code_429320", func_802A9178_429498); - -INCLUDE_ASM(s32, "code_429320", func_802A9294_4295B4); - -INCLUDE_ASM(s32, "code_429320", func_802A984C_429B6C); - -INCLUDE_ASM(s32, "code_429320", func_802A992C_429C4C); diff --git a/src/code_429D20.c b/src/code_429D20.c deleted file mode 100644 index d70652dd0c..0000000000 --- a/src/code_429D20.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_429D20", func_802A9000_429D20); - -INCLUDE_ASM(s32, "code_429D20", func_802A911C_429E3C); - -INCLUDE_ASM(s32, "code_429D20", func_802A9208_429F28); - -INCLUDE_ASM(s32, "code_429D20", func_802A9634_42A354); - -INCLUDE_ASM(s32, "code_429D20", func_802A9720_42A440); diff --git a/src/code_42A4F0.c b/src/code_42A4F0.c deleted file mode 100644 index 579884ab68..0000000000 --- a/src/code_42A4F0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_42A4F0", func_802A9000_42A4F0); - -INCLUDE_ASM(s32, "code_42A4F0", func_802A9398_42A888); - -INCLUDE_ASM(s32, "code_42A4F0", func_802A948C_42A97C); - -INCLUDE_ASM(s32, "code_42A4F0", func_802AA014_42B504); - -INCLUDE_ASM(s32, "code_42A4F0", func_802AA0D8_42B5C8); diff --git a/src/code_42C6F0.c b/src/code_42C6F0.c deleted file mode 100644 index 40c97b8c2f..0000000000 --- a/src/code_42C6F0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_42C6F0", func_802A9000_42C6F0); - -INCLUDE_ASM(s32, "code_42C6F0", func_802A9138_42C828); - -INCLUDE_ASM(s32, "code_42C6F0", func_802A9228_42C918); - -INCLUDE_ASM(s32, "code_42C6F0", func_802A9718_42CE08); - -INCLUDE_ASM(s32, "code_42C6F0", func_802A9764_42CE54); diff --git a/src/code_42CF10.c b/src/code_42CF10.c deleted file mode 100644 index 0c4f2c0cb5..0000000000 --- a/src/code_42CF10.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_42CF10", func_802A9000_42CF10); - -INCLUDE_ASM(s32, "code_42CF10", func_802A9210_42D120); - -INCLUDE_ASM(s32, "code_42CF10", func_802A9310_42D220); - -INCLUDE_ASM(s32, "code_42CF10", func_802A98D0_42D7E0); - -INCLUDE_ASM(s32, "code_42CF10", func_802A9A54_42D964); diff --git a/src/code_42DA10.c b/src/code_42DA10.c deleted file mode 100644 index ed0aa8a83f..0000000000 --- a/src/code_42DA10.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_42DA10", func_802A9000_42DA10); - -INCLUDE_ASM(s32, "code_42DA10", func_802A91A0_42DBB0); - -INCLUDE_ASM(s32, "code_42DA10", func_802A92A0_42DCB0); - -INCLUDE_ASM(s32, "code_42DA10", func_802A97F8_42E208); - -INCLUDE_ASM(s32, "code_42DA10", func_802A98E0_42E2F0); diff --git a/src/code_42E3A0.c b/src/code_42E3A0.c deleted file mode 100644 index 2d5c189ddc..0000000000 --- a/src/code_42E3A0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_42E3A0", func_802A9000_42E3A0); - -INCLUDE_ASM(s32, "code_42E3A0", func_802A917C_42E51C); - -INCLUDE_ASM(s32, "code_42E3A0", func_802A9298_42E638); - -INCLUDE_ASM(s32, "code_42E3A0", func_802A98B0_42EC50); - -INCLUDE_ASM(s32, "code_42E3A0", func_802A9990_42ED30); diff --git a/src/code_42EE20.c b/src/code_42EE20.c deleted file mode 100644 index 2f3a1aa468..0000000000 --- a/src/code_42EE20.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_42EE20", func_802A9000_42EE20); - -INCLUDE_ASM(s32, "code_42EE20", func_802A916C_42EF8C); - -INCLUDE_ASM(s32, "code_42EE20", func_802A9254_42F074); - -INCLUDE_ASM(s32, "code_42EE20", func_802A973C_42F55C); - -INCLUDE_ASM(s32, "code_42EE20", func_802A981C_42F63C); diff --git a/src/code_42F6E0.c b/src/code_42F6E0.c deleted file mode 100644 index b238ceb801..0000000000 --- a/src/code_42F6E0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_42F6E0", func_802A9000_42F6E0); - -INCLUDE_ASM(s32, "code_42F6E0", func_802A91A0_42F880); - -INCLUDE_ASM(s32, "code_42F6E0", func_802A92A0_42F980); - -INCLUDE_ASM(s32, "code_42F6E0", func_802A97AC_42FE8C); - -INCLUDE_ASM(s32, "code_42F6E0", func_802A9894_42FF74); diff --git a/src/code_430020.c b/src/code_430020.c deleted file mode 100644 index 641f8b351d..0000000000 --- a/src/code_430020.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_430020", func_802A9000_430020); - -INCLUDE_ASM(s32, "code_430020", func_802A917C_43019C); - -INCLUDE_ASM(s32, "code_430020", func_802A9298_4302B8); - -INCLUDE_ASM(s32, "code_430020", func_802A97FC_43081C); - -INCLUDE_ASM(s32, "code_430020", func_802A98DC_4308FC); diff --git a/src/code_4ac90_len_3910.c b/src/code_4ac90_len_3910.c deleted file mode 100644 index 602586ec4f..0000000000 --- a/src/code_4ac90_len_3910.c +++ /dev/null @@ -1,279 +0,0 @@ -#include "common.h" - -extern EffectTableEntry gEffectTable[135]; - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006F890); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_8006F8F0, f32 arg0, f32 arg1, f32 arg2); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006F950); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006F9B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FA10); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FA70); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", fx_walk_large); - -INCLUDE_ASM(void, "code_4ac90_len_3910", fx_walk_normal, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FB90); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FBF0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FC50); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FCB0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FD10); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FD70); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FDD0); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_8006FE30, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - f32 arg6, f32 arg7); - -INCLUDE_ASM(void, "code_4ac90_len_3910", fx_emote, s32 arg0, Npc* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - f32 arg6, s32 arg7, s32* arg8); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_8006FEF0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FF50); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_8006FFB0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070010); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070070); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800700D0); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070130, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070190, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, f32 arg5, - s32 arg6, s32 arg7); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_800701F0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070250); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800702B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070310); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070370); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800703D0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070430); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070490); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800704F0); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070550, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, - s32 arg6, s32 arg7); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800705B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070610); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070670); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_800706D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070730); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", fx_sweat); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", fx_sleep_bubble); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070850); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800708B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070910); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070970, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_800709D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070A30); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070A90, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070AF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070B50, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070BB0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070C10); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070C70); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80070CD0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070D30); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070D90); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070DF0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070E50); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070EB0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070F10); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070F70); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80070FD0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071030, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80071090, s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800710F0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071150); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800711B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071210); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071270); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800712D0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071330); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071390); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800713F0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071450); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800714B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071510); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071570); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800715D0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071630); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071690); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800716F0); - -INCLUDE_ASM(Effect*, "code_4ac90_len_3910", func_80071750, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800717B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071810); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071870); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_800718D0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071930); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071990); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800719F0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071A50); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071AB0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071B10); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071B70); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071BD0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071C30); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071C90); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071CF0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071D50); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071DB0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071E10); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071E70); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071ED0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071F30); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80071F90); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80071FF0, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 arg5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072050); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_800720B0, s32 a0, f32 a1, f32 a2, f32 a3, f32 a4, s32 a5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072110); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072170); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800721D0); - -INCLUDE_ASM(UNK_TYPE, "code_4ac90_len_3910", func_80072230, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, - s32 arg5); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072290); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800722F0); - -INCLUDE_ASM(UNK_TYPE, "code_4ac90_len_3910", func_80072350, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, - f32 arg5, f32 arg6, s32 arg7, s32 arg8); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800723B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072410); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072470); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800724D0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072530); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072590); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800725F0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072650); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800726B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072710); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072770); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800727D0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072830); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072890); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800728F0); - -INCLUDE_ASM(void, "code_4ac90_len_3910", func_80072950, s32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s32 time); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_800729B0); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072A10); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072A70); - -INCLUDE_ASM(s32, "code_4ac90_len_3910", func_80072AD0); diff --git a/src/code_7340_len_b00.c b/src/code_7340_len_b00.c deleted file mode 100644 index ffd87a6f99..0000000000 --- a/src/code_7340_len_b00.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_7340_len_b00", crash_delay_msec); - -INCLUDE_ASM(s32, "code_7340_len_b00", func_8002BFB0); - -INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C054); - -INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C1D4); - -INCLUDE_ASM(s32, "code_7340_len_b00", crash_printf_string); - -INCLUDE_ASM(s32, "code_7340_len_b00", crash_print_fpr); - -INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C324); - -INCLUDE_ASM(s32, "code_7340_len_b00", crash_show_handler); - -INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C7B0); - -INCLUDE_ASM(s32, "code_7340_len_b00", crash_monitor_thread); - -INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C890); - -INCLUDE_ASM(s32, "code_7340_len_b00", crash_create_monitor); - -INCLUDE_ASM(s32, "code_7340_len_b00", func_8002C94C); diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c deleted file mode 100644 index 92a04f4719..0000000000 --- a/src/code_759b0_len_61b0.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "common.h" - -PlayerStatus* gPlayerStatusPtr = &gPlayerStatus; // maybe wPlayerStatus - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DC500); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DC778); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DCB7C, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32* arg4); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DCE70); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD04C); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD228); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD44C); - -void func_800DD5B4(f32* arg0, f32* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { - f32 temp = (arg2 * arg4) + (arg3 * arg5); - - *arg0 = (arg2 - (temp * arg4)) * 0.5f; - *arg1 = (arg3 - (temp * arg5)) * 0.5f; -} - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD618); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DD8FC); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDAE4); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDC44, s32 arg0, f32* arg1, f32* arg2, f32* arg3, f32 arg4, f32 arg5, - f32 arg6, f32 arg7); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDCEC); - -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DDD94); diff --git a/src/code_8560.c b/src/code_8560.c deleted file mode 100644 index 99fdfd8ffb..0000000000 --- a/src/code_8560.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_8560", func_8002D160); diff --git a/src/code_891b0_len_fb0.c b/src/code_891b0_len_fb0.c deleted file mode 100644 index 34474f6004..0000000000 --- a/src/code_891b0_len_fb0.c +++ /dev/null @@ -1,20 +0,0 @@ -#include "common.h" - -void func_800EFD00(void) { -} - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFD08); - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800EFE2C); - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0248); - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0490); - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0864); - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F09EC); - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0B3C); - -INCLUDE_ASM(s32, "code_891b0_len_fb0", func_800F0C9C); diff --git a/src/code_8a860_len_3f30.c b/src/code_8a860_len_3f30.c deleted file mode 100644 index d36dfd9b2e..0000000000 --- a/src/code_8a860_len_3f30.c +++ /dev/null @@ -1,35 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F13B0); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F1538); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F16CC); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F1A10); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F3680); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", draw_submenu_title); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F48F4); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4944); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4C1C); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4C6C); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4CF0); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4D28); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4E40); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F4FC4); - -INCLUDE_ASM(s32, "code_8a860_len_3f30", func_800F513C); - -void func_800F52BC(void) { - func_800F1A10(); -} diff --git a/src/code_8e790_len_2850.c b/src/code_8e790_len_2850.c deleted file mode 100644 index d9d940f77e..0000000000 --- a/src/code_8e790_len_2850.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_8e790_len_2850", draw_box); diff --git a/src/code_9d10_len_1080.c b/src/code_9d10_len_1080.c deleted file mode 100644 index 0592bf3cb8..0000000000 --- a/src/code_9d10_len_1080.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_4); - -INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_2); - -INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_1); - -INCLUDE_ASM(s32, "code_9d10_len_1080", do_camera_type_0); diff --git a/src/code_B0E0.c b/src/code_B0E0.c deleted file mode 100644 index 93276b559e..0000000000 --- a/src/code_B0E0.c +++ /dev/null @@ -1,18 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_B0E0", do_camera_type_unused); - -INCLUDE_ASM(s32, "code_B0E0", do_camera_type_5); - -INCLUDE_ASM(s32, "code_B0E0", func_80030210); - -INCLUDE_ASM(s32, "code_B0E0", func_8003034C); - -void func_80030450(void) { -} - -INCLUDE_ASM(s32, "code_B0E0", test_ray_zone_aabb); - -INCLUDE_ASM(s32, "code_B0E0", update_camera_from_zone); - -INCLUDE_ASM(s32, "code_B0E0", do_camera_type_3); diff --git a/src/code_B4580.c b/src/code_B4580.c deleted file mode 100644 index 3593ffb1a0..0000000000 --- a/src/code_B4580.c +++ /dev/null @@ -1,105 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_B4580", func_8011DE80); - -INCLUDE_ASM(s32, "code_B4580", func_8011DFD0); - -INCLUDE_ASM(s32, "code_B4580", func_8011E014); - -INCLUDE_ASM(s32, "code_B4580", func_8011E058); - -INCLUDE_ASM(s32, "code_B4580", func_8011E09C); - -INCLUDE_ASM(s32, "code_B4580", func_8011E0DC); - -INCLUDE_ASM(s32, "code_B4580", func_8011E150); - -INCLUDE_ASM(s32, "code_B4580", func_8011E1C4); - -INCLUDE_ASM(s32, "code_B4580", func_8011E224); - -INCLUDE_ASM(s32, "code_B4580", func_8011E310); - -INCLUDE_ASM(s32, "code_B4580", func_8011E398); - -INCLUDE_ASM(s32, "code_B4580", func_8011E400); - -INCLUDE_ASM(s32, "code_B4580", func_8011E438); - -INCLUDE_ASM(s32, "code_B4580", func_8011E4B8); - -INCLUDE_ASM(s32, "code_B4580", func_8011E5E0); - -INCLUDE_ASM(s32, "code_B4580", func_8011E718); - -INCLUDE_ASM(s32, "code_B4580", func_8011E8BC); - -INCLUDE_ASM(s32, "code_B4580", func_8011EA54); - -INCLUDE_ASM(s32, "code_B4580", func_8011EBF0); - -INCLUDE_ASM(s32, "code_B4580", func_8011F058); - -INCLUDE_ASM(s32, "code_B4580", func_8011F118); - -INCLUDE_ASM(s32, "code_B4580", func_8011F304); - -INCLUDE_ASM(s32, "code_B4580", func_8011F3E8); - -INCLUDE_ASM(s32, "code_B4580", func_8011F4D4); - -INCLUDE_ASM(s32, "code_B4580", func_8011FA54); - -INCLUDE_ASM(s32, "code_B4580", func_8011FF74); - -INCLUDE_ASM(s32, "code_B4580", func_8011FF98); - -INCLUDE_ASM(s32, "code_B4580", func_8011FFB4); - -AnimatedMesh* get_anim_mesh(s32 animModelID) { - return (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; -} - -AnimatedMesh* func_80120000(s32 animModelID, s32 arg1, s32 arg2) { - AnimatedMesh* ret = (*gCurrentAnimMeshListPtr)[animModelID & ~0x800]; - - ret->unk_2D4 = arg2; - ret->unk_2D8 = arg1; - return ret; -} - -INCLUDE_ASM(s32, "code_B4580", func_80120028); - -INCLUDE_ASM(s32, "code_B4580", func_8012003C); - -INCLUDE_ASM(s32, "code_B4580", func_8012004C); - -INCLUDE_ASM(s32, "code_B4580", func_80120064); - -INCLUDE_ASM(s32, "code_B4580", func_8012008C); - -INCLUDE_ASM(s32, "code_B4580", func_8012009C); - -INCLUDE_ASM(s32, "code_B4580", func_801200B8); - -INCLUDE_ASM(s32, "code_B4580", func_801200EC); - -INCLUDE_ASM(s32, "code_B4580", func_80120118); - -INCLUDE_ASM(s32, "code_B4580", play_model_animation); - -INCLUDE_ASM(s32, "code_B4580", func_80120198); - -INCLUDE_ASM(s32, "code_B4580", func_80120234); - -INCLUDE_ASM(s32, "code_B4580", func_801203AC); - -INCLUDE_ASM(s32, "code_B4580", func_80120420); - -INCLUDE_ASM(s32, "code_B4580", func_80120474); - -INCLUDE_ASM(s32, "code_B4580", func_80120530); - -INCLUDE_ASM(s32, "code_B4580", func_80120678); - -INCLUDE_ASM(s32, "code_B4580", func_801206F8); diff --git a/src/code_B9D60.c b/src/code_B9D60.c deleted file mode 100644 index 665317a798..0000000000 --- a/src/code_B9D60.c +++ /dev/null @@ -1,112 +0,0 @@ -#include "common.h" - -extern Gfx D_8014C500[]; -extern s32 D_801512F4; // message images? -extern s16 D_80155C98; - -void clear_character_set(void) { - D_80155C98 = -1; -} - -INCLUDE_ASM(s32, "code_B9D60", clear_printers); - -INCLUDE_ASM(s32, "code_B9D60", load_font_data); - -INCLUDE_ASM(s32, "code_B9D60", load_font); - -INCLUDE_ASM(s32, "code_B9D60", update_messages); - -INCLUDE_ASM(s32, "code_B9D60", _update_message); - -INCLUDE_ASM(s32, "code_B9D60", render_messages); - -INCLUDE_ASM(s32, "code_B9D60", func_80124434); - -INCLUDE_ASM(s32, "code_B9D60", func_80124570); - -INCLUDE_ASM(s32, "code_B9D60", initialize_printer); - -INCLUDE_ASM(s32, "code_B9D60", dma_load_string); - -INCLUDE_ASM(s32, "code_B9D60", load_message_to_buffer); - -PrintContext* load_string(s32 stringID, s32* a1) { - return _load_string(stringID, a1, 0); -} - -INCLUDE_ASM(s32, "code_B9D60", _load_string); - -INCLUDE_ASM(s32, "code_B9D60", load_message_to_printer); - -INCLUDE_ASM(s32, "code_B9D60", clamp_printer_coords); - -s32 cancel_message(PrintContext* printContext) { - if ((printContext->stateFlags & 2) == 0) { - return 0; - } - - printContext->stateFlags |= 1; - return 1; -} - -void set_message_images(s32* images) { - D_801512F4 = images; -} - -INCLUDE_ASM(s32, "code_B9D60", set_message_string); - -INCLUDE_ASM(s32, "code_B9D60", set_message_value); - -void close_message(PrintContext* printContext) { - printContext->stateFlags &= ~0x40; -} - -INCLUDE_ASM(s32, "code_B9D60", func_80125C84); - -INCLUDE_ASM(s32, "code_B9D60", get_char_width); - -INCLUDE_ASM(s32, "code_B9D60", get_string_properties); - -INCLUDE_ASM(s32, "code_B9D60", get_string_width); - -INCLUDE_ASM(s32, "code_B9D60", get_msg_lines); - -INCLUDE_ASM(s32, "code_B9D60", draw_msg); - -INCLUDE_ASM(s32, "code_B9D60", func_80126790); - -INCLUDE_ASM(s32, "code_B9D60", func_80126EAC); - -INCLUDE_ASM(s32, "code_B9D60", func_80126F78); - -INCLUDE_ASM(s32, "code_B9D60", draw_digit); - -INCLUDE_ASM(s32, "code_B9D60", draw_number); - -void func_80127B70(s32 arg0) { - func_80127D90(arg0, 0, 0, 0, 0, 4, 0); -} - -INCLUDE_ASM(s32, "code_B9D60", func_80127BA4); - -INCLUDE_ASM(s32, "code_B9D60", func_80127D90, s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6); - - -void func_8012C2E0(void) { - gDPPipeSync(gMasterGfxPos++); - gSPDisplayList(gMasterGfxPos++, D_8014C500); -} - -INCLUDE_ASM(s32, "code_B9D60", func_8012C324); - -INCLUDE_ASM(s32, "code_B9D60", func_8012C9A8); - -INCLUDE_ASM(s32, "code_B9D60", func_8012CA08); - -INCLUDE_ASM(s32, "code_B9D60", _draw_message_box); - -INCLUDE_ASM(s32, "code_B9D60", func_8012D3DC); - -INCLUDE_ASM(s32, "code_B9D60", func_8012DB58); - -INCLUDE_ASM(s32, "code_B9D60", func_8012E8E0); diff --git a/src/code_CEE40.c b/src/code_CEE40.c deleted file mode 100644 index 338483515a..0000000000 --- a/src/code_CEE40.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_CEE40", func_80138740); - -INCLUDE_ASM(void, "code_CEE40", func_80138D88, s32 param0, s32 param1, s32 param2, s32 param3, f32 param4); - -INCLUDE_ASM(s32, "code_CEE40", func_80138E54); - -INCLUDE_ASM(s32, "code_CEE40", func_80139F10); diff --git a/src/code_E225B0.c b/src/code_E225B0.c deleted file mode 100644 index a503056063..0000000000 --- a/src/code_E225B0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E225B0", func_802B7000_E225B0); - -INCLUDE_ASM(s32, "code_E225B0", func_802B72C0_E22870); - -INCLUDE_ASM(s32, "code_E225B0", func_802B735C_E2290C); diff --git a/src/code_E23260.c b/src/code_E23260.c deleted file mode 100644 index f73f6f8773..0000000000 --- a/src/code_E23260.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E23260", func_802B6000_E23260); - -INCLUDE_ASM(s32, "code_E23260", func_802B61E4_E23444); diff --git a/src/code_E236E0.c b/src/code_E236E0.c deleted file mode 100644 index 7b8b46b0e7..0000000000 --- a/src/code_E236E0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E236E0", func_802B6000_E236E0); - -INCLUDE_ASM(s32, "code_E236E0", func_802B6288_E23968); - -INCLUDE_ASM(s32, "code_E236E0", func_802B6550_E23C30); - -INCLUDE_ASM(s32, "code_E236E0", func_802B65E8_E23CC8); - -INCLUDE_ASM(s32, "code_E236E0", func_802B6738_E23E18); diff --git a/src/code_E24040.c b/src/code_E24040.c deleted file mode 100644 index 36982a43b1..0000000000 --- a/src/code_E24040.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E24040", func_802B6000_E24040); - -INCLUDE_ASM(s32, "code_E24040", func_802B60B4_E240F4); - -INCLUDE_ASM(s32, "code_E24040", func_802B6198_E241D8); - -INCLUDE_ASM(s32, "code_E24040", func_802B6294_E242D4); - -INCLUDE_ASM(s32, "code_E24040", func_802B6348_E24388); - -INCLUDE_ASM(s32, "code_E24040", func_802B647C_E244BC); - -INCLUDE_ASM(s32, "code_E24040", func_802B6508_E24548); diff --git a/src/code_E245D0.c b/src/code_E245D0.c deleted file mode 100644 index 72f6978331..0000000000 --- a/src/code_E245D0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E245D0", func_802B6000_E245D0); - -INCLUDE_ASM(s32, "code_E245D0", func_802B6198_E24768); - -INCLUDE_ASM(s32, "code_E245D0", func_802B6230_E24800); diff --git a/src/code_E24920.c b/src/code_E24920.c deleted file mode 100644 index c1611d4764..0000000000 --- a/src/code_E24920.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E24920", func_802B6000_E24920); - -INCLUDE_ASM(s32, "code_E24920", func_802B61C0_E24AE0); - -INCLUDE_ASM(s32, "code_E24920", func_802B62CC_E24BEC); - -INCLUDE_ASM(s32, "code_E24920", func_802B644C_E24D6C); diff --git a/src/code_E24ED0.c b/src/code_E24ED0.c deleted file mode 100644 index 20d36f762e..0000000000 --- a/src/code_E24ED0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E24ED0", func_802B6000_E24ED0); - -INCLUDE_ASM(s32, "code_E24ED0", func_802B6048_E24F18); - -INCLUDE_ASM(s32, "code_E24ED0", func_802B62A4_E25174); - -INCLUDE_ASM(s32, "code_E24ED0", func_802B66A8_E25578); - -INCLUDE_ASM(s32, "code_E24ED0", func_802B6820_E256F0); diff --git a/src/code_E25D60.c b/src/code_E25D60.c deleted file mode 100644 index 5364031790..0000000000 --- a/src/code_E25D60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E25D60", func_802B6000_E25D60); diff --git a/src/code_E26710.c b/src/code_E26710.c deleted file mode 100644 index 88547a5805..0000000000 --- a/src/code_E26710.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E26710", func_802B6000_E26710); - -INCLUDE_ASM(s32, "code_E26710", func_802B65F8_E26D08); diff --git a/src/code_E26DE0.c b/src/code_E26DE0.c deleted file mode 100644 index 186172ddec..0000000000 --- a/src/code_E26DE0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E26DE0", func_802B6000_E26DE0); - -INCLUDE_ASM(s32, "code_E26DE0", func_802B6648_E27428); diff --git a/src/code_E27510.c b/src/code_E27510.c deleted file mode 100644 index db12654acf..0000000000 --- a/src/code_E27510.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E27510", func_802B6000_E27510); - -INCLUDE_ASM(s32, "code_E27510", func_802B6060_E27570); diff --git a/src/code_E27C90.c b/src/code_E27C90.c deleted file mode 100644 index 49f30c94db..0000000000 --- a/src/code_E27C90.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E27C90", func_802B6000_E27C90); diff --git a/src/code_E27F40.c b/src/code_E27F40.c deleted file mode 100644 index 29fb3ab96d..0000000000 --- a/src/code_E27F40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E27F40", func_802B6000_E27F40); diff --git a/src/code_E287F0.c b/src/code_E287F0.c deleted file mode 100644 index c0e2f1916c..0000000000 --- a/src/code_E287F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E287F0", func_802B6000_E287F0); diff --git a/src/code_E28A30.c b/src/code_E28A30.c deleted file mode 100644 index cb56e9b2f3..0000000000 --- a/src/code_E28A30.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E28A30", func_802B6000_E28A30); - -INCLUDE_ASM(s32, "code_E28A30", func_802B609C_E28ACC); - -INCLUDE_ASM(s32, "code_E28A30", func_802B6350_E28D80); - -INCLUDE_ASM(s32, "code_E28A30", func_802B63D4_E28E04); - -INCLUDE_ASM(s32, "code_E28A30", func_802B6478_E28EA8); - -INCLUDE_ASM(s32, "code_E28A30", func_802B6508_E28F38); - -INCLUDE_ASM(s32, "code_E28A30", func_802B6638_E29068); diff --git a/src/code_E291A0.c b/src/code_E291A0.c deleted file mode 100644 index 574a54fff8..0000000000 --- a/src/code_E291A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E291A0", func_802B6000_E291A0); diff --git a/src/code_E29470.c b/src/code_E29470.c deleted file mode 100644 index e617a93cbf..0000000000 --- a/src/code_E29470.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E29470", func_802B6000_E29470); - -INCLUDE_ASM(s32, "code_E29470", func_802B60A4_E29514); diff --git a/src/code_E2A340.c b/src/code_E2A340.c deleted file mode 100644 index 84ca0ae750..0000000000 --- a/src/code_E2A340.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2A340", func_802B6000_E2A340); diff --git a/src/code_E2A6B0.c b/src/code_E2A6B0.c deleted file mode 100644 index 6b38beeaec..0000000000 --- a/src/code_E2A6B0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2A6B0", func_802B6000_E2A6B0); - -INCLUDE_ASM(s32, "code_E2A6B0", func_802B6120_E2A7D0); - -INCLUDE_ASM(s32, "code_E2A6B0", func_802B6CF0_E2B3A0); diff --git a/src/code_E2B530.c b/src/code_E2B530.c deleted file mode 100644 index a1520f9475..0000000000 --- a/src/code_E2B530.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2B530", func_802BAE00_E2B530); - -INCLUDE_ASM(s32, "code_E2B530", func_802BB044_E2B774); - -INCLUDE_ASM(s32, "code_E2B530", func_802BB1E8_E2B918); - -INCLUDE_ASM(s32, "code_E2B530", func_802BB62C_E2BD5C); - -INCLUDE_ASM(s32, "code_E2B530", func_802BB664_E2BD94); - -INCLUDE_ASM(s32, "code_E2B530", func_802BB69C_E2BDCC); - -INCLUDE_ASM(s32, "code_E2B530", func_802BB6D4_E2BE04); diff --git a/src/code_E2BE40.c b/src/code_E2BE40.c deleted file mode 100644 index f59ccb13b2..0000000000 --- a/src/code_E2BE40.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2BE40", func_802BB710_E2BE40); - -INCLUDE_ASM(s32, "code_E2BE40", func_802BB870_E2BFA0); - -INCLUDE_ASM(s32, "code_E2BE40", func_802BB8A4_E2BFD4); - -INCLUDE_ASM(s32, "code_E2BE40", func_802BBE3C_E2C56C); - -INCLUDE_ASM(s32, "code_E2BE40", func_802BC148_E2C878); - -INCLUDE_ASM(s32, "code_E2BE40", func_802BC1A8_E2C8D8); diff --git a/src/code_E2C930.c b/src/code_E2C930.c deleted file mode 100644 index ba5e1b5288..0000000000 --- a/src/code_E2C930.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2C930", func_802BC200_E2C930); - -INCLUDE_ASM(s32, "code_E2C930", func_802BC3A8_E2CAD8); - -INCLUDE_ASM(s32, "code_E2C930", func_802BC3DC_E2CB0C); - -INCLUDE_ASM(s32, "code_E2C930", func_802BC974_E2D0A4); - -INCLUDE_ASM(s32, "code_E2C930", func_802BCC80_E2D3B0); diff --git a/src/code_E2D730.c b/src/code_E2D730.c deleted file mode 100644 index 4188696a45..0000000000 --- a/src/code_E2D730.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2D730", func_802BAE00_E2D730); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB000_E2D930); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB0A0_E2D9D0); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB228_E2DB58); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB298_E2DBC8); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB314_E2DC44); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB34C_E2DC7C); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB374_E2DCA4); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB648_E2DF78); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB6E0_E2E010); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB778_E2E0A8); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB78C_E2E0BC); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB8D4_E2E204); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB98C_E2E2BC); - -INCLUDE_ASM(s32, "code_E2D730", func_802BB9E0_E2E310); diff --git a/src/code_E2E5F0.c b/src/code_E2E5F0.c deleted file mode 100644 index 26ad12ebd2..0000000000 --- a/src/code_E2E5F0.c +++ /dev/null @@ -1,43 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BBCC0_E2E5F0); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BBD1C_E2E64C); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BBD78_E2E6A8); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BBE8C_E2E7BC); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC00C_E2E93C); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC050_E2E980); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC0B8_E2E9E8); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC0F0_E2EA20); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC17C_E2EAAC); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC1D0_E2EB00); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC220_E2EB50); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC250_E2EB80); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC274_E2EBA4); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC2B4_E2EBE4); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC308_E2EC38); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC32C_E2EC5C); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC358_E2EC88); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC37C_E2ECAC); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC3A0_E2ECD0); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC3CC_E2ECFC); - -INCLUDE_ASM(s32, "code_E2E5F0", func_802BC3E4_E2ED14); diff --git a/src/code_E2EDE0.c b/src/code_E2EDE0.c deleted file mode 100644 index 2e95945048..0000000000 --- a/src/code_E2EDE0.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2EDE0", func_802BC4B0_E2EDE0); - -void func_802BC628_E2EF58() { -} - -INCLUDE_ASM(s32, "code_E2EDE0", func_802BC630_E2EF60); - -INCLUDE_ASM(s32, "code_E2EDE0", func_802BC658_E2EF88); diff --git a/src/code_E2F750.c b/src/code_E2F750.c deleted file mode 100644 index 6fb2e57bc0..0000000000 --- a/src/code_E2F750.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E2F750", func_802BAE00_E2F750); - -INCLUDE_ASM(s32, "code_E2F750", func_802BAF84_E2F8D4); - -INCLUDE_ASM(s32, "code_E2F750", func_802BB108_E2FA58); - -INCLUDE_ASM(s32, "code_E2F750", func_802BB3B8_E2FD08); - -INCLUDE_ASM(s32, "code_E2F750", func_802BB704_E30054); - -INCLUDE_ASM(s32, "code_E2F750", func_802BB76C_E300BC); - -INCLUDE_ASM(s32, "code_E2F750", func_802BB7E0_E30130); - -INCLUDE_ASM(s32, "code_E2F750", func_802BB8E4_E30234); - -INCLUDE_ASM(s32, "code_E2F750", func_802BBA60_E303B0); - -INCLUDE_ASM(s32, "code_E2F750", func_802BBDB8_E30708); - -INCLUDE_ASM(s32, "code_E2F750", func_802BBE14_E30764); diff --git a/src/code_E307C0.c b/src/code_E307C0.c deleted file mode 100644 index b5a9ee24a0..0000000000 --- a/src/code_E307C0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_E307C0", func_802BBE70_E307C0); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC2BC_E30C0C); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC4B8_E30E08); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC514_E30E64); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC558_E30EA8); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC570_E30EC0); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC99C_E312EC); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC9CC_E3131C); - -INCLUDE_ASM(s32, "code_E307C0", func_802BC9FC_E3134C); diff --git a/src/code_EA0C10.c b/src/code_EA0C10.c deleted file mode 100644 index af724a2622..0000000000 --- a/src/code_EA0C10.c +++ /dev/null @@ -1,125 +0,0 @@ -#include "common.h" - -const char* ascii_EA6D70 = "kzn_11"; -const char* ascii_EA6D78 = "kzn_18"; - -INCLUDE_ASM(s32, "code_EA0C10", func_80240310_EA0C10); - -INCLUDE_ASM(s32, "code_EA0C10", func_8024037C_EA0C7C); - -INCLUDE_ASM(s32, "code_EA0C10", func_802403EC_EA0CEC); - -INCLUDE_ASM(s32, "code_EA0C10", func_802404C4_EA0DC4); - -INCLUDE_ASM(s32, "code_EA0C10", func_80240518_EA0E18); - -INCLUDE_ASM(s32, "code_EA0C10", func_802406CC_EA0FCC); - -INCLUDE_ASM(s32, "code_EA0C10", func_8024097C_EA127C); - -INCLUDE_ASM(s32, "code_EA0C10", func_80240C5C_EA155C); - -INCLUDE_ASM(s32, "code_EA0C10", func_80240CC8_EA15C8); - -INCLUDE_ASM(s32, "code_EA0C10", func_80240DC4_EA16C4); - -INCLUDE_ASM(s32, "code_EA0C10", func_80241804_EA2104); - -INCLUDE_ASM(s32, "code_EA0C10", func_80241894_EA2194); - -INCLUDE_ASM(s32, "code_EA0C10", func_80241994_EA2294); - -INCLUDE_ASM(s32, "code_EA0C10", func_802419F4_EA22F4); - -INCLUDE_ASM(s32, "code_EA0C10", func_80241AE0_EA23E0); - -INCLUDE_ASM(s32, "code_EA0C10", func_80241D68_EA2668); - -INCLUDE_ASM(s32, "code_EA0C10", func_80241DE4_EA26E4); - -INCLUDE_ASM(s32, "code_EA0C10", func_80241F18_EA2818); - -INCLUDE_ASM(s32, "code_EA0C10", func_8024207C_EA297C); - -INCLUDE_ASM(s32, "code_EA0C10", func_802420FC_EA29FC); - -INCLUDE_ASM(s32, "code_EA0C10", func_80242568_EA2E68); - -INCLUDE_ASM(s32, "code_EA0C10", func_802425B0_EA2EB0); - -INCLUDE_ASM(s32, "code_EA0C10", func_80242608_EA2F08); - -INCLUDE_ASM(s32, "code_EA0C10", func_8024267C_EA2F7C); -/* -ApiStatus N(func_8024267C_EA2F7C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &N(D_80241C68_BE09F8); - s32 i; - s32* test; - - if (*ptr == NULL) { - i = heap_malloc(16 * sizeof(s32)); - *ptr = i; - for (i = 0, test = *ptr; i < 16; i++) { - *test++ = script->varTable[i]; - } - } else { - for (i = 0, test = *ptr; i < 16; i++) { - script->varTable[i] = *test++; - } - ptr = &N(D_80241C68_BE09F8); - heap_free(*ptr); - *ptr = NULL; - } - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EA0C10", func_80242730_EA3030); - -INCLUDE_ASM(s32, "code_EA0C10", func_80242794_EA3094); - -INCLUDE_ASM(s32, "code_EA0C10", func_802427F0_EA30F0); - -INCLUDE_ASM(s32, "code_EA0C10", func_802429C0_EA32C0); -/* -ApiStatus N(func_802429C0_EA32C0)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr; - - if (isInitialCall) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - } - - ptr = &D_80241CCC_BE0A5C; - if (*ptr != NULL) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - set_variable(script, *args, D_80241CD0_BE0A60); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} -*/ - -INCLUDE_ASM(s32, "code_EA0C10", func_80242A14_EA3314); -/* -ApiStatus N(func_80242A14_EA3314)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80241CD0_BE0A60 = get_variable(script, *args); - D_80241CCC_BE0A5C = 1; - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EA0C10", func_80242A4C_EA334C); - -INCLUDE_ASM(s32, "code_EA0C10", func_80242AE8_EA33E8); - -INCLUDE_ASM(s32, "code_EA0C10", func_80242BD8_EA34D8); - -INCLUDE_ASM(s32, "code_EA0C10", func_80242D64_EA3664); - -INCLUDE_ASM(s32, "code_EA0C10", func_80242DA8_EA36A8); diff --git a/src/code_EA36E0.c b/src/code_EA36E0.c deleted file mode 100644 index 9975ec0db6..0000000000 --- a/src/code_EA36E0.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EA36E0", func_80242DE0_EA36E0); - -INCLUDE_ASM(s32, "code_EA36E0", func_80242E00_EA3700); - -INCLUDE_ASM(s32, "code_EA36E0", func_80242E2C_EA372C); - -INCLUDE_ASM(s32, "code_EA36E0", func_80242EC4_EA37C4); - -INCLUDE_ASM(s32, "code_EA36E0", func_80242F64_EA3864); - -INCLUDE_ASM(s32, "code_EA36E0", func_80242F9C_EA389C); - -INCLUDE_ASM(s32, "code_EA36E0", func_80243054_EA3954); - -INCLUDE_ASM(s32, "code_EA36E0", func_802430E4_EA39E4); diff --git a/src/code_EA6FD0.c b/src/code_EA6FD0.c deleted file mode 100644 index aae81a4ed5..0000000000 --- a/src/code_EA6FD0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EA6FD0", func_80240000_EA6FD0); diff --git a/src/code_EA7010.c b/src/code_EA7010.c deleted file mode 100644 index 2b30b49b7d..0000000000 --- a/src/code_EA7010.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EA7010", func_80240040_EA7010); - -INCLUDE_ASM(s32, "code_EA7010", func_80240164_EA7134); diff --git a/src/code_EA7320.c b/src/code_EA7320.c deleted file mode 100644 index 372ba6e85a..0000000000 --- a/src/code_EA7320.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EA7320", func_80240350_EA7320); - -INCLUDE_ASM(s32, "code_EA7320", func_8024036C_EA733C); - -INCLUDE_ASM(s32, "code_EA7320", func_80240388_EA7358); diff --git a/src/code_EA8AE0.c b/src/code_EA8AE0.c deleted file mode 100644 index 4b322cd5fe..0000000000 --- a/src/code_EA8AE0.c +++ /dev/null @@ -1,112 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EA8AE0 - -#include "world/common/DeadUnkTexturePanFunc.inc.c" - -#include "world/common/DeadUnkTexturePanFunc2.inc.c" - -INCLUDE_ASM(s32, "code_EA8AE0", func_8024030C_EA8DEC); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240358_EA8E38); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802404B8_EA8F98); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802408C8_EA93A8); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240908_EA93E8); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240A14_EA94F4); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240B00_EA95E0); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240BD4_EA96B4); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240CD8_EA97B8); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240DA4_EA9884); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80240E2C_EA990C); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802413C0_EA9EA0); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802413FC_EA9EDC); - -INCLUDE_ASM(s32, "code_EA8AE0", func_8024140C_EA9EEC); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80241468_EA9F48); -/* -ApiStatus N(func_80241468_EA9F48)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &N(D_80241C68_BE09F8); - s32 i; - s32* test; - - if (*ptr == NULL) { - i = heap_malloc(16 * sizeof(s32)); - *ptr = i; - for (i = 0, test = *ptr; i < 16; i++) { - *test++ = script->varTable[i]; - } - } else { - for (i = 0, test = *ptr; i < 16; i++) { - script->varTable[i] = *test++; - } - ptr = &N(D_80241C68_BE09F8); - heap_free(*ptr); - *ptr = NULL; - } - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EA8AE0", func_8024151C_EA9FFC); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80241580_EAA060); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802415DC_EAA0BC); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802417AC_EAA28C); -/* -ApiStatus N(func_802417AC_EAA28C)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr; - - if (isInitialCall) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - } - - ptr = &D_80241CCC_BE0A5C; - if (*ptr != NULL) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - set_variable(script, *args, D_80241CD0_BE0A60); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} -*/ - -INCLUDE_ASM(s32, "code_EA8AE0", func_80241800_EAA2E0); -/* -ApiStatus N(func_80241800_EAA2E0)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80241CD0_BE0A60 = get_variable(script, *args); - D_80241CCC_BE0A5C = 1; - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EA8AE0", func_80241838_EAA318); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802418D4_EAA3B4); - -INCLUDE_ASM(s32, "code_EA8AE0", func_802419C4_EAA4A4); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80241B50_EAA630); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80241B94_EAA674); - -INCLUDE_ASM(s32, "code_EA8AE0", func_80241BC0_EAA6A0); diff --git a/src/code_EB1170.c b/src/code_EB1170.c deleted file mode 100644 index b4a4077872..0000000000 --- a/src/code_EB1170.c +++ /dev/null @@ -1,80 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EB1170", func_80240310_EB1170); -/* -ApiStatus N(func_80240310_EB1170)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &N(D_80241C68_BE09F8); - s32 i; - s32* test; - - if (*ptr == NULL) { - i = heap_malloc(16 * sizeof(s32)); - *ptr = i; - for (i = 0, test = *ptr; i < 16; i++) { - *test++ = script->varTable[i]; - } - } else { - for (i = 0, test = *ptr; i < 16; i++) { - script->varTable[i] = *test++; - } - ptr = &N(D_80241C68_BE09F8); - heap_free(*ptr); - *ptr = NULL; - } - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EB1170", func_802403C4_EB1224); - -INCLUDE_ASM(s32, "code_EB1170", func_80240428_EB1288); - -INCLUDE_ASM(s32, "code_EB1170", func_80240484_EB12E4); - -INCLUDE_ASM(s32, "code_EB1170", func_80240654_EB14B4); -/* -ApiStatus N(func_80240654_EB14B4)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr; - - if (isInitialCall) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - } - - ptr = &D_80241CCC_BE0A5C; - if (*ptr != NULL) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - set_variable(script, *args, D_80241CD0_BE0A60); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} -*/ - -INCLUDE_ASM(s32, "code_EB1170", func_802406A8_EB1508); -/* -ApiStatus N(func_802406A8_EB1508)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80241CD0_BE0A60 = get_variable(script, *args); - D_80241CCC_BE0A5C = 1; - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EB1170", func_802406E0_EB1540); - -INCLUDE_ASM(s32, "code_EB1170", func_8024077C_EB15DC); - -INCLUDE_ASM(s32, "code_EB1170", func_8024086C_EB16CC); - -INCLUDE_ASM(s32, "code_EB1170", func_802409F8_EB1858); - -INCLUDE_ASM(s32, "code_EB1170", func_80240A3C_EB189C); - -INCLUDE_ASM(s32, "code_EB1170", func_80240A68_EB18C8); - -INCLUDE_ASM(s32, "code_EB1170", func_80240A8C_EB18EC); diff --git a/src/code_EB5470.c b/src/code_EB5470.c deleted file mode 100644 index 75afab2315..0000000000 --- a/src/code_EB5470.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EB5470", func_80240340_EB5470); - -INCLUDE_ASM(s32, "code_EB5470", func_8024036C_EB549C); diff --git a/src/code_EB7540.c b/src/code_EB7540.c deleted file mode 100644 index 31ec2a8e6c..0000000000 --- a/src/code_EB7540.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EB7540", func_80240310_EB7540); - -INCLUDE_ASM(s32, "code_EB7540", func_802403D8_EB7608); - -INCLUDE_ASM(s32, "code_EB7540", func_80240478_EB76A8); - -INCLUDE_ASM(s32, "code_EB7540", func_80240504_EB7734); - -INCLUDE_ASM(s32, "code_EB7540", func_80240520_EB7750); diff --git a/src/code_EB8E90.c b/src/code_EB8E90.c deleted file mode 100644 index 75aea2471e..0000000000 --- a/src/code_EB8E90.c +++ /dev/null @@ -1,203 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EB8E90", func_80240040_EB8E90); -/* -ApiStatus N(func_80240040_EB8E90)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc *npc = get_npc_unsafe(enemy->npcID); - f32 ret; - f32 max; - f32 posX; - f32 posZ; - s32 i; - s32 j; - - script->functionTemp[1].s = 0; - max = 32767.0f; - posX = npc->pos.x; - posZ = npc->pos.z; - script->functionTemp[2].s = 0; - - for (i = 0, j = 0; i < enemy->territory->patrol.numPoints; i++, j++) { - ret = dist2D(posX, posZ, i[enemy->territory->patrol.points].x, i[enemy->territory->patrol.points].z); - if (ret < max) { - max = ret; - script->functionTemp[2].s = j; - } - } - - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ - -INCLUDE_ASM(s32, "code_EB8E90", func_80240198_EB8FE8); -/* -void N(func_80240198_EB8FE8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 x, z; - s32 var; - - if (aiSettings->unk_14 >= 0) { - if (script->functionTemp[1].s <= 0) { - script->functionTemp[1].s = aiSettings->unk_14; - if (func_800490B4(territory, enemy, aiSettings->alertRadius, aiSettings->unk_10.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } - script->functionTemp[1].s--; - } - - if (npc->unk_8C == 0) { - if (npc->moveSpeed < 4.0) { - func_8003D660(npc, 0); - } else { - func_8003D660(npc, 1); - } - - x = script->functionTemp[2].s[enemy->territory->patrol.points].x; - z = script->functionTemp[2].s[enemy->territory->patrol.points].z; - npc->yaw = atan2(npc->pos.x, npc->pos.z, x, z); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (dist2D(npc->pos.x, npc->pos.z, x, z) <= npc->moveSpeed) { - script->functionTemp[0].s = 2; - script->functionTemp[1].s = (rand_int(1000) % 3) + 2; - if ((aiSettings->unk_2C <= 0) || (aiSettings->moveTime <= 0) || - (aiSettings->waitTime <= 0) || (script->functionTemp[1].s == 0)) { - script->functionTemp[0].s = 4; - } - if (rand_int(10000) % 100 < aiSettings->moveTime) { - script->functionTemp[0].s = 4; - } - } - } -} -*/ - -INCLUDE_ASM(s32, "code_EB8E90", func_80240440_EB9290); - -INCLUDE_ASM(s32, "code_EB8E90", func_80240500_EB9350); -/* -void N(func_80240500_EB9350)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if ((aiSettings->unk_14 >= 0) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 0)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 0xF, &var); - npc->yaw = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - func_800494C0(npc, 0x2F4, 0x200000); - if (!(enemy->npcSettings->unk_2A & 1)) { - script->functionTemp[0].s = 12; - } else { - script->functionTemp[0].s = 10; - } - } else if (npc->unk_8C == 0) { - npc->duration--; - if (npc->duration == 0) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s != 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = aiSettings->waitTime / 2 + rand_int(aiSettings->waitTime / 2 + 1); - } else { - script->functionTemp[0].s = 4; - } - } - } -} -*/ - -INCLUDE_ASM(s32, "code_EB8E90", func_802406BC_EB950C); -/* -ApiStatus N(func_802406BC_EB950C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - script->functionTemp[2].s++; - if (script->functionTemp[2].s >= enemy->territory->patrol.numPoints) { - script->functionTemp[2].s = 0; - } - npc->currentAnim = enemy->animList[1]; - if (enemy->territory->patrol.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->patrol.moveSpeedOverride / 32767.0; - } - script->functionTemp[0].s = 1; - return ApiStatus_DONE1; -} -*/ - -INCLUDE_ASM(s32, "code_EB8E90", func_80240770_EB95C0); - -INCLUDE_ASM(s32, "code_EB8E90", func_802407E4_EB9634); - -INCLUDE_ASM(s32, "code_EB8E90", func_8024085C_EB96AC); - -INCLUDE_ASM(s32, "code_EB8E90", func_8024098C_EB97DC); -/* -ApiStatus N(func_8024098C_EB97DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 var; - - if (!func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(2, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 15, &var); - npc->currentAnim = enemy->animList[0]; - npc->duration = 25; - script->functionTemp[0].s = 14; - } else { - func_8003D660(npc, 1); - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - if (npc->duration > 0) { - npc->duration--; - } else { - script->functionTemp[0].s = 12; - } - } -} -*/ - -INCLUDE_ASM(s32, "code_EB8E90", func_80240AAC_EB98FC); - -INCLUDE_ASM(s32, "code_EB8E90", func_80240B14_EB9964); -/* -void N(func_80240B14_EB9964)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - s32 i; - - for (i = script->functionTemp[2].s; i < enemy->territory->patrol.numPoints; i++) { - if (i[enemy->territory->patrol.points].y <= npc->pos.y) { - script->functionTemp[2].s = i; - break; - } - } - - npc->moveSpeed = aiSettings->moveSpeed; - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - script->functionTemp[0].s = 1; -} -*/ - -INCLUDE_ASM(s32, "code_EB8E90", func_80240BD4_EB9A24); - -INCLUDE_ASM(s32, "code_EB8E90", func_80240EFC_EB9D4C); diff --git a/src/code_EB9D90.c b/src/code_EB9D90.c deleted file mode 100644 index cfb4ea3b45..0000000000 --- a/src/code_EB9D90.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EB9D90", func_80240F40_EB9D90); - -INCLUDE_ASM(s32, "code_EB9D90", func_80240FB0_EB9E00); - -INCLUDE_ASM(s32, "code_EB9D90", func_802410E4_EB9F34); - -INCLUDE_ASM(s32, "code_EB9D90", func_8024121C_EBA06C); -/* -ApiStatus N(func_8024121C_EBA06C)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a1 = *args++; - s32 var0 = get_variable(script, a1); - s32 a2 = *args++; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - f32 temp = (get_float_variable(script, *args++) / 180.0f) * PI; - f32 diff = fabsf(var2 - var1) / 2; - - if (var4 != 0 && var3 < var0) { - var0 = var3; - set_variable(script, a1, var3); - } - - set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EB9D90", func_802413AC_EBA1FC); - -INCLUDE_ASM(s32, "code_EB9D90", func_802413CC_EBA21C); - -INCLUDE_ASM(s32, "code_EB9D90", func_802413EC_EBA23C); diff --git a/src/code_EC2240.c b/src/code_EC2240.c deleted file mode 100644 index 443cdea38e..0000000000 --- a/src/code_EC2240.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EC2240", func_80240040_EC2240); -/* -ApiStatus N(func_80240040_EC2240)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &N(D_80241C68_BE09F8); - s32 i; - s32* test; - - if (*ptr == NULL) { - i = heap_malloc(16 * sizeof(s32)); - *ptr = i; - for (i = 0, test = *ptr; i < 16; i++) { - *test++ = script->varTable[i]; - } - } else { - for (i = 0, test = *ptr; i < 16; i++) { - script->varTable[i] = *test++; - } - ptr = &N(D_80241C68_BE09F8); - heap_free(*ptr); - *ptr = NULL; - } - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EC2240", func_802400F4_EC22F4); - -INCLUDE_ASM(s32, "code_EC2240", func_80240158_EC2358); diff --git a/src/code_EC2610.c b/src/code_EC2610.c deleted file mode 100644 index 8f5385d8e0..0000000000 --- a/src/code_EC2610.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EC2610", func_80240410_EC2610); - -INCLUDE_ASM(s32, "code_EC2610", func_80240480_EC2680); diff --git a/src/code_EC71B0.c b/src/code_EC71B0.c deleted file mode 100644 index 23b643cc27..0000000000 --- a/src/code_EC71B0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EC71B0 - -#include "world/common/DeadUnkTexturePanFunc.inc.c" - -#include "world/common/DeadUnkTexturePanFunc2.inc.c" - -INCLUDE_ASM(s32, "code_EC71B0", func_8024030C_EC74BC); - -INCLUDE_ASM(s32, "code_EC71B0", func_80240344_EC74F4); diff --git a/src/code_EC7590.c b/src/code_EC7590.c deleted file mode 100644 index 543ea1e577..0000000000 --- a/src/code_EC7590.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EC7590", func_802403E0_EC7590); - -INCLUDE_ASM(s32, "code_EC7590", func_80240450_EC7600); - -INCLUDE_ASM(s32, "code_EC7590", func_8024061C_EC77CC); -/* -ApiStatus N(func_8024061C_EC77CC)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &N(D_80241C68_BE09F8); - s32 i; - s32* test; - - if (*ptr == NULL) { - i = heap_malloc(16 * sizeof(s32)); - *ptr = i; - for (i = 0, test = *ptr; i < 16; i++) { - *test++ = script->varTable[i]; - } - } else { - for (i = 0, test = *ptr; i < 16; i++) { - script->varTable[i] = *test++; - } - ptr = &N(D_80241C68_BE09F8); - heap_free(*ptr); - *ptr = NULL; - } - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EC7590", func_802406D0_EC7880); diff --git a/src/code_EC9D00.c b/src/code_EC9D00.c deleted file mode 100644 index f4134da1f7..0000000000 --- a/src/code_EC9D00.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EC9D00 - -INCLUDE_ASM(s32, "code_EC9D00", func_80240000_EC9D00); - -INCLUDE_ASM(s32, "code_EC9D00", func_8024001C_EC9D1C); - -INCLUDE_ASM(s32, "code_EC9D00", func_8024003C_EC9D3C); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240068_EC9D68); - -INCLUDE_ASM(s32, "code_EC9D00", func_802400D4_EC9DD4); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240120_EC9E20); - -INCLUDE_ASM(s32, "code_EC9D00", func_802401CC_EC9ECC); - -INCLUDE_ASM(s32, "code_EC9D00", func_8024041C_ECA11C); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240448_ECA148); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240480_ECA180); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240510_ECA210); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240544_ECA244); - -INCLUDE_ASM(s32, "code_EC9D00", func_802405A8_ECA2A8); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240600_ECA300); - -INCLUDE_ASM(s32, "code_EC9D00", func_80240B38_ECA838); - -#include "world/common/DeadUnkPartnerPosFuncs.inc.c" - -INCLUDE_ASM(s32, "code_EC9D00", func_80240D08_ECAA08); diff --git a/src/code_ECAA80.c b/src/code_ECAA80.c deleted file mode 100644 index bad1b49307..0000000000 --- a/src/code_ECAA80.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ECAA80", func_80240D80_ECAA80); - -INCLUDE_ASM(s32, "code_ECAA80", func_80241364_ECB064); - -INCLUDE_ASM(s32, "code_ECAA80", func_802414C8_ECB1C8); - -INCLUDE_ASM(s32, "code_ECAA80", func_8024150C_ECB20C); - -INCLUDE_ASM(s32, "code_ECAA80", func_80241770_ECB470); - -INCLUDE_ASM(s32, "code_ECAA80", func_802417CC_ECB4CC); - -INCLUDE_ASM(s32, "code_ECAA80", func_8024199C_ECB69C); -/* -ApiStatus N(func_8024199C_ECB69C)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr; - - if (isInitialCall) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - } - - ptr = &D_80241CCC_BE0A5C; - if (*ptr != NULL) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - set_variable(script, *args, D_80241CD0_BE0A60); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} -*/ - -INCLUDE_ASM(s32, "code_ECAA80", func_802419F0_ECB6F0); -/* -ApiStatus N(func_802419F0_ECB6F0)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80241CD0_BE0A60 = get_variable(script, *args); - D_80241CCC_BE0A5C = 1; - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_ECAA80", func_80241A28_ECB728); - -INCLUDE_ASM(s32, "code_ECAA80", func_80241AC4_ECB7C4); - -INCLUDE_ASM(s32, "code_ECAA80", func_80241B88_ECB888); - -INCLUDE_ASM(s32, "code_ECAA80", func_80241BF8_ECB8F8); diff --git a/src/code_ECB930.c b/src/code_ECB930.c deleted file mode 100644 index c5d4105ff8..0000000000 --- a/src/code_ECB930.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ECB930", func_80241C30_ECB930); - -INCLUDE_ASM(s32, "code_ECB930", func_80241CA0_ECB9A0); diff --git a/src/code_ECBB70.c b/src/code_ECBB70.c deleted file mode 100644 index 38d162fe67..0000000000 --- a/src/code_ECBB70.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ECBB70", func_80241E70_ECBB70); diff --git a/src/code_ED0030.c b/src/code_ED0030.c deleted file mode 100644 index dc55d5ffd1..0000000000 --- a/src/code_ED0030.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ED0030", func_80240040_ED0030); diff --git a/src/code_ED00D0.c b/src/code_ED00D0.c deleted file mode 100644 index 248a3df936..0000000000 --- a/src/code_ED00D0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ED00D0", func_802400E0_ED00D0); - -INCLUDE_ASM(s32, "code_ED00D0", func_80240150_ED0140); diff --git a/src/code_ED0310.c b/src/code_ED0310.c deleted file mode 100644 index d07f3f4c02..0000000000 --- a/src/code_ED0310.c +++ /dev/null @@ -1,245 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_ED0310 - -INCLUDE_ASM(s32, "code_ED0310", func_80240320_ED0310); -/* -void N(func_80240320_ED0310)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.unk_18, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ - -INCLUDE_ASM(s32, "code_ED0310", func_802404D0_ED04C0); - -INCLUDE_ASM(s32, "code_ED0310", func_80240AF8_ED0AE8); - -INCLUDE_ASM(s32, "code_ED0310", func_80240BB8_ED0BA8); -/* -void N(func_80240BB8_ED0BA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ - -INCLUDE_ASM(s32, "code_ED0310", func_80240EFC_ED0EEC); - -INCLUDE_ASM(s32, "code_ED0310", func_80240F74_ED0F64); -/* -void N(func_80240F74_ED0F64)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0].s = 12; - } -} -*/ - -#include "world/common/DeadUnkNpcAIFunc14.inc.c" - -INCLUDE_ASM(s32, "code_ED0310", func_80241114_ED1104); - -INCLUDE_ASM(s32, "code_ED0310", func_80241178_ED1168); -/* -void N(func_80241178_ED1168)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; - - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "code_ED0310", func_80241508_ED14F8); -/* -void N(func_80241508_ED14F8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ - -INCLUDE_ASM(s32, "code_ED0310", func_8024162C_ED161C); diff --git a/src/code_ED4220.c b/src/code_ED4220.c deleted file mode 100644 index 714bc59dbf..0000000000 --- a/src/code_ED4220.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ED4220", func_80240000_ED4220); diff --git a/src/code_ED42A0.c b/src/code_ED42A0.c deleted file mode 100644 index 317537bcb1..0000000000 --- a/src/code_ED42A0.c +++ /dev/null @@ -1,32 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ED42A0", func_80240080_ED42A0); -/* -ApiStatus N(func_80240080_ED42A0)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &N(D_80241C68_BE09F8); - s32 i; - s32* test; - - if (*ptr == NULL) { - i = heap_malloc(16 * sizeof(s32)); - *ptr = i; - for (i = 0, test = *ptr; i < 16; i++) { - *test++ = script->varTable[i]; - } - } else { - for (i = 0, test = *ptr; i < 16; i++) { - script->varTable[i] = *test++; - } - ptr = &N(D_80241C68_BE09F8); - heap_free(*ptr); - *ptr = NULL; - } - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_ED42A0", func_80240134_ED4354); - -INCLUDE_ASM(s32, "code_ED42A0", func_80240198_ED43B8); - -INCLUDE_ASM(s32, "code_ED42A0", func_802402BC_ED44DC); diff --git a/src/code_ED46D0.c b/src/code_ED46D0.c deleted file mode 100644 index 36173b2a6d..0000000000 --- a/src/code_ED46D0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ED46D0", func_802404B0_ED46D0); - -INCLUDE_ASM(s32, "code_ED46D0", func_80240B10_ED4D30); diff --git a/src/code_ED5540.c b/src/code_ED5540.c deleted file mode 100644 index 8a4354c95c..0000000000 --- a/src/code_ED5540.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ED5540", func_80241320_ED5540); - -INCLUDE_ASM(s32, "code_ED5540", func_80241390_ED55B0); diff --git a/src/code_ED8E20.c b/src/code_ED8E20.c deleted file mode 100644 index ecf88c9d16..0000000000 --- a/src/code_ED8E20.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ED8E20", func_80240000_ED8E20); - -INCLUDE_ASM(s32, "code_ED8E20", func_80240020_ED8E40); - -INCLUDE_ASM(s32, "code_ED8E20", func_80240034_ED8E54); - -INCLUDE_ASM(s32, "code_ED8E20", func_802400F0_ED8F10); - -INCLUDE_ASM(s32, "code_ED8E20", func_80240208_ED9028); - -INCLUDE_ASM(s32, "code_ED8E20", func_80240274_ED9094); - -INCLUDE_ASM(s32, "code_ED8E20", func_80240318_ED9138); diff --git a/src/code_EDBFE0.c b/src/code_EDBFE0.c deleted file mode 100644 index b11b9228af..0000000000 --- a/src/code_EDBFE0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EDBFE0", func_80240000_EDBFE0); diff --git a/src/code_EDC020.c b/src/code_EDC020.c deleted file mode 100644 index be8494d995..0000000000 --- a/src/code_EDC020.c +++ /dev/null @@ -1,72 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EDC020", func_80240040_EDC020); - -INCLUDE_ASM(s32, "code_EDC020", func_802400B0_EDC090); - -INCLUDE_ASM(s32, "code_EDC020", func_8024027C_EDC25C); -/* -ApiStatus N(func_8024027C_EDC25C)(ScriptInstance* script, s32 isInitialCall) { - s32** ptr = &N(D_80241C68_BE09F8); - s32 i; - s32* test; - - if (*ptr == NULL) { - i = heap_malloc(16 * sizeof(s32)); - *ptr = i; - for (i = 0, test = *ptr; i < 16; i++) { - *test++ = script->varTable[i]; - } - } else { - for (i = 0, test = *ptr; i < 16; i++) { - script->varTable[i] = *test++; - } - ptr = &N(D_80241C68_BE09F8); - heap_free(*ptr); - *ptr = NULL; - } - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EDC020", func_80240330_EDC310); - -INCLUDE_ASM(s32, "code_EDC020", func_80240394_EDC374); - -INCLUDE_ASM(s32, "code_EDC020", func_802403F0_EDC3D0); - -INCLUDE_ASM(s32, "code_EDC020", func_802405C0_EDC5A0); -/* -ApiStatus N(func_802405C0_EDC5A0)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr; - - if (isInitialCall) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - } - - ptr = &D_80241CCC_BE0A5C; - if (*ptr != NULL) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - set_variable(script, *args, D_80241CD0_BE0A60); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} -*/ - -INCLUDE_ASM(s32, "code_EDC020", func_80240614_EDC5F4); -/* -ApiStatus N(func_80240614_EDC5F4)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80241CD0_BE0A60 = get_variable(script, *args); - D_80241CCC_BE0A5C = 1; - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EDC020", func_8024064C_EDC62C); diff --git a/src/code_EDE9C0.c b/src/code_EDE9C0.c deleted file mode 100644 index 3ac7bdaa70..0000000000 --- a/src/code_EDE9C0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EDE9C0", func_80240000_EDE9C0); diff --git a/src/code_EDEA00.c b/src/code_EDEA00.c deleted file mode 100644 index a6e85304a6..0000000000 --- a/src/code_EDEA00.c +++ /dev/null @@ -1,273 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EDEA00 - -INCLUDE_ASM(s32, "code_EDEA00", func_80240040_EDEA00); - -INCLUDE_ASM(s32, "code_EDEA00", func_802401C4_EDEB84); -/* -void N(func_802401C4_EDEB84)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.unk_18, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ - -INCLUDE_ASM(s32, "code_EDEA00", func_80240374_EDED34); - -INCLUDE_ASM(s32, "code_EDEA00", func_8024099C_EDF35C); - -INCLUDE_ASM(s32, "code_EDEA00", func_80240A5C_EDF41C); -/* -void N(func_80240A5C_EDF41C)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ - -INCLUDE_ASM(s32, "code_EDEA00", func_80240DA0_EDF760); - -INCLUDE_ASM(s32, "code_EDEA00", func_80240E18_EDF7D8); -/* -void N(func_80240E18_EDF7D8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0].s = 12; - } -} -*/ - -#include "world/common/DeadUnkNpcAIFunc14.inc.c" - -INCLUDE_ASM(s32, "code_EDEA00", func_80240FB8_EDF978); - -INCLUDE_ASM(s32, "code_EDEA00", func_8024101C_EDF9DC); -/* -void N(func_8024101C_EDF9DC)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; - - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "code_EDEA00", func_802413AC_EDFD6C); -/* -void N(func_802413AC_EDFD6C)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ - -INCLUDE_ASM(s32, "code_EDEA00", func_802414D0_EDFE90); - -INCLUDE_ASM(s32, "code_EDEA00", func_802416E8_EE00A8); - -INCLUDE_ASM(s32, "code_EDEA00", func_80241730_EE00F0); - -INCLUDE_ASM(s32, "code_EDEA00", func_80241B94_EE0554); - -INCLUDE_ASM(s32, "code_EDEA00", func_80241DE4_EE07A4); - -INCLUDE_ASM(s32, "code_EDEA00", func_802422F0_EE0CB0); - -INCLUDE_ASM(s32, "code_EDEA00", func_8024236C_EE0D2C); - -INCLUDE_ASM(s32, "code_EDEA00", func_802424A0_EE0E60); - -INCLUDE_ASM(s32, "code_EDEA00", func_80242604_EE0FC4); - -INCLUDE_ASM(s32, "code_EDEA00", func_80242684_EE1044); - -INCLUDE_ASM(s32, "code_EDEA00", func_80242AF0_EE14B0); - -INCLUDE_ASM(s32, "code_EDEA00", pause_interp_text_scroll_EE1DD8); - -INCLUDE_ASM(s32, "code_EDEA00", func_80243470_EE1E30); - -INCLUDE_ASM(s32, "code_EDEA00", func_80243584_EE1F44); diff --git a/src/code_EE2040.c b/src/code_EE2040.c deleted file mode 100644 index 64fe03621a..0000000000 --- a/src/code_EE2040.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EE2040", func_80243680_EE2040); diff --git a/src/code_EE65B0.c b/src/code_EE65B0.c deleted file mode 100644 index 30f916a241..0000000000 --- a/src/code_EE65B0.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EE65B0 - -#include "world/common/DeadUnkTexturePanFunc.inc.c" - -#include "world/common/DeadUnkTexturePanFunc2.inc.c" - -INCLUDE_ASM(s32, "code_EE65B0", func_8024030C_EE68BC); - -INCLUDE_ASM(s32, "code_EE65B0", func_80240340_EE68F0); - -INCLUDE_ASM(s32, "code_EE65B0", func_802403D4_EE6984); - -INCLUDE_ASM(s32, "code_EE65B0", func_8024042C_EE69DC); - -INCLUDE_ASM(s32, "code_EE65B0", func_8024046C_EE6A1C); - -INCLUDE_ASM(s32, "code_EE65B0", func_80240504_EE6AB4); - -INCLUDE_ASM(s32, "code_EE65B0", func_802407D4_EE6D84); diff --git a/src/code_EE70C0.c b/src/code_EE70C0.c deleted file mode 100644 index 66f11200d8..0000000000 --- a/src/code_EE70C0.c +++ /dev/null @@ -1,285 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EE70C0 - -INCLUDE_ASM(s32, "code_EE70C0", func_80240B10_EE70C0); -/* -void N(func_80240B10_EE70C0)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.unk_18, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ - -INCLUDE_ASM(s32, "code_EE70C0", func_80240CC0_EE7270); - -INCLUDE_ASM(s32, "code_EE70C0", func_802412E8_EE7898); - -INCLUDE_ASM(s32, "code_EE70C0", func_802413A8_EE7958); -/* -void N(func_802413A8_EE7958)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ - -INCLUDE_ASM(s32, "code_EE70C0", func_802416EC_EE7C9C); - -INCLUDE_ASM(s32, "code_EE70C0", func_80241764_EE7D14); -/* -void N(func_80241764_EE7D14)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0].s = 12; - } -} -*/ - -#include "world/common/DeadUnkNpcAIFunc14.inc.c" - -INCLUDE_ASM(s32, "code_EE70C0", func_80241904_EE7EB4); - -INCLUDE_ASM(s32, "code_EE70C0", func_80241968_EE7F18); -/* -void N(func_80241968_EE7F18)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; - - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "code_EE70C0", func_80241CF8_EE82A8); -/* -void N(func_80241CF8_EE82A8)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ - -INCLUDE_ASM(s32, "code_EE70C0", func_80241E1C_EE83CC); - -INCLUDE_ASM(s32, "code_EE70C0", func_80242034_EE85E4); - -INCLUDE_ASM(s32, "code_EE70C0", func_80242090_EE8640); - -INCLUDE_ASM(s32, "code_EE70C0", func_80242260_EE8810); -/* -ApiStatus N(func_80242260_EE8810)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32* ptr; - - if (isInitialCall) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - } - - ptr = &D_80241CCC_BE0A5C; - if (*ptr != NULL) { - ptr = &D_80241CCC_BE0A5C; - *ptr = 0; - set_variable(script, *args, D_80241CD0_BE0A60); - return ApiStatus_DONE2; - } - - return ApiStatus_BLOCK; -} -*/ - -INCLUDE_ASM(s32, "code_EE70C0", func_802422B4_EE8864); -/* -ApiStatus N(func_802422B4_EE8864)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - D_80241CD0_BE0A60 = get_variable(script, *args); - D_80241CCC_BE0A5C = 1; - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EE70C0", func_802422EC_EE889C); diff --git a/src/code_EE8940.c b/src/code_EE8940.c deleted file mode 100644 index 48f0a3a275..0000000000 --- a/src/code_EE8940.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EE8940", func_80242390_EE8940); diff --git a/src/code_EED140.c b/src/code_EED140.c deleted file mode 100644 index f8605950b2..0000000000 --- a/src/code_EED140.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EED140", func_80240040_EED140); diff --git a/src/code_EED1E0.c b/src/code_EED1E0.c deleted file mode 100644 index 13b7f0f17b..0000000000 --- a/src/code_EED1E0.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EED1E0 - -INCLUDE_ASM(s32, "code_EED1E0", func_802400E0_EED1E0); - -INCLUDE_ASM(s32, "code_EED1E0", func_802400FC_EED1FC); - -INCLUDE_ASM(s32, "code_EED1E0", func_8024011C_EED21C); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240148_EED248); - -INCLUDE_ASM(s32, "code_EED1E0", func_802401B4_EED2B4); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240200_EED300); - -INCLUDE_ASM(s32, "code_EED1E0", func_802402AC_EED3AC); - -INCLUDE_ASM(s32, "code_EED1E0", func_802404FC_EED5FC); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240528_EED628); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240560_EED660); - -INCLUDE_ASM(s32, "code_EED1E0", func_802405F0_EED6F0); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240624_EED724); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240688_EED788); - -INCLUDE_ASM(s32, "code_EED1E0", func_802406E0_EED7E0); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240C18_EEDD18); - -#include "world/common/DeadUnkPartnerPosFuncs.inc.c" - -INCLUDE_ASM(s32, "code_EED1E0", func_80240DE8_EEDEE8); - -INCLUDE_ASM(s32, "code_EED1E0", func_80240E18_EEDF18); diff --git a/src/code_EEDF50.c b/src/code_EEDF50.c deleted file mode 100644 index a8720d87be..0000000000 --- a/src/code_EEDF50.c +++ /dev/null @@ -1,253 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EEDF50 - -INCLUDE_ASM(s32, "code_EEDF50", func_80240E50_EEDF50); -/* -void N(func_80240E50_EEDF50)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.unk_18, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ - -INCLUDE_ASM(s32, "code_EEDF50", func_80241000_EEE100); - -INCLUDE_ASM(s32, "code_EEDF50", func_80241628_EEE728); - -INCLUDE_ASM(s32, "code_EEDF50", func_802416E8_EEE7E8); -/* -void N(func_802416E8_EEE7E8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ - -INCLUDE_ASM(s32, "code_EEDF50", func_80241A2C_EEEB2C); - -INCLUDE_ASM(s32, "code_EEDF50", func_80241AA4_EEEBA4); -/* -void N(func_80241AA4_EEEBA4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0].s = 12; - } -} -*/ - -#include "world/common/DeadUnkNpcAIFunc14.inc.c" - -INCLUDE_ASM(s32, "code_EEDF50", func_80241C44_EEED44); - -INCLUDE_ASM(s32, "code_EEDF50", func_80241CA8_EEEDA8); -/* -void N(func_80241CA8_EEEDA8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; - - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "code_EEDF50", func_80242038_EEF138); -/* -void N(func_80242038_EEF138)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ - -INCLUDE_ASM(s32, "code_EEDF50", func_8024215C_EEF25C); - -INCLUDE_ASM(s32, "code_EEDF50", func_80242374_EEF474); - -INCLUDE_ASM(s32, "code_EEDF50", func_802424A4_EEF5A4); - -INCLUDE_ASM(s32, "code_EEDF50", func_80242724_EEF824); - -INCLUDE_ASM(s32, "code_EEDF50", func_80242780_EEF880); diff --git a/src/code_EEFAA0.c b/src/code_EEFAA0.c deleted file mode 100644 index 539f893270..0000000000 --- a/src/code_EEFAA0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EEFAA0", func_802429A0_EEFAA0); diff --git a/src/code_EF2610.c b/src/code_EF2610.c deleted file mode 100644 index 7c4c417e22..0000000000 --- a/src/code_EF2610.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EF2610 - -#include "common/DeadUnk1.inc.c" diff --git a/src/code_EF2680.c b/src/code_EF2680.c deleted file mode 100644 index af46267819..0000000000 --- a/src/code_EF2680.c +++ /dev/null @@ -1,265 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EF2680 - -INCLUDE_ASM(s32, "code_EF2680", func_80240070_EF2680); -/* -void N(func_80240070_EF2680)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->duration = aiSettings->moveTime / 2 + rand_int(aiSettings->moveTime / 2 + 1); - if (is_point_within_region(enemy->territory->wander.unk_18, - enemy->territory->wander.point.x, enemy->territory->wander.point.z, - npc->pos.x, npc->pos.z, - enemy->territory->wander.wanderSizeX, enemy->territory->wander.wanderSizeZ)) { - npc->yaw = atan2(npc->pos.x, npc->pos.z, enemy->territory->wander.point.x, enemy->territory->wander.point.z); - } else { - npc->yaw = clamp_angle((npc->yaw + rand_int(60)) - 30.0f); - } - npc->currentAnim = enemy->animList[1]; - script->functionTemp[1].s = 0; - if (enemy->territory->wander.moveSpeedOverride < 0) { - npc->moveSpeed = aiSettings->moveSpeed; - } else { - npc->moveSpeed = enemy->territory->wander.moveSpeedOverride / 32767.0; - } - enemy->varTable[4] = npc->pos.y * 100.0; - script->functionTemp[0].s = 1; -} -*/ - -INCLUDE_ASM(s32, "code_EF2680", func_80240220_EF2830); - -INCLUDE_ASM(s32, "code_EF2680", func_80240848_EF2E58); - -INCLUDE_ASM(s32, "code_EF2680", func_80240908_EF2F18); -/* -void N(func_80240908_EF2F18)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f24 = (f32)enemy->varTable[3] / 100.0; - f32 temp_f26 = temp_f24 + (f32)((f32)enemy->varTable[7] / 100.0); - s32 var; - - if (npc->duration > 0) { - npc->duration--; - } - - if (enemy->varTable[1] > 0) { - f32 temp_f22 = (f32)enemy->varTable[1] / 100.0; - f32 sin_degrees = sin_deg(enemy->varTable[2]); - s32 phi_v0; - - if (npc->flags & 8) { - phi_v0 = FALSE; - } else { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } - - if (phi_v0) { - npc->pos.y = posY + temp_f24 + (sin_degrees * temp_f22); - } else { - npc->pos.y = temp_f26 + (sin_degrees * temp_f22); - } - - enemy->varTable[2] = clamp_angle(enemy->varTable[2] + 10); - } - - if (enemy->varTable[9] <= 0) { - if ((gPlayerStatusPtr->position.y < ((npc->pos.y + npc->collisionHeight) + 10.0)) && func_800490B4(territory, enemy, aiSettings->chaseRadius, aiSettings->unk_28.f, 1)) { - fx_emote(0, npc, 0.0f, npc->collisionHeight, 1.0f, 2.0f, -20.0f, 12, &var); - npc->moveToPos.y = npc->pos.y; - func_800494C0(npc, 0x2F4, 0x200000); - if (enemy->npcSettings->unk_2A & 1) { - script->functionTemp[0].s = 10; - } else { - script->functionTemp[0].s = 12; - } - return; - } - } else { - enemy->varTable[9]--; - } - - if ((npc->unk_8C == 0) && (npc->duration <= 0)) { - script->functionTemp[1].s--; - if (script->functionTemp[1].s > 0) { - if (!(enemy->npcSettings->unk_2A & 0x10)) { - npc->yaw = clamp_angle(npc->yaw + 180.0f); - } - npc->duration = (rand_int(1000) % 11) + 5; - } else { - script->functionTemp[0].s = 0; - } - } -} -*/ - -INCLUDE_ASM(s32, "code_EF2680", func_80240C4C_EF325C); - -INCLUDE_ASM(s32, "code_EF2680", func_80240CC4_EF32D4); -/* -void N(func_80240CC4_EF32D4)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - - npc->pos.y += N(D_802436DC_BE6E8C)[npc->duration++]; - if (npc->duration >= 5) { - script->functionTemp[0].s = 12; - } -} -*/ - -#include "world/common/DeadUnkNpcAIFunc14.inc.c" - -INCLUDE_ASM(s32, "code_EF2680", func_80240E64_EF3474); - -INCLUDE_ASM(s32, "code_EF2680", func_80240EC8_EF34D8); -/* -void N(func_80240EC8_EF34D8)(ScriptInstance* script, NpcAISettings* aiSettings, EnemyTerritoryThing* territory) { - Enemy* enemy = script->owner1.enemy; - Npc* npc = get_npc_unsafe(enemy->npcID); - f32 posX, posY, posZ, posW; - f32 temp_f0_2; - f32 temp_f20; - f32 temp_f22; - f32 temp_f2; - s32 phi_v0; - f32 phi_f20; - f32 a = enemy->varTable[3]; - f32 b = enemy->varTable[7]; - - npc->jumpVelocity += npc->jumpScale; - temp_f20 = a / 100.0; - temp_f22 = b / 100.0; - npc_move_heading(npc, npc->moveSpeed, npc->yaw); - - if (npc->jumpVelocity >= 0.0) { - npc->pos.y += npc->jumpVelocity; - npc->currentAnim = enemy->animList[9]; - enemy->unk_07 = 0; - if (!(npc->flags & 8)) { - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - phi_v0 = func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - } else { - phi_v0 = FALSE; - } - if (phi_v0) { - temp_f2 = posY + temp_f20; - if (temp_f2 <= npc->pos.y) { - npc->pos.y = temp_f2; - script->functionTemp[0].s = 0; - } - } else if (npc->pos.y >= npc->moveToPos.y) { - script->functionTemp[0].s = 0; - } - } else if (npc->jumpVelocity < 0.0) { - npc->duration++; - if (npc->duration >= aiSettings->unk_20) { - npc->duration = 0; - phi_f20 = atan2(npc->pos.x, npc->pos.z, gPlayerStatusPtr->position.x, gPlayerStatusPtr->position.z); - temp_f0_2 = get_clamped_angle_diff(npc->yaw, phi_f20); - if (aiSettings->unk_1C.s < fabsf(temp_f0_2)) { - phi_f20 = npc->yaw; - if (temp_f0_2 < 0.0f) { - phi_f20 += -aiSettings->unk_1C.s; - } else { - phi_f20 += aiSettings->unk_1C.s; - } - } - npc->yaw = clamp_angle(phi_f20); - } - - if (npc->flags & 8) { - if (npc->pos.y + npc->jumpVelocity < temp_f22) { - npc->pos.y = temp_f22; - npc->jumpVelocity = 0.0f; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } - - posX = npc->pos.x; - posY = npc->pos.y + npc->collisionHeight; - posZ = npc->pos.z; - posW = (fabsf(npc->jumpVelocity) + npc->collisionHeight) + 10.0; - if (func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW)) { - if (posW <= (npc->collisionHeight + fabsf(npc->jumpVelocity))) { - npc->jumpVelocity = 0.0f; - npc->pos.y = posY; - } else { - npc->pos.y += npc->jumpVelocity; - } - return; - } else if (fabsf(npc->jumpVelocity) < ((npc->pos.y - temp_f22) + npc->collisionHeight)) { - npc->pos.y = npc->pos.y + npc->jumpVelocity; - return; - } - npc->jumpVelocity = 0.0f; - } -} -*/ - -INCLUDE_ASM(s32, "code_EF2680", func_80241258_EF3868); -/* -void N(func_80241258_EF3868)(Npc *npc, Enemy *enemy, ScriptInstance *script, NpcAISettings *aiSettings) { - f32 posX, posY, posZ, posW; - s32 temp_a1; - s32 temp_v1; - s32 phi_v0; - - script->functionTemp[0].s = 0; - npc->duration = 0; - temp_v1 = npc->flags & ~0x200; - npc->flags = (npc->flags & ~0x200) | 0x800; - if (enemy->territory->wander.isFlying) { - npc->flags = temp_v1 | 0x808; - } else { - npc->flags = npc->flags & ~8; - } - - posX = npc->pos.x; - posY = npc->pos.y; - posZ = npc->pos.z; - posW = 1000.0f; - func_800DCB7C(npc->unk_80, &posX, &posY, &posZ, &posW); - enemy->varTable[2] = 0; - enemy->varTable[9] = 0; - enemy->varTable[3] = ((posW * 100.0) + 0.5); - enemy->varTable[7] = ((posY * 100.0) + 0.5); - script->functionTemp[1].s = aiSettings->unk_14; - enemy->unk_B0 |= 0x10; -} -*/ - -INCLUDE_ASM(s32, "code_EF2680", func_8024137C_EF398C); - -INCLUDE_ASM(s32, "code_EF2680", func_80241594_EF3BA4); - -INCLUDE_ASM(s32, "code_EF2680", func_802415DC_EF3BEC); - -INCLUDE_ASM(s32, "code_EF2680", func_80241A40_EF4050); - -INCLUDE_ASM(s32, "code_EF2680", func_80241C90_EF42A0); - -INCLUDE_ASM(s32, "code_EF2680", func_8024219C_EF47AC); - -INCLUDE_ASM(s32, "code_EF2680", func_80242218_EF4828); - -INCLUDE_ASM(s32, "code_EF2680", func_8024234C_EF495C); - -INCLUDE_ASM(s32, "code_EF2680", func_802424B0_EF4AC0); - -INCLUDE_ASM(s32, "code_EF2680", func_80242530_EF4B40); - -INCLUDE_ASM(s32, "code_EF2680", func_8024299C_EF4FAC); diff --git a/src/code_EF7FB0.c b/src/code_EF7FB0.c deleted file mode 100644 index 7e65ef8c00..0000000000 --- a/src/code_EF7FB0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EF7FB0", func_80240530_EF7FB0); diff --git a/src/code_EF8010.c b/src/code_EF8010.c deleted file mode 100644 index ac3e62aef6..0000000000 --- a/src/code_EF8010.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_EF8010", func_80240590_EF8010); - -INCLUDE_ASM(s32, "code_EF8010", func_80240600_EF8080); diff --git a/src/code_EFEB00.c b/src/code_EFEB00.c deleted file mode 100644 index 64119fe7d5..0000000000 --- a/src/code_EFEB00.c +++ /dev/null @@ -1,44 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_EFEB00 - -#include "world/common/DeadUnkTexturePanFunc.inc.c" - -#include "world/common/DeadUnkTexturePanFunc2.inc.c" - -#include "common/DeadUnk1.inc.c" - -INCLUDE_ASM(s32, "code_EFEB00", func_80240340_EFEE40); -/* -ApiStatus N(func_80240340_EFEE40)(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - s32 a1 = *args++; - s32 var0 = get_variable(script, a1); - s32 a2 = *args++; - f32 var1 = get_float_variable(script, *args++); - f32 var2 = get_float_variable(script, *args++); - s32 var3 = get_variable(script, *args++); - s32 var4 = get_variable(script, *args++); - f32 temp = (get_float_variable(script, *args++) / 180.0f) * PI; - f32 diff = fabsf(var2 - var1) / 2; - - if (var4 != 0 && var3 < var0) { - var0 = var3; - set_variable(script, a1, var3); - } - - set_float_variable(script, a2, (var1 + diff) - (diff * cos_rad(((var0 * PI) / var3) + temp))); - - return ApiStatus_DONE2; -} -*/ - -INCLUDE_ASM(s32, "code_EFEB00", func_802404D0_EFEFD0); - -INCLUDE_ASM(s32, "code_EFEB00", func_80240540_EFF040); - -INCLUDE_ASM(s32, "code_EFEB00", func_80240660_EFF160); - -INCLUDE_ASM(s32, "code_EFEB00", func_80240784_EFF284); - -INCLUDE_ASM(s32, "code_EFEB00", func_802407B0_EFF2B0); diff --git a/src/code_ad90_len_2880.c b/src/code_ad90_len_2880.c deleted file mode 100644 index f9f0cb54a4..0000000000 --- a/src/code_ad90_len_2880.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_ad90_len_2880", do_camera_type_6); diff --git a/src/code_cd180_len_38f0.c b/src/code_cd180_len_38f0.c deleted file mode 100644 index 8df1e43541..0000000000 --- a/src/code_cd180_len_38f0.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "code_cd180_len_38f0", _render_transition_stencil); - -INCLUDE_ASM(void, "code_cd180_len_38f0", set_transition_stencil_zoom_0, s32 arg0, f32 arg1); - -INCLUDE_ASM(void, "code_cd180_len_38f0", set_transition_stencil_zoom_1, s32 arg0, f32 arg1); - -INCLUDE_ASM(void, "code_cd180_len_38f0", func_80137DC0, s32 arg0, f32* arg1, f32* arg2); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", set_transition_stencil_color, s32 arg0, u8 arg1, u8 arg2, u8 arg3); - -INCLUDE_ASM(void, "code_cd180_len_38f0", set_transition_stencil_center, s32 arg0, s32 arg1, s32 arg2, s32 arg3); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", set_transition_stencil_center_worldpos); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", set_transition_stencil_alpha); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", clear_transition_stencil); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_80138188); - -void func_80138198(void) { -} - -INCLUDE_ASM(s32, "code_cd180_len_38f0", render_transition_stencil_upper); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", render_transition_stencil_lower); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", set_map_transition_effect); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801382AC); - -INCLUDE_ASM(s32, "code_cd180_len_38f0", func_801385D4); diff --git a/src/code_d5a50_len_5fd0.c b/src/code_d5a50_len_5fd0.c deleted file mode 100644 index 881f2733d0..0000000000 --- a/src/code_d5a50_len_5fd0.c +++ /dev/null @@ -1,114 +0,0 @@ -#include "common.h" - -s32 D_8014EFC0[] = { 0x00000000, }; -s32 D_8014EFC4[] = { 0x00011000, }; -s32 D_8014EFC8[] = { 0x00000000, }; -s32 D_8014EFCC[] = { 0x00080008, 0x00200010, 0x00100080, 0x00180018, 0x01200020, 0x00200200, 0x00300030, 0x04800040, - 0x00400800, 0x00080010, 0x00400010, 0x00080040, 0x00100018, 0x00C00010, 0x00200100, 0x00400020, - 0x04000020, 0x00100100, 0x000C000C, 0x00480030, 0x00180240, 0x00200008, 0x00800018, 0x00080060, - 0x00400010, 0x02000010, 0x00400200, 0x00C00020, 0x0C000028, 0x00280320, 0x00180010, 0x00C00020, - 0x00280280, 0x00280010, 0x01400028, 0x001801E0, 0x00200018, 0x01800014, 0x00200000, 0x00220020, - 0x00000028, 0x002803C8, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, 0x00000000, 0xE3000A11, - 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, - 0x00000000, 0xE3000A11, 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, - }; -s32 D_8014F0C8[] = { 0xFFF40000, 0x00000000, 0x08000800, 0x000000FF, 0x00330000, 0x00000000, 0x00000800, 0x000000FF, - 0x0033003F, 0x00000000, 0x00000000, 0x000000FF, 0xFFF4003F, 0x00000000, 0x08000000, 0x000000FF, - 0xFFFFFF00, 0xFFFFFF00, - }; -s32 D_8014F110[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; - - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_8013F350); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_8013F704); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80141100); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", init_menu_icon_list); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801413F8); - -INCLUDE_ASM(MenuIcon*, "code_d5a50_len_5fd0", create_icon, s32* iconIndex); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", update_menu_icons); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80141704); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80142210); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_8014271C); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", render_menu_icon); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", render_menu_icons); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80143C48); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144218); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144238); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144258); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144278); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_menu_icon); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_icon_0); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_icon_1); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", draw_icon_2); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", set_menu_icon_script); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_menu_icon_script); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_menu_icon); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", free_icon, MenuIcon* iconIndex); - -INCLUDE_ASM(void, "code_d5a50_len_5fd0", set_icon_render_pos, MenuIcon* iconIndex, s32 posX, s32 posY); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", get_icon_render_pos); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801449DC); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", set_icon_flags); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", clear_icon_flags); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144A5C); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144C20); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144DF4); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144E4C); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144E74); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", icon_set_opacity); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", icon_set_tint); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144F28); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80144FD8); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145070); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145108); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145184); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801451D4); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145224); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_80145274); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801452B4); - -INCLUDE_ASM(s32, "code_d5a50_len_5fd0", func_801452E8); diff --git a/src/code_d610_len_1330.c b/src/code_d610_len_1330.c deleted file mode 100644 index 844b2312e3..0000000000 --- a/src/code_d610_len_1330.c +++ /dev/null @@ -1,30 +0,0 @@ -#include "common.h" - -extern s16 D_800A08F0; -extern s32 gameModeMap[]; - -INCLUDE_ASM(s32, "code_d610_len_1330", func_80032210); - -INCLUDE_ASM(s32, "code_d610_len_1330", func_800322DC); - -INCLUDE_ASM(s32, "code_d610_len_1330", func_800325E4); - -INCLUDE_ASM(s32, "code_d610_len_1330", func_800328A4); - -INCLUDE_ASM(s32, "code_d610_len_1330", func_80032970); - -INCLUDE_ASM(s32, "code_d610_len_1330", func_80032C64); - -INCLUDE_ASM(s32, "code_d610_len_1330", create_camera_lead_player_mtx); - -void func_800334E8(void) { -} - -void set_game_mode(s16 idx) { - D_800A08F0 = idx; - set_game_mode_slot(0, gameModeMap[idx]); -} - -s16 get_game_mode(void) { - return D_800A08F0; -} diff --git a/src/code_e20eb0.c b/src/code_e20eb0.c deleted file mode 100644 index 9b7bd4346f..0000000000 --- a/src/code_e20eb0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -#define NAMESPACE code_e20eb0 - -#include "common/UnkAngleFunc1.inc.c" - -INCLUDE_ASM(s32, "code_e20eb0", func_802B70B4); - -INCLUDE_ASM(s32, "code_e20eb0", func_802B71C8); - -INCLUDE_ASM(s32, "code_e20eb0", func_802B742C); diff --git a/src/code_d0a70_len_4fe0.c b/src/d0a70_len_4fe0.c similarity index 59% rename from src/code_d0a70_len_4fe0.c rename to src/d0a70_len_4fe0.c index 9d94ce162a..d4871237cf 100644 --- a/src/code_d0a70_len_4fe0.c +++ b/src/d0a70_len_4fe0.c @@ -35,19 +35,19 @@ s32 D_8014EF64[] = { 0x00014358, 0x00018200, 0x0001A858, 0x0001E830, 0x00029458, #define UNKSTRUCT8013A854_SIZE 90 -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A370); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A370); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A37C); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A37C); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A4D0); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A4D0); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A610); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A610); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A650); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A650); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A6E8); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A6E8); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A704); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A704); typedef struct { /* 0x00 */ char unk_0[0x10]; @@ -69,46 +69,46 @@ void func_8013A854(u32 i) { } } -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A888); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A888); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A8E0); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A8E0); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A920); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A920); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A93C); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A93C); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A9C8); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A9C8); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013A9E8); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013A9E8); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013AA9C); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013AA9C); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013AF20); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013AF20); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013AF70); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013AF70); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013B0EC); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013B0EC); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013B1B0); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013B1B0); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013BC88); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013BC88); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013C048); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013C048); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013C220); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013C220); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013C3F0); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013C3F0); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013CFA8); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013CFA8); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013DAB4); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013DAB4); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013E2F0); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013E2F0); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013E904); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013E904); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013EE48); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013EE48); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013EE68); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013EE68); -INCLUDE_ASM(s32, "code_d0a70_len_4fe0", func_8013F1F8); +INCLUDE_ASM(s32, "d0a70_len_4fe0", func_8013F1F8); diff --git a/src/d5a50_len_5fd0.c b/src/d5a50_len_5fd0.c new file mode 100644 index 0000000000..5c98fefdb4 --- /dev/null +++ b/src/d5a50_len_5fd0.c @@ -0,0 +1,114 @@ +#include "common.h" + +s32 D_8014EFC0[] = { 0x00000000, }; +s32 D_8014EFC4[] = { 0x00011000, }; +s32 D_8014EFC8[] = { 0x00000000, }; +s32 D_8014EFCC[] = { 0x00080008, 0x00200010, 0x00100080, 0x00180018, 0x01200020, 0x00200200, 0x00300030, 0x04800040, + 0x00400800, 0x00080010, 0x00400010, 0x00080040, 0x00100018, 0x00C00010, 0x00200100, 0x00400020, + 0x04000020, 0x00100100, 0x000C000C, 0x00480030, 0x00180240, 0x00200008, 0x00800018, 0x00080060, + 0x00400010, 0x02000010, 0x00400200, 0x00C00020, 0x0C000028, 0x00280320, 0x00180010, 0x00C00020, + 0x00280280, 0x00280010, 0x01400028, 0x001801E0, 0x00200018, 0x01800014, 0x00200000, 0x00220020, + 0x00000028, 0x002803C8, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, 0x00000000, 0xE3000A11, + 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, 0xED000000, 0x005003C0, 0xE7000000, + 0x00000000, 0xE3000A11, 0x00002CF0, 0xE2001E01, 0x00000000, 0xDF000000, 0x00000000, + }; +s32 D_8014F0C8[] = { 0xFFF40000, 0x00000000, 0x08000800, 0x000000FF, 0x00330000, 0x00000000, 0x00000800, 0x000000FF, + 0x0033003F, 0x00000000, 0x00000000, 0x000000FF, 0xFFF4003F, 0x00000000, 0x08000000, 0x000000FF, + 0xFFFFFF00, 0xFFFFFF00, + }; +s32 D_8014F110[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }; + + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_8013F350); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_8013F704); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80141100); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", init_menu_icon_list); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_801413F8); + +INCLUDE_ASM(MenuIcon*, "d5a50_len_5fd0", create_icon, s32* iconIndex); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", update_menu_icons); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80141704); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80142210); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_8014271C); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", render_menu_icon); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", render_menu_icons); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80143C48); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144218); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144238); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144258); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144278); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", draw_menu_icon); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", draw_icon_0); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", draw_icon_1); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", draw_icon_2); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", set_menu_icon_script); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", get_menu_icon_script); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", get_menu_icon); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", free_icon, MenuIcon* iconIndex); + +INCLUDE_ASM(void, "d5a50_len_5fd0", set_icon_render_pos, MenuIcon* iconIndex, s32 posX, s32 posY); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", get_icon_render_pos); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_801449DC); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", set_icon_flags); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", clear_icon_flags); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144A5C); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144C20); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144DF4); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144E4C); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144E74); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", icon_set_opacity); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", icon_set_tint); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144F28); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80144FD8); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80145070); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80145108); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80145184); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_801451D4); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80145224); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_80145274); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_801452B4); + +INCLUDE_ASM(s32, "d5a50_len_5fd0", func_801452E8); diff --git a/src/d610_len_1330.c b/src/d610_len_1330.c new file mode 100644 index 0000000000..8cc6d1715d --- /dev/null +++ b/src/d610_len_1330.c @@ -0,0 +1,30 @@ +#include "common.h" + +extern s16 D_800A08F0; +extern s32 gameModeMap[]; + +INCLUDE_ASM(s32, "d610_len_1330", func_80032210); + +INCLUDE_ASM(s32, "d610_len_1330", func_800322DC); + +INCLUDE_ASM(s32, "d610_len_1330", func_800325E4); + +INCLUDE_ASM(s32, "d610_len_1330", func_800328A4); + +INCLUDE_ASM(s32, "d610_len_1330", func_80032970); + +INCLUDE_ASM(s32, "d610_len_1330", func_80032C64); + +INCLUDE_ASM(s32, "d610_len_1330", create_camera_lead_player_mtx); + +void func_800334E8(void) { +} + +void set_game_mode(s16 idx) { + D_800A08F0 = idx; + set_game_mode_slot(0, gameModeMap[idx]); +} + +s16 get_game_mode(void) { + return D_800A08F0; +} diff --git a/src/code_dba20_len_350.c b/src/dba20_len_350.c similarity index 100% rename from src/code_dba20_len_350.c rename to src/dba20_len_350.c diff --git a/src/code_dbd70_len_700.c b/src/dbd70_len_700.c similarity index 90% rename from src/code_dbd70_len_700.c rename to src/dbd70_len_700.c index 55efe20666..1ac6d5af08 100644 --- a/src/code_dbd70_len_700.c +++ b/src/dbd70_len_700.c @@ -46,9 +46,9 @@ void init_trigger_list(void) { gTriggerCount = 0; } -INCLUDE_ASM(Trigger*, "code_dbd70_len_700", create_trigger, TriggerDefinition* def); +INCLUDE_ASM(Trigger*, "dbd70_len_700", create_trigger, TriggerDefinition* def); -INCLUDE_ASM(s32, "code_dbd70_len_700", update_triggers); +INCLUDE_ASM(s32, "dbd70_len_700", update_triggers); void delete_trigger(Trigger* toDelete) { s32 i; @@ -66,7 +66,7 @@ void delete_trigger(Trigger* toDelete) { } } -INCLUDE_ASM(s32, "code_dbd70_len_700", is_trigger_bound, Trigger* trigger, Bytecode* script); +INCLUDE_ASM(s32, "dbd70_len_700", is_trigger_bound, Trigger* trigger, Bytecode* script); Trigger* get_trigger_by_id(s32 triggerID) { return (*gCurrentTriggerListPtr)[triggerID]; diff --git a/src/code_dc470_len_14c0.c b/src/dc470_len_14c0.c similarity index 96% rename from src/code_dc470_len_14c0.c rename to src/dc470_len_14c0.c index ea2db8505a..c6bdfd40a4 100644 --- a/src/code_dc470_len_14c0.c +++ b/src/dc470_len_14c0.c @@ -61,7 +61,7 @@ u16 blend_background_channel(s32 arg0, s32 arg1, s32 alpha) { return temp_lo; } -INCLUDE_ASM(s32, "code_dc470_len_14c0", enable_background_wave); +INCLUDE_ASM(s32, "dc470_len_14c0", enable_background_wave); void func_8014720C(void) { D_8014F12F = 1; diff --git a/src/code_dd930_len_1c0.c b/src/dd930_len_1c0.c similarity index 100% rename from src/code_dd930_len_1c0.c rename to src/dd930_len_1c0.c diff --git a/src/code_ddaf0_len_c50.c b/src/ddaf0_len_c50.c similarity index 80% rename from src/code_ddaf0_len_c50.c rename to src/ddaf0_len_c50.c index c5668f1025..cfda99349b 100644 --- a/src/code_ddaf0_len_c50.c +++ b/src/ddaf0_len_c50.c @@ -39,21 +39,21 @@ void clear_windows(void) { } } -INCLUDE_ASM(s32, "code_ddaf0_len_c50", update_windows); +INCLUDE_ASM(s32, "ddaf0_len_c50", update_windows); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", basic_window_update); +INCLUDE_ASM(s32, "ddaf0_len_c50", basic_window_update); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", basic_hidden_window_update); +INCLUDE_ASM(s32, "ddaf0_len_c50", basic_hidden_window_update); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", main_menu_window_update); +INCLUDE_ASM(s32, "ddaf0_len_c50", main_menu_window_update); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", render_windows); +INCLUDE_ASM(s32, "ddaf0_len_c50", render_windows); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", render_window_root); +INCLUDE_ASM(s32, "ddaf0_len_c50", render_window_root); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", set_window_properties); +INCLUDE_ASM(s32, "ddaf0_len_c50", set_window_properties); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", update_window_hierarchy); +INCLUDE_ASM(s32, "ddaf0_len_c50", update_window_hierarchy); void replace_window_update(s32 panelIndex, s8 arg1, s32 arg2) { UIPanel* panels = gUIPanels; @@ -78,6 +78,6 @@ void set_window_update(s32 panelIndex, s32 arg1) { } } -INCLUDE_ASM(s32, "code_ddaf0_len_c50", set_windows_visible); +INCLUDE_ASM(s32, "ddaf0_len_c50", set_windows_visible); -INCLUDE_ASM(s32, "code_ddaf0_len_c50", setup_pause_menu_tab); +INCLUDE_ASM(s32, "ddaf0_len_c50", setup_pause_menu_tab); diff --git a/src/code_de740_len_23f0.c b/src/de740_len_23f0.c similarity index 60% rename from src/code_de740_len_23f0.c rename to src/de740_len_23f0.c index cdb5d475ba..3959ddbeea 100644 --- a/src/code_de740_len_23f0.c +++ b/src/de740_len_23f0.c @@ -1,14 +1,14 @@ #include "common.h" -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80148040); +INCLUDE_ASM(s32, "de740_len_23f0", func_80148040); -INCLUDE_ASM(s32, "code_de740_len_23f0", func_801480F0); +INCLUDE_ASM(s32, "de740_len_23f0", func_801480F0); -INCLUDE_ASM(s32, "code_de740_len_23f0", func_80148154); +INCLUDE_ASM(s32, "de740_len_23f0", func_80148154); -INCLUDE_ASM(s32, "code_de740_len_23f0", render_shaded_sprite); +INCLUDE_ASM(s32, "de740_len_23f0", render_shaded_sprite); -INCLUDE_ASM(s32, "code_de740_len_23f0", appendGfx_shaded_sprite); +INCLUDE_ASM(s32, "de740_len_23f0", appendGfx_shaded_sprite); void func_801491E4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 alpha) { gDPSetPrimColor(gMasterGfxPos++, 0, 0, 0, 0, 0, alpha); diff --git a/src/code_e0b30_len_b80.c b/src/e0b30_len_b80.c similarity index 97% rename from src/code_e0b30_len_b80.c rename to src/e0b30_len_b80.c index 11b323fe35..ac62a849be 100644 --- a/src/code_e0b30_len_b80.c +++ b/src/e0b30_len_b80.c @@ -67,7 +67,7 @@ void bgm_reset_volume(void) { gMusicUnkVolume2 = 8; } -INCLUDE_ASM(s32, "code_e0b30_len_b80", bgm_update_music_settings); +INCLUDE_ASM(s32, "e0b30_len_b80", bgm_update_music_settings); s32 _bgm_set_song(s32 playerIndex, SongID songID, s32 variation, s32 fadeOutTime, s16 volume) { if (gGameStatusPtr->demoState != 0) { @@ -259,10 +259,10 @@ void bgm_update_volume(void) { } } #else -INCLUDE_ASM(s32, "code_e0b30_len_b80", bgm_update_volume); +INCLUDE_ASM(s32, "e0b30_len_b80", bgm_update_volume); #endif -INCLUDE_ASM(s32, "code_e0b30_len_b80", func_8014AD40); +INCLUDE_ASM(s32, "e0b30_len_b80", func_8014AD40); void bgm_pop_song(void) { MusicSettings* musicSetting = &gMusicSettings[0]; diff --git a/src/e20eb0.c b/src/e20eb0.c new file mode 100644 index 0000000000..463023ca27 --- /dev/null +++ b/src/e20eb0.c @@ -0,0 +1,11 @@ +#include "common.h" + +#define NAMESPACE e20eb0 + +#include "common/UnkAngleFunc1.inc.c" + +INCLUDE_ASM(s32, "e20eb0", func_802B70B4); + +INCLUDE_ASM(s32, "e20eb0", func_802B71C8); + +INCLUDE_ASM(s32, "e20eb0", func_802B742C); diff --git a/src/code_e79b0_len_1920.c b/src/e79b0_len_1920.c similarity index 98% rename from src/code_e79b0_len_1920.c rename to src/e79b0_len_1920.c index b5ea3767bd..2a2aafebf4 100644 --- a/src/code_e79b0_len_1920.c +++ b/src/e79b0_len_1920.c @@ -218,7 +218,7 @@ ScriptInstance* start_script(Bytecode* initialLine, s32 priority, s32 initialSta return newScript; } #else -INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority, +INCLUDE_ASM(ScriptInstance*, "e79b0_len_1920", start_script, Bytecode* initialLine, s32 priority, s32 initialState); #endif @@ -294,7 +294,7 @@ ScriptInstance* start_script_in_group(Bytecode* initialLine, u8 priority, u8 ini return newScript; } -INCLUDE_ASM(s32, "code_e79b0_len_1920", start_child_script); +INCLUDE_ASM(s32, "e79b0_len_1920", start_child_script); #ifdef NON_MATCHING // appears to be functionally equivalent, some ordering and regalloc issues @@ -363,7 +363,7 @@ ScriptInstance* func_802C39F8(ScriptInstance* parentScript, Bytecode* nextLine, return child; } #else -INCLUDE_ASM(ScriptInstance*, "code_e79b0_len_1920", func_802C39F8, ScriptInstance* parentScript, Bytecode* nextLine, +INCLUDE_ASM(ScriptInstance*, "e79b0_len_1920", func_802C39F8, ScriptInstance* parentScript, Bytecode* nextLine, s32 newState); #endif @@ -431,10 +431,10 @@ ScriptInstance* restart_script(ScriptInstance* script) { return script; } -INCLUDE_ASM(s32, "code_e79b0_len_1920", update_scripts); +INCLUDE_ASM(s32, "e79b0_len_1920", update_scripts); // this function is evil. -INCLUDE_ASM(s32, "code_e79b0_len_1920", func_802C3EE4); +INCLUDE_ASM(s32, "e79b0_len_1920", func_802C3EE4); void kill_script(ScriptInstance* instanceToKill) { ScriptInstance* childScript; diff --git a/src/code_e940_len_290.c b/src/e940_len_290.c similarity index 98% rename from src/code_e940_len_290.c rename to src/e940_len_290.c index f110456ec2..a0734ce1f4 100644 --- a/src/code_e940_len_290.c +++ b/src/e940_len_290.c @@ -47,7 +47,7 @@ void step_init_state(void) { clear_entity_data(0); clear_transition_stencil(); clear_player_status(); - clear_npcs(); + npc_list_clear(); clear_player_data(); func_80072B30(); func_8003E338(); diff --git a/src/code_ebd0_len_6a0.c b/src/ebd0_len_6a0.c similarity index 96% rename from src/code_ebd0_len_6a0.c rename to src/ebd0_len_6a0.c index 7d3f3e457c..b3a5a6c146 100644 --- a/src/code_ebd0_len_6a0.c +++ b/src/ebd0_len_6a0.c @@ -115,7 +115,7 @@ void step_battle(void) { reset_status_menu(); clear_item_entity_data(); clear_script_list(); - clear_npcs(); + npc_list_clear(); clear_entity_data(1); clear_trigger_data(); dma_copy(&code_code_16C8E0_ROM_START, &code_code_16C8E0_ROM_END, &code_code_16C8E0_VRAM); @@ -136,14 +136,14 @@ void step_battle(void) { update_counters(); update_battle_state(); - update_npcs(); + npc_list_update(); update_item_entities(); update_effects(); func_80116674(); update_cameras(); } #else -INCLUDE_ASM(s32, "code_ebd0_len_6a0", step_battle); +INCLUDE_ASM(s32, "ebd0_len_6a0", step_battle); #endif @@ -160,7 +160,7 @@ void func_80033B88(void) { D_800A0900 = 5; } -INCLUDE_ASM(s32, "code_ebd0_len_6a0", func_80033BC0); +INCLUDE_ASM(s32, "ebd0_len_6a0", func_80033BC0); void func_80033E64(void) { } diff --git a/src/code_ef070_len_3400.c b/src/ef070_len_3400.c similarity index 95% rename from src/code_ef070_len_3400.c rename to src/ef070_len_3400.c index e6d234e746..7b51a093cd 100644 --- a/src/code_ef070_len_3400.c +++ b/src/ef070_len_3400.c @@ -179,9 +179,9 @@ ApiStatus SetCamTarget(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CB008, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ef070_len_3400", func_802CB008, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ef070_len_3400", ShakeCam, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ef070_len_3400", ShakeCam, ScriptInstance* script, s32 isInitialCall); void exec_ShakeCam1(s32 arg0, s32 arg1, s32 arg2) { ScriptInstance* script; @@ -248,9 +248,9 @@ ApiStatus PanToTarget(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ef070_len_3400", UseSettingsFrom, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ef070_len_3400", UseSettingsFrom, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ef070_len_3400", LoadSettings, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ef070_len_3400", LoadSettings, ScriptInstance* script, s32 isInitialCall); ApiStatus SetCamType(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -459,11 +459,11 @@ ApiStatus WaitForCam(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ef070_len_3400", SetCamProperties, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ef070_len_3400", SetCamProperties, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ef070_len_3400", AdjustCam, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ef070_len_3400", AdjustCam, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_ef070_len_3400", ResetCam, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "ef070_len_3400", ResetCam, ScriptInstance* script, s32 isInitialCall); void func_802CCAC0(void) { s32 i; @@ -477,7 +477,7 @@ void func_802CCAC0(void) { } } -INCLUDE_ASM(s32, "code_ef070_len_3400", draw_anim_models); +INCLUDE_ASM(s32, "ef070_len_3400", draw_anim_models); ApiStatus func_802CCCB0(ScriptInstance* script, s32 isInitialCall) { if (!gGameStatusPtr->isBattle) { @@ -685,7 +685,7 @@ ApiStatus func_802CD418(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD4B4); +INCLUDE_ASM(s32, "ef070_len_3400", func_802CD4B4); void func_802CD57C(void) { if (!gGameStatusPtr->isBattle) { @@ -695,12 +695,12 @@ void func_802CD57C(void) { } } -INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD5C0); +INCLUDE_ASM(s32, "ef070_len_3400", func_802CD5C0); -INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD6E0); +INCLUDE_ASM(s32, "ef070_len_3400", func_802CD6E0); -INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD7D8); +INCLUDE_ASM(s32, "ef070_len_3400", func_802CD7D8); -INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD8F8); +INCLUDE_ASM(s32, "ef070_len_3400", func_802CD8F8); -INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD9F0); +INCLUDE_ASM(s32, "ef070_len_3400", func_802CD9F0); diff --git a/src/entity/default/E2B530.c b/src/entity/default/E2B530.c new file mode 100644 index 0000000000..d1f742c936 --- /dev/null +++ b/src/entity/default/E2B530.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/default/E2B530", func_802BAE00_E2B530); + +INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB044_E2B774); + +INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB1E8_E2B918); + +INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB62C_E2BD5C); + +INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB664_E2BD94); + +INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB69C_E2BDCC); + +INCLUDE_ASM(s32, "entity/default/E2B530", func_802BB6D4_E2BE04); diff --git a/src/entity/default/E2BE40.c b/src/entity/default/E2BE40.c new file mode 100644 index 0000000000..c99033128c --- /dev/null +++ b/src/entity/default/E2BE40.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BB710_E2BE40); + +INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BB870_E2BFA0); + +INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BB8A4_E2BFD4); + +INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BBE3C_E2C56C); + +INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BC148_E2C878); + +INCLUDE_ASM(s32, "entity/default/E2BE40", func_802BC1A8_E2C8D8); diff --git a/src/entity/default/E2C930.c b/src/entity/default/E2C930.c new file mode 100644 index 0000000000..7232f1584c --- /dev/null +++ b/src/entity/default/E2C930.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC200_E2C930); + +INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC3A8_E2CAD8); + +INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC3DC_E2CB0C); + +INCLUDE_ASM(s32, "entity/default/E2C930", func_802BC974_E2D0A4); + +INCLUDE_ASM(s32, "entity/default/E2C930", func_802BCC80_E2D3B0); diff --git a/src/entity/jan_iwa/E2D730.c b/src/entity/jan_iwa/E2D730.c new file mode 100644 index 0000000000..2f0a778824 --- /dev/null +++ b/src/entity/jan_iwa/E2D730.c @@ -0,0 +1,31 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BAE00_E2D730); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB000_E2D930); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB0A0_E2D9D0); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB228_E2DB58); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB298_E2DBC8); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB314_E2DC44); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB34C_E2DC7C); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB374_E2DCA4); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB648_E2DF78); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB6E0_E2E010); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB778_E2E0A8); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB78C_E2E0BC); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB8D4_E2E204); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB98C_E2E2BC); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2D730", func_802BB9E0_E2E310); diff --git a/src/entity/jan_iwa/E2E5F0.c b/src/entity/jan_iwa/E2E5F0.c new file mode 100644 index 0000000000..2e9b79a2ed --- /dev/null +++ b/src/entity/jan_iwa/E2E5F0.c @@ -0,0 +1,43 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBCC0_E2E5F0); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBD1C_E2E64C); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBD78_E2E6A8); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BBE8C_E2E7BC); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC00C_E2E93C); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC050_E2E980); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC0B8_E2E9E8); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC0F0_E2EA20); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC17C_E2EAAC); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC1D0_E2EB00); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC220_E2EB50); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC250_E2EB80); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC274_E2EBA4); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC2B4_E2EBE4); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC308_E2EC38); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC32C_E2EC5C); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC358_E2EC88); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC37C_E2ECAC); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC3A0_E2ECD0); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC3CC_E2ECFC); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2E5F0", func_802BC3E4_E2ED14); diff --git a/src/entity/jan_iwa/E2EDE0.c b/src/entity/jan_iwa/E2EDE0.c new file mode 100644 index 0000000000..16a9f0c8c2 --- /dev/null +++ b/src/entity/jan_iwa/E2EDE0.c @@ -0,0 +1,10 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/jan_iwa/E2EDE0", func_802BC4B0_E2EDE0); + +void func_802BC628_E2EF58() { +} + +INCLUDE_ASM(s32, "entity/jan_iwa/E2EDE0", func_802BC630_E2EF60); + +INCLUDE_ASM(s32, "entity/jan_iwa/E2EDE0", func_802BC658_E2EF88); diff --git a/src/entity/sbk_omo/E2F750.c b/src/entity/sbk_omo/E2F750.c new file mode 100644 index 0000000000..ca62db04c2 --- /dev/null +++ b/src/entity/sbk_omo/E2F750.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BAE00_E2F750); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BAF84_E2F8D4); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB108_E2FA58); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB3B8_E2FD08); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB704_E30054); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB76C_E300BC); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB7E0_E30130); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BB8E4_E30234); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BBA60_E303B0); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BBDB8_E30708); + +INCLUDE_ASM(s32, "entity/sbk_omo/E2F750", func_802BBE14_E30764); diff --git a/src/entity/sbk_omo/E307C0.c b/src/entity/sbk_omo/E307C0.c new file mode 100644 index 0000000000..45e3ad303a --- /dev/null +++ b/src/entity/sbk_omo/E307C0.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BBE70_E307C0); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC2BC_E30C0C); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC4B8_E30E08); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC514_E30E64); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC558_E30EA8); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC570_E30EC0); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC99C_E312EC); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC9CC_E3131C); + +INCLUDE_ASM(s32, "entity/sbk_omo/E307C0", func_802BC9FC_E3134C); diff --git a/src/code_f2470_len_27f0.c b/src/f2470_len_27f0.c similarity index 95% rename from src/code_f2470_len_27f0.c rename to src/f2470_len_27f0.c index f1edc8c664..9f17b24577 100644 --- a/src/code_f2470_len_27f0.c +++ b/src/f2470_len_27f0.c @@ -24,7 +24,7 @@ void set_npc_animation(Npc* npc, u32 arg1) { } /// Used in battle scripts. -INCLUDE_ASM(ApiStatus, "code_f2470_len_27f0", CreateNpc, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "f2470_len_27f0", CreateNpc, ScriptInstance* script, s32 isInitialCall); ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -34,7 +34,7 @@ ApiStatus DeleteNpc(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } - free_npc(npc); + npc_free(npc); return ApiStatus_DONE2; } @@ -207,9 +207,9 @@ ApiStatus SetNpcAnimationSpeed(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_f2470_len_27f0", NpcMoveTo, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f2470_len_27f0", NpcMoveTo, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_f2470_len_27f0", _npc_jump_to); +INCLUDE_ASM(s32, "f2470_len_27f0", _npc_jump_to); ApiStatus NpcJump0(ScriptInstance* script, s32 isInitialCall) { return _npc_jump_to(script, isInitialCall, 0); @@ -219,7 +219,7 @@ ApiStatus NpcJump1(ScriptInstance* script, s32 isInitialCall) { return _npc_jump_to(script, isInitialCall, 1); } -INCLUDE_ASM(s32, "code_f2470_len_27f0", NpcFlyTo, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f2470_len_27f0", NpcFlyTo, ScriptInstance* script, s32 isInitialCall); ApiStatus GetNpcYaw(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -248,11 +248,11 @@ ApiStatus SetNpcYaw(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_f2470_len_27f0", InterpNpcYaw, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f2470_len_27f0", InterpNpcYaw, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_f2470_len_27f0", NpcFacePlayer, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f2470_len_27f0", NpcFacePlayer, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_f2470_len_27f0", NpcFaceNpc, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f2470_len_27f0", NpcFaceNpc, ScriptInstance* script, s32 isInitialCall); ApiStatus SetNpcFlagBits(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -432,9 +432,9 @@ ApiStatus func_802CF56C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(ApiStatus, "code_f2470_len_27f0", BringPartnerOut, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "f2470_len_27f0", BringPartnerOut, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(ApiStatus, "code_f2470_len_27f0", PutPartnerAway, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "f2470_len_27f0", PutPartnerAway, ScriptInstance* script, s32 isInitialCall); ApiStatus GetCurrentPartnerID(ScriptInstance* script, s32 isInitialCall) { set_variable(script, *script->ptrReadPos, gPlayerData.currentPartner); diff --git a/src/code_f270_len_1190.c b/src/f270_len_1190.c similarity index 96% rename from src/code_f270_len_1190.c rename to src/f270_len_1190.c index 23d1302543..28d38ada4a 100644 --- a/src/code_f270_len_1190.c +++ b/src/f270_len_1190.c @@ -23,10 +23,10 @@ s32 D_80077950[] = { 0x8038F800, 0x803B5000, &D_803DA800 }; // TODO the gPauseMenuHeldButtons should be BSS_START // TODO 80278640 is BSS_END NUPiOverlaySegment D_8007795C = { - .romStart = &code_code_135EE0_ROM_START, - .romEnd = &code_code_135EE0_ROM_END, - .ramStart = &code_code_135EE0_VRAM, - .textStart = &code_code_135EE0_VRAM, + .romStart = pause_ROM_START, + .romEnd = pause_ROM_END, + .ramStart = pause_VRAM, + .textStart = pause_VRAM, .textEnd = gPauseMenuIconScripts, .dataStart = gPauseMenuIconScripts, .dataEnd = &gPauseMenuHeldButtons, @@ -54,8 +54,8 @@ void state_init_logos(void) { intro_logos_set_fade_alpha(255); intro_logos_set_fade_color(0); - romEnd = &code_code_1FE1B0_ROM_END; - romStart = &code_code_1FE1B0_ROM_START; + romEnd = logos_ROM_END; + romStart = logos_ROM_START; logoRam = heap_malloc(romEnd - romStart); temp_800A0910 = &D_800A0910; @@ -100,7 +100,7 @@ void state_init_logos(void) { func_802DD8F8(0); func_8011E224(); clear_entity_models(); - clear_npcs(); + npc_list_clear(); func_80141100(); use_default_background_settings(); clear_entity_data(1); @@ -110,7 +110,7 @@ void state_init_logos(void) { (*gameStatus)->enableBackground = FALSE; } -//INCLUDE_ASM(s32, "code_f270_len_1190", state_step_logos); +//INCLUDE_ASM(s32, "f270_len_1190", state_step_logos); void state_step_logos(void) { s32 gameModeTemp; s32* temp800A0910; @@ -215,7 +215,7 @@ void state_step_logos(void) { break; } } - update_npcs(); + npc_list_update(); update_cameras(); intro_logos_update_fade(); } @@ -303,7 +303,7 @@ void appendGfx_intro_logos(void) { } } #else -INCLUDE_ASM(void, "code_f270_len_1190", appendGfx_intro_logos); +INCLUDE_ASM(void, "f270_len_1190", appendGfx_intro_logos); #endif void state_init_pause(void) { @@ -323,7 +323,7 @@ void state_step_pause(void) { switch (temp800A0921_2) { case 0: update_counters(); - update_npcs(); + npc_list_update(); update_player(); update_effects(); if (D_8009A658[1] == D_8009A64C) { @@ -363,12 +363,12 @@ void state_step_pause(void) { clear_entity_models(); func_8011E224(); clear_dynamic_entity_list(); - func_801452E8(&code_code_3169F0_VRAM, 0x38000); + func_801452E8(_3169F0_VRAM, 0x38000); func_80141100(); reset_status_menu(); clear_item_entity_data(); clear_script_list(); - clear_npcs(); + npc_list_clear(); clear_entity_data(0); clear_trigger_data(); D_800A0924 = func_80149828(); @@ -460,7 +460,7 @@ void state_step_unpause(void) { init_menu_icon_list(); init_item_entity_list(); init_script_list(); - init_npc_list(); + npc_list_update_current(); func_80110E58(); init_trigger_list(); func_801497FC(D_800A0924); @@ -495,7 +495,7 @@ void state_step_unpause(void) { D_802D9D71 = D_802D9D70 + 1; update_counters(); - update_npcs(); + npc_list_update(); update_player(); update_effects(); @@ -510,7 +510,7 @@ void state_step_unpause(void) { break; case 3: update_counters(); - update_npcs(); + npc_list_update(); update_player(); update_effects(); @@ -527,7 +527,7 @@ void state_step_unpause(void) { case 4: func_80027088(0); update_counters(); - update_npcs(); + npc_list_update(); update_player(); update_effects(); enable_player_input(); diff --git a/src/code_f4c60_len_4300.c b/src/f4c60_len_4300.c similarity index 82% rename from src/code_f4c60_len_4300.c rename to src/f4c60_len_4300.c index e81710e900..4cd65c4432 100644 --- a/src/code_f4c60_len_4300.c +++ b/src/f4c60_len_4300.c @@ -18,11 +18,11 @@ ApiStatus SpeakToNpc(ScriptInstance* script, s32 isInitialCall) { return _show_message(script, isInitialCall, 3); } -INCLUDE_ASM(ApiStatus, "code_f4c60_len_4300", _show_message, ScriptInstance* script, s32 isInitialCall, s32 arg2); +INCLUDE_ASM(ApiStatus, "f4c60_len_4300", _show_message, ScriptInstance* script, s32 isInitialCall, s32 arg2); -INCLUDE_ASM(s32, "code_f4c60_len_4300", ShowMessageAtScreenPos, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f4c60_len_4300", ShowMessageAtScreenPos, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_f4c60_len_4300", ShowMessageAtWorldPos, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f4c60_len_4300", ShowMessageAtWorldPos, ScriptInstance* script, s32 isInitialCall); ApiStatus CloseMessage(ScriptInstance* script, s32 isInitialCall) { if (isInitialCall) { @@ -56,7 +56,7 @@ ApiStatus SwitchMessage(ScriptInstance* script, s32 isInitialCall) { } } -INCLUDE_ASM(s32, "code_f4c60_len_4300", ShowChoice, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f4c60_len_4300", ShowChoice, ScriptInstance* script, s32 isInitialCall); ApiStatus CloseChoice(ScriptInstance* script, s32 isInitialCall) { close_message(D_802DB268); @@ -78,7 +78,7 @@ ApiStatus SetMessageImages(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D0C94(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D0C94(ScriptInstance* script, s32 initialCall) { if (get_variable(script, *script->ptrReadPos) == 0) { OVERRIDE_FLAG_SET(0x10); } else { @@ -96,7 +96,7 @@ ApiStatus SetMessageString(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus SetMessageValue(ScriptInstance* script, s32 isInitialCall) { +ApiStatus SetMessageValue(ScriptInstance* script, s32 initialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 value = get_variable(script, *ptrReadPos++); s32 index = get_variable(script, *ptrReadPos); diff --git a/src/code_f8f60_len_1560.c b/src/f8f60_len_1560.c similarity index 94% rename from src/code_f8f60_len_1560.c rename to src/f8f60_len_1560.c index 28f7c990b0..03e216040d 100644 --- a/src/code_f8f60_len_1560.c +++ b/src/f8f60_len_1560.c @@ -188,12 +188,12 @@ ApiStatus AddVectorPolar(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D4BDC(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D4BDC(ScriptInstance* script, s32 initialCall) { s32* t0 = &script->functionTemp[0].s; s32* t1 = &script->functionTemp[1].s; s32 t1v; - if (isInitialCall) { + if (initialCall) { *t0 = 0; *t1 = 0; } @@ -216,12 +216,12 @@ ApiStatus func_802D4BDC(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802D4C4C(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D4C4C(ScriptInstance* script, s32 initialCall) { s32* t0 = &script->functionTemp[0].s; s32* t1 = &script->functionTemp[1].s; s32 t1v; - if (isInitialCall) { + if (initialCall) { *t0 = 0; *t1 = 255; } @@ -243,7 +243,7 @@ ApiStatus func_802D4C4C(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_BLOCK; } -ApiStatus func_802D4CC4(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D4CC4(ScriptInstance* script, s32 initialCall) { s32 value = get_variable(script, *script->ptrReadPos); if (value < 0) { set_transition_stencil_zoom_1(255, -1.0f); @@ -254,7 +254,7 @@ ApiStatus func_802D4CC4(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D4D14(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D4D14(ScriptInstance* script, s32 initialCall) { s32 value = get_float_variable(script, *script->ptrReadPos); set_transition_stencil_center(0, 0, 0xC, 0x14); @@ -264,7 +264,7 @@ ApiStatus func_802D4D14(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D4D88(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D4D88(ScriptInstance* script, s32 initialCall) { set_transition_stencil_zoom_0(0xC, 0); return ApiStatus_DONE2; } @@ -346,10 +346,10 @@ void setup_path_data(s32 numVecs, f32* arg1, struct Vec3f* arg2, struct Vec3f* a heap_free(temp_s4); } #else -INCLUDE_ASM(s32, "code_f8f60_len_1560", setup_path_data); +INCLUDE_ASM(s32, "f8f60_len_1560", setup_path_data); #endif -INCLUDE_ASM(s32, "code_f8f60_len_1560", func_802D5270); +INCLUDE_ASM(s32, "f8f60_len_1560", func_802D5270); s32 LoadPath(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -373,7 +373,7 @@ s32 LoadPath(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "code_f8f60_len_1560", GetNextPathPos, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(s32, "f8f60_len_1560", GetNextPathPos, ScriptInstance* script, s32 isInitialCall); ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) { Bytecode* ptrReadPos = script->ptrReadPos; @@ -389,12 +389,12 @@ ApiStatus GetDist2D(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -ApiStatus func_802D5830(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D5830(ScriptInstance* script, s32 initialCall) { func_80027088(get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } -ApiStatus func_802D585C(ScriptInstance* script, s32 isInitialCall) { +ApiStatus func_802D585C(ScriptInstance* script, s32 initialCall) { Bytecode* ptrReadPos = script->ptrReadPos; s32 setMode = get_variable(script, *ptrReadPos++); s32 flags = get_variable(script, *ptrReadPos++); diff --git a/src/code_fa4c0_len_3bf0.c b/src/fa4c0_len_3bf0.c similarity index 98% rename from src/code_fa4c0_len_3bf0.c rename to src/fa4c0_len_3bf0.c index dba36194a0..9803139492 100644 --- a/src/code_fa4c0_len_3bf0.c +++ b/src/fa4c0_len_3bf0.c @@ -1,8 +1,8 @@ #include "common.h" -INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5B10); +INCLUDE_ASM(s32, "fa4c0_len_3bf0", func_802D5B10); -INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D5C70); +INCLUDE_ASM(s32, "fa4c0_len_3bf0", func_802D5C70); ApiStatus FadeOutMusic(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; @@ -166,9 +166,9 @@ ApiStatus PlaySoundAtF(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(ApiStatus, "code_fa4c0_len_3bf0", func_802D6420, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "fa4c0_len_3bf0", func_802D6420, ScriptInstance* script, s32 isInitialCall); -INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", func_802D663C); +INCLUDE_ASM(s32, "fa4c0_len_3bf0", func_802D663C); ApiStatus RemoveKeyItemAt(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; diff --git a/src/code_fe0b0_len_5a0.c b/src/fe0b0_len_5a0.c similarity index 94% rename from src/code_fe0b0_len_5a0.c rename to src/fe0b0_len_5a0.c index 2f8268e35d..daaaf89119 100644 --- a/src/code_fe0b0_len_5a0.c +++ b/src/fe0b0_len_5a0.c @@ -1,6 +1,6 @@ #include "common.h" -INCLUDE_ASM(ApiStatus, "code_fe0b0_len_5a0", SetSpriteShading, ScriptInstance* script, s32 isInitialCall); +INCLUDE_ASM(ApiStatus, "fe0b0_len_5a0", SetSpriteShading, ScriptInstance* script, s32 isInitialCall); ApiStatus EnableSpriteShading(ScriptInstance* script, s32 isInitialCall) { if (get_variable(script, *script->ptrReadPos) != 0) { diff --git a/src/code_fee30_len_2d60.c b/src/fee30_len_2d60.c similarity index 72% rename from src/code_fee30_len_2d60.c rename to src/fee30_len_2d60.c index 08fa4b72a5..cbe77f4cd2 100644 --- a/src/code_fee30_len_2d60.c +++ b/src/fee30_len_2d60.c @@ -51,7 +51,7 @@ f32 D_802DF4C0 = 1.0f; s32 D_802DF4C4[] = { 0x00000006, 0x00000700, 0x000003C6, 0x00000012, 0x00000700, 0x000003C6, 0x0000000A, 0x00000900, 0x00003FC6, 0x00000003, 0x00000700, 0x00000006, 0x00000006, 0x00000900, 0x00003C00, 0x00000006, 0x00000700, 0x0000003E, 0x00000006, 0x00000900, 0x00003C00, 0x00000000, 0x00000000, }; -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBD40); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DBD40); // extern s32* gSpriteHeapPtr; // extern s32** D_802DFE44; @@ -67,17 +67,17 @@ INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBD40); // } // } -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBD8C); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DBD8C); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBDBC); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DBDBC); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBE78); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DBE78); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DBFC0); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DBFC0); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DC008); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DC008); -INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_appendMDL_component); +INCLUDE_ASM(s32, "fee30_len_2d60", spr_appendMDL_component); void spr_transform_point(s32 rotX, s32 rotY, s32 rotZ, f32 inX, f32 inY, f32 inZ, f32* outX, f32* outY, f32* outZ) { if (rotX == 0 && rotY == 0 && rotZ == 0) { @@ -110,7 +110,7 @@ void spr_transform_point(s32 rotX, s32 rotY, s32 rotZ, f32 inX, f32 inY, f32 inZ } } -INCLUDE_ASM(s32, "code_fee30_len_2d60", spr_draw_component); +INCLUDE_ASM(s32, "fee30_len_2d60", spr_draw_component); s32 _spr_sign_extend_12bit(u16 val) { s32 temp = val & 0xFFF; @@ -132,23 +132,23 @@ s32 _spr_sign_extend_16bit(u16 val) { } } -INCLUDE_ASM(s32, "code_fee30_len_2d60", update_component); +INCLUDE_ASM(s32, "fee30_len_2d60", update_component); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD634); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DD634); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD6DC); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DD6DC); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD7B0); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DD7B0); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD820); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DD820); void set_anim_timescale(f32 arg0) { D_802DF4C0 = arg0 * 2.0f; } -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD89C); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DD89C); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DD8F8); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DD8F8); void func_802DDA60(void) { func_802DEFB4(); @@ -159,40 +159,40 @@ s32 func_802DDA84(void) { return 0; } -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDA8C); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DDA8C); -INCLUDE_ASM(s32, "code_fee30_len_2d60", render_sprite); +INCLUDE_ASM(s32, "fee30_len_2d60", render_sprite); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDEC4); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DDEC4); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDEE4); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DDEE4); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DDFF8); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DDFF8); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE044); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE044); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE0C0); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE0C0); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE0EC); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE0EC); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE2AC, s32 arg0, s32 arg1, f32 arg2); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE2AC, s32 arg0, s32 arg1, f32 arg2); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE3D8); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE3D8); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE5C8); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE5C8); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE5E8); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE5E8); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE748); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE748); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE780); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE780); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE894); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE894); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE8DC); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE8DC); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DE9D8); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DE9D8); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DEA40); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DEA40); -INCLUDE_ASM(s32, "code_fee30_len_2d60", func_802DEA6C); +INCLUDE_ASM(s32, "fee30_len_2d60", func_802DEA6C); diff --git a/src/jp/10080.c b/src/jp/10080.c new file mode 100644 index 0000000000..7d288d875a --- /dev/null +++ b/src/jp/10080.c @@ -0,0 +1,25 @@ +#include "common.h" + +INCLUDE_ASM(s32, "10080", func_80034C80); + +INCLUDE_ASM(s32, "10080", func_80034CD8); + +INCLUDE_ASM(s32, "10080", func_80034E48); + +INCLUDE_ASM(s32, "10080", func_8003516C); + +INCLUDE_ASM(s32, "10080", func_80035244); + +INCLUDE_ASM(s32, "10080", func_8003524C); + +INCLUDE_ASM(s32, "10080", func_80035254); + +INCLUDE_ASM(s32, "10080", func_800352E0); + +INCLUDE_ASM(s32, "10080", func_80035384); + +INCLUDE_ASM(s32, "10080", func_800357C0); + +INCLUDE_ASM(s32, "10080", func_80035998); + +INCLUDE_ASM(s32, "10080", func_800359A0); diff --git a/src/jp/main_1060.c b/src/jp/1060.c similarity index 100% rename from src/jp/main_1060.c rename to src/jp/1060.c diff --git a/src/jp/10DB0.c b/src/jp/10DB0.c new file mode 100644 index 0000000000..9f738f127a --- /dev/null +++ b/src/jp/10DB0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "10DB0", func_800359B0); + +INCLUDE_ASM(s32, "10DB0", func_800359D4); + +INCLUDE_ASM(s32, "10DB0", func_80035A20); + +INCLUDE_ASM(s32, "10DB0", func_80035A4C); diff --git a/src/jp/10E70.c b/src/jp/10E70.c new file mode 100644 index 0000000000..62180818d3 --- /dev/null +++ b/src/jp/10E70.c @@ -0,0 +1,25 @@ +#include "common.h" + +INCLUDE_ASM(s32, "10E70", func_80035A70); + +INCLUDE_ASM(s32, "10E70", func_80035A80); + +INCLUDE_ASM(s32, "10E70", func_80035AA4); + +INCLUDE_ASM(s32, "10E70", func_80035AD4); + +INCLUDE_ASM(s32, "10E70", func_80035B6C); + +INCLUDE_ASM(s32, "10E70", func_80035D7C); + +INCLUDE_ASM(s32, "10E70", func_80035DB0); + +INCLUDE_ASM(s32, "10E70", func_80035DFC); + +INCLUDE_ASM(s32, "10E70", func_8003607C); + +INCLUDE_ASM(s32, "10E70", func_800360B0); + +INCLUDE_ASM(s32, "10E70", func_800360EC); + +INCLUDE_ASM(s32, "10E70", func_800362C0); diff --git a/src/jp/116D0.c b/src/jp/116D0.c new file mode 100644 index 0000000000..8ec8fdf414 --- /dev/null +++ b/src/jp/116D0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "116D0", func_800362D0); + +INCLUDE_ASM(s32, "116D0", func_800364D4); + +INCLUDE_ASM(s32, "116D0", func_80036A60); diff --git a/src/jp/11E70.c b/src/jp/11E70.c new file mode 100644 index 0000000000..0372ec1003 --- /dev/null +++ b/src/jp/11E70.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "11E70", func_80036A70); + +INCLUDE_ASM(s32, "11E70", func_80036D44); + +INCLUDE_ASM(s32, "11E70", func_80037234); + +INCLUDE_ASM(s32, "11E70", func_800372C8); + +INCLUDE_ASM(s32, "11E70", func_800375F0); + +INCLUDE_ASM(s32, "11E70", func_800375F8); + +INCLUDE_ASM(s32, "11E70", func_80037624); + +INCLUDE_ASM(s32, "11E70", func_80037860); + +INCLUDE_ASM(s32, "11E70", func_80037AAC); diff --git a/src/jp/13140.c b/src/jp/13140.c new file mode 100644 index 0000000000..8185d576a6 --- /dev/null +++ b/src/jp/13140.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "13140", func_80037D40); + +INCLUDE_ASM(s32, "13140", func_80037DB4); + +INCLUDE_ASM(s32, "13140", func_8003811C); diff --git a/src/jp/13530.c b/src/jp/13530.c new file mode 100644 index 0000000000..e1f3eb93c1 --- /dev/null +++ b/src/jp/13530.c @@ -0,0 +1,201 @@ +#include "common.h" + +INCLUDE_ASM(s32, "13530", func_80038130); + +INCLUDE_ASM(s32, "13530", func_80038138); + +INCLUDE_ASM(s32, "13530", func_8003817C); + +INCLUDE_ASM(s32, "13530", func_800381EC); + +INCLUDE_ASM(s32, "13530", func_8003823C); + +INCLUDE_ASM(s32, "13530", func_80038258); + +INCLUDE_ASM(s32, "13530", func_80038504); + +INCLUDE_ASM(s32, "13530", func_80038524); + +INCLUDE_ASM(s32, "13530", func_80038540); + +INCLUDE_ASM(s32, "13530", func_80038560); + +INCLUDE_ASM(s32, "13530", func_8003868C); + +INCLUDE_ASM(s32, "13530", func_8003879C); + +INCLUDE_ASM(s32, "13530", func_800387BC); + +INCLUDE_ASM(s32, "13530", func_80038CCC); + +INCLUDE_ASM(s32, "13530", func_80038F98); + +INCLUDE_ASM(s32, "13530", func_80039348); + +INCLUDE_ASM(s32, "13530", func_800394A8); + +INCLUDE_ASM(s32, "13530", func_800395F0); + +INCLUDE_ASM(s32, "13530", func_80039A64); + +INCLUDE_ASM(s32, "13530", func_80039C90); + +INCLUDE_ASM(s32, "13530", func_8003A4B0); + +INCLUDE_ASM(s32, "13530", func_8003A714); + +INCLUDE_ASM(s32, "13530", func_8003A7AC); + +INCLUDE_ASM(s32, "13530", func_8003A808); + +INCLUDE_ASM(s32, "13530", func_8003A860); + +INCLUDE_ASM(s32, "13530", func_8003A8BC); + +INCLUDE_ASM(s32, "13530", func_8003A91C); + +INCLUDE_ASM(s32, "13530", func_8003A9E4); + +INCLUDE_ASM(s32, "13530", func_8003AA6C); + +INCLUDE_ASM(s32, "13530", func_8003AAB8); + +INCLUDE_ASM(s32, "13530", func_8003AAF8); + +INCLUDE_ASM(s32, "13530", func_8003AE44); + +INCLUDE_ASM(s32, "13530", func_8003AE58); + +INCLUDE_ASM(s32, "13530", func_8003AE68); + +INCLUDE_ASM(s32, "13530", func_8003AE70); + +INCLUDE_ASM(s32, "13530", func_8003B000); + +INCLUDE_ASM(s32, "13530", func_8003B090); + +INCLUDE_ASM(s32, "13530", func_8003B0B8); + +INCLUDE_ASM(s32, "13530", func_8003B0E0); + +INCLUDE_ASM(s32, "13530", func_8003B10C); + +INCLUDE_ASM(s32, "13530", func_8003B124); + +INCLUDE_ASM(s32, "13530", func_8003B13C); + +INCLUDE_ASM(s32, "13530", func_8003B1C0); + +INCLUDE_ASM(s32, "13530", func_8003B274); + +INCLUDE_ASM(s32, "13530", func_8003B62C); + +INCLUDE_ASM(s32, "13530", func_8003B720); + +INCLUDE_ASM(s32, "13530", func_8003BB98); + +INCLUDE_ASM(s32, "13530", func_8003C098); + +INCLUDE_ASM(s32, "13530", func_8003C0E8); + +INCLUDE_ASM(s32, "13530", func_8003C104); + +INCLUDE_ASM(s32, "13530", func_8003C1FC); + +INCLUDE_ASM(s32, "13530", func_8003C2DC); + +INCLUDE_ASM(s32, "13530", func_8003C318); + +INCLUDE_ASM(s32, "13530", func_8003C320); + +INCLUDE_ASM(s32, "13530", func_8003C328); + +INCLUDE_ASM(s32, "13530", func_8003C44C); + +INCLUDE_ASM(s32, "13530", func_8003C468); + +INCLUDE_ASM(s32, "13530", func_8003C56C); + +INCLUDE_ASM(s32, "13530", func_8003C574); + +INCLUDE_ASM(s32, "13530", func_8003C644); + +INCLUDE_ASM(s32, "13530", func_8003C668); + +INCLUDE_ASM(s32, "13530", func_8003C7E0); + +INCLUDE_ASM(s32, "13530", func_8003C804); + +INCLUDE_ASM(s32, "13530", func_8003C94C); + +INCLUDE_ASM(s32, "13530", func_8003C970); + +INCLUDE_ASM(s32, "13530", func_8003CC60); + +INCLUDE_ASM(s32, "13530", func_8003CC68); + +INCLUDE_ASM(s32, "13530", func_8003CC74); + +INCLUDE_ASM(s32, "13530", func_8003CD84); + +INCLUDE_ASM(s32, "13530", func_8003CE94); + +INCLUDE_ASM(s32, "13530", func_8003CFB8); + +INCLUDE_ASM(s32, "13530", func_8003D07C); + +INCLUDE_ASM(s32, "13530", func_8003D2E4); + +INCLUDE_ASM(s32, "13530", func_8003D320); + +INCLUDE_ASM(s32, "13530", func_8003D448); + +INCLUDE_ASM(s32, "13530", func_8003D6F8); + +INCLUDE_ASM(s32, "13530", func_8003D8F8); + +INCLUDE_ASM(s32, "13530", func_8003DC60); + +INCLUDE_ASM(s32, "13530", func_8003DD94); + +INCLUDE_ASM(s32, "13530", func_8003DE90); + +INCLUDE_ASM(s32, "13530", func_8003DFA0); + +INCLUDE_ASM(s32, "13530", func_8003DFF8); + +INCLUDE_ASM(s32, "13530", func_8003E0C0); + +INCLUDE_ASM(s32, "13530", func_8003E1CC); + +INCLUDE_ASM(s32, "13530", func_8003E1D4); + +INCLUDE_ASM(s32, "13530", func_8003E1E4); + +INCLUDE_ASM(s32, "13530", func_8003E270); + +INCLUDE_ASM(s32, "13530", func_8003E2FC); + +INCLUDE_ASM(s32, "13530", func_8003E330); + +INCLUDE_ASM(s32, "13530", func_8003E338); + +INCLUDE_ASM(s32, "13530", func_8003E3F0); + +INCLUDE_ASM(s32, "13530", func_8003E46C); + +INCLUDE_ASM(s32, "13530", func_8003E60C); + +INCLUDE_ASM(s32, "13530", func_8003E674); + +INCLUDE_ASM(s32, "13530", func_8003E6DC); + +INCLUDE_ASM(s32, "13530", func_8003E744); + +INCLUDE_ASM(s32, "13530", func_8003E810); + +INCLUDE_ASM(s32, "13530", func_8003E8DC); + +INCLUDE_ASM(s32, "13530", func_8003E9A8); + +INCLUDE_ASM(s32, "13530", func_8003EA28); diff --git a/src/jp/main_1370.c b/src/jp/1370.c similarity index 58% rename from src/jp/main_1370.c rename to src/jp/1370.c index 15d364223e..621f966a0a 100644 --- a/src/jp/main_1370.c +++ b/src/jp/1370.c @@ -2,9 +2,9 @@ extern s32* D_80073DE0; -INCLUDE_ASM(s32, "main_1370", func_80025F70); +INCLUDE_ASM(s32, "1370", func_80025F70); -INCLUDE_ASM(s32, "main_1370", func_80026148); +INCLUDE_ASM(s32, "1370", func_80026148); void gfxPreNMI_Callback(void) { D_80073DE0 = 1; diff --git a/src/jp/19EB0.c b/src/jp/19EB0.c new file mode 100644 index 0000000000..d2c7e33298 --- /dev/null +++ b/src/jp/19EB0.c @@ -0,0 +1,59 @@ +#include "common.h" + +INCLUDE_ASM(s32, "19EB0", func_8003EAB0); + +INCLUDE_ASM(s32, "19EB0", func_8003EB00); + +INCLUDE_ASM(s32, "19EB0", func_8003EB58); + +INCLUDE_ASM(s32, "19EB0", func_8003EB8C); + +INCLUDE_ASM(s32, "19EB0", func_8003EBC0); + +INCLUDE_ASM(s32, "19EB0", func_8003EC58); + +INCLUDE_ASM(s32, "19EB0", func_8003ECD8); + +INCLUDE_ASM(s32, "19EB0", func_8003ED44); + +INCLUDE_ASM(s32, "19EB0", func_8003ED84); + +INCLUDE_ASM(s32, "19EB0", func_8003F044); + +INCLUDE_ASM(s32, "19EB0", func_8003F058); + +INCLUDE_ASM(s32, "19EB0", func_8003F0B4); + +INCLUDE_ASM(s32, "19EB0", func_8003F0D4); + +INCLUDE_ASM(s32, "19EB0", func_8003F18C); + +INCLUDE_ASM(s32, "19EB0", func_8003F240); + +INCLUDE_ASM(s32, "19EB0", func_8003F3A8); + +INCLUDE_ASM(s32, "19EB0", func_8003F48C); + +INCLUDE_ASM(s32, "19EB0", func_8004101C); + +INCLUDE_ASM(s32, "19EB0", func_80041024); + +INCLUDE_ASM(s32, "19EB0", func_80041624); + +INCLUDE_ASM(s32, "19EB0", func_8004191C); + +INCLUDE_ASM(s32, "19EB0", func_80041BD0); + +INCLUDE_ASM(s32, "19EB0", func_80042D0C); + +INCLUDE_ASM(s32, "19EB0", func_80042D5C); + +INCLUDE_ASM(s32, "19EB0", func_80042E94); + +INCLUDE_ASM(s32, "19EB0", func_80042E9C); + +INCLUDE_ASM(s32, "19EB0", func_80043370); + +INCLUDE_ASM(s32, "19EB0", func_80043E00); + +INCLUDE_ASM(s32, "19EB0", func_80043E08); diff --git a/src/jp/1B10.c b/src/jp/1B10.c new file mode 100644 index 0000000000..90e2b565a6 --- /dev/null +++ b/src/jp/1B10.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "1B10", func_80026710); + +INCLUDE_ASM(s32, "1B10", func_800269C0); + +INCLUDE_ASM(s32, "1B10", func_80026AD4); + +INCLUDE_ASM(s32, "1B10", func_80026DA8); + +INCLUDE_ASM(s32, "1B10", func_80027054); + +INCLUDE_ASM(s32, "1B10", func_8002715C); diff --git a/src/jp/1F240.c b/src/jp/1F240.c new file mode 100644 index 0000000000..583bf24ee8 --- /dev/null +++ b/src/jp/1F240.c @@ -0,0 +1,101 @@ +#include "common.h" + +INCLUDE_ASM(s32, "1F240", func_80043E40); + +INCLUDE_ASM(s32, "1F240", func_80043EB0); + +INCLUDE_ASM(s32, "1F240", func_80043EF8); + +INCLUDE_ASM(s32, "1F240", func_80043F24); + +INCLUDE_ASM(s32, "1F240", func_80043F50); + +INCLUDE_ASM(s32, "1F240", func_80043F58); + +INCLUDE_ASM(s32, "1F240", func_80044000); + +INCLUDE_ASM(s32, "1F240", func_80044138); + +INCLUDE_ASM(s32, "1F240", func_8004423C); + +INCLUDE_ASM(s32, "1F240", func_80044268); + +INCLUDE_ASM(s32, "1F240", func_80044294); + +INCLUDE_ASM(s32, "1F240", func_800442C0); + +INCLUDE_ASM(s32, "1F240", func_800442EC); + +INCLUDE_ASM(s32, "1F240", func_80044374); + +INCLUDE_ASM(s32, "1F240", func_80044500); + +INCLUDE_ASM(s32, "1F240", func_80044520); + +INCLUDE_ASM(s32, "1F240", func_8004455C); + +INCLUDE_ASM(s32, "1F240", func_800446F8); + +INCLUDE_ASM(s32, "1F240", func_80044738); + +INCLUDE_ASM(s32, "1F240", func_8004486C); + +INCLUDE_ASM(s32, "1F240", func_800448EC); + +INCLUDE_ASM(s32, "1F240", func_800449B0); + +INCLUDE_ASM(s32, "1F240", func_80044A64); + +INCLUDE_ASM(s32, "1F240", func_80044B78); + +INCLUDE_ASM(s32, "1F240", func_80044BF8); + +INCLUDE_ASM(s32, "1F240", func_80044CB0); + +INCLUDE_ASM(s32, "1F240", func_80044D64); + +INCLUDE_ASM(s32, "1F240", func_80044E00); + +INCLUDE_ASM(s32, "1F240", func_80044E9C); + +INCLUDE_ASM(s32, "1F240", func_80044F1C); + +INCLUDE_ASM(s32, "1F240", func_80044F80); + +INCLUDE_ASM(s32, "1F240", func_80044FE0); + +INCLUDE_ASM(s32, "1F240", func_8004507C); + +INCLUDE_ASM(s32, "1F240", func_8004511C); + +INCLUDE_ASM(s32, "1F240", func_800451CC); + +INCLUDE_ASM(s32, "1F240", func_800451E4); + +INCLUDE_ASM(s32, "1F240", func_80045240); + +INCLUDE_ASM(s32, "1F240", func_800452D4); + +INCLUDE_ASM(s32, "1F240", func_80045300); + +INCLUDE_ASM(s32, "1F240", func_80045348); + +INCLUDE_ASM(s32, "1F240", func_800453EC); + +INCLUDE_ASM(s32, "1F240", func_800453F4); + +INCLUDE_ASM(s32, "1F240", func_80045458); + +INCLUDE_ASM(s32, "1F240", func_80045484); + +INCLUDE_ASM(s32, "1F240", func_800454B8); + +INCLUDE_ASM(s32, "1F240", func_800454CC); + +INCLUDE_ASM(s32, "1F240", func_800454F8); + +INCLUDE_ASM(s32, "1F240", func_8004558C); + +INCLUDE_ASM(s32, "1F240", func_800455C0); + +INCLUDE_ASM(s32, "1F240", func_80045718); diff --git a/src/jp/20B80.c b/src/jp/20B80.c new file mode 100644 index 0000000000..a04e7a0280 --- /dev/null +++ b/src/jp/20B80.c @@ -0,0 +1,99 @@ +#include "common.h" + +INCLUDE_ASM(s32, "20B80", func_80045780); + +INCLUDE_ASM(s32, "20B80", func_800457D0); + +INCLUDE_ASM(s32, "20B80", func_80045828); + +INCLUDE_ASM(s32, "20B80", func_80045888); + +INCLUDE_ASM(s32, "20B80", func_800458E8); + +INCLUDE_ASM(s32, "20B80", func_80045948); + +INCLUDE_ASM(s32, "20B80", func_80045984); + +INCLUDE_ASM(s32, "20B80", func_800459C0); + +INCLUDE_ASM(s32, "20B80", func_80045A3C); + +INCLUDE_ASM(s32, "20B80", func_80045B0C); + +INCLUDE_ASM(s32, "20B80", func_80045B5C); + +INCLUDE_ASM(s32, "20B80", func_80045C50); + +INCLUDE_ASM(s32, "20B80", func_80045C60); + +INCLUDE_ASM(s32, "20B80", func_80045CDC); + +INCLUDE_ASM(s32, "20B80", func_8004628C); + +INCLUDE_ASM(s32, "20B80", func_800472B4); + +INCLUDE_ASM(s32, "20B80", func_800473A0); + +INCLUDE_ASM(s32, "20B80", func_80047438); + +INCLUDE_ASM(s32, "20B80", func_800474A0); + +INCLUDE_ASM(s32, "20B80", func_800474CC); + +INCLUDE_ASM(s32, "20B80", func_80047544); + +INCLUDE_ASM(s32, "20B80", func_800475A4); + +INCLUDE_ASM(s32, "20B80", func_800475D4); + +INCLUDE_ASM(s32, "20B80", func_8004764C); + +INCLUDE_ASM(s32, "20B80", func_800476AC); + +INCLUDE_ASM(s32, "20B80", func_800476DC); + +INCLUDE_ASM(s32, "20B80", func_80047754); + +INCLUDE_ASM(s32, "20B80", func_800477B4); + +INCLUDE_ASM(s32, "20B80", func_800477E4); + +INCLUDE_ASM(s32, "20B80", func_80047830); + +INCLUDE_ASM(s32, "20B80", func_80047890); + +INCLUDE_ASM(s32, "20B80", func_800478C0); + +INCLUDE_ASM(s32, "20B80", func_80047950); + +INCLUDE_ASM(s32, "20B80", func_800479AC); + +INCLUDE_ASM(s32, "20B80", func_800479DC); + +INCLUDE_ASM(s32, "20B80", func_80047A6C); + +INCLUDE_ASM(s32, "20B80", func_80047AC8); + +INCLUDE_ASM(s32, "20B80", func_80047AF8); + +INCLUDE_ASM(s32, "20B80", func_80047B88); + +INCLUDE_ASM(s32, "20B80", func_80047BD4); + +INCLUDE_ASM(s32, "20B80", func_80047C04); + +INCLUDE_ASM(s32, "20B80", func_80047C94); + +INCLUDE_ASM(s32, "20B80", func_80047CE0); + +INCLUDE_ASM(s32, "20B80", func_80047D10); + +INCLUDE_ASM(s32, "20B80", func_80047DA0); + +INCLUDE_ASM(s32, "20B80", func_80047DEC); + +INCLUDE_ASM(s32, "20B80", func_80047E1C); + +INCLUDE_ASM(s32, "20B80", func_80047EAC); + +INCLUDE_ASM(s32, "20B80", func_80047EF8); diff --git a/src/jp/23330.c b/src/jp/23330.c new file mode 100644 index 0000000000..92e489afdd --- /dev/null +++ b/src/jp/23330.c @@ -0,0 +1,39 @@ +#include "common.h" + +INCLUDE_ASM(s32, "23330", func_80047F30); + +INCLUDE_ASM(s32, "23330", func_80048A00); + +INCLUDE_ASM(s32, "23330", func_80048AE4); + +INCLUDE_ASM(s32, "23330", func_80048BBC); + +INCLUDE_ASM(s32, "23330", func_80048C84); + +INCLUDE_ASM(s32, "23330", func_80048D64); + +INCLUDE_ASM(s32, "23330", func_8004909C); + +INCLUDE_ASM(s32, "23330", func_80049170); + +INCLUDE_ASM(s32, "23330", func_80049200); + +INCLUDE_ASM(s32, "23330", func_80049250); + +INCLUDE_ASM(s32, "23330", func_80049368); + +INCLUDE_ASM(s32, "23330", func_800497F4); + +INCLUDE_ASM(s32, "23330", func_800498B4); + +INCLUDE_ASM(s32, "23330", func_80049AEC); + +INCLUDE_ASM(s32, "23330", func_80049B7C); + +INCLUDE_ASM(s32, "23330", func_80049C2C); + +INCLUDE_ASM(s32, "23330", func_80049DD4); + +INCLUDE_ASM(s32, "23330", func_8004A098); + +INCLUDE_ASM(s32, "23330", func_8004A12C); diff --git a/src/jp/2570.c b/src/jp/2570.c new file mode 100644 index 0000000000..45d39d2741 --- /dev/null +++ b/src/jp/2570.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "2570", func_80027170); + +INCLUDE_ASM(s32, "2570", func_800271CC); + +INCLUDE_ASM(s32, "2570", func_8002722C); + +INCLUDE_ASM(s32, "2570", func_800275D0); + +INCLUDE_ASM(s32, "2570", func_80027744); + +INCLUDE_ASM(s32, "2570", func_80027984); + +INCLUDE_ASM(s32, "2570", func_80027B7C); + +INCLUDE_ASM(s32, "2570", func_80027DE0); diff --git a/src/jp/257A0.c b/src/jp/257A0.c new file mode 100644 index 0000000000..6e5bca10e5 --- /dev/null +++ b/src/jp/257A0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "257A0", func_8004A3A0); + +INCLUDE_ASM(s32, "257A0", func_8004A3EC); + +INCLUDE_ASM(s32, "257A0", func_8004A434); diff --git a/src/jp/25BB0.c b/src/jp/25BB0.c new file mode 100644 index 0000000000..37624569db --- /dev/null +++ b/src/jp/25BB0.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "25BB0", func_8004A7B0); + +INCLUDE_ASM(s32, "25BB0", func_8004AA80); + +INCLUDE_ASM(s32, "25BB0", func_8004AAB8); + +INCLUDE_ASM(s32, "25BB0", func_8004AED4); + +INCLUDE_ASM(s32, "25BB0", func_8004AF18); + +INCLUDE_ASM(s32, "25BB0", func_8004AFD8); + +INCLUDE_ASM(s32, "25BB0", func_8004B09C); + +INCLUDE_ASM(s32, "25BB0", func_8004B0BC); diff --git a/src/jp/264F0.c b/src/jp/264F0.c new file mode 100644 index 0000000000..03865b95da --- /dev/null +++ b/src/jp/264F0.c @@ -0,0 +1,97 @@ +#include "common.h" + +INCLUDE_ASM(s32, "264F0", func_8004B0F0); + +INCLUDE_ASM(s32, "264F0", func_8004B2DC); + +INCLUDE_ASM(s32, "264F0", func_8004B348); + +INCLUDE_ASM(s32, "264F0", func_8004B388); + +INCLUDE_ASM(s32, "264F0", func_8004B3F8); + +INCLUDE_ASM(s32, "264F0", func_8004B694); + +INCLUDE_ASM(s32, "264F0", func_8004B704); + +INCLUDE_ASM(s32, "264F0", func_8004B724); + +INCLUDE_ASM(s32, "264F0", func_8004BD94); + +INCLUDE_ASM(s32, "264F0", func_8004BF18); + +INCLUDE_ASM(s32, "264F0", func_8004BF54); + +INCLUDE_ASM(s32, "264F0", func_8004BFB0); + +INCLUDE_ASM(s32, "264F0", func_8004C008); + +INCLUDE_ASM(s32, "264F0", func_8004C084); + +INCLUDE_ASM(s32, "264F0", func_8004C0F4); + +INCLUDE_ASM(s32, "264F0", func_8004C228); + +INCLUDE_ASM(s32, "264F0", func_8004C4F4); + +INCLUDE_ASM(s32, "264F0", func_8004C534); + +INCLUDE_ASM(s32, "264F0", func_8004CA44); + +INCLUDE_ASM(s32, "264F0", func_8004CAA8); + +INCLUDE_ASM(s32, "264F0", func_8004CB20); + +INCLUDE_ASM(s32, "264F0", func_8004CB54); + +INCLUDE_ASM(s32, "264F0", func_8004CB74); + +INCLUDE_ASM(s32, "264F0", func_8004CBBC); + +INCLUDE_ASM(s32, "264F0", func_8004CBEC); + +INCLUDE_ASM(s32, "264F0", func_8004CCBC); + +INCLUDE_ASM(s32, "264F0", func_8004CCE8); + +INCLUDE_ASM(s32, "264F0", func_8004CD00); + +INCLUDE_ASM(s32, "264F0", func_8004CD2C); + +INCLUDE_ASM(s32, "264F0", func_8004CDC4); + +INCLUDE_ASM(s32, "264F0", func_8004CDE0); + +INCLUDE_ASM(s32, "264F0", func_8004CE0C); + +INCLUDE_ASM(s32, "264F0", func_8004CE30); + +INCLUDE_ASM(s32, "264F0", func_8004CE64); + +INCLUDE_ASM(s32, "264F0", func_8004CEEC); + +INCLUDE_ASM(s32, "264F0", func_8004CF60); + +INCLUDE_ASM(s32, "264F0", func_8004CF94); + +INCLUDE_ASM(s32, "264F0", func_8004CFC0); + +INCLUDE_ASM(s32, "264F0", func_8004CFCC); + +INCLUDE_ASM(s32, "264F0", func_8004CFD4); + +INCLUDE_ASM(s32, "264F0", func_8004CFEC); + +INCLUDE_ASM(s32, "264F0", func_8004D004); + +INCLUDE_ASM(s32, "264F0", func_8004D01C); + +INCLUDE_ASM(s32, "264F0", func_8004D050); + +INCLUDE_ASM(s32, "264F0", func_8004D0A8); + +INCLUDE_ASM(s32, "264F0", func_8004D0D8); + +INCLUDE_ASM(s32, "264F0", func_8004D134); + +INCLUDE_ASM(s32, "264F0", func_8004D16C); diff --git a/src/jp/285C0.c b/src/jp/285C0.c new file mode 100644 index 0000000000..b2082f434a --- /dev/null +++ b/src/jp/285C0.c @@ -0,0 +1,137 @@ +#include "common.h" + +INCLUDE_ASM(s32, "285C0", func_8004D1C0); + +INCLUDE_ASM(s32, "285C0", func_8004D444); + +INCLUDE_ASM(s32, "285C0", func_8004D490); + +INCLUDE_ASM(s32, "285C0", func_8004D6BC); + +INCLUDE_ASM(s32, "285C0", func_8004D724); + +INCLUDE_ASM(s32, "285C0", func_8004D758); + +INCLUDE_ASM(s32, "285C0", func_8004D790); + +INCLUDE_ASM(s32, "285C0", func_8004D7D8); + +INCLUDE_ASM(s32, "285C0", func_8004D7FC); + +INCLUDE_ASM(s32, "285C0", func_8004D930); + +INCLUDE_ASM(s32, "285C0", func_8004D968); + +INCLUDE_ASM(s32, "285C0", func_8004DADC); + +INCLUDE_ASM(s32, "285C0", func_8004DC84); + +INCLUDE_ASM(s32, "285C0", func_8004DDA4); + +INCLUDE_ASM(s32, "285C0", func_8004DE08); + +INCLUDE_ASM(s32, "285C0", func_8004DFF4); + +INCLUDE_ASM(s32, "285C0", func_8004E054); + +INCLUDE_ASM(s32, "285C0", func_8004E0F4); + +INCLUDE_ASM(s32, "285C0", func_8004E168); + +INCLUDE_ASM(s32, "285C0", func_8004E288); + +INCLUDE_ASM(s32, "285C0", func_8004E4F4); + +INCLUDE_ASM(s32, "285C0", func_8004E530); + +INCLUDE_ASM(s32, "285C0", func_8004E5B4); + +INCLUDE_ASM(s32, "285C0", func_8004E6E4); + +INCLUDE_ASM(s32, "285C0", func_8004E784); + +INCLUDE_ASM(s32, "285C0", func_8004E8B4); + +INCLUDE_ASM(s32, "285C0", func_8004E918); + +INCLUDE_ASM(s32, "285C0", func_8004F86C); + +INCLUDE_ASM(s32, "285C0", func_8004F8B8); + +INCLUDE_ASM(s32, "285C0", func_8004F964); + +INCLUDE_ASM(s32, "285C0", func_8004F994); + +INCLUDE_ASM(s32, "285C0", func_8004F9B4); + +INCLUDE_ASM(s32, "285C0", func_8004F9E8); + +INCLUDE_ASM(s32, "285C0", func_8004FA44); + +INCLUDE_ASM(s32, "285C0", func_8004FAC0); + +INCLUDE_ASM(s32, "285C0", func_8004FB1C); + +INCLUDE_ASM(s32, "285C0", func_8004FB60); + +INCLUDE_ASM(s32, "285C0", func_8004FB80); + +INCLUDE_ASM(s32, "285C0", func_8004FBEC); + +INCLUDE_ASM(s32, "285C0", func_8004FC08); + +INCLUDE_ASM(s32, "285C0", func_8004FC20); + +INCLUDE_ASM(s32, "285C0", func_8004FC38); + +INCLUDE_ASM(s32, "285C0", func_8004FC58); + +INCLUDE_ASM(s32, "285C0", func_8004FC64); + +INCLUDE_ASM(s32, "285C0", func_8004FC78); + +INCLUDE_ASM(s32, "285C0", func_8004FC94); + +INCLUDE_ASM(s32, "285C0", func_8004FCA0); + +INCLUDE_ASM(s32, "285C0", func_8004FCAC); + +INCLUDE_ASM(s32, "285C0", func_8004FCB4); + +INCLUDE_ASM(s32, "285C0", func_8004FCD0); + +INCLUDE_ASM(s32, "285C0", func_8004FDD8); + +INCLUDE_ASM(s32, "285C0", func_8004FE0C); + +INCLUDE_ASM(s32, "285C0", func_8004FE34); + +INCLUDE_ASM(s32, "285C0", func_8004FE58); + +INCLUDE_ASM(s32, "285C0", func_8004FFA0); + +INCLUDE_ASM(s32, "285C0", func_80050210); + +INCLUDE_ASM(s32, "285C0", func_80050218); + +INCLUDE_ASM(s32, "285C0", func_80050294); + +INCLUDE_ASM(s32, "285C0", func_80050304); + +INCLUDE_ASM(s32, "285C0", func_8005033C); + +INCLUDE_ASM(s32, "285C0", func_80050378); + +INCLUDE_ASM(s32, "285C0", func_80050420); + +INCLUDE_ASM(s32, "285C0", func_800504C8); + +INCLUDE_ASM(s32, "285C0", func_800504EC); + +INCLUDE_ASM(s32, "285C0", func_8005052C); + +INCLUDE_ASM(s32, "285C0", func_80050538); + +INCLUDE_ASM(s32, "285C0", func_800505B0); + +INCLUDE_ASM(s32, "285C0", func_80050620); diff --git a/src/jp/2BC40.c b/src/jp/2BC40.c new file mode 100644 index 0000000000..e09877e75d --- /dev/null +++ b/src/jp/2BC40.c @@ -0,0 +1,41 @@ +#include "common.h" + +INCLUDE_ASM(s32, "2BC40", func_80050840); + +INCLUDE_ASM(s32, "2BC40", func_800508E0); + +INCLUDE_ASM(s32, "2BC40", func_80050904); + +INCLUDE_ASM(s32, "2BC40", func_80050914); + +INCLUDE_ASM(s32, "2BC40", func_80050950); + +INCLUDE_ASM(s32, "2BC40", func_80050A00); + +INCLUDE_ASM(s32, "2BC40", func_80050AC8); + +INCLUDE_ASM(s32, "2BC40", func_80050B34); + +INCLUDE_ASM(s32, "2BC40", func_80050BA0); + +INCLUDE_ASM(s32, "2BC40", func_80050C14); + +INCLUDE_ASM(s32, "2BC40", func_80050C80); + +INCLUDE_ASM(s32, "2BC40", func_80050D00); + +INCLUDE_ASM(s32, "2BC40", func_80050D54); + +INCLUDE_ASM(s32, "2BC40", func_80050E6C); + +INCLUDE_ASM(s32, "2BC40", func_80050FE4); + +INCLUDE_ASM(s32, "2BC40", func_800510E4); + +INCLUDE_ASM(s32, "2BC40", func_80051E80); + +INCLUDE_ASM(s32, "2BC40", func_80051E98); + +INCLUDE_ASM(s32, "2BC40", func_80051F58); + +INCLUDE_ASM(s32, "2BC40", func_80051FDC); diff --git a/src/jp/2D650.c b/src/jp/2D650.c new file mode 100644 index 0000000000..9b4f0e15d8 --- /dev/null +++ b/src/jp/2D650.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "2D650", func_80052250); + +INCLUDE_ASM(s32, "2D650", func_800522C4); + +INCLUDE_ASM(s32, "2D650", func_80052310); + +INCLUDE_ASM(s32, "2D650", func_800527F4); + +INCLUDE_ASM(s32, "2D650", func_80052870); + +INCLUDE_ASM(s32, "2D650", func_800528A8); + +INCLUDE_ASM(s32, "2D650", func_800529AC); + +INCLUDE_ASM(s32, "2D650", func_80052AC8); diff --git a/src/jp/2DEE0.c b/src/jp/2DEE0.c new file mode 100644 index 0000000000..5cbd8702e4 --- /dev/null +++ b/src/jp/2DEE0.c @@ -0,0 +1,91 @@ +#include "common.h" + +INCLUDE_ASM(s32, "2DEE0", func_80052AE0); + +INCLUDE_ASM(s32, "2DEE0", func_80052B0C); + +INCLUDE_ASM(s32, "2DEE0", func_80052FA4); + +INCLUDE_ASM(s32, "2DEE0", func_80053020); + +INCLUDE_ASM(s32, "2DEE0", func_80053058); + +INCLUDE_ASM(s32, "2DEE0", func_80053080); + +INCLUDE_ASM(s32, "2DEE0", func_80053270); + +INCLUDE_ASM(s32, "2DEE0", func_80053304); + +INCLUDE_ASM(s32, "2DEE0", func_80053538); + +INCLUDE_ASM(s32, "2DEE0", func_80053574); + +INCLUDE_ASM(s32, "2DEE0", func_800535A8); + +INCLUDE_ASM(s32, "2DEE0", func_80053624); + +INCLUDE_ASM(s32, "2DEE0", func_800536C8); + +INCLUDE_ASM(s32, "2DEE0", func_800536D8); + +INCLUDE_ASM(s32, "2DEE0", func_80053748); + +INCLUDE_ASM(s32, "2DEE0", func_80053778); + +INCLUDE_ASM(s32, "2DEE0", func_8005379C); + +INCLUDE_ASM(s32, "2DEE0", func_800537B4); + +INCLUDE_ASM(s32, "2DEE0", func_80053858); + +INCLUDE_ASM(s32, "2DEE0", func_80053898); + +INCLUDE_ASM(s32, "2DEE0", func_80053908); + +INCLUDE_ASM(s32, "2DEE0", func_80053964); + +INCLUDE_ASM(s32, "2DEE0", func_800539A8); + +INCLUDE_ASM(s32, "2DEE0", func_80053B08); + +INCLUDE_ASM(s32, "2DEE0", func_80053C14); + +INCLUDE_ASM(s32, "2DEE0", func_80053C30); + +INCLUDE_ASM(s32, "2DEE0", func_80053EF8); + +INCLUDE_ASM(s32, "2DEE0", func_80053F6C); + +INCLUDE_ASM(s32, "2DEE0", func_8005412C); + +INCLUDE_ASM(s32, "2DEE0", func_800541A8); + +INCLUDE_ASM(s32, "2DEE0", func_80054264); + +INCLUDE_ASM(s32, "2DEE0", func_8005430C); + +INCLUDE_ASM(s32, "2DEE0", func_800543F4); + +INCLUDE_ASM(s32, "2DEE0", func_80054478); + +INCLUDE_ASM(s32, "2DEE0", func_800546A8); + +INCLUDE_ASM(s32, "2DEE0", func_80054750); + +INCLUDE_ASM(s32, "2DEE0", func_800548FC); + +INCLUDE_ASM(s32, "2DEE0", func_80054934); + +INCLUDE_ASM(s32, "2DEE0", func_80054990); + +INCLUDE_ASM(s32, "2DEE0", func_80054A24); + +INCLUDE_ASM(s32, "2DEE0", func_80054A58); + +INCLUDE_ASM(s32, "2DEE0", func_80054AB0); + +INCLUDE_ASM(s32, "2DEE0", func_80054B40); + +INCLUDE_ASM(s32, "2DEE0", func_80054BF8); + +INCLUDE_ASM(s32, "2DEE0", func_80054C24); diff --git a/src/jp/30070.c b/src/jp/30070.c new file mode 100644 index 0000000000..6ce543f00e --- /dev/null +++ b/src/jp/30070.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "30070", func_80054C70); diff --git a/src/jp/30100.c b/src/jp/30100.c new file mode 100644 index 0000000000..5dc27ce2a7 --- /dev/null +++ b/src/jp/30100.c @@ -0,0 +1,137 @@ +#include "common.h" + +INCLUDE_ASM(s32, "30100", func_80054D00); + +INCLUDE_ASM(s32, "30100", func_80054D18); + +INCLUDE_ASM(s32, "30100", func_80054DC0); + +INCLUDE_ASM(s32, "30100", func_80054DEC); + +INCLUDE_ASM(s32, "30100", func_80054E90); + +INCLUDE_ASM(s32, "30100", func_80054EF0); + +INCLUDE_ASM(s32, "30100", func_80054F80); + +INCLUDE_ASM(s32, "30100", func_80054FE0); + +INCLUDE_ASM(s32, "30100", func_80055070); + +INCLUDE_ASM(s32, "30100", func_800550A4); + +INCLUDE_ASM(s32, "30100", func_800550B8); + +INCLUDE_ASM(s32, "30100", func_800550F8); + +INCLUDE_ASM(s32, "30100", func_80055114); + +INCLUDE_ASM(s32, "30100", func_80055154); + +INCLUDE_ASM(s32, "30100", func_80055198); + +INCLUDE_ASM(s32, "30100", func_800551EC); + +INCLUDE_ASM(s32, "30100", func_80055240); + +INCLUDE_ASM(s32, "30100", func_80055294); + +INCLUDE_ASM(s32, "30100", func_800552C8); + +INCLUDE_ASM(s32, "30100", func_8005531C); + +INCLUDE_ASM(s32, "30100", func_80055380); + +INCLUDE_ASM(s32, "30100", func_800553C8); + +INCLUDE_ASM(s32, "30100", func_80055410); + +INCLUDE_ASM(s32, "30100", func_8005547C); + +INCLUDE_ASM(s32, "30100", func_800554F8); + +INCLUDE_ASM(s32, "30100", func_80055584); + +INCLUDE_ASM(s32, "30100", func_800555CC); + +INCLUDE_ASM(s32, "30100", func_80055620); + +INCLUDE_ASM(s32, "30100", func_80055674); + +INCLUDE_ASM(s32, "30100", func_80055690); + +INCLUDE_ASM(s32, "30100", func_800556AC); + +INCLUDE_ASM(s32, "30100", func_800556C8); + +INCLUDE_ASM(s32, "30100", func_8005571C); + +INCLUDE_ASM(s32, "30100", func_8005576C); + +INCLUDE_ASM(s32, "30100", func_800557A0); + +INCLUDE_ASM(s32, "30100", func_800557D8); + +INCLUDE_ASM(s32, "30100", func_80055830); + +INCLUDE_ASM(s32, "30100", func_80055868); + +INCLUDE_ASM(s32, "30100", func_800558A0); + +INCLUDE_ASM(s32, "30100", func_800558DC); + +INCLUDE_ASM(s32, "30100", func_80055914); + +INCLUDE_ASM(s32, "30100", func_80055944); + +INCLUDE_ASM(s32, "30100", func_80055974); + +INCLUDE_ASM(s32, "30100", func_80055998); + +INCLUDE_ASM(s32, "30100", func_800559E8); + +INCLUDE_ASM(s32, "30100", func_80055A3C); + +INCLUDE_ASM(s32, "30100", func_80055A8C); + +INCLUDE_ASM(s32, "30100", func_80055AF8); + +INCLUDE_ASM(s32, "30100", func_80055B64); + +INCLUDE_ASM(s32, "30100", func_80055C08); + +INCLUDE_ASM(s32, "30100", func_80055C84); + +INCLUDE_ASM(s32, "30100", func_80055CA0); + +INCLUDE_ASM(s32, "30100", func_80055CBC); + +INCLUDE_ASM(s32, "30100", func_80055CD8); + +INCLUDE_ASM(s32, "30100", func_80055CF4); + +INCLUDE_ASM(s32, "30100", func_80055D18); + +INCLUDE_ASM(s32, "30100", func_80055D3C); + +INCLUDE_ASM(s32, "30100", func_80055D58); + +INCLUDE_ASM(s32, "30100", func_80055D6C); + +INCLUDE_ASM(s32, "30100", func_80055DBC); + +INCLUDE_ASM(s32, "30100", func_80055DF4); + +INCLUDE_ASM(s32, "30100", func_80055E0C); + +INCLUDE_ASM(s32, "30100", func_80055E30); + +INCLUDE_ASM(s32, "30100", func_80055E54); + +INCLUDE_ASM(s32, "30100", func_80055E74); + +INCLUDE_ASM(s32, "30100", func_80055E94); + +INCLUDE_ASM(s32, "30100", func_80055EB4); + +INCLUDE_ASM(s32, "30100", func_80055ED8); diff --git a/src/jp/31300.c b/src/jp/31300.c new file mode 100644 index 0000000000..d16cb977e2 --- /dev/null +++ b/src/jp/31300.c @@ -0,0 +1,79 @@ +#include "common.h" + +INCLUDE_ASM(s32, "31300", func_80055F00); + +INCLUDE_ASM(s32, "31300", func_80056254); + +INCLUDE_ASM(s32, "31300", func_80056270); + +INCLUDE_ASM(s32, "31300", func_800569E4); + +INCLUDE_ASM(s32, "31300", func_800569F4); + +INCLUDE_ASM(s32, "31300", func_80056A00); + +INCLUDE_ASM(s32, "31300", func_80056A0C); + +INCLUDE_ASM(s32, "31300", func_80056A28); + +INCLUDE_ASM(s32, "31300", func_80056A54); + +INCLUDE_ASM(s32, "31300", func_80056A7C); + +INCLUDE_ASM(s32, "31300", func_80056AE4); + +INCLUDE_ASM(s32, "31300", func_80056B70); + +INCLUDE_ASM(s32, "31300", func_80056B98); + +INCLUDE_ASM(s32, "31300", func_80056C28); + +INCLUDE_ASM(s32, "31300", func_80056C54); + +INCLUDE_ASM(s32, "31300", func_80056ED4); + +INCLUDE_ASM(s32, "31300", func_80056FF4); + +INCLUDE_ASM(s32, "31300", func_8005701C); + +INCLUDE_ASM(s32, "31300", func_800571F8); + +INCLUDE_ASM(s32, "31300", func_8005739C); + +INCLUDE_ASM(s32, "31300", func_80057524); + +INCLUDE_ASM(s32, "31300", func_80057688); + +INCLUDE_ASM(s32, "31300", func_80057814); + +INCLUDE_ASM(s32, "31300", func_8005783C); + +INCLUDE_ASM(s32, "31300", func_80057864); + +INCLUDE_ASM(s32, "31300", func_8005788C); + +INCLUDE_ASM(s32, "31300", func_800578B4); + +INCLUDE_ASM(s32, "31300", func_800578DC); + +INCLUDE_ASM(s32, "31300", func_80057904); + +INCLUDE_ASM(s32, "31300", func_800579BC); + +INCLUDE_ASM(s32, "31300", func_80057A78); + +INCLUDE_ASM(s32, "31300", func_80057AB8); + +INCLUDE_ASM(s32, "31300", func_80057B0C); + +INCLUDE_ASM(s32, "31300", func_80057B60); + +INCLUDE_ASM(s32, "31300", func_80057B80); + +INCLUDE_ASM(s32, "31300", func_80057BD0); + +INCLUDE_ASM(s32, "31300", func_80057C40); + +INCLUDE_ASM(s32, "31300", func_80057C88); + +INCLUDE_ASM(s32, "31300", func_80057CB4); diff --git a/src/jp/33100.c b/src/jp/33100.c new file mode 100644 index 0000000000..8708da4451 --- /dev/null +++ b/src/jp/33100.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "33100", func_80057D00); + +INCLUDE_ASM(s32, "33100", func_800587D0); + +INCLUDE_ASM(s32, "33100", func_8005891C); diff --git a/src/jp/33E80.c b/src/jp/33E80.c new file mode 100644 index 0000000000..4d770867a5 --- /dev/null +++ b/src/jp/33E80.c @@ -0,0 +1,41 @@ +#include "common.h" + +INCLUDE_ASM(s32, "33E80", func_80058A80); + +INCLUDE_ASM(s32, "33E80", func_80058B34); + +INCLUDE_ASM(s32, "33E80", func_80058C38); + +INCLUDE_ASM(s32, "33E80", func_80058CB8); + +INCLUDE_ASM(s32, "33E80", func_80058CFC); + +INCLUDE_ASM(s32, "33E80", func_80058FC0); + +INCLUDE_ASM(s32, "33E80", func_80059550); + +INCLUDE_ASM(s32, "33E80", func_80059768); + +INCLUDE_ASM(s32, "33E80", func_80059884); + +INCLUDE_ASM(s32, "33E80", func_80059930); + +INCLUDE_ASM(s32, "33E80", func_80059938); + +INCLUDE_ASM(s32, "33E80", func_8005994C); + +INCLUDE_ASM(s32, "33E80", func_800599F8); + +INCLUDE_ASM(s32, "33E80", func_80059A00); + +INCLUDE_ASM(s32, "33E80", func_80059BA4); + +INCLUDE_ASM(s32, "33E80", func_80059C44); + +INCLUDE_ASM(s32, "33E80", func_80059F6C); + +INCLUDE_ASM(s32, "33E80", func_8005A100); + +INCLUDE_ASM(s32, "33E80", func_8005A190); + +INCLUDE_ASM(s32, "33E80", func_8005A214); diff --git a/src/jp/35770.c b/src/jp/35770.c new file mode 100644 index 0000000000..da2bf5d8df --- /dev/null +++ b/src/jp/35770.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "35770", func_8005A370); + +INCLUDE_ASM(s32, "35770", func_8005A3A4); + +INCLUDE_ASM(s32, "35770", func_8005A890); + +INCLUDE_ASM(s32, "35770", func_8005A8A0); + +INCLUDE_ASM(s32, "35770", func_8005A8B0); + +INCLUDE_ASM(s32, "35770", func_8005A9A0); + +INCLUDE_ASM(s32, "35770", func_8005AA88); diff --git a/src/jp/35F50.c b/src/jp/35F50.c new file mode 100644 index 0000000000..85c46dc2dc --- /dev/null +++ b/src/jp/35F50.c @@ -0,0 +1,51 @@ +#include "common.h" + +INCLUDE_ASM(s32, "35F50", func_8005AB50); + +INCLUDE_ASM(s32, "35F50", func_8005AC34); + +INCLUDE_ASM(s32, "35F50", func_8005AC3C); + +INCLUDE_ASM(s32, "35F50", func_8005AC44); + +INCLUDE_ASM(s32, "35F50", func_8005AC70); + +INCLUDE_ASM(s32, "35F50", func_8005AD08); + +INCLUDE_ASM(s32, "35F50", func_8005AE50); + +INCLUDE_ASM(s32, "35F50", func_8005AEEC); + +INCLUDE_ASM(s32, "35F50", func_8005B430); + +INCLUDE_ASM(s32, "35F50", func_8005B650); + +INCLUDE_ASM(s32, "35F50", func_8005B6A4); + +INCLUDE_ASM(s32, "35F50", func_8005B6D4); + +INCLUDE_ASM(s32, "35F50", func_8005BA58); + +INCLUDE_ASM(s32, "35F50", func_8005BA88); + +INCLUDE_ASM(s32, "35F50", func_8005BAC0); + +INCLUDE_ASM(s32, "35F50", func_8005BB34); + +INCLUDE_ASM(s32, "35F50", func_8005C14C); + +INCLUDE_ASM(s32, "35F50", func_8005C454); + +INCLUDE_ASM(s32, "35F50", func_8005C980); + +INCLUDE_ASM(s32, "35F50", func_8005CDD4); + +INCLUDE_ASM(s32, "35F50", func_8005CF8C); + +INCLUDE_ASM(s32, "35F50", func_8005D0F8); + +INCLUDE_ASM(s32, "35F50", func_8005D7B0); + +INCLUDE_ASM(s32, "35F50", func_8005DA04); + +INCLUDE_ASM(s32, "35F50", func_8005DAA0); diff --git a/src/jp/38EC0.c b/src/jp/38EC0.c new file mode 100644 index 0000000000..200187aca1 --- /dev/null +++ b/src/jp/38EC0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "38EC0", func_8005DAC0); + +INCLUDE_ASM(s32, "38EC0", func_8005DB7C); + +INCLUDE_ASM(s32, "38EC0", func_8005DC84); + +INCLUDE_ASM(s32, "38EC0", func_8005DDDC); diff --git a/src/jp/39960.c b/src/jp/39960.c new file mode 100644 index 0000000000..b125766782 --- /dev/null +++ b/src/jp/39960.c @@ -0,0 +1,29 @@ +#include "common.h" + +INCLUDE_ASM(s32, "39960", func_8005E560); + +INCLUDE_ASM(s32, "39960", func_8005E5BC); + +INCLUDE_ASM(s32, "39960", func_8005E660); + +INCLUDE_ASM(s32, "39960", func_8005E890); + +INCLUDE_ASM(s32, "39960", func_8005EAE0); + +INCLUDE_ASM(s32, "39960", func_8005EB6C); + +INCLUDE_ASM(s32, "39960", func_8005EBE8); + +INCLUDE_ASM(s32, "39960", func_8005EC28); + +INCLUDE_ASM(s32, "39960", func_8005EC34); + +INCLUDE_ASM(s32, "39960", func_8005EC40); + +INCLUDE_ASM(s32, "39960", func_8005EC4C); + +INCLUDE_ASM(s32, "39960", func_8005EC58); + +INCLUDE_ASM(s32, "39960", func_8005ED70); + +INCLUDE_ASM(s32, "39960", func_8005EDD0); diff --git a/src/jp/3A300.c b/src/jp/3A300.c new file mode 100644 index 0000000000..6ae0913cbc --- /dev/null +++ b/src/jp/3A300.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A300", func_8005EF00); diff --git a/src/jp/3A340.c b/src/jp/3A340.c new file mode 100644 index 0000000000..dc4960ca4c --- /dev/null +++ b/src/jp/3A340.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A340", func_8005EF40); diff --git a/src/jp/3A380.c b/src/jp/3A380.c new file mode 100644 index 0000000000..870c498ec4 --- /dev/null +++ b/src/jp/3A380.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A380", func_8005EF80); diff --git a/src/jp/3A3A0.c b/src/jp/3A3A0.c new file mode 100644 index 0000000000..c729f2ce42 --- /dev/null +++ b/src/jp/3A3A0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A3A0", func_8005EFA0); diff --git a/src/jp/3A4B0.c b/src/jp/3A4B0.c new file mode 100644 index 0000000000..392f152cdd --- /dev/null +++ b/src/jp/3A4B0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A4B0", func_8005F0B0); diff --git a/src/jp/3A4E0.c b/src/jp/3A4E0.c new file mode 100644 index 0000000000..0b1b1fb40d --- /dev/null +++ b/src/jp/3A4E0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A4E0", func_8005F0E0); diff --git a/src/jp/3A500.c b/src/jp/3A500.c new file mode 100644 index 0000000000..2836f00a94 --- /dev/null +++ b/src/jp/3A500.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A500", func_8005F100); + +INCLUDE_ASM(s32, "3A500", func_8005F140); diff --git a/src/jp/3A610.c b/src/jp/3A610.c new file mode 100644 index 0000000000..c70e899a3a --- /dev/null +++ b/src/jp/3A610.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A610", func_8005F210); + +INCLUDE_ASM(s32, "3A610", func_8005F2C0); diff --git a/src/jp/3A700.c b/src/jp/3A700.c new file mode 100644 index 0000000000..e01e788916 --- /dev/null +++ b/src/jp/3A700.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A700", func_8005F300); diff --git a/src/jp/3A760.c b/src/jp/3A760.c new file mode 100644 index 0000000000..27f573dddd --- /dev/null +++ b/src/jp/3A760.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A760", func_8005F360); + +INCLUDE_ASM(s32, "3A760", func_8005F384); + +INCLUDE_ASM(s32, "3A760", func_8005F3A8); + +INCLUDE_ASM(s32, "3A760", func_8005F3F8); + +INCLUDE_ASM(s32, "3A760", func_8005F420); + +INCLUDE_ASM(s32, "3A760", func_8005F460); + +INCLUDE_ASM(s32, "3A760", func_8005F514); + +INCLUDE_ASM(s32, "3A760", func_8005F554); + +INCLUDE_ASM(s32, "3A760", func_8005F580); + +INCLUDE_ASM(s32, "3A760", func_8005F5AC); diff --git a/src/jp/3A9D0.c b/src/jp/3A9D0.c new file mode 100644 index 0000000000..c6bef93f2f --- /dev/null +++ b/src/jp/3A9D0.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3A9D0", func_8005F5D0); + +INCLUDE_ASM(s32, "3A9D0", func_8005F7C0); + +INCLUDE_ASM(s32, "3A9D0", func_8005F93C); + +INCLUDE_ASM(s32, "3A9D0", func_8005F99C); + +INCLUDE_ASM(s32, "3A9D0", func_8005F9C0); + +INCLUDE_ASM(s32, "3A9D0", func_8005FA08); + +INCLUDE_ASM(s32, "3A9D0", func_8005FA94); + +INCLUDE_ASM(s32, "3A9D0", func_8005FABC); + +INCLUDE_ASM(s32, "3A9D0", func_8005FB04); diff --git a/src/jp/3AF40.c b/src/jp/3AF40.c new file mode 100644 index 0000000000..e4b1d9b304 --- /dev/null +++ b/src/jp/3AF40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3AF40", func_8005FB40); diff --git a/src/jp/3AFA0.c b/src/jp/3AFA0.c new file mode 100644 index 0000000000..116a484ac7 --- /dev/null +++ b/src/jp/3AFA0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3AFA0", func_8005FBA0); diff --git a/src/jp/3B040.c b/src/jp/3B040.c new file mode 100644 index 0000000000..11d851783a --- /dev/null +++ b/src/jp/3B040.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B040", func_8005FC40); diff --git a/src/jp/3B2A0.c b/src/jp/3B2A0.c new file mode 100644 index 0000000000..a075d2ca9e --- /dev/null +++ b/src/jp/3B2A0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B2A0", func_8005FEA0); + +INCLUDE_ASM(s32, "3B2A0", func_8005FEF8); + +INCLUDE_ASM(s32, "3B2A0", func_8005FFC0); diff --git a/src/jp/3B400.c b/src/jp/3B400.c new file mode 100644 index 0000000000..508047dec9 --- /dev/null +++ b/src/jp/3B400.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B400", func_80060000); diff --git a/src/jp/3B420.c b/src/jp/3B420.c new file mode 100644 index 0000000000..a40b1f09bd --- /dev/null +++ b/src/jp/3B420.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B420", func_80060020); diff --git a/src/jp/3B4A0.c b/src/jp/3B4A0.c new file mode 100644 index 0000000000..31c74400ce --- /dev/null +++ b/src/jp/3B4A0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B4A0", func_800600A0); + +INCLUDE_ASM(s32, "3B4A0", func_80060230); + +INCLUDE_ASM(s32, "3B4A0", func_800602C8); + +INCLUDE_ASM(s32, "3B4A0", func_8006032C); + +INCLUDE_ASM(s32, "3B4A0", func_80060390); diff --git a/src/jp/3B7C0.c b/src/jp/3B7C0.c new file mode 100644 index 0000000000..a4e149fb53 --- /dev/null +++ b/src/jp/3B7C0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B7C0", func_800603C0); + +INCLUDE_ASM(s32, "3B7C0", func_80060460); diff --git a/src/jp/3B8E0.c b/src/jp/3B8E0.c new file mode 100644 index 0000000000..91c153d70e --- /dev/null +++ b/src/jp/3B8E0.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3B8E0", func_800604E0); + +INCLUDE_ASM(s32, "3B8E0", func_800605B8); + +INCLUDE_ASM(s32, "3B8E0", func_800605DC); + +INCLUDE_ASM(s32, "3B8E0", func_80060604); + +INCLUDE_ASM(s32, "3B8E0", func_8006062C); + +INCLUDE_ASM(s32, "3B8E0", func_80060708); + +INCLUDE_ASM(s32, "3B8E0", func_80060784); + +INCLUDE_ASM(s32, "3B8E0", func_80060840); + +INCLUDE_ASM(s32, "3B8E0", func_80060890); + +INCLUDE_ASM(s32, "3B8E0", func_800608C0); diff --git a/src/jp/3BC0.c b/src/jp/3BC0.c new file mode 100644 index 0000000000..31e62b9d67 --- /dev/null +++ b/src/jp/3BC0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3BC0", func_800287C0); + +INCLUDE_ASM(s32, "3BC0", func_80028808); + +INCLUDE_ASM(s32, "3BC0", func_80028844); diff --git a/src/jp/3BCF0.c b/src/jp/3BCF0.c new file mode 100644 index 0000000000..90335c56ce --- /dev/null +++ b/src/jp/3BCF0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3BCF0", func_800608F0); + +INCLUDE_ASM(s32, "3BCF0", func_80060910); + +INCLUDE_ASM(s32, "3BCF0", func_800609B0); + +INCLUDE_ASM(s32, "3BCF0", func_80060B40); diff --git a/src/jp/3C1F0.c b/src/jp/3C1F0.c new file mode 100644 index 0000000000..2022974542 --- /dev/null +++ b/src/jp/3C1F0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3C1F0", func_80060DF0); diff --git a/src/jp/3C290.c b/src/jp/3C290.c new file mode 100644 index 0000000000..675e5f862c --- /dev/null +++ b/src/jp/3C290.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3C290", func_80060E90); diff --git a/src/jp/3C2E0.c b/src/jp/3C2E0.c new file mode 100644 index 0000000000..5e6c06f316 --- /dev/null +++ b/src/jp/3C2E0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3C2E0", func_80060EE0); diff --git a/src/jp/3C460.c b/src/jp/3C460.c new file mode 100644 index 0000000000..364b134ca3 --- /dev/null +++ b/src/jp/3C460.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3C460", func_80061060); diff --git a/src/jp/3C820.c b/src/jp/3C820.c new file mode 100644 index 0000000000..7149e5314f --- /dev/null +++ b/src/jp/3C820.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3C820", func_80061420); + +INCLUDE_ASM(s32, "3C820", func_80061474); + +INCLUDE_ASM(s32, "3C820", func_800614E0); diff --git a/src/jp/3C910.c b/src/jp/3C910.c new file mode 100644 index 0000000000..59cc3e6ef1 --- /dev/null +++ b/src/jp/3C910.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3C910", func_80061510); + +INCLUDE_ASM(s32, "3C910", func_80061520); + +INCLUDE_ASM(s32, "3C910", func_80061530); diff --git a/src/jp/3CA50.c b/src/jp/3CA50.c new file mode 100644 index 0000000000..cacd089219 --- /dev/null +++ b/src/jp/3CA50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CA50", func_80061650); diff --git a/src/jp/3CAF0.c b/src/jp/3CAF0.c new file mode 100644 index 0000000000..ae05c95fe1 --- /dev/null +++ b/src/jp/3CAF0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CAF0", func_800616F0); + +INCLUDE_ASM(s32, "3CAF0", func_800617A0); diff --git a/src/jp/3CC20.c b/src/jp/3CC20.c new file mode 100644 index 0000000000..889d36d52c --- /dev/null +++ b/src/jp/3CC20.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CC20", func_80061820); diff --git a/src/jp/3CCA0.c b/src/jp/3CCA0.c new file mode 100644 index 0000000000..b77a0b78c3 --- /dev/null +++ b/src/jp/3CCA0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CCA0", func_800618A0); diff --git a/src/jp/3CCD0.c b/src/jp/3CCD0.c new file mode 100644 index 0000000000..8fcaae5859 --- /dev/null +++ b/src/jp/3CCD0.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CCD0", func_800618D0); + +INCLUDE_ASM(s32, "3CCD0", func_80061950); + +INCLUDE_ASM(s32, "3CCD0", func_80061970); + +INCLUDE_ASM(s32, "3CCD0", func_800619F8); + +INCLUDE_ASM(s32, "3CCD0", func_80061A94); diff --git a/src/jp/3CF50.c b/src/jp/3CF50.c new file mode 100644 index 0000000000..44ce81d537 --- /dev/null +++ b/src/jp/3CF50.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3CF50", func_80061B50); + +INCLUDE_ASM(s32, "3CF50", func_80061CEC); + +INCLUDE_ASM(s32, "3CF50", func_80061DA0); diff --git a/src/jp/3D260.c b/src/jp/3D260.c new file mode 100644 index 0000000000..328598529f --- /dev/null +++ b/src/jp/3D260.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D260", func_80061E60); diff --git a/src/jp/3D2C0.c b/src/jp/3D2C0.c new file mode 100644 index 0000000000..27e4902be1 --- /dev/null +++ b/src/jp/3D2C0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D2C0", func_80061EC0); diff --git a/src/jp/3D2D0.c b/src/jp/3D2D0.c new file mode 100644 index 0000000000..1ef2505da3 --- /dev/null +++ b/src/jp/3D2D0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D2D0", func_80061ED0); diff --git a/src/jp/3D300.c b/src/jp/3D300.c new file mode 100644 index 0000000000..fac6d31dc6 --- /dev/null +++ b/src/jp/3D300.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D300", func_80061F00); + +INCLUDE_ASM(s32, "3D300", func_80062030); diff --git a/src/jp/3D580.c b/src/jp/3D580.c new file mode 100644 index 0000000000..f867ed9a54 --- /dev/null +++ b/src/jp/3D580.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3D580", func_80062180); + +INCLUDE_ASM(s32, "3D580", func_80062500); diff --git a/src/jp/3DC90.c b/src/jp/3DC90.c new file mode 100644 index 0000000000..900dc62ab1 --- /dev/null +++ b/src/jp/3DC90.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3DC90", func_80062890); + +INCLUDE_ASM(s32, "3DC90", func_80063214); diff --git a/src/jp/3E6F0.c b/src/jp/3E6F0.c new file mode 100644 index 0000000000..a77c123a7d --- /dev/null +++ b/src/jp/3E6F0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3E6F0", func_800632F0); + +INCLUDE_ASM(s32, "3E6F0", func_80063868); diff --git a/src/jp/3ECE0.c b/src/jp/3ECE0.c new file mode 100644 index 0000000000..1bba749bec --- /dev/null +++ b/src/jp/3ECE0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3ECE0", func_800638E0); + +INCLUDE_ASM(s32, "3ECE0", func_80063A10); diff --git a/src/jp/3EF60.c b/src/jp/3EF60.c new file mode 100644 index 0000000000..de8e62175e --- /dev/null +++ b/src/jp/3EF60.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3EF60", func_80063B60); + +INCLUDE_ASM(s32, "3EF60", func_80063D10); diff --git a/src/jp/3F2E0.c b/src/jp/3F2E0.c new file mode 100644 index 0000000000..7d1debae18 --- /dev/null +++ b/src/jp/3F2E0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3F2E0", func_80063EE0); + +INCLUDE_ASM(s32, "3F2E0", func_800640B8); diff --git a/src/jp/3F6A0.c b/src/jp/3F6A0.c new file mode 100644 index 0000000000..afbbe9e7b7 --- /dev/null +++ b/src/jp/3F6A0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3F6A0", func_800642A0); + +INCLUDE_ASM(s32, "3F6A0", func_80064428); diff --git a/src/jp/3F9C0.c b/src/jp/3F9C0.c new file mode 100644 index 0000000000..0a66f5c9d2 --- /dev/null +++ b/src/jp/3F9C0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3F9C0", func_800645C0); diff --git a/src/jp/3FA20.c b/src/jp/3FA20.c new file mode 100644 index 0000000000..99cd185c89 --- /dev/null +++ b/src/jp/3FA20.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3FA20", func_80064620); + +INCLUDE_ASM(s32, "3FA20", func_80064940); + +INCLUDE_ASM(s32, "3FA20", func_800649E0); + +INCLUDE_ASM(s32, "3FA20", func_80064A20); + +INCLUDE_ASM(s32, "3FA20", func_80064A44); diff --git a/src/jp/3FE70.c b/src/jp/3FE70.c new file mode 100644 index 0000000000..28c08b8219 --- /dev/null +++ b/src/jp/3FE70.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "3FE70", _Printf); + +INCLUDE_ASM(s32, "3FE70", func_80064FF0); + +INCLUDE_ASM(s32, "3FE70", func_800654C0); + +INCLUDE_ASM(s32, "3FE70", func_80065518); diff --git a/src/jp/40950.c b/src/jp/40950.c new file mode 100644 index 0000000000..399254c854 --- /dev/null +++ b/src/jp/40950.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40950", func_80065550); diff --git a/src/jp/40980.c b/src/jp/40980.c new file mode 100644 index 0000000000..774e6cb954 --- /dev/null +++ b/src/jp/40980.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40980", func_80065580); diff --git a/src/jp/40AC0.c b/src/jp/40AC0.c new file mode 100644 index 0000000000..5490b8635c --- /dev/null +++ b/src/jp/40AC0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40AC0", func_800656C0); diff --git a/src/jp/40BF0.c b/src/jp/40BF0.c new file mode 100644 index 0000000000..c7d225ba7f --- /dev/null +++ b/src/jp/40BF0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40BF0", func_800657F0); + +INCLUDE_ASM(s32, "40BF0", func_80065920); diff --git a/src/jp/40DD0.c b/src/jp/40DD0.c new file mode 100644 index 0000000000..0bd40dac59 --- /dev/null +++ b/src/jp/40DD0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40DD0", func_800659D0); diff --git a/src/jp/40DE0.c b/src/jp/40DE0.c new file mode 100644 index 0000000000..cdd72672d7 --- /dev/null +++ b/src/jp/40DE0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "40DE0", func_800659E0); + +INCLUDE_ASM(s32, "40DE0", func_80065BEC); diff --git a/src/jp/41020.c b/src/jp/41020.c new file mode 100644 index 0000000000..1d0cd228c4 --- /dev/null +++ b/src/jp/41020.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41020", func_80065C20); diff --git a/src/jp/41040.c b/src/jp/41040.c new file mode 100644 index 0000000000..8f92ec6d4c --- /dev/null +++ b/src/jp/41040.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41040", func_80065C40); diff --git a/src/jp/41090.c b/src/jp/41090.c new file mode 100644 index 0000000000..2d9dd7a3b1 --- /dev/null +++ b/src/jp/41090.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41090", func_80065C90); diff --git a/src/jp/41140.c b/src/jp/41140.c new file mode 100644 index 0000000000..538a71e808 --- /dev/null +++ b/src/jp/41140.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41140", func_80065D40); + +INCLUDE_ASM(s32, "41140", func_80065D94); + +INCLUDE_ASM(s32, "41140", func_80065E00); diff --git a/src/jp/41230.c b/src/jp/41230.c new file mode 100644 index 0000000000..6a98d16faa --- /dev/null +++ b/src/jp/41230.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41230", func_80065E30); + +INCLUDE_ASM(s32, "41230", func_80065F00); diff --git a/src/jp/41320.c b/src/jp/41320.c new file mode 100644 index 0000000000..f23cbc3cf3 --- /dev/null +++ b/src/jp/41320.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41320", func_80065F20); diff --git a/src/jp/413F0.c b/src/jp/413F0.c new file mode 100644 index 0000000000..654a526ee3 --- /dev/null +++ b/src/jp/413F0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "413F0", func_80065FF0); diff --git a/src/jp/41510.c b/src/jp/41510.c new file mode 100644 index 0000000000..513e52a534 --- /dev/null +++ b/src/jp/41510.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41510", func_80066110); diff --git a/src/jp/415D0.c b/src/jp/415D0.c new file mode 100644 index 0000000000..eef0c3339f --- /dev/null +++ b/src/jp/415D0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "415D0", func_800661D0); diff --git a/src/jp/41610.c b/src/jp/41610.c new file mode 100644 index 0000000000..a7d232e5a9 --- /dev/null +++ b/src/jp/41610.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41610", func_80066210); diff --git a/src/jp/41660.c b/src/jp/41660.c new file mode 100644 index 0000000000..09c2159d4f --- /dev/null +++ b/src/jp/41660.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41660", func_80066260); diff --git a/src/jp/41670.c b/src/jp/41670.c new file mode 100644 index 0000000000..e9c064956e --- /dev/null +++ b/src/jp/41670.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41670", func_80066270); diff --git a/src/jp/41700.c b/src/jp/41700.c new file mode 100644 index 0000000000..be0eed58e8 --- /dev/null +++ b/src/jp/41700.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41700", func_80066300); diff --git a/src/jp/41720.c b/src/jp/41720.c new file mode 100644 index 0000000000..35922e9b97 --- /dev/null +++ b/src/jp/41720.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41720", func_80066320); diff --git a/src/jp/41850.c b/src/jp/41850.c new file mode 100644 index 0000000000..912c86513f --- /dev/null +++ b/src/jp/41850.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41850", func_80066450); + +INCLUDE_ASM(s32, "41850", func_800664A4); + +INCLUDE_ASM(s32, "41850", func_800665E0); + +INCLUDE_ASM(s32, "41850", func_80066660); diff --git a/src/jp/41B70.c b/src/jp/41B70.c new file mode 100644 index 0000000000..62c49a66f1 --- /dev/null +++ b/src/jp/41B70.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41B70", func_80066770); diff --git a/src/jp/41C30.c b/src/jp/41C30.c new file mode 100644 index 0000000000..9b3497f93f --- /dev/null +++ b/src/jp/41C30.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41C30", func_80066830); diff --git a/src/jp/41CF0.c b/src/jp/41CF0.c new file mode 100644 index 0000000000..79879fbf0b --- /dev/null +++ b/src/jp/41CF0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41CF0", func_800668F0); diff --git a/src/jp/41D30.c b/src/jp/41D30.c new file mode 100644 index 0000000000..0042822270 --- /dev/null +++ b/src/jp/41D30.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41D30", func_80066930); diff --git a/src/jp/41D80.c b/src/jp/41D80.c new file mode 100644 index 0000000000..5707c828b8 --- /dev/null +++ b/src/jp/41D80.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41D80", func_80066980); diff --git a/src/jp/41DC0.c b/src/jp/41DC0.c new file mode 100644 index 0000000000..b6ef43320f --- /dev/null +++ b/src/jp/41DC0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41DC0", func_800669C0); diff --git a/src/jp/41E00.c b/src/jp/41E00.c new file mode 100644 index 0000000000..6a11b20d08 --- /dev/null +++ b/src/jp/41E00.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41E00", func_80066A00); diff --git a/src/jp/41E40.c b/src/jp/41E40.c new file mode 100644 index 0000000000..6df0b43ff7 --- /dev/null +++ b/src/jp/41E40.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "41E40", func_80066A40); + +INCLUDE_ASM(s32, "41E40", func_80066BE0); diff --git a/src/jp/42180.c b/src/jp/42180.c new file mode 100644 index 0000000000..0e7e3d6316 --- /dev/null +++ b/src/jp/42180.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42180", func_80066D80); diff --git a/src/jp/421E0.c b/src/jp/421E0.c new file mode 100644 index 0000000000..12931b42a9 --- /dev/null +++ b/src/jp/421E0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "421E0", func_80066DE0); diff --git a/src/jp/42230.c b/src/jp/42230.c new file mode 100644 index 0000000000..e862e1aeb3 --- /dev/null +++ b/src/jp/42230.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42230", func_80066E30); diff --git a/src/jp/423A0.c b/src/jp/423A0.c new file mode 100644 index 0000000000..7b3aef4ca5 --- /dev/null +++ b/src/jp/423A0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "423A0", func_80066FA0); diff --git a/src/jp/423F0.c b/src/jp/423F0.c new file mode 100644 index 0000000000..019b9f4dea --- /dev/null +++ b/src/jp/423F0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "423F0", func_80066FF0); diff --git a/src/jp/42440.c b/src/jp/42440.c new file mode 100644 index 0000000000..2b12bad3f7 --- /dev/null +++ b/src/jp/42440.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42440", func_80067040); diff --git a/src/jp/42750.c b/src/jp/42750.c new file mode 100644 index 0000000000..3aafd367a2 --- /dev/null +++ b/src/jp/42750.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42750", func_80067350); diff --git a/src/jp/427B0.c b/src/jp/427B0.c new file mode 100644 index 0000000000..792187a13f --- /dev/null +++ b/src/jp/427B0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "427B0", func_800673B0); diff --git a/src/jp/42820.c b/src/jp/42820.c new file mode 100644 index 0000000000..0537161309 --- /dev/null +++ b/src/jp/42820.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42820", func_80067420); diff --git a/src/jp/42880.c b/src/jp/42880.c new file mode 100644 index 0000000000..bc1f65fda8 --- /dev/null +++ b/src/jp/42880.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42880", func_80067480); diff --git a/src/jp/428E0.c b/src/jp/428E0.c new file mode 100644 index 0000000000..9bee4fed76 --- /dev/null +++ b/src/jp/428E0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "428E0", func_800674E0); diff --git a/src/jp/42960.c b/src/jp/42960.c new file mode 100644 index 0000000000..ff45c8ce26 --- /dev/null +++ b/src/jp/42960.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42960", func_80067560); diff --git a/src/jp/429E0.c b/src/jp/429E0.c new file mode 100644 index 0000000000..4d2d844a80 --- /dev/null +++ b/src/jp/429E0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "429E0", func_800675E0); diff --git a/src/jp/42AE0.c b/src/jp/42AE0.c new file mode 100644 index 0000000000..7b73641f8d --- /dev/null +++ b/src/jp/42AE0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42AE0", func_800676E0); diff --git a/src/jp/42B0.c b/src/jp/42B0.c new file mode 100644 index 0000000000..4bf45f39f5 --- /dev/null +++ b/src/jp/42B0.c @@ -0,0 +1,89 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42B0", func_80028EB0); + +INCLUDE_ASM(s32, "42B0", func_80028ED8); + +INCLUDE_ASM(s32, "42B0", func_80028F4C); + +INCLUDE_ASM(s32, "42B0", func_80028FA0); + +INCLUDE_ASM(s32, "42B0", func_80028FB0); + +INCLUDE_ASM(s32, "42B0", func_80028FF0); + +INCLUDE_ASM(s32, "42B0", func_8002902C); + +INCLUDE_ASM(s32, "42B0", func_80029124); + +INCLUDE_ASM(s32, "42B0", func_800291DC); + +INCLUDE_ASM(s32, "42B0", func_80029284); + +INCLUDE_ASM(s32, "42B0", func_80029394); + +INCLUDE_ASM(s32, "42B0", func_80029470); + +INCLUDE_ASM(s32, "42B0", func_80029484); + +INCLUDE_ASM(s32, "42B0", func_800295C0); + +INCLUDE_ASM(s32, "42B0", func_800295E0); + +INCLUDE_ASM(s32, "42B0", func_800296E0); + +INCLUDE_ASM(s32, "42B0", func_800296FC); + +INCLUDE_ASM(s32, "42B0", func_80029794); + +INCLUDE_ASM(s32, "42B0", func_80029820); + +INCLUDE_ASM(s32, "42B0", func_800298C0); + +INCLUDE_ASM(s32, "42B0", func_800298F4); + +INCLUDE_ASM(s32, "42B0", func_80029954); + +INCLUDE_ASM(s32, "42B0", func_800299BC); + +INCLUDE_ASM(s32, "42B0", func_80029A3C); + +INCLUDE_ASM(s32, "42B0", func_80029A84); + +INCLUDE_ASM(s32, "42B0", func_80029AE4); + +INCLUDE_ASM(s32, "42B0", func_80029BE8); + +INCLUDE_ASM(s32, "42B0", func_80029C40); + +INCLUDE_ASM(s32, "42B0", func_80029DE0); + +INCLUDE_ASM(s32, "42B0", func_80029E10); + +INCLUDE_ASM(s32, "42B0", func_80029E94); + +INCLUDE_ASM(s32, "42B0", func_80029EEC); + +INCLUDE_ASM(s32, "42B0", func_80029F5C); + +INCLUDE_ASM(s32, "42B0", func_80029FF4); + +INCLUDE_ASM(s32, "42B0", func_8002A074); + +INCLUDE_ASM(s32, "42B0", func_8002A12C); + +INCLUDE_ASM(s32, "42B0", func_8002A190); + +INCLUDE_ASM(s32, "42B0", func_8002A1F4); + +INCLUDE_ASM(s32, "42B0", func_8002A2AC); + +INCLUDE_ASM(s32, "42B0", func_8002A310); + +INCLUDE_ASM(s32, "42B0", func_8002A374); + +INCLUDE_ASM(s32, "42B0", func_8002A8C4); + +INCLUDE_ASM(s32, "42B0", func_8002AA84); + +INCLUDE_ASM(s32, "42B0", func_8002AB1C); diff --git a/src/jp/42BA0.c b/src/jp/42BA0.c new file mode 100644 index 0000000000..fd29fa32fb --- /dev/null +++ b/src/jp/42BA0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42BA0", func_800677A0); diff --git a/src/jp/42C00.c b/src/jp/42C00.c new file mode 100644 index 0000000000..6fbeeef3bc --- /dev/null +++ b/src/jp/42C00.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42C00", func_80067800); diff --git a/src/jp/42CE0.c b/src/jp/42CE0.c new file mode 100644 index 0000000000..ac54147643 --- /dev/null +++ b/src/jp/42CE0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42CE0", func_800678E0); diff --git a/src/jp/42D40.c b/src/jp/42D40.c new file mode 100644 index 0000000000..1c30c98395 --- /dev/null +++ b/src/jp/42D40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42D40", func_80067940); diff --git a/src/jp/42DC0.c b/src/jp/42DC0.c new file mode 100644 index 0000000000..8721e57a08 --- /dev/null +++ b/src/jp/42DC0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42DC0", func_800679C0); diff --git a/src/jp/42E50.c b/src/jp/42E50.c new file mode 100644 index 0000000000..feeaf75351 --- /dev/null +++ b/src/jp/42E50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42E50", func_80067A50); diff --git a/src/jp/42F00.c b/src/jp/42F00.c new file mode 100644 index 0000000000..722917698c --- /dev/null +++ b/src/jp/42F00.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "42F00", func_80067B00); + +INCLUDE_ASM(s32, "42F00", func_80067C60); diff --git a/src/jp/431E0.c b/src/jp/431E0.c new file mode 100644 index 0000000000..045c020994 --- /dev/null +++ b/src/jp/431E0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "431E0", func_80067DE0); + +INCLUDE_ASM(s32, "431E0", func_80067F24); diff --git a/src/jp/43570.c b/src/jp/43570.c new file mode 100644 index 0000000000..92ebf82ec1 --- /dev/null +++ b/src/jp/43570.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "43570", func_80068170); + +INCLUDE_ASM(s32, "43570", func_8006847C); diff --git a/src/jp/439A0.c b/src/jp/439A0.c new file mode 100644 index 0000000000..1deb7a7666 --- /dev/null +++ b/src/jp/439A0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "439A0", func_800685A0); + +INCLUDE_ASM(s32, "439A0", func_8006874C); diff --git a/src/jp/43BC0.c b/src/jp/43BC0.c new file mode 100644 index 0000000000..73dc825d5e --- /dev/null +++ b/src/jp/43BC0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "43BC0", func_800687C0); + +INCLUDE_ASM(s32, "43BC0", func_80068C00); diff --git a/src/jp/441A0.c b/src/jp/441A0.c new file mode 100644 index 0000000000..6c445b23c5 --- /dev/null +++ b/src/jp/441A0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "441A0", func_80068DA0); diff --git a/src/jp/44360.c b/src/jp/44360.c new file mode 100644 index 0000000000..92d3ea3ee5 --- /dev/null +++ b/src/jp/44360.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "44360", func_80068F60); diff --git a/src/jp/44470.c b/src/jp/44470.c new file mode 100644 index 0000000000..1d0f730342 --- /dev/null +++ b/src/jp/44470.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "44470", func_80069070); + +INCLUDE_ASM(s32, "44470", func_80069170); + +INCLUDE_ASM(s32, "44470", func_80069368); diff --git a/src/jp/44840.c b/src/jp/44840.c new file mode 100644 index 0000000000..3f8f639d91 --- /dev/null +++ b/src/jp/44840.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "44840", func_80069440); diff --git a/src/jp/448A0.c b/src/jp/448A0.c new file mode 100644 index 0000000000..653e8d7cbd --- /dev/null +++ b/src/jp/448A0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "448A0", func_800694A0); + +INCLUDE_ASM(s32, "448A0", func_80069590); + +INCLUDE_ASM(s32, "448A0", func_80069624); diff --git a/src/jp/44AB0.c b/src/jp/44AB0.c new file mode 100644 index 0000000000..b07227bb2e --- /dev/null +++ b/src/jp/44AB0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "44AB0", func_800696B0); diff --git a/src/jp/44B20.c b/src/jp/44B20.c new file mode 100644 index 0000000000..3e4ff4a9cc --- /dev/null +++ b/src/jp/44B20.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "44B20", func_80069720); + +INCLUDE_ASM(s32, "44B20", func_80069754); + +INCLUDE_ASM(s32, "44B20", func_80069798); + +INCLUDE_ASM(s32, "44B20", func_80069A84); + +INCLUDE_ASM(s32, "44B20", func_80069BE8); + +INCLUDE_ASM(s32, "44B20", func_80069DB4); + +INCLUDE_ASM(s32, "44B20", func_80069E6C); diff --git a/src/jp/455B0.c b/src/jp/455B0.c new file mode 100644 index 0000000000..7d40164898 --- /dev/null +++ b/src/jp/455B0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "455B0", func_8006A1B0); diff --git a/src/jp/457A0.c b/src/jp/457A0.c new file mode 100644 index 0000000000..f16d295f34 --- /dev/null +++ b/src/jp/457A0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "457A0", func_8006A3A0); diff --git a/src/jp/45A10.c b/src/jp/45A10.c new file mode 100644 index 0000000000..cb9da140ed --- /dev/null +++ b/src/jp/45A10.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "45A10", func_8006A610); diff --git a/src/jp/45A30.c b/src/jp/45A30.c new file mode 100644 index 0000000000..15a150ee7a --- /dev/null +++ b/src/jp/45A30.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "45A30", func_8006A630); + +INCLUDE_ASM(s32, "45A30", func_8006A6E8); + +INCLUDE_ASM(s32, "45A30", func_8006A9C0); diff --git a/src/jp/45DD0.c b/src/jp/45DD0.c new file mode 100644 index 0000000000..ea576e9949 --- /dev/null +++ b/src/jp/45DD0.c @@ -0,0 +1,19 @@ +#include "common.h" + +INCLUDE_ASM(s32, "45DD0", func_8006A9D0); + +INCLUDE_ASM(s32, "45DD0", func_8006A9E0); + +INCLUDE_ASM(s32, "45DD0", func_8006AF5C); + +INCLUDE_ASM(s32, "45DD0", func_8006B04C); + +INCLUDE_ASM(s32, "45DD0", func_8006B154); + +INCLUDE_ASM(s32, "45DD0", func_8006B19C); + +INCLUDE_ASM(s32, "45DD0", func_8006B1B4); + +INCLUDE_ASM(s32, "45DD0", func_8006B340); + +INCLUDE_ASM(s32, "45DD0", func_8006B3B0); diff --git a/src/jp/467D0.c b/src/jp/467D0.c new file mode 100644 index 0000000000..f2476939b0 --- /dev/null +++ b/src/jp/467D0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "467D0", func_8006B3D0); + +INCLUDE_ASM(s32, "467D0", func_8006B410); diff --git a/src/jp/46860.c b/src/jp/46860.c new file mode 100644 index 0000000000..7a3d6a11cc --- /dev/null +++ b/src/jp/46860.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "46860", func_8006B460); + +INCLUDE_ASM(s32, "46860", func_8006B530); + +INCLUDE_ASM(s32, "46860", func_8006B550); diff --git a/src/jp/46AC0.c b/src/jp/46AC0.c new file mode 100644 index 0000000000..177a863daf --- /dev/null +++ b/src/jp/46AC0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "46AC0", func_8006B6C0); diff --git a/src/jp/46C30.c b/src/jp/46C30.c new file mode 100644 index 0000000000..28aaf6e25c --- /dev/null +++ b/src/jp/46C30.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "46C30", func_8006B830); diff --git a/src/jp/46C50.c b/src/jp/46C50.c new file mode 100644 index 0000000000..989de76a2d --- /dev/null +++ b/src/jp/46C50.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(s32, "46C50", func_8006B850); + +INCLUDE_ASM(s32, "46C50", func_8006B960); + +INCLUDE_ASM(s32, "46C50", func_8006BBB0); + +INCLUDE_ASM(s32, "46C50", func_8006BFFC); + +INCLUDE_ASM(s32, "46C50", func_8006C094); diff --git a/src/jp/47A40.c b/src/jp/47A40.c new file mode 100644 index 0000000000..1861361317 --- /dev/null +++ b/src/jp/47A40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47A40", func_8006C640); diff --git a/src/jp/47A50.c b/src/jp/47A50.c new file mode 100644 index 0000000000..d8ca3d2838 --- /dev/null +++ b/src/jp/47A50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47A50", func_8006C650); diff --git a/src/jp/47A60.c b/src/jp/47A60.c new file mode 100644 index 0000000000..9d27df3e0c --- /dev/null +++ b/src/jp/47A60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47A60", func_8006C660); diff --git a/src/jp/47A70.c b/src/jp/47A70.c new file mode 100644 index 0000000000..9bd12a7f58 --- /dev/null +++ b/src/jp/47A70.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47A70", func_8006C670); + +INCLUDE_ASM(s32, "47A70", func_8006C680); + +INCLUDE_ASM(s32, "47A70", func_8006C690); + +INCLUDE_ASM(s32, "47A70", func_8006C6A0); diff --git a/src/jp/47AC0.c b/src/jp/47AC0.c new file mode 100644 index 0000000000..b275942970 --- /dev/null +++ b/src/jp/47AC0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47AC0", func_8006C6C0); + +INCLUDE_ASM(s32, "47AC0", func_8006C6D0); + +INCLUDE_ASM(s32, "47AC0", func_8006C6E0); + +INCLUDE_ASM(s32, "47AC0", func_8006C710); diff --git a/src/jp/47BA0.c b/src/jp/47BA0.c new file mode 100644 index 0000000000..52eeaa55a3 --- /dev/null +++ b/src/jp/47BA0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47BA0", func_8006C7A0); diff --git a/src/jp/47BF0.c b/src/jp/47BF0.c new file mode 100644 index 0000000000..5b40f89b3a --- /dev/null +++ b/src/jp/47BF0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47BF0", func_8006C7F0); diff --git a/src/jp/47C40.c b/src/jp/47C40.c new file mode 100644 index 0000000000..364b09b41f --- /dev/null +++ b/src/jp/47C40.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47C40", func_8006C840); + +INCLUDE_ASM(s32, "47C40", func_8006C8AC); diff --git a/src/jp/47D30.c b/src/jp/47D30.c new file mode 100644 index 0000000000..4992ba85c1 --- /dev/null +++ b/src/jp/47D30.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47D30", func_8006C930); diff --git a/src/jp/47E10.c b/src/jp/47E10.c new file mode 100644 index 0000000000..39416cc297 --- /dev/null +++ b/src/jp/47E10.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47E10", func_8006CA10); diff --git a/src/jp/47E70.c b/src/jp/47E70.c new file mode 100644 index 0000000000..35850d4971 --- /dev/null +++ b/src/jp/47E70.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47E70", func_8006CA70); diff --git a/src/jp/47F80.c b/src/jp/47F80.c new file mode 100644 index 0000000000..ec88766ad8 --- /dev/null +++ b/src/jp/47F80.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47F80", func_8006CB80); diff --git a/src/jp/47FA0.c b/src/jp/47FA0.c new file mode 100644 index 0000000000..a446453f5f --- /dev/null +++ b/src/jp/47FA0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "47FA0", func_8006CBA0); diff --git a/src/jp/48000.c b/src/jp/48000.c new file mode 100644 index 0000000000..0d1d55bcf2 --- /dev/null +++ b/src/jp/48000.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "48000", func_8006CC00); + +INCLUDE_ASM(s32, "48000", func_8006D060); + +INCLUDE_ASM(s32, "48000", func_8006D1B8); + +INCLUDE_ASM(s32, "48000", func_8006D320); + +INCLUDE_ASM(s32, "48000", func_8006D49C); + +INCLUDE_ASM(s32, "48000", func_8006D540); diff --git a/src/jp/48A00.c b/src/jp/48A00.c new file mode 100644 index 0000000000..6736914f87 --- /dev/null +++ b/src/jp/48A00.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "48A00", func_8006D600); + +INCLUDE_ASM(s32, "48A00", func_8006D684); diff --git a/src/jp/48BC0.c b/src/jp/48BC0.c new file mode 100644 index 0000000000..811ceccf82 --- /dev/null +++ b/src/jp/48BC0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "48BC0", func_8006D7C0); diff --git a/src/jp/48BE0.c b/src/jp/48BE0.c new file mode 100644 index 0000000000..2ee250ba40 --- /dev/null +++ b/src/jp/48BE0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "48BE0", func_8006D7E0); diff --git a/src/jp/491A0.c b/src/jp/491A0.c new file mode 100644 index 0000000000..b3c2a802ef --- /dev/null +++ b/src/jp/491A0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "491A0", func_8006DDA0); + +INCLUDE_ASM(s32, "491A0", func_8006E2F0); diff --git a/src/jp/49C50.c b/src/jp/49C50.c new file mode 100644 index 0000000000..48c40271fe --- /dev/null +++ b/src/jp/49C50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "49C50", func_8006E850); diff --git a/src/jp/4A120.c b/src/jp/4A120.c new file mode 100644 index 0000000000..24d725c973 --- /dev/null +++ b/src/jp/4A120.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4A120", func_8006ED20); + +INCLUDE_ASM(s32, "4A120", func_8006ED50); diff --git a/src/jp/4A190.c b/src/jp/4A190.c new file mode 100644 index 0000000000..acd2d9e5fa --- /dev/null +++ b/src/jp/4A190.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4A190", func_8006ED90); diff --git a/src/jp/4A1D0.c b/src/jp/4A1D0.c new file mode 100644 index 0000000000..e312f13071 --- /dev/null +++ b/src/jp/4A1D0.c @@ -0,0 +1,31 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4A1D0", func_8006EDD0); + +INCLUDE_ASM(s32, "4A1D0", func_8006EEF8); + +INCLUDE_ASM(s32, "4A1D0", func_8006EF00); + +INCLUDE_ASM(s32, "4A1D0", func_8006EF08); + +INCLUDE_ASM(s32, "4A1D0", func_8006EF38); + +INCLUDE_ASM(s32, "4A1D0", func_8006EF40); + +INCLUDE_ASM(s32, "4A1D0", func_8006EF48); + +INCLUDE_ASM(s32, "4A1D0", func_8006F098); + +INCLUDE_ASM(s32, "4A1D0", func_8006F164); + +INCLUDE_ASM(s32, "4A1D0", func_8006F27C); + +INCLUDE_ASM(s32, "4A1D0", func_8006F2E8); + +INCLUDE_ASM(s32, "4A1D0", func_8006F404); + +INCLUDE_ASM(s32, "4A1D0", func_8006F530); + +INCLUDE_ASM(s32, "4A1D0", func_8006F5FC); + +INCLUDE_ASM(s32, "4A1D0", func_8006F73C); diff --git a/src/jp/4AC70.c b/src/jp/4AC70.c new file mode 100644 index 0000000000..c76c1356e3 --- /dev/null +++ b/src/jp/4AC70.c @@ -0,0 +1,293 @@ +#include "common.h" + +INCLUDE_ASM(s32, "4AC70", func_8006F870); + +INCLUDE_ASM(s32, "4AC70", func_8006F8D0); + +INCLUDE_ASM(s32, "4AC70", func_8006F930); + +INCLUDE_ASM(s32, "4AC70", func_8006F990); + +INCLUDE_ASM(s32, "4AC70", func_8006F9F0); + +INCLUDE_ASM(s32, "4AC70", func_8006FA50); + +INCLUDE_ASM(s32, "4AC70", func_8006FAB0); + +INCLUDE_ASM(s32, "4AC70", func_8006FB10); + +INCLUDE_ASM(s32, "4AC70", func_8006FB70); + +INCLUDE_ASM(s32, "4AC70", func_8006FBD0); + +INCLUDE_ASM(s32, "4AC70", func_8006FC30); + +INCLUDE_ASM(s32, "4AC70", func_8006FC90); + +INCLUDE_ASM(s32, "4AC70", func_8006FCF0); + +INCLUDE_ASM(s32, "4AC70", func_8006FD50); + +INCLUDE_ASM(s32, "4AC70", func_8006FDB0); + +INCLUDE_ASM(s32, "4AC70", func_8006FE10); + +INCLUDE_ASM(s32, "4AC70", func_8006FE70); + +INCLUDE_ASM(s32, "4AC70", func_8006FED0); + +INCLUDE_ASM(s32, "4AC70", func_8006FF30); + +INCLUDE_ASM(s32, "4AC70", func_8006FF90); + +INCLUDE_ASM(s32, "4AC70", func_8006FFF0); + +INCLUDE_ASM(s32, "4AC70", func_80070050); + +INCLUDE_ASM(s32, "4AC70", func_800700B0); + +INCLUDE_ASM(s32, "4AC70", func_80070110); + +INCLUDE_ASM(s32, "4AC70", func_80070170); + +INCLUDE_ASM(s32, "4AC70", func_800701D0); + +INCLUDE_ASM(s32, "4AC70", func_80070230); + +INCLUDE_ASM(s32, "4AC70", func_80070290); + +INCLUDE_ASM(s32, "4AC70", func_800702F0); + +INCLUDE_ASM(s32, "4AC70", func_80070350); + +INCLUDE_ASM(s32, "4AC70", func_800703B0); + +INCLUDE_ASM(s32, "4AC70", func_80070410); + +INCLUDE_ASM(s32, "4AC70", func_80070470); + +INCLUDE_ASM(s32, "4AC70", func_800704D0); + +INCLUDE_ASM(s32, "4AC70", func_80070530); + +INCLUDE_ASM(s32, "4AC70", func_80070590); + +INCLUDE_ASM(s32, "4AC70", func_800705F0); + +INCLUDE_ASM(s32, "4AC70", func_80070650); + +INCLUDE_ASM(s32, "4AC70", func_800706B0); + +INCLUDE_ASM(s32, "4AC70", func_80070710); + +INCLUDE_ASM(s32, "4AC70", func_80070770); + +INCLUDE_ASM(s32, "4AC70", func_800707D0); + +INCLUDE_ASM(s32, "4AC70", func_80070830); + +INCLUDE_ASM(s32, "4AC70", func_80070890); + +INCLUDE_ASM(s32, "4AC70", func_800708F0); + +INCLUDE_ASM(s32, "4AC70", func_80070950); + +INCLUDE_ASM(s32, "4AC70", func_800709B0); + +INCLUDE_ASM(s32, "4AC70", func_80070A10); + +INCLUDE_ASM(s32, "4AC70", func_80070A70); + +INCLUDE_ASM(s32, "4AC70", func_80070AD0); + +INCLUDE_ASM(s32, "4AC70", func_80070B30); + +INCLUDE_ASM(s32, "4AC70", func_80070B90); + +INCLUDE_ASM(s32, "4AC70", func_80070BF0); + +INCLUDE_ASM(s32, "4AC70", func_80070C50); + +INCLUDE_ASM(s32, "4AC70", func_80070CB0); + +INCLUDE_ASM(s32, "4AC70", func_80070D10); + +INCLUDE_ASM(s32, "4AC70", func_80070D70); + +INCLUDE_ASM(s32, "4AC70", func_80070DD0); + +INCLUDE_ASM(s32, "4AC70", func_80070E30); + +INCLUDE_ASM(s32, "4AC70", func_80070E90); + +INCLUDE_ASM(s32, "4AC70", func_80070EF0); + +INCLUDE_ASM(s32, "4AC70", func_80070F50); + +INCLUDE_ASM(s32, "4AC70", func_80070FB0); + +INCLUDE_ASM(s32, "4AC70", func_80071010); + +INCLUDE_ASM(s32, "4AC70", func_80071070); + +INCLUDE_ASM(s32, "4AC70", func_800710D0); + +INCLUDE_ASM(s32, "4AC70", func_80071130); + +INCLUDE_ASM(s32, "4AC70", func_80071190); + +INCLUDE_ASM(s32, "4AC70", func_800711F0); + +INCLUDE_ASM(s32, "4AC70", func_80071250); + +INCLUDE_ASM(s32, "4AC70", func_800712B0); + +INCLUDE_ASM(s32, "4AC70", func_80071310); + +INCLUDE_ASM(s32, "4AC70", func_80071370); + +INCLUDE_ASM(s32, "4AC70", func_800713D0); + +INCLUDE_ASM(s32, "4AC70", func_80071430); + +INCLUDE_ASM(s32, "4AC70", func_80071490); + +INCLUDE_ASM(s32, "4AC70", func_800714F0); + +INCLUDE_ASM(s32, "4AC70", func_80071550); + +INCLUDE_ASM(s32, "4AC70", func_800715B0); + +INCLUDE_ASM(s32, "4AC70", func_80071610); + +INCLUDE_ASM(s32, "4AC70", func_80071670); + +INCLUDE_ASM(s32, "4AC70", func_800716D0); + +INCLUDE_ASM(s32, "4AC70", func_80071730); + +INCLUDE_ASM(s32, "4AC70", func_80071790); + +INCLUDE_ASM(s32, "4AC70", func_800717F0); + +INCLUDE_ASM(s32, "4AC70", func_80071850); + +INCLUDE_ASM(s32, "4AC70", func_800718B0); + +INCLUDE_ASM(s32, "4AC70", func_80071910); + +INCLUDE_ASM(s32, "4AC70", func_80071970); + +INCLUDE_ASM(s32, "4AC70", func_800719D0); + +INCLUDE_ASM(s32, "4AC70", func_80071A30); + +INCLUDE_ASM(s32, "4AC70", func_80071A90); + +INCLUDE_ASM(s32, "4AC70", func_80071AF0); + +INCLUDE_ASM(s32, "4AC70", func_80071B50); + +INCLUDE_ASM(s32, "4AC70", func_80071BB0); + +INCLUDE_ASM(s32, "4AC70", func_80071C10); + +INCLUDE_ASM(s32, "4AC70", func_80071C70); + +INCLUDE_ASM(s32, "4AC70", func_80071CD0); + +INCLUDE_ASM(s32, "4AC70", func_80071D30); + +INCLUDE_ASM(s32, "4AC70", func_80071D90); + +INCLUDE_ASM(s32, "4AC70", func_80071DF0); + +INCLUDE_ASM(s32, "4AC70", func_80071E50); + +INCLUDE_ASM(s32, "4AC70", func_80071EB0); + +INCLUDE_ASM(s32, "4AC70", func_80071F10); + +INCLUDE_ASM(s32, "4AC70", func_80071F70); + +INCLUDE_ASM(s32, "4AC70", func_80071FD0); + +INCLUDE_ASM(s32, "4AC70", func_80072030); + +INCLUDE_ASM(s32, "4AC70", func_80072090); + +INCLUDE_ASM(s32, "4AC70", func_800720F0); + +INCLUDE_ASM(s32, "4AC70", func_80072150); + +INCLUDE_ASM(s32, "4AC70", func_800721B0); + +INCLUDE_ASM(s32, "4AC70", func_80072210); + +INCLUDE_ASM(s32, "4AC70", func_80072270); + +INCLUDE_ASM(s32, "4AC70", func_800722D0); + +INCLUDE_ASM(s32, "4AC70", func_80072330); + +INCLUDE_ASM(s32, "4AC70", func_80072390); + +INCLUDE_ASM(s32, "4AC70", func_800723F0); + +INCLUDE_ASM(s32, "4AC70", func_80072450); + +INCLUDE_ASM(s32, "4AC70", func_800724B0); + +INCLUDE_ASM(s32, "4AC70", func_80072510); + +INCLUDE_ASM(s32, "4AC70", func_80072570); + +INCLUDE_ASM(s32, "4AC70", func_800725D0); + +INCLUDE_ASM(s32, "4AC70", func_80072630); + +INCLUDE_ASM(s32, "4AC70", func_80072690); + +INCLUDE_ASM(s32, "4AC70", func_800726F0); + +INCLUDE_ASM(s32, "4AC70", func_80072750); + +INCLUDE_ASM(s32, "4AC70", func_800727B0); + +INCLUDE_ASM(s32, "4AC70", func_80072810); + +INCLUDE_ASM(s32, "4AC70", func_80072870); + +INCLUDE_ASM(s32, "4AC70", func_800728D0); + +INCLUDE_ASM(s32, "4AC70", func_80072930); + +INCLUDE_ASM(s32, "4AC70", func_80072990); + +INCLUDE_ASM(s32, "4AC70", func_800729F0); + +INCLUDE_ASM(s32, "4AC70", func_80072A50); + +INCLUDE_ASM(s32, "4AC70", func_80072AB0); + +INCLUDE_ASM(s32, "4AC70", func_80072B10); + +INCLUDE_ASM(s32, "4AC70", func_80072B90); + +INCLUDE_ASM(s32, "4AC70", func_80072BAC); + +INCLUDE_ASM(s32, "4AC70", func_80072BBC); + +INCLUDE_ASM(s32, "4AC70", func_80072C70); + +INCLUDE_ASM(s32, "4AC70", func_80072CAC); + +INCLUDE_ASM(s32, "4AC70", func_80072CBC); + +INCLUDE_ASM(s32, "4AC70", func_80072CCC); + +INCLUDE_ASM(s32, "4AC70", func_80072CD4); + +INCLUDE_ASM(s32, "4AC70", func_80072D0C); + +INCLUDE_ASM(s32, "4AC70", func_80072DF4); diff --git a/src/jp/5FC0.c b/src/jp/5FC0.c new file mode 100644 index 0000000000..246521ca20 --- /dev/null +++ b/src/jp/5FC0.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(s32, "5FC0", func_8002ABC0); + +INCLUDE_ASM(s32, "5FC0", func_8002ABE8); + +INCLUDE_ASM(s32, "5FC0", func_8002AC10); + +INCLUDE_ASM(s32, "5FC0", func_8002AC38); + +INCLUDE_ASM(s32, "5FC0", func_8002AC60); + +INCLUDE_ASM(s32, "5FC0", func_8002AC9C); + +INCLUDE_ASM(s32, "5FC0", func_8002ACA4); + +INCLUDE_ASM(s32, "5FC0", func_8002ACEC); + +INCLUDE_ASM(s32, "5FC0", func_8002AD34); + +INCLUDE_ASM(s32, "5FC0", func_8002AD70); + +INCLUDE_ASM(s32, "5FC0", func_8002ADB4); diff --git a/src/jp/6200.c b/src/jp/6200.c new file mode 100644 index 0000000000..70d276eba2 --- /dev/null +++ b/src/jp/6200.c @@ -0,0 +1,37 @@ +#include "common.h" + +INCLUDE_ASM(s32, "6200", func_8002AE00); + +INCLUDE_ASM(s32, "6200", func_8002AF00); + +INCLUDE_ASM(s32, "6200", func_8002AF30); + +INCLUDE_ASM(s32, "6200", func_8002AF98); + +INCLUDE_ASM(s32, "6200", func_8002B00C); + +INCLUDE_ASM(s32, "6200", func_8002B090); + +INCLUDE_ASM(s32, "6200", func_8002B0B8); + +INCLUDE_ASM(s32, "6200", func_8002B114); + +INCLUDE_ASM(s32, "6200", func_8002B290); + +INCLUDE_ASM(s32, "6200", func_8002B334); + +INCLUDE_ASM(s32, "6200", func_8002B3EC); + +INCLUDE_ASM(s32, "6200", func_8002B450); + +INCLUDE_ASM(s32, "6200", func_8002B5C8); + +INCLUDE_ASM(s32, "6200", func_8002B5F0); + +INCLUDE_ASM(s32, "6200", func_8002B80C); + +INCLUDE_ASM(s32, "6200", func_8002B828); + +INCLUDE_ASM(s32, "6200", func_8002B908); + +INCLUDE_ASM(s32, "6200", func_8002B9DC); diff --git a/src/jp/6E00.c b/src/jp/6E00.c new file mode 100644 index 0000000000..7be5069662 --- /dev/null +++ b/src/jp/6E00.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "6E00", func_8002BA00); + +INCLUDE_ASM(s32, "6E00", func_8002BA38); + +INCLUDE_ASM(s32, "6E00", func_8002BA40); + +INCLUDE_ASM(s32, "6E00", func_8002BE9C); + +INCLUDE_ASM(s32, "6E00", func_8002BEAC); + +INCLUDE_ASM(s32, "6E00", func_8002BEC4); + +INCLUDE_ASM(s32, "6E00", func_8002BED4); + +INCLUDE_ASM(s32, "6E00", func_8002BEE4); diff --git a/src/jp/7300.c b/src/jp/7300.c new file mode 100644 index 0000000000..bebfaf1702 --- /dev/null +++ b/src/jp/7300.c @@ -0,0 +1,27 @@ +#include "common.h" + +INCLUDE_ASM(s32, "7300", func_8002BF00); + +INCLUDE_ASM(s32, "7300", func_8002BF70); + +INCLUDE_ASM(s32, "7300", func_8002C014); + +INCLUDE_ASM(s32, "7300", func_8002C194); + +INCLUDE_ASM(s32, "7300", func_8002C1C8); + +INCLUDE_ASM(s32, "7300", func_8002C278); + +INCLUDE_ASM(s32, "7300", func_8002C2E4); + +INCLUDE_ASM(s32, "7300", func_8002C370); + +INCLUDE_ASM(s32, "7300", func_8002C770); + +INCLUDE_ASM(s32, "7300", func_8002C7DC); + +INCLUDE_ASM(s32, "7300", func_8002C850); + +INCLUDE_ASM(s32, "7300", func_8002C870); + +INCLUDE_ASM(s32, "7300", func_8002C90C); diff --git a/src/jp/7E00.c b/src/jp/7E00.c new file mode 100644 index 0000000000..0745881f70 --- /dev/null +++ b/src/jp/7E00.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "7E00", func_8002CA00); diff --git a/src/jp/80A0.c b/src/jp/80A0.c new file mode 100644 index 0000000000..ec3b6e946c --- /dev/null +++ b/src/jp/80A0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "80A0", func_8002CCA0); + +INCLUDE_ASM(s32, "80A0", func_8002CF24); diff --git a/src/jp/8490.c b/src/jp/8490.c new file mode 100644 index 0000000000..222116dfb4 --- /dev/null +++ b/src/jp/8490.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(s32, "8490", func_8002D090); + +INCLUDE_ASM(s32, "8490", func_8002D3CC); + +INCLUDE_ASM(s32, "8490", func_8002DB84); + +INCLUDE_ASM(s32, "8490", func_8002DCC8); + +INCLUDE_ASM(s32, "8490", func_8002DDFC); + +INCLUDE_ASM(s32, "8490", func_8002DFA4); + +INCLUDE_ASM(s32, "8490", func_8002E178); + +INCLUDE_ASM(s32, "8490", func_8002E1C8); + +INCLUDE_ASM(s32, "8490", func_8002E3E4); + +INCLUDE_ASM(s32, "8490", func_8002E45C); + +INCLUDE_ASM(s32, "8490", func_8002E4BC); diff --git a/src/jp/99A0.c b/src/jp/99A0.c new file mode 100644 index 0000000000..852eb03d99 --- /dev/null +++ b/src/jp/99A0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "99A0", func_8002E5A0); + +INCLUDE_ASM(s32, "99A0", func_8002E988); + +INCLUDE_ASM(s32, "99A0", func_8002EF20); + +INCLUDE_ASM(s32, "99A0", func_8002F4E0); diff --git a/src/jp/AA20.c b/src/jp/AA20.c new file mode 100644 index 0000000000..1191826243 --- /dev/null +++ b/src/jp/AA20.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "AA20", func_8002F620); diff --git a/src/jp/AD70.c b/src/jp/AD70.c new file mode 100644 index 0000000000..0104976c07 --- /dev/null +++ b/src/jp/AD70.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "AD70", func_8002F970); + +INCLUDE_ASM(s32, "AD70", func_8002FC90); + +INCLUDE_ASM(s32, "AD70", func_8002FEA0); + +INCLUDE_ASM(s32, "AD70", func_8002FFDC); + +INCLUDE_ASM(s32, "AD70", func_800300E0); + +INCLUDE_ASM(s32, "AD70", func_800300E8); + +INCLUDE_ASM(s32, "AD70", func_8003018C); + +INCLUDE_ASM(s32, "AD70", func_80031124); diff --git a/src/jp/D2A0.c b/src/jp/D2A0.c new file mode 100644 index 0000000000..0bc17920ba --- /dev/null +++ b/src/jp/D2A0.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(s32, "D2A0", func_80031EA0); + +INCLUDE_ASM(s32, "D2A0", func_80031F6C); + +INCLUDE_ASM(s32, "D2A0", func_80032274); + +INCLUDE_ASM(s32, "D2A0", func_80032534); + +INCLUDE_ASM(s32, "D2A0", func_80032600); + +INCLUDE_ASM(s32, "D2A0", func_800328F4); + +INCLUDE_ASM(s32, "D2A0", func_80033024); + +INCLUDE_ASM(s32, "D2A0", func_80033178); + +INCLUDE_ASM(s32, "D2A0", func_80033180); + +INCLUDE_ASM(s32, "D2A0", func_800331B8); diff --git a/src/jp/E5D0.c b/src/jp/E5D0.c new file mode 100644 index 0000000000..e496c03740 --- /dev/null +++ b/src/jp/E5D0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E5D0", func_800331D0); + +INCLUDE_ASM(s32, "E5D0", func_800331F8); + +INCLUDE_ASM(s32, "E5D0", func_80033418); diff --git a/src/jp/E860.c b/src/jp/E860.c new file mode 100644 index 0000000000..c9cefadafa --- /dev/null +++ b/src/jp/E860.c @@ -0,0 +1,23 @@ +#include "common.h" + +INCLUDE_ASM(s32, "E860", func_80033460); + +INCLUDE_ASM(s32, "E860", func_80033470); + +INCLUDE_ASM(s32, "E860", func_80033488); + +INCLUDE_ASM(s32, "E860", func_800334C0); + +INCLUDE_ASM(s32, "E860", func_80033504); + +INCLUDE_ASM(s32, "E860", func_80033560); + +INCLUDE_ASM(s32, "E860", func_80033574); + +INCLUDE_ASM(s32, "E860", func_800337E4); + +INCLUDE_ASM(s32, "E860", func_80033818); + +INCLUDE_ASM(s32, "E860", func_80033850); + +INCLUDE_ASM(s32, "E860", func_80033AF4); diff --git a/src/jp/EF00.c b/src/jp/EF00.c new file mode 100644 index 0000000000..1cd3b8a364 --- /dev/null +++ b/src/jp/EF00.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(s32, "EF00", func_80033B00); + +INCLUDE_ASM(s32, "EF00", func_80033D34); + +INCLUDE_ASM(s32, "EF00", func_80034038); + +INCLUDE_ASM(s32, "EF00", func_80034054); + +INCLUDE_ASM(s32, "EF00", func_800345C0); + +INCLUDE_ASM(s32, "EF00", func_800345FC); + +INCLUDE_ASM(s32, "EF00", func_80034874); + +INCLUDE_ASM(s32, "EF00", func_8003487C); + +INCLUDE_ASM(s32, "EF00", func_800348BC); + +INCLUDE_ASM(s32, "EF00", func_80034C70); diff --git a/src/jp/main_10080.c b/src/jp/main_10080.c deleted file mode 100644 index 77027523f2..0000000000 --- a/src/jp/main_10080.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_10080", func_80034C80); - -INCLUDE_ASM(s32, "main_10080", func_80034CD8); - -INCLUDE_ASM(s32, "main_10080", func_80034E48); - -INCLUDE_ASM(s32, "main_10080", func_8003516C); - -INCLUDE_ASM(s32, "main_10080", func_80035244); - -INCLUDE_ASM(s32, "main_10080", func_8003524C); - -INCLUDE_ASM(s32, "main_10080", func_80035254); - -INCLUDE_ASM(s32, "main_10080", func_800352E0); - -INCLUDE_ASM(s32, "main_10080", func_80035384); - -INCLUDE_ASM(s32, "main_10080", func_800357C0); - -INCLUDE_ASM(s32, "main_10080", func_80035998); - -INCLUDE_ASM(s32, "main_10080", func_800359A0); diff --git a/src/jp/main_10DB0.c b/src/jp/main_10DB0.c deleted file mode 100644 index fab3534e9e..0000000000 --- a/src/jp/main_10DB0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_10DB0", func_800359B0); - -INCLUDE_ASM(s32, "main_10DB0", func_800359D4); - -INCLUDE_ASM(s32, "main_10DB0", func_80035A20); - -INCLUDE_ASM(s32, "main_10DB0", func_80035A4C); diff --git a/src/jp/main_10E70.c b/src/jp/main_10E70.c deleted file mode 100644 index 539f4599b2..0000000000 --- a/src/jp/main_10E70.c +++ /dev/null @@ -1,25 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_10E70", func_80035A70); - -INCLUDE_ASM(s32, "main_10E70", func_80035A80); - -INCLUDE_ASM(s32, "main_10E70", func_80035AA4); - -INCLUDE_ASM(s32, "main_10E70", func_80035AD4); - -INCLUDE_ASM(s32, "main_10E70", func_80035B6C); - -INCLUDE_ASM(s32, "main_10E70", func_80035D7C); - -INCLUDE_ASM(s32, "main_10E70", func_80035DB0); - -INCLUDE_ASM(s32, "main_10E70", func_80035DFC); - -INCLUDE_ASM(s32, "main_10E70", func_8003607C); - -INCLUDE_ASM(s32, "main_10E70", func_800360B0); - -INCLUDE_ASM(s32, "main_10E70", func_800360EC); - -INCLUDE_ASM(s32, "main_10E70", func_800362C0); diff --git a/src/jp/main_116D0.c b/src/jp/main_116D0.c deleted file mode 100644 index b7ae128986..0000000000 --- a/src/jp/main_116D0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_116D0", func_800362D0); - -INCLUDE_ASM(s32, "main_116D0", func_800364D4); - -INCLUDE_ASM(s32, "main_116D0", func_80036A60); diff --git a/src/jp/main_11E70.c b/src/jp/main_11E70.c deleted file mode 100644 index d65bc5ba13..0000000000 --- a/src/jp/main_11E70.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_11E70", func_80036A70); - -INCLUDE_ASM(s32, "main_11E70", func_80036D44); - -INCLUDE_ASM(s32, "main_11E70", func_80037234); - -INCLUDE_ASM(s32, "main_11E70", func_800372C8); - -INCLUDE_ASM(s32, "main_11E70", func_800375F0); - -INCLUDE_ASM(s32, "main_11E70", func_800375F8); - -INCLUDE_ASM(s32, "main_11E70", func_80037624); - -INCLUDE_ASM(s32, "main_11E70", func_80037860); - -INCLUDE_ASM(s32, "main_11E70", func_80037AAC); diff --git a/src/jp/main_13140.c b/src/jp/main_13140.c deleted file mode 100644 index ea6136e3c1..0000000000 --- a/src/jp/main_13140.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_13140", func_80037D40); - -INCLUDE_ASM(s32, "main_13140", func_80037DB4); - -INCLUDE_ASM(s32, "main_13140", func_8003811C); diff --git a/src/jp/main_13530.c b/src/jp/main_13530.c deleted file mode 100644 index d6fe3ec99e..0000000000 --- a/src/jp/main_13530.c +++ /dev/null @@ -1,201 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_13530", func_80038130); - -INCLUDE_ASM(s32, "main_13530", func_80038138); - -INCLUDE_ASM(s32, "main_13530", func_8003817C); - -INCLUDE_ASM(s32, "main_13530", func_800381EC); - -INCLUDE_ASM(s32, "main_13530", func_8003823C); - -INCLUDE_ASM(s32, "main_13530", func_80038258); - -INCLUDE_ASM(s32, "main_13530", func_80038504); - -INCLUDE_ASM(s32, "main_13530", func_80038524); - -INCLUDE_ASM(s32, "main_13530", func_80038540); - -INCLUDE_ASM(s32, "main_13530", func_80038560); - -INCLUDE_ASM(s32, "main_13530", func_8003868C); - -INCLUDE_ASM(s32, "main_13530", func_8003879C); - -INCLUDE_ASM(s32, "main_13530", func_800387BC); - -INCLUDE_ASM(s32, "main_13530", func_80038CCC); - -INCLUDE_ASM(s32, "main_13530", func_80038F98); - -INCLUDE_ASM(s32, "main_13530", func_80039348); - -INCLUDE_ASM(s32, "main_13530", func_800394A8); - -INCLUDE_ASM(s32, "main_13530", func_800395F0); - -INCLUDE_ASM(s32, "main_13530", func_80039A64); - -INCLUDE_ASM(s32, "main_13530", func_80039C90); - -INCLUDE_ASM(s32, "main_13530", func_8003A4B0); - -INCLUDE_ASM(s32, "main_13530", func_8003A714); - -INCLUDE_ASM(s32, "main_13530", func_8003A7AC); - -INCLUDE_ASM(s32, "main_13530", func_8003A808); - -INCLUDE_ASM(s32, "main_13530", func_8003A860); - -INCLUDE_ASM(s32, "main_13530", func_8003A8BC); - -INCLUDE_ASM(s32, "main_13530", func_8003A91C); - -INCLUDE_ASM(s32, "main_13530", func_8003A9E4); - -INCLUDE_ASM(s32, "main_13530", func_8003AA6C); - -INCLUDE_ASM(s32, "main_13530", func_8003AAB8); - -INCLUDE_ASM(s32, "main_13530", func_8003AAF8); - -INCLUDE_ASM(s32, "main_13530", func_8003AE44); - -INCLUDE_ASM(s32, "main_13530", func_8003AE58); - -INCLUDE_ASM(s32, "main_13530", func_8003AE68); - -INCLUDE_ASM(s32, "main_13530", func_8003AE70); - -INCLUDE_ASM(s32, "main_13530", func_8003B000); - -INCLUDE_ASM(s32, "main_13530", func_8003B090); - -INCLUDE_ASM(s32, "main_13530", func_8003B0B8); - -INCLUDE_ASM(s32, "main_13530", func_8003B0E0); - -INCLUDE_ASM(s32, "main_13530", func_8003B10C); - -INCLUDE_ASM(s32, "main_13530", func_8003B124); - -INCLUDE_ASM(s32, "main_13530", func_8003B13C); - -INCLUDE_ASM(s32, "main_13530", func_8003B1C0); - -INCLUDE_ASM(s32, "main_13530", func_8003B274); - -INCLUDE_ASM(s32, "main_13530", func_8003B62C); - -INCLUDE_ASM(s32, "main_13530", func_8003B720); - -INCLUDE_ASM(s32, "main_13530", func_8003BB98); - -INCLUDE_ASM(s32, "main_13530", func_8003C098); - -INCLUDE_ASM(s32, "main_13530", func_8003C0E8); - -INCLUDE_ASM(s32, "main_13530", func_8003C104); - -INCLUDE_ASM(s32, "main_13530", func_8003C1FC); - -INCLUDE_ASM(s32, "main_13530", func_8003C2DC); - -INCLUDE_ASM(s32, "main_13530", func_8003C318); - -INCLUDE_ASM(s32, "main_13530", func_8003C320); - -INCLUDE_ASM(s32, "main_13530", func_8003C328); - -INCLUDE_ASM(s32, "main_13530", func_8003C44C); - -INCLUDE_ASM(s32, "main_13530", func_8003C468); - -INCLUDE_ASM(s32, "main_13530", func_8003C56C); - -INCLUDE_ASM(s32, "main_13530", func_8003C574); - -INCLUDE_ASM(s32, "main_13530", func_8003C644); - -INCLUDE_ASM(s32, "main_13530", func_8003C668); - -INCLUDE_ASM(s32, "main_13530", func_8003C7E0); - -INCLUDE_ASM(s32, "main_13530", func_8003C804); - -INCLUDE_ASM(s32, "main_13530", func_8003C94C); - -INCLUDE_ASM(s32, "main_13530", func_8003C970); - -INCLUDE_ASM(s32, "main_13530", func_8003CC60); - -INCLUDE_ASM(s32, "main_13530", func_8003CC68); - -INCLUDE_ASM(s32, "main_13530", func_8003CC74); - -INCLUDE_ASM(s32, "main_13530", func_8003CD84); - -INCLUDE_ASM(s32, "main_13530", func_8003CE94); - -INCLUDE_ASM(s32, "main_13530", func_8003CFB8); - -INCLUDE_ASM(s32, "main_13530", func_8003D07C); - -INCLUDE_ASM(s32, "main_13530", func_8003D2E4); - -INCLUDE_ASM(s32, "main_13530", func_8003D320); - -INCLUDE_ASM(s32, "main_13530", func_8003D448); - -INCLUDE_ASM(s32, "main_13530", func_8003D6F8); - -INCLUDE_ASM(s32, "main_13530", func_8003D8F8); - -INCLUDE_ASM(s32, "main_13530", func_8003DC60); - -INCLUDE_ASM(s32, "main_13530", func_8003DD94); - -INCLUDE_ASM(s32, "main_13530", func_8003DE90); - -INCLUDE_ASM(s32, "main_13530", func_8003DFA0); - -INCLUDE_ASM(s32, "main_13530", func_8003DFF8); - -INCLUDE_ASM(s32, "main_13530", func_8003E0C0); - -INCLUDE_ASM(s32, "main_13530", func_8003E1CC); - -INCLUDE_ASM(s32, "main_13530", func_8003E1D4); - -INCLUDE_ASM(s32, "main_13530", func_8003E1E4); - -INCLUDE_ASM(s32, "main_13530", func_8003E270); - -INCLUDE_ASM(s32, "main_13530", func_8003E2FC); - -INCLUDE_ASM(s32, "main_13530", func_8003E330); - -INCLUDE_ASM(s32, "main_13530", func_8003E338); - -INCLUDE_ASM(s32, "main_13530", func_8003E3F0); - -INCLUDE_ASM(s32, "main_13530", func_8003E46C); - -INCLUDE_ASM(s32, "main_13530", func_8003E60C); - -INCLUDE_ASM(s32, "main_13530", func_8003E674); - -INCLUDE_ASM(s32, "main_13530", func_8003E6DC); - -INCLUDE_ASM(s32, "main_13530", func_8003E744); - -INCLUDE_ASM(s32, "main_13530", func_8003E810); - -INCLUDE_ASM(s32, "main_13530", func_8003E8DC); - -INCLUDE_ASM(s32, "main_13530", func_8003E9A8); - -INCLUDE_ASM(s32, "main_13530", func_8003EA28); diff --git a/src/jp/main_19EB0.c b/src/jp/main_19EB0.c deleted file mode 100644 index 510956a5c5..0000000000 --- a/src/jp/main_19EB0.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_19EB0", func_8003EAB0); - -INCLUDE_ASM(s32, "main_19EB0", func_8003EB00); - -INCLUDE_ASM(s32, "main_19EB0", func_8003EB58); - -INCLUDE_ASM(s32, "main_19EB0", func_8003EB8C); - -INCLUDE_ASM(s32, "main_19EB0", func_8003EBC0); - -INCLUDE_ASM(s32, "main_19EB0", func_8003EC58); - -INCLUDE_ASM(s32, "main_19EB0", func_8003ECD8); - -INCLUDE_ASM(s32, "main_19EB0", func_8003ED44); - -INCLUDE_ASM(s32, "main_19EB0", func_8003ED84); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F044); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F058); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F0B4); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F0D4); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F18C); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F240); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F3A8); - -INCLUDE_ASM(s32, "main_19EB0", func_8003F48C); - -INCLUDE_ASM(s32, "main_19EB0", func_8004101C); - -INCLUDE_ASM(s32, "main_19EB0", func_80041024); - -INCLUDE_ASM(s32, "main_19EB0", func_80041624); - -INCLUDE_ASM(s32, "main_19EB0", func_8004191C); - -INCLUDE_ASM(s32, "main_19EB0", func_80041BD0); - -INCLUDE_ASM(s32, "main_19EB0", func_80042D0C); - -INCLUDE_ASM(s32, "main_19EB0", func_80042D5C); - -INCLUDE_ASM(s32, "main_19EB0", func_80042E94); - -INCLUDE_ASM(s32, "main_19EB0", func_80042E9C); - -INCLUDE_ASM(s32, "main_19EB0", func_80043370); - -INCLUDE_ASM(s32, "main_19EB0", func_80043E00); - -INCLUDE_ASM(s32, "main_19EB0", func_80043E08); diff --git a/src/jp/main_1B10.c b/src/jp/main_1B10.c deleted file mode 100644 index 1256527b17..0000000000 --- a/src/jp/main_1B10.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_1B10", func_80026710); - -INCLUDE_ASM(s32, "main_1B10", func_800269C0); - -INCLUDE_ASM(s32, "main_1B10", func_80026AD4); - -INCLUDE_ASM(s32, "main_1B10", func_80026DA8); - -INCLUDE_ASM(s32, "main_1B10", func_80027054); - -INCLUDE_ASM(s32, "main_1B10", func_8002715C); diff --git a/src/jp/main_1F240.c b/src/jp/main_1F240.c deleted file mode 100644 index e774d0374b..0000000000 --- a/src/jp/main_1F240.c +++ /dev/null @@ -1,101 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_1F240", func_80043E40); - -INCLUDE_ASM(s32, "main_1F240", func_80043EB0); - -INCLUDE_ASM(s32, "main_1F240", func_80043EF8); - -INCLUDE_ASM(s32, "main_1F240", func_80043F24); - -INCLUDE_ASM(s32, "main_1F240", func_80043F50); - -INCLUDE_ASM(s32, "main_1F240", func_80043F58); - -INCLUDE_ASM(s32, "main_1F240", func_80044000); - -INCLUDE_ASM(s32, "main_1F240", func_80044138); - -INCLUDE_ASM(s32, "main_1F240", func_8004423C); - -INCLUDE_ASM(s32, "main_1F240", func_80044268); - -INCLUDE_ASM(s32, "main_1F240", func_80044294); - -INCLUDE_ASM(s32, "main_1F240", func_800442C0); - -INCLUDE_ASM(s32, "main_1F240", func_800442EC); - -INCLUDE_ASM(s32, "main_1F240", func_80044374); - -INCLUDE_ASM(s32, "main_1F240", func_80044500); - -INCLUDE_ASM(s32, "main_1F240", func_80044520); - -INCLUDE_ASM(s32, "main_1F240", func_8004455C); - -INCLUDE_ASM(s32, "main_1F240", func_800446F8); - -INCLUDE_ASM(s32, "main_1F240", func_80044738); - -INCLUDE_ASM(s32, "main_1F240", func_8004486C); - -INCLUDE_ASM(s32, "main_1F240", func_800448EC); - -INCLUDE_ASM(s32, "main_1F240", func_800449B0); - -INCLUDE_ASM(s32, "main_1F240", func_80044A64); - -INCLUDE_ASM(s32, "main_1F240", func_80044B78); - -INCLUDE_ASM(s32, "main_1F240", func_80044BF8); - -INCLUDE_ASM(s32, "main_1F240", func_80044CB0); - -INCLUDE_ASM(s32, "main_1F240", func_80044D64); - -INCLUDE_ASM(s32, "main_1F240", func_80044E00); - -INCLUDE_ASM(s32, "main_1F240", func_80044E9C); - -INCLUDE_ASM(s32, "main_1F240", func_80044F1C); - -INCLUDE_ASM(s32, "main_1F240", func_80044F80); - -INCLUDE_ASM(s32, "main_1F240", func_80044FE0); - -INCLUDE_ASM(s32, "main_1F240", func_8004507C); - -INCLUDE_ASM(s32, "main_1F240", func_8004511C); - -INCLUDE_ASM(s32, "main_1F240", func_800451CC); - -INCLUDE_ASM(s32, "main_1F240", func_800451E4); - -INCLUDE_ASM(s32, "main_1F240", func_80045240); - -INCLUDE_ASM(s32, "main_1F240", func_800452D4); - -INCLUDE_ASM(s32, "main_1F240", func_80045300); - -INCLUDE_ASM(s32, "main_1F240", func_80045348); - -INCLUDE_ASM(s32, "main_1F240", func_800453EC); - -INCLUDE_ASM(s32, "main_1F240", func_800453F4); - -INCLUDE_ASM(s32, "main_1F240", func_80045458); - -INCLUDE_ASM(s32, "main_1F240", func_80045484); - -INCLUDE_ASM(s32, "main_1F240", func_800454B8); - -INCLUDE_ASM(s32, "main_1F240", func_800454CC); - -INCLUDE_ASM(s32, "main_1F240", func_800454F8); - -INCLUDE_ASM(s32, "main_1F240", func_8004558C); - -INCLUDE_ASM(s32, "main_1F240", func_800455C0); - -INCLUDE_ASM(s32, "main_1F240", func_80045718); diff --git a/src/jp/main_20B80.c b/src/jp/main_20B80.c deleted file mode 100644 index 2375a64740..0000000000 --- a/src/jp/main_20B80.c +++ /dev/null @@ -1,99 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_20B80", func_80045780); - -INCLUDE_ASM(s32, "main_20B80", func_800457D0); - -INCLUDE_ASM(s32, "main_20B80", func_80045828); - -INCLUDE_ASM(s32, "main_20B80", func_80045888); - -INCLUDE_ASM(s32, "main_20B80", func_800458E8); - -INCLUDE_ASM(s32, "main_20B80", func_80045948); - -INCLUDE_ASM(s32, "main_20B80", func_80045984); - -INCLUDE_ASM(s32, "main_20B80", func_800459C0); - -INCLUDE_ASM(s32, "main_20B80", func_80045A3C); - -INCLUDE_ASM(s32, "main_20B80", func_80045B0C); - -INCLUDE_ASM(s32, "main_20B80", func_80045B5C); - -INCLUDE_ASM(s32, "main_20B80", func_80045C50); - -INCLUDE_ASM(s32, "main_20B80", func_80045C60); - -INCLUDE_ASM(s32, "main_20B80", func_80045CDC); - -INCLUDE_ASM(s32, "main_20B80", func_8004628C); - -INCLUDE_ASM(s32, "main_20B80", func_800472B4); - -INCLUDE_ASM(s32, "main_20B80", func_800473A0); - -INCLUDE_ASM(s32, "main_20B80", func_80047438); - -INCLUDE_ASM(s32, "main_20B80", func_800474A0); - -INCLUDE_ASM(s32, "main_20B80", func_800474CC); - -INCLUDE_ASM(s32, "main_20B80", func_80047544); - -INCLUDE_ASM(s32, "main_20B80", func_800475A4); - -INCLUDE_ASM(s32, "main_20B80", func_800475D4); - -INCLUDE_ASM(s32, "main_20B80", func_8004764C); - -INCLUDE_ASM(s32, "main_20B80", func_800476AC); - -INCLUDE_ASM(s32, "main_20B80", func_800476DC); - -INCLUDE_ASM(s32, "main_20B80", func_80047754); - -INCLUDE_ASM(s32, "main_20B80", func_800477B4); - -INCLUDE_ASM(s32, "main_20B80", func_800477E4); - -INCLUDE_ASM(s32, "main_20B80", func_80047830); - -INCLUDE_ASM(s32, "main_20B80", func_80047890); - -INCLUDE_ASM(s32, "main_20B80", func_800478C0); - -INCLUDE_ASM(s32, "main_20B80", func_80047950); - -INCLUDE_ASM(s32, "main_20B80", func_800479AC); - -INCLUDE_ASM(s32, "main_20B80", func_800479DC); - -INCLUDE_ASM(s32, "main_20B80", func_80047A6C); - -INCLUDE_ASM(s32, "main_20B80", func_80047AC8); - -INCLUDE_ASM(s32, "main_20B80", func_80047AF8); - -INCLUDE_ASM(s32, "main_20B80", func_80047B88); - -INCLUDE_ASM(s32, "main_20B80", func_80047BD4); - -INCLUDE_ASM(s32, "main_20B80", func_80047C04); - -INCLUDE_ASM(s32, "main_20B80", func_80047C94); - -INCLUDE_ASM(s32, "main_20B80", func_80047CE0); - -INCLUDE_ASM(s32, "main_20B80", func_80047D10); - -INCLUDE_ASM(s32, "main_20B80", func_80047DA0); - -INCLUDE_ASM(s32, "main_20B80", func_80047DEC); - -INCLUDE_ASM(s32, "main_20B80", func_80047E1C); - -INCLUDE_ASM(s32, "main_20B80", func_80047EAC); - -INCLUDE_ASM(s32, "main_20B80", func_80047EF8); diff --git a/src/jp/main_23330.c b/src/jp/main_23330.c deleted file mode 100644 index b52ee8a2b4..0000000000 --- a/src/jp/main_23330.c +++ /dev/null @@ -1,39 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_23330", func_80047F30); - -INCLUDE_ASM(s32, "main_23330", func_80048A00); - -INCLUDE_ASM(s32, "main_23330", func_80048AE4); - -INCLUDE_ASM(s32, "main_23330", func_80048BBC); - -INCLUDE_ASM(s32, "main_23330", func_80048C84); - -INCLUDE_ASM(s32, "main_23330", func_80048D64); - -INCLUDE_ASM(s32, "main_23330", func_8004909C); - -INCLUDE_ASM(s32, "main_23330", func_80049170); - -INCLUDE_ASM(s32, "main_23330", func_80049200); - -INCLUDE_ASM(s32, "main_23330", func_80049250); - -INCLUDE_ASM(s32, "main_23330", func_80049368); - -INCLUDE_ASM(s32, "main_23330", func_800497F4); - -INCLUDE_ASM(s32, "main_23330", func_800498B4); - -INCLUDE_ASM(s32, "main_23330", func_80049AEC); - -INCLUDE_ASM(s32, "main_23330", func_80049B7C); - -INCLUDE_ASM(s32, "main_23330", func_80049C2C); - -INCLUDE_ASM(s32, "main_23330", func_80049DD4); - -INCLUDE_ASM(s32, "main_23330", func_8004A098); - -INCLUDE_ASM(s32, "main_23330", func_8004A12C); diff --git a/src/jp/main_2570.c b/src/jp/main_2570.c deleted file mode 100644 index 5d76b107a1..0000000000 --- a/src/jp/main_2570.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_2570", func_80027170); - -INCLUDE_ASM(s32, "main_2570", func_800271CC); - -INCLUDE_ASM(s32, "main_2570", func_8002722C); - -INCLUDE_ASM(s32, "main_2570", func_800275D0); - -INCLUDE_ASM(s32, "main_2570", func_80027744); - -INCLUDE_ASM(s32, "main_2570", func_80027984); - -INCLUDE_ASM(s32, "main_2570", func_80027B7C); - -INCLUDE_ASM(s32, "main_2570", func_80027DE0); diff --git a/src/jp/main_257A0.c b/src/jp/main_257A0.c deleted file mode 100644 index 3533f7faa5..0000000000 --- a/src/jp/main_257A0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_257A0", func_8004A3A0); - -INCLUDE_ASM(s32, "main_257A0", func_8004A3EC); - -INCLUDE_ASM(s32, "main_257A0", func_8004A434); diff --git a/src/jp/main_25BB0.c b/src/jp/main_25BB0.c deleted file mode 100644 index 13bca31670..0000000000 --- a/src/jp/main_25BB0.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_25BB0", func_8004A7B0); - -INCLUDE_ASM(s32, "main_25BB0", func_8004AA80); - -INCLUDE_ASM(s32, "main_25BB0", func_8004AAB8); - -INCLUDE_ASM(s32, "main_25BB0", func_8004AED4); - -INCLUDE_ASM(s32, "main_25BB0", func_8004AF18); - -INCLUDE_ASM(s32, "main_25BB0", func_8004AFD8); - -INCLUDE_ASM(s32, "main_25BB0", func_8004B09C); - -INCLUDE_ASM(s32, "main_25BB0", func_8004B0BC); diff --git a/src/jp/main_264F0.c b/src/jp/main_264F0.c deleted file mode 100644 index 37812bcd19..0000000000 --- a/src/jp/main_264F0.c +++ /dev/null @@ -1,97 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_264F0", func_8004B0F0); - -INCLUDE_ASM(s32, "main_264F0", func_8004B2DC); - -INCLUDE_ASM(s32, "main_264F0", func_8004B348); - -INCLUDE_ASM(s32, "main_264F0", func_8004B388); - -INCLUDE_ASM(s32, "main_264F0", func_8004B3F8); - -INCLUDE_ASM(s32, "main_264F0", func_8004B694); - -INCLUDE_ASM(s32, "main_264F0", func_8004B704); - -INCLUDE_ASM(s32, "main_264F0", func_8004B724); - -INCLUDE_ASM(s32, "main_264F0", func_8004BD94); - -INCLUDE_ASM(s32, "main_264F0", func_8004BF18); - -INCLUDE_ASM(s32, "main_264F0", func_8004BF54); - -INCLUDE_ASM(s32, "main_264F0", func_8004BFB0); - -INCLUDE_ASM(s32, "main_264F0", func_8004C008); - -INCLUDE_ASM(s32, "main_264F0", func_8004C084); - -INCLUDE_ASM(s32, "main_264F0", func_8004C0F4); - -INCLUDE_ASM(s32, "main_264F0", func_8004C228); - -INCLUDE_ASM(s32, "main_264F0", func_8004C4F4); - -INCLUDE_ASM(s32, "main_264F0", func_8004C534); - -INCLUDE_ASM(s32, "main_264F0", func_8004CA44); - -INCLUDE_ASM(s32, "main_264F0", func_8004CAA8); - -INCLUDE_ASM(s32, "main_264F0", func_8004CB20); - -INCLUDE_ASM(s32, "main_264F0", func_8004CB54); - -INCLUDE_ASM(s32, "main_264F0", func_8004CB74); - -INCLUDE_ASM(s32, "main_264F0", func_8004CBBC); - -INCLUDE_ASM(s32, "main_264F0", func_8004CBEC); - -INCLUDE_ASM(s32, "main_264F0", func_8004CCBC); - -INCLUDE_ASM(s32, "main_264F0", func_8004CCE8); - -INCLUDE_ASM(s32, "main_264F0", func_8004CD00); - -INCLUDE_ASM(s32, "main_264F0", func_8004CD2C); - -INCLUDE_ASM(s32, "main_264F0", func_8004CDC4); - -INCLUDE_ASM(s32, "main_264F0", func_8004CDE0); - -INCLUDE_ASM(s32, "main_264F0", func_8004CE0C); - -INCLUDE_ASM(s32, "main_264F0", func_8004CE30); - -INCLUDE_ASM(s32, "main_264F0", func_8004CE64); - -INCLUDE_ASM(s32, "main_264F0", func_8004CEEC); - -INCLUDE_ASM(s32, "main_264F0", func_8004CF60); - -INCLUDE_ASM(s32, "main_264F0", func_8004CF94); - -INCLUDE_ASM(s32, "main_264F0", func_8004CFC0); - -INCLUDE_ASM(s32, "main_264F0", func_8004CFCC); - -INCLUDE_ASM(s32, "main_264F0", func_8004CFD4); - -INCLUDE_ASM(s32, "main_264F0", func_8004CFEC); - -INCLUDE_ASM(s32, "main_264F0", func_8004D004); - -INCLUDE_ASM(s32, "main_264F0", func_8004D01C); - -INCLUDE_ASM(s32, "main_264F0", func_8004D050); - -INCLUDE_ASM(s32, "main_264F0", func_8004D0A8); - -INCLUDE_ASM(s32, "main_264F0", func_8004D0D8); - -INCLUDE_ASM(s32, "main_264F0", func_8004D134); - -INCLUDE_ASM(s32, "main_264F0", func_8004D16C); diff --git a/src/jp/main_285C0.c b/src/jp/main_285C0.c deleted file mode 100644 index 1ce9d9f7fd..0000000000 --- a/src/jp/main_285C0.c +++ /dev/null @@ -1,137 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_285C0", func_8004D1C0); - -INCLUDE_ASM(s32, "main_285C0", func_8004D444); - -INCLUDE_ASM(s32, "main_285C0", func_8004D490); - -INCLUDE_ASM(s32, "main_285C0", func_8004D6BC); - -INCLUDE_ASM(s32, "main_285C0", func_8004D724); - -INCLUDE_ASM(s32, "main_285C0", func_8004D758); - -INCLUDE_ASM(s32, "main_285C0", func_8004D790); - -INCLUDE_ASM(s32, "main_285C0", func_8004D7D8); - -INCLUDE_ASM(s32, "main_285C0", func_8004D7FC); - -INCLUDE_ASM(s32, "main_285C0", func_8004D930); - -INCLUDE_ASM(s32, "main_285C0", func_8004D968); - -INCLUDE_ASM(s32, "main_285C0", func_8004DADC); - -INCLUDE_ASM(s32, "main_285C0", func_8004DC84); - -INCLUDE_ASM(s32, "main_285C0", func_8004DDA4); - -INCLUDE_ASM(s32, "main_285C0", func_8004DE08); - -INCLUDE_ASM(s32, "main_285C0", func_8004DFF4); - -INCLUDE_ASM(s32, "main_285C0", func_8004E054); - -INCLUDE_ASM(s32, "main_285C0", func_8004E0F4); - -INCLUDE_ASM(s32, "main_285C0", func_8004E168); - -INCLUDE_ASM(s32, "main_285C0", func_8004E288); - -INCLUDE_ASM(s32, "main_285C0", func_8004E4F4); - -INCLUDE_ASM(s32, "main_285C0", func_8004E530); - -INCLUDE_ASM(s32, "main_285C0", func_8004E5B4); - -INCLUDE_ASM(s32, "main_285C0", func_8004E6E4); - -INCLUDE_ASM(s32, "main_285C0", func_8004E784); - -INCLUDE_ASM(s32, "main_285C0", func_8004E8B4); - -INCLUDE_ASM(s32, "main_285C0", func_8004E918); - -INCLUDE_ASM(s32, "main_285C0", func_8004F86C); - -INCLUDE_ASM(s32, "main_285C0", func_8004F8B8); - -INCLUDE_ASM(s32, "main_285C0", func_8004F964); - -INCLUDE_ASM(s32, "main_285C0", func_8004F994); - -INCLUDE_ASM(s32, "main_285C0", func_8004F9B4); - -INCLUDE_ASM(s32, "main_285C0", func_8004F9E8); - -INCLUDE_ASM(s32, "main_285C0", func_8004FA44); - -INCLUDE_ASM(s32, "main_285C0", func_8004FAC0); - -INCLUDE_ASM(s32, "main_285C0", func_8004FB1C); - -INCLUDE_ASM(s32, "main_285C0", func_8004FB60); - -INCLUDE_ASM(s32, "main_285C0", func_8004FB80); - -INCLUDE_ASM(s32, "main_285C0", func_8004FBEC); - -INCLUDE_ASM(s32, "main_285C0", func_8004FC08); - -INCLUDE_ASM(s32, "main_285C0", func_8004FC20); - -INCLUDE_ASM(s32, "main_285C0", func_8004FC38); - -INCLUDE_ASM(s32, "main_285C0", func_8004FC58); - -INCLUDE_ASM(s32, "main_285C0", func_8004FC64); - -INCLUDE_ASM(s32, "main_285C0", func_8004FC78); - -INCLUDE_ASM(s32, "main_285C0", func_8004FC94); - -INCLUDE_ASM(s32, "main_285C0", func_8004FCA0); - -INCLUDE_ASM(s32, "main_285C0", func_8004FCAC); - -INCLUDE_ASM(s32, "main_285C0", func_8004FCB4); - -INCLUDE_ASM(s32, "main_285C0", func_8004FCD0); - -INCLUDE_ASM(s32, "main_285C0", func_8004FDD8); - -INCLUDE_ASM(s32, "main_285C0", func_8004FE0C); - -INCLUDE_ASM(s32, "main_285C0", func_8004FE34); - -INCLUDE_ASM(s32, "main_285C0", func_8004FE58); - -INCLUDE_ASM(s32, "main_285C0", func_8004FFA0); - -INCLUDE_ASM(s32, "main_285C0", func_80050210); - -INCLUDE_ASM(s32, "main_285C0", func_80050218); - -INCLUDE_ASM(s32, "main_285C0", func_80050294); - -INCLUDE_ASM(s32, "main_285C0", func_80050304); - -INCLUDE_ASM(s32, "main_285C0", func_8005033C); - -INCLUDE_ASM(s32, "main_285C0", func_80050378); - -INCLUDE_ASM(s32, "main_285C0", func_80050420); - -INCLUDE_ASM(s32, "main_285C0", func_800504C8); - -INCLUDE_ASM(s32, "main_285C0", func_800504EC); - -INCLUDE_ASM(s32, "main_285C0", func_8005052C); - -INCLUDE_ASM(s32, "main_285C0", func_80050538); - -INCLUDE_ASM(s32, "main_285C0", func_800505B0); - -INCLUDE_ASM(s32, "main_285C0", func_80050620); diff --git a/src/jp/main_2BC40.c b/src/jp/main_2BC40.c deleted file mode 100644 index 0c7ef13384..0000000000 --- a/src/jp/main_2BC40.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_2BC40", func_80050840); - -INCLUDE_ASM(s32, "main_2BC40", func_800508E0); - -INCLUDE_ASM(s32, "main_2BC40", func_80050904); - -INCLUDE_ASM(s32, "main_2BC40", func_80050914); - -INCLUDE_ASM(s32, "main_2BC40", func_80050950); - -INCLUDE_ASM(s32, "main_2BC40", func_80050A00); - -INCLUDE_ASM(s32, "main_2BC40", func_80050AC8); - -INCLUDE_ASM(s32, "main_2BC40", func_80050B34); - -INCLUDE_ASM(s32, "main_2BC40", func_80050BA0); - -INCLUDE_ASM(s32, "main_2BC40", func_80050C14); - -INCLUDE_ASM(s32, "main_2BC40", func_80050C80); - -INCLUDE_ASM(s32, "main_2BC40", func_80050D00); - -INCLUDE_ASM(s32, "main_2BC40", func_80050D54); - -INCLUDE_ASM(s32, "main_2BC40", func_80050E6C); - -INCLUDE_ASM(s32, "main_2BC40", func_80050FE4); - -INCLUDE_ASM(s32, "main_2BC40", func_800510E4); - -INCLUDE_ASM(s32, "main_2BC40", func_80051E80); - -INCLUDE_ASM(s32, "main_2BC40", func_80051E98); - -INCLUDE_ASM(s32, "main_2BC40", func_80051F58); - -INCLUDE_ASM(s32, "main_2BC40", func_80051FDC); diff --git a/src/jp/main_2D650.c b/src/jp/main_2D650.c deleted file mode 100644 index 4e0d70e8be..0000000000 --- a/src/jp/main_2D650.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_2D650", func_80052250); - -INCLUDE_ASM(s32, "main_2D650", func_800522C4); - -INCLUDE_ASM(s32, "main_2D650", func_80052310); - -INCLUDE_ASM(s32, "main_2D650", func_800527F4); - -INCLUDE_ASM(s32, "main_2D650", func_80052870); - -INCLUDE_ASM(s32, "main_2D650", func_800528A8); - -INCLUDE_ASM(s32, "main_2D650", func_800529AC); - -INCLUDE_ASM(s32, "main_2D650", func_80052AC8); diff --git a/src/jp/main_2DEE0.c b/src/jp/main_2DEE0.c deleted file mode 100644 index d1675bba4f..0000000000 --- a/src/jp/main_2DEE0.c +++ /dev/null @@ -1,91 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_2DEE0", func_80052AE0); - -INCLUDE_ASM(s32, "main_2DEE0", func_80052B0C); - -INCLUDE_ASM(s32, "main_2DEE0", func_80052FA4); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053020); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053058); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053080); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053270); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053304); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053538); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053574); - -INCLUDE_ASM(s32, "main_2DEE0", func_800535A8); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053624); - -INCLUDE_ASM(s32, "main_2DEE0", func_800536C8); - -INCLUDE_ASM(s32, "main_2DEE0", func_800536D8); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053748); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053778); - -INCLUDE_ASM(s32, "main_2DEE0", func_8005379C); - -INCLUDE_ASM(s32, "main_2DEE0", func_800537B4); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053858); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053898); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053908); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053964); - -INCLUDE_ASM(s32, "main_2DEE0", func_800539A8); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053B08); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053C14); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053C30); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053EF8); - -INCLUDE_ASM(s32, "main_2DEE0", func_80053F6C); - -INCLUDE_ASM(s32, "main_2DEE0", func_8005412C); - -INCLUDE_ASM(s32, "main_2DEE0", func_800541A8); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054264); - -INCLUDE_ASM(s32, "main_2DEE0", func_8005430C); - -INCLUDE_ASM(s32, "main_2DEE0", func_800543F4); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054478); - -INCLUDE_ASM(s32, "main_2DEE0", func_800546A8); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054750); - -INCLUDE_ASM(s32, "main_2DEE0", func_800548FC); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054934); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054990); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054A24); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054A58); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054AB0); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054B40); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054BF8); - -INCLUDE_ASM(s32, "main_2DEE0", func_80054C24); diff --git a/src/jp/main_30070.c b/src/jp/main_30070.c deleted file mode 100644 index e3e726f363..0000000000 --- a/src/jp/main_30070.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_30070", func_80054C70); diff --git a/src/jp/main_30100.c b/src/jp/main_30100.c deleted file mode 100644 index 946d4b3286..0000000000 --- a/src/jp/main_30100.c +++ /dev/null @@ -1,137 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_30100", func_80054D00); - -INCLUDE_ASM(s32, "main_30100", func_80054D18); - -INCLUDE_ASM(s32, "main_30100", func_80054DC0); - -INCLUDE_ASM(s32, "main_30100", func_80054DEC); - -INCLUDE_ASM(s32, "main_30100", func_80054E90); - -INCLUDE_ASM(s32, "main_30100", func_80054EF0); - -INCLUDE_ASM(s32, "main_30100", func_80054F80); - -INCLUDE_ASM(s32, "main_30100", func_80054FE0); - -INCLUDE_ASM(s32, "main_30100", func_80055070); - -INCLUDE_ASM(s32, "main_30100", func_800550A4); - -INCLUDE_ASM(s32, "main_30100", func_800550B8); - -INCLUDE_ASM(s32, "main_30100", func_800550F8); - -INCLUDE_ASM(s32, "main_30100", func_80055114); - -INCLUDE_ASM(s32, "main_30100", func_80055154); - -INCLUDE_ASM(s32, "main_30100", func_80055198); - -INCLUDE_ASM(s32, "main_30100", func_800551EC); - -INCLUDE_ASM(s32, "main_30100", func_80055240); - -INCLUDE_ASM(s32, "main_30100", func_80055294); - -INCLUDE_ASM(s32, "main_30100", func_800552C8); - -INCLUDE_ASM(s32, "main_30100", func_8005531C); - -INCLUDE_ASM(s32, "main_30100", func_80055380); - -INCLUDE_ASM(s32, "main_30100", func_800553C8); - -INCLUDE_ASM(s32, "main_30100", func_80055410); - -INCLUDE_ASM(s32, "main_30100", func_8005547C); - -INCLUDE_ASM(s32, "main_30100", func_800554F8); - -INCLUDE_ASM(s32, "main_30100", func_80055584); - -INCLUDE_ASM(s32, "main_30100", func_800555CC); - -INCLUDE_ASM(s32, "main_30100", func_80055620); - -INCLUDE_ASM(s32, "main_30100", func_80055674); - -INCLUDE_ASM(s32, "main_30100", func_80055690); - -INCLUDE_ASM(s32, "main_30100", func_800556AC); - -INCLUDE_ASM(s32, "main_30100", func_800556C8); - -INCLUDE_ASM(s32, "main_30100", func_8005571C); - -INCLUDE_ASM(s32, "main_30100", func_8005576C); - -INCLUDE_ASM(s32, "main_30100", func_800557A0); - -INCLUDE_ASM(s32, "main_30100", func_800557D8); - -INCLUDE_ASM(s32, "main_30100", func_80055830); - -INCLUDE_ASM(s32, "main_30100", func_80055868); - -INCLUDE_ASM(s32, "main_30100", func_800558A0); - -INCLUDE_ASM(s32, "main_30100", func_800558DC); - -INCLUDE_ASM(s32, "main_30100", func_80055914); - -INCLUDE_ASM(s32, "main_30100", func_80055944); - -INCLUDE_ASM(s32, "main_30100", func_80055974); - -INCLUDE_ASM(s32, "main_30100", func_80055998); - -INCLUDE_ASM(s32, "main_30100", func_800559E8); - -INCLUDE_ASM(s32, "main_30100", func_80055A3C); - -INCLUDE_ASM(s32, "main_30100", func_80055A8C); - -INCLUDE_ASM(s32, "main_30100", func_80055AF8); - -INCLUDE_ASM(s32, "main_30100", func_80055B64); - -INCLUDE_ASM(s32, "main_30100", func_80055C08); - -INCLUDE_ASM(s32, "main_30100", func_80055C84); - -INCLUDE_ASM(s32, "main_30100", func_80055CA0); - -INCLUDE_ASM(s32, "main_30100", func_80055CBC); - -INCLUDE_ASM(s32, "main_30100", func_80055CD8); - -INCLUDE_ASM(s32, "main_30100", func_80055CF4); - -INCLUDE_ASM(s32, "main_30100", func_80055D18); - -INCLUDE_ASM(s32, "main_30100", func_80055D3C); - -INCLUDE_ASM(s32, "main_30100", func_80055D58); - -INCLUDE_ASM(s32, "main_30100", func_80055D6C); - -INCLUDE_ASM(s32, "main_30100", func_80055DBC); - -INCLUDE_ASM(s32, "main_30100", func_80055DF4); - -INCLUDE_ASM(s32, "main_30100", func_80055E0C); - -INCLUDE_ASM(s32, "main_30100", func_80055E30); - -INCLUDE_ASM(s32, "main_30100", func_80055E54); - -INCLUDE_ASM(s32, "main_30100", func_80055E74); - -INCLUDE_ASM(s32, "main_30100", func_80055E94); - -INCLUDE_ASM(s32, "main_30100", func_80055EB4); - -INCLUDE_ASM(s32, "main_30100", func_80055ED8); diff --git a/src/jp/main_31300.c b/src/jp/main_31300.c deleted file mode 100644 index fa16cb880a..0000000000 --- a/src/jp/main_31300.c +++ /dev/null @@ -1,79 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_31300", func_80055F00); - -INCLUDE_ASM(s32, "main_31300", func_80056254); - -INCLUDE_ASM(s32, "main_31300", func_80056270); - -INCLUDE_ASM(s32, "main_31300", func_800569E4); - -INCLUDE_ASM(s32, "main_31300", func_800569F4); - -INCLUDE_ASM(s32, "main_31300", func_80056A00); - -INCLUDE_ASM(s32, "main_31300", func_80056A0C); - -INCLUDE_ASM(s32, "main_31300", func_80056A28); - -INCLUDE_ASM(s32, "main_31300", func_80056A54); - -INCLUDE_ASM(s32, "main_31300", func_80056A7C); - -INCLUDE_ASM(s32, "main_31300", func_80056AE4); - -INCLUDE_ASM(s32, "main_31300", func_80056B70); - -INCLUDE_ASM(s32, "main_31300", func_80056B98); - -INCLUDE_ASM(s32, "main_31300", func_80056C28); - -INCLUDE_ASM(s32, "main_31300", func_80056C54); - -INCLUDE_ASM(s32, "main_31300", func_80056ED4); - -INCLUDE_ASM(s32, "main_31300", func_80056FF4); - -INCLUDE_ASM(s32, "main_31300", func_8005701C); - -INCLUDE_ASM(s32, "main_31300", func_800571F8); - -INCLUDE_ASM(s32, "main_31300", func_8005739C); - -INCLUDE_ASM(s32, "main_31300", func_80057524); - -INCLUDE_ASM(s32, "main_31300", func_80057688); - -INCLUDE_ASM(s32, "main_31300", func_80057814); - -INCLUDE_ASM(s32, "main_31300", func_8005783C); - -INCLUDE_ASM(s32, "main_31300", func_80057864); - -INCLUDE_ASM(s32, "main_31300", func_8005788C); - -INCLUDE_ASM(s32, "main_31300", func_800578B4); - -INCLUDE_ASM(s32, "main_31300", func_800578DC); - -INCLUDE_ASM(s32, "main_31300", func_80057904); - -INCLUDE_ASM(s32, "main_31300", func_800579BC); - -INCLUDE_ASM(s32, "main_31300", func_80057A78); - -INCLUDE_ASM(s32, "main_31300", func_80057AB8); - -INCLUDE_ASM(s32, "main_31300", func_80057B0C); - -INCLUDE_ASM(s32, "main_31300", func_80057B60); - -INCLUDE_ASM(s32, "main_31300", func_80057B80); - -INCLUDE_ASM(s32, "main_31300", func_80057BD0); - -INCLUDE_ASM(s32, "main_31300", func_80057C40); - -INCLUDE_ASM(s32, "main_31300", func_80057C88); - -INCLUDE_ASM(s32, "main_31300", func_80057CB4); diff --git a/src/jp/main_33100.c b/src/jp/main_33100.c deleted file mode 100644 index 346b679d68..0000000000 --- a/src/jp/main_33100.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_33100", func_80057D00); - -INCLUDE_ASM(s32, "main_33100", func_800587D0); - -INCLUDE_ASM(s32, "main_33100", func_8005891C); diff --git a/src/jp/main_33E80.c b/src/jp/main_33E80.c deleted file mode 100644 index 9c30f3d18a..0000000000 --- a/src/jp/main_33E80.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_33E80", func_80058A80); - -INCLUDE_ASM(s32, "main_33E80", func_80058B34); - -INCLUDE_ASM(s32, "main_33E80", func_80058C38); - -INCLUDE_ASM(s32, "main_33E80", func_80058CB8); - -INCLUDE_ASM(s32, "main_33E80", func_80058CFC); - -INCLUDE_ASM(s32, "main_33E80", func_80058FC0); - -INCLUDE_ASM(s32, "main_33E80", func_80059550); - -INCLUDE_ASM(s32, "main_33E80", func_80059768); - -INCLUDE_ASM(s32, "main_33E80", func_80059884); - -INCLUDE_ASM(s32, "main_33E80", func_80059930); - -INCLUDE_ASM(s32, "main_33E80", func_80059938); - -INCLUDE_ASM(s32, "main_33E80", func_8005994C); - -INCLUDE_ASM(s32, "main_33E80", func_800599F8); - -INCLUDE_ASM(s32, "main_33E80", func_80059A00); - -INCLUDE_ASM(s32, "main_33E80", func_80059BA4); - -INCLUDE_ASM(s32, "main_33E80", func_80059C44); - -INCLUDE_ASM(s32, "main_33E80", func_80059F6C); - -INCLUDE_ASM(s32, "main_33E80", func_8005A100); - -INCLUDE_ASM(s32, "main_33E80", func_8005A190); - -INCLUDE_ASM(s32, "main_33E80", func_8005A214); diff --git a/src/jp/main_35770.c b/src/jp/main_35770.c deleted file mode 100644 index 815b1527f9..0000000000 --- a/src/jp/main_35770.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_35770", func_8005A370); - -INCLUDE_ASM(s32, "main_35770", func_8005A3A4); - -INCLUDE_ASM(s32, "main_35770", func_8005A890); - -INCLUDE_ASM(s32, "main_35770", func_8005A8A0); - -INCLUDE_ASM(s32, "main_35770", func_8005A8B0); - -INCLUDE_ASM(s32, "main_35770", func_8005A9A0); - -INCLUDE_ASM(s32, "main_35770", func_8005AA88); diff --git a/src/jp/main_35F50.c b/src/jp/main_35F50.c deleted file mode 100644 index 3eebc0589b..0000000000 --- a/src/jp/main_35F50.c +++ /dev/null @@ -1,51 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_35F50", func_8005AB50); - -INCLUDE_ASM(s32, "main_35F50", func_8005AC34); - -INCLUDE_ASM(s32, "main_35F50", func_8005AC3C); - -INCLUDE_ASM(s32, "main_35F50", func_8005AC44); - -INCLUDE_ASM(s32, "main_35F50", func_8005AC70); - -INCLUDE_ASM(s32, "main_35F50", func_8005AD08); - -INCLUDE_ASM(s32, "main_35F50", func_8005AE50); - -INCLUDE_ASM(s32, "main_35F50", func_8005AEEC); - -INCLUDE_ASM(s32, "main_35F50", func_8005B430); - -INCLUDE_ASM(s32, "main_35F50", func_8005B650); - -INCLUDE_ASM(s32, "main_35F50", func_8005B6A4); - -INCLUDE_ASM(s32, "main_35F50", func_8005B6D4); - -INCLUDE_ASM(s32, "main_35F50", func_8005BA58); - -INCLUDE_ASM(s32, "main_35F50", func_8005BA88); - -INCLUDE_ASM(s32, "main_35F50", func_8005BAC0); - -INCLUDE_ASM(s32, "main_35F50", func_8005BB34); - -INCLUDE_ASM(s32, "main_35F50", func_8005C14C); - -INCLUDE_ASM(s32, "main_35F50", func_8005C454); - -INCLUDE_ASM(s32, "main_35F50", func_8005C980); - -INCLUDE_ASM(s32, "main_35F50", func_8005CDD4); - -INCLUDE_ASM(s32, "main_35F50", func_8005CF8C); - -INCLUDE_ASM(s32, "main_35F50", func_8005D0F8); - -INCLUDE_ASM(s32, "main_35F50", func_8005D7B0); - -INCLUDE_ASM(s32, "main_35F50", func_8005DA04); - -INCLUDE_ASM(s32, "main_35F50", func_8005DAA0); diff --git a/src/jp/main_38EC0.c b/src/jp/main_38EC0.c deleted file mode 100644 index 0e2402a8a5..0000000000 --- a/src/jp/main_38EC0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_38EC0", func_8005DAC0); - -INCLUDE_ASM(s32, "main_38EC0", func_8005DB7C); - -INCLUDE_ASM(s32, "main_38EC0", func_8005DC84); - -INCLUDE_ASM(s32, "main_38EC0", func_8005DDDC); diff --git a/src/jp/main_39960.c b/src/jp/main_39960.c deleted file mode 100644 index 1f447f4eca..0000000000 --- a/src/jp/main_39960.c +++ /dev/null @@ -1,29 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_39960", func_8005E560); - -INCLUDE_ASM(s32, "main_39960", func_8005E5BC); - -INCLUDE_ASM(s32, "main_39960", func_8005E660); - -INCLUDE_ASM(s32, "main_39960", func_8005E890); - -INCLUDE_ASM(s32, "main_39960", func_8005EAE0); - -INCLUDE_ASM(s32, "main_39960", func_8005EB6C); - -INCLUDE_ASM(s32, "main_39960", func_8005EBE8); - -INCLUDE_ASM(s32, "main_39960", func_8005EC28); - -INCLUDE_ASM(s32, "main_39960", func_8005EC34); - -INCLUDE_ASM(s32, "main_39960", func_8005EC40); - -INCLUDE_ASM(s32, "main_39960", func_8005EC4C); - -INCLUDE_ASM(s32, "main_39960", func_8005EC58); - -INCLUDE_ASM(s32, "main_39960", func_8005ED70); - -INCLUDE_ASM(s32, "main_39960", func_8005EDD0); diff --git a/src/jp/main_3A300.c b/src/jp/main_3A300.c deleted file mode 100644 index 2e7ee812c8..0000000000 --- a/src/jp/main_3A300.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A300", func_8005EF00); diff --git a/src/jp/main_3A340.c b/src/jp/main_3A340.c deleted file mode 100644 index 43ff01be78..0000000000 --- a/src/jp/main_3A340.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A340", func_8005EF40); diff --git a/src/jp/main_3A380.c b/src/jp/main_3A380.c deleted file mode 100644 index 8eb854eea5..0000000000 --- a/src/jp/main_3A380.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A380", func_8005EF80); diff --git a/src/jp/main_3A3A0.c b/src/jp/main_3A3A0.c deleted file mode 100644 index 8290ee17bb..0000000000 --- a/src/jp/main_3A3A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A3A0", func_8005EFA0); diff --git a/src/jp/main_3A4B0.c b/src/jp/main_3A4B0.c deleted file mode 100644 index 69ec6d38ec..0000000000 --- a/src/jp/main_3A4B0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A4B0", func_8005F0B0); diff --git a/src/jp/main_3A4E0.c b/src/jp/main_3A4E0.c deleted file mode 100644 index f0fe6383e2..0000000000 --- a/src/jp/main_3A4E0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A4E0", func_8005F0E0); diff --git a/src/jp/main_3A500.c b/src/jp/main_3A500.c deleted file mode 100644 index 8d2138c9f0..0000000000 --- a/src/jp/main_3A500.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A500", func_8005F100); - -INCLUDE_ASM(s32, "main_3A500", func_8005F140); diff --git a/src/jp/main_3A610.c b/src/jp/main_3A610.c deleted file mode 100644 index 96560a226b..0000000000 --- a/src/jp/main_3A610.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A610", func_8005F210); - -INCLUDE_ASM(s32, "main_3A610", func_8005F2C0); diff --git a/src/jp/main_3A700.c b/src/jp/main_3A700.c deleted file mode 100644 index 6fbc9523bf..0000000000 --- a/src/jp/main_3A700.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A700", func_8005F300); diff --git a/src/jp/main_3A760.c b/src/jp/main_3A760.c deleted file mode 100644 index 85d2442ab4..0000000000 --- a/src/jp/main_3A760.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A760", func_8005F360); - -INCLUDE_ASM(s32, "main_3A760", func_8005F384); - -INCLUDE_ASM(s32, "main_3A760", func_8005F3A8); - -INCLUDE_ASM(s32, "main_3A760", func_8005F3F8); - -INCLUDE_ASM(s32, "main_3A760", func_8005F420); - -INCLUDE_ASM(s32, "main_3A760", func_8005F460); - -INCLUDE_ASM(s32, "main_3A760", func_8005F514); - -INCLUDE_ASM(s32, "main_3A760", func_8005F554); - -INCLUDE_ASM(s32, "main_3A760", func_8005F580); - -INCLUDE_ASM(s32, "main_3A760", func_8005F5AC); diff --git a/src/jp/main_3A9D0.c b/src/jp/main_3A9D0.c deleted file mode 100644 index 6ecfa44842..0000000000 --- a/src/jp/main_3A9D0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3A9D0", func_8005F5D0); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005F7C0); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005F93C); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005F99C); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005F9C0); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005FA08); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005FA94); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005FABC); - -INCLUDE_ASM(s32, "main_3A9D0", func_8005FB04); diff --git a/src/jp/main_3AF40.c b/src/jp/main_3AF40.c deleted file mode 100644 index 8e2979b461..0000000000 --- a/src/jp/main_3AF40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3AF40", func_8005FB40); diff --git a/src/jp/main_3AFA0.c b/src/jp/main_3AFA0.c deleted file mode 100644 index 60f7e3f27a..0000000000 --- a/src/jp/main_3AFA0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3AFA0", func_8005FBA0); diff --git a/src/jp/main_3B040.c b/src/jp/main_3B040.c deleted file mode 100644 index 018ebe19ce..0000000000 --- a/src/jp/main_3B040.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B040", func_8005FC40); diff --git a/src/jp/main_3B2A0.c b/src/jp/main_3B2A0.c deleted file mode 100644 index 7aa61e1e9d..0000000000 --- a/src/jp/main_3B2A0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B2A0", func_8005FEA0); - -INCLUDE_ASM(s32, "main_3B2A0", func_8005FEF8); - -INCLUDE_ASM(s32, "main_3B2A0", func_8005FFC0); diff --git a/src/jp/main_3B400.c b/src/jp/main_3B400.c deleted file mode 100644 index 57204f2469..0000000000 --- a/src/jp/main_3B400.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B400", func_80060000); diff --git a/src/jp/main_3B420.c b/src/jp/main_3B420.c deleted file mode 100644 index d8d0ef3402..0000000000 --- a/src/jp/main_3B420.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B420", func_80060020); diff --git a/src/jp/main_3B4A0.c b/src/jp/main_3B4A0.c deleted file mode 100644 index ccab633189..0000000000 --- a/src/jp/main_3B4A0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B4A0", func_800600A0); - -INCLUDE_ASM(s32, "main_3B4A0", func_80060230); - -INCLUDE_ASM(s32, "main_3B4A0", func_800602C8); - -INCLUDE_ASM(s32, "main_3B4A0", func_8006032C); - -INCLUDE_ASM(s32, "main_3B4A0", func_80060390); diff --git a/src/jp/main_3B7C0.c b/src/jp/main_3B7C0.c deleted file mode 100644 index e832b7299b..0000000000 --- a/src/jp/main_3B7C0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B7C0", func_800603C0); - -INCLUDE_ASM(s32, "main_3B7C0", func_80060460); diff --git a/src/jp/main_3B8E0.c b/src/jp/main_3B8E0.c deleted file mode 100644 index 0665aa2db1..0000000000 --- a/src/jp/main_3B8E0.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3B8E0", func_800604E0); - -INCLUDE_ASM(s32, "main_3B8E0", func_800605B8); - -INCLUDE_ASM(s32, "main_3B8E0", func_800605DC); - -INCLUDE_ASM(s32, "main_3B8E0", func_80060604); - -INCLUDE_ASM(s32, "main_3B8E0", func_8006062C); - -INCLUDE_ASM(s32, "main_3B8E0", func_80060708); - -INCLUDE_ASM(s32, "main_3B8E0", func_80060784); - -INCLUDE_ASM(s32, "main_3B8E0", func_80060840); - -INCLUDE_ASM(s32, "main_3B8E0", func_80060890); - -INCLUDE_ASM(s32, "main_3B8E0", func_800608C0); diff --git a/src/jp/main_3BC0.c b/src/jp/main_3BC0.c deleted file mode 100644 index 5538d20739..0000000000 --- a/src/jp/main_3BC0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3BC0", func_800287C0); - -INCLUDE_ASM(s32, "main_3BC0", func_80028808); - -INCLUDE_ASM(s32, "main_3BC0", func_80028844); diff --git a/src/jp/main_3BCF0.c b/src/jp/main_3BCF0.c deleted file mode 100644 index 706b25b1fb..0000000000 --- a/src/jp/main_3BCF0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3BCF0", func_800608F0); - -INCLUDE_ASM(s32, "main_3BCF0", func_80060910); - -INCLUDE_ASM(s32, "main_3BCF0", func_800609B0); - -INCLUDE_ASM(s32, "main_3BCF0", func_80060B40); diff --git a/src/jp/main_3C1F0.c b/src/jp/main_3C1F0.c deleted file mode 100644 index 06f3ab7622..0000000000 --- a/src/jp/main_3C1F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C1F0", func_80060DF0); diff --git a/src/jp/main_3C290.c b/src/jp/main_3C290.c deleted file mode 100644 index 8710ad6503..0000000000 --- a/src/jp/main_3C290.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C290", func_80060E90); diff --git a/src/jp/main_3C2E0.c b/src/jp/main_3C2E0.c deleted file mode 100644 index cfa54549cb..0000000000 --- a/src/jp/main_3C2E0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C2E0", func_80060EE0); diff --git a/src/jp/main_3C460.c b/src/jp/main_3C460.c deleted file mode 100644 index ab54a48ceb..0000000000 --- a/src/jp/main_3C460.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C460", func_80061060); diff --git a/src/jp/main_3C820.c b/src/jp/main_3C820.c deleted file mode 100644 index 68f9c5d959..0000000000 --- a/src/jp/main_3C820.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C820", func_80061420); - -INCLUDE_ASM(s32, "main_3C820", func_80061474); - -INCLUDE_ASM(s32, "main_3C820", func_800614E0); diff --git a/src/jp/main_3C910.c b/src/jp/main_3C910.c deleted file mode 100644 index cb18b05be7..0000000000 --- a/src/jp/main_3C910.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3C910", func_80061510); - -INCLUDE_ASM(s32, "main_3C910", func_80061520); - -INCLUDE_ASM(s32, "main_3C910", func_80061530); diff --git a/src/jp/main_3CA50.c b/src/jp/main_3CA50.c deleted file mode 100644 index 2a02255a25..0000000000 --- a/src/jp/main_3CA50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3CA50", func_80061650); diff --git a/src/jp/main_3CAF0.c b/src/jp/main_3CAF0.c deleted file mode 100644 index 42ccde7e5c..0000000000 --- a/src/jp/main_3CAF0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3CAF0", func_800616F0); - -INCLUDE_ASM(s32, "main_3CAF0", func_800617A0); diff --git a/src/jp/main_3CC20.c b/src/jp/main_3CC20.c deleted file mode 100644 index 322626dade..0000000000 --- a/src/jp/main_3CC20.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3CC20", func_80061820); diff --git a/src/jp/main_3CCA0.c b/src/jp/main_3CCA0.c deleted file mode 100644 index b5953b8237..0000000000 --- a/src/jp/main_3CCA0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3CCA0", func_800618A0); diff --git a/src/jp/main_3CCD0.c b/src/jp/main_3CCD0.c deleted file mode 100644 index bf075bf9fa..0000000000 --- a/src/jp/main_3CCD0.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3CCD0", func_800618D0); - -INCLUDE_ASM(s32, "main_3CCD0", func_80061950); - -INCLUDE_ASM(s32, "main_3CCD0", func_80061970); - -INCLUDE_ASM(s32, "main_3CCD0", func_800619F8); - -INCLUDE_ASM(s32, "main_3CCD0", func_80061A94); diff --git a/src/jp/main_3CF50.c b/src/jp/main_3CF50.c deleted file mode 100644 index 83b552f20d..0000000000 --- a/src/jp/main_3CF50.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3CF50", func_80061B50); - -INCLUDE_ASM(s32, "main_3CF50", func_80061CEC); - -INCLUDE_ASM(s32, "main_3CF50", func_80061DA0); diff --git a/src/jp/main_3D260.c b/src/jp/main_3D260.c deleted file mode 100644 index 14eaf9c363..0000000000 --- a/src/jp/main_3D260.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3D260", func_80061E60); diff --git a/src/jp/main_3D2C0.c b/src/jp/main_3D2C0.c deleted file mode 100644 index 8d4aad7e48..0000000000 --- a/src/jp/main_3D2C0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3D2C0", func_80061EC0); diff --git a/src/jp/main_3D2D0.c b/src/jp/main_3D2D0.c deleted file mode 100644 index a619886971..0000000000 --- a/src/jp/main_3D2D0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3D2D0", func_80061ED0); diff --git a/src/jp/main_3D300.c b/src/jp/main_3D300.c deleted file mode 100644 index 191ac956dc..0000000000 --- a/src/jp/main_3D300.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3D300", func_80061F00); - -INCLUDE_ASM(s32, "main_3D300", func_80062030); diff --git a/src/jp/main_3D580.c b/src/jp/main_3D580.c deleted file mode 100644 index 7835afc15f..0000000000 --- a/src/jp/main_3D580.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3D580", func_80062180); - -INCLUDE_ASM(s32, "main_3D580", func_80062500); diff --git a/src/jp/main_3DC90.c b/src/jp/main_3DC90.c deleted file mode 100644 index 0e5cc8f847..0000000000 --- a/src/jp/main_3DC90.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3DC90", func_80062890); - -INCLUDE_ASM(s32, "main_3DC90", func_80063214); diff --git a/src/jp/main_3E6F0.c b/src/jp/main_3E6F0.c deleted file mode 100644 index cd2d4ebbdd..0000000000 --- a/src/jp/main_3E6F0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3E6F0", func_800632F0); - -INCLUDE_ASM(s32, "main_3E6F0", func_80063868); diff --git a/src/jp/main_3ECE0.c b/src/jp/main_3ECE0.c deleted file mode 100644 index af8d5b829a..0000000000 --- a/src/jp/main_3ECE0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3ECE0", func_800638E0); - -INCLUDE_ASM(s32, "main_3ECE0", func_80063A10); diff --git a/src/jp/main_3EF60.c b/src/jp/main_3EF60.c deleted file mode 100644 index 194171310f..0000000000 --- a/src/jp/main_3EF60.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3EF60", func_80063B60); - -INCLUDE_ASM(s32, "main_3EF60", func_80063D10); diff --git a/src/jp/main_3F2E0.c b/src/jp/main_3F2E0.c deleted file mode 100644 index 968927ef1b..0000000000 --- a/src/jp/main_3F2E0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3F2E0", func_80063EE0); - -INCLUDE_ASM(s32, "main_3F2E0", func_800640B8); diff --git a/src/jp/main_3F6A0.c b/src/jp/main_3F6A0.c deleted file mode 100644 index 97d0b6a791..0000000000 --- a/src/jp/main_3F6A0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3F6A0", func_800642A0); - -INCLUDE_ASM(s32, "main_3F6A0", func_80064428); diff --git a/src/jp/main_3F9C0.c b/src/jp/main_3F9C0.c deleted file mode 100644 index 5f2889c2b4..0000000000 --- a/src/jp/main_3F9C0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3F9C0", func_800645C0); diff --git a/src/jp/main_3FA20.c b/src/jp/main_3FA20.c deleted file mode 100644 index 31a2c9cbdc..0000000000 --- a/src/jp/main_3FA20.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3FA20", func_80064620); - -INCLUDE_ASM(s32, "main_3FA20", func_80064940); - -INCLUDE_ASM(s32, "main_3FA20", func_800649E0); - -INCLUDE_ASM(s32, "main_3FA20", func_80064A20); - -INCLUDE_ASM(s32, "main_3FA20", func_80064A44); diff --git a/src/jp/main_3FE70.c b/src/jp/main_3FE70.c deleted file mode 100644 index 5e3388b97a..0000000000 --- a/src/jp/main_3FE70.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_3FE70", _Printf); - -INCLUDE_ASM(s32, "main_3FE70", func_80064FF0); - -INCLUDE_ASM(s32, "main_3FE70", func_800654C0); - -INCLUDE_ASM(s32, "main_3FE70", func_80065518); diff --git a/src/jp/main_40950.c b/src/jp/main_40950.c deleted file mode 100644 index 91c9d905fe..0000000000 --- a/src/jp/main_40950.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_40950", func_80065550); diff --git a/src/jp/main_40980.c b/src/jp/main_40980.c deleted file mode 100644 index 1bc08fd47e..0000000000 --- a/src/jp/main_40980.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_40980", func_80065580); diff --git a/src/jp/main_40AC0.c b/src/jp/main_40AC0.c deleted file mode 100644 index 5dac575a2c..0000000000 --- a/src/jp/main_40AC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_40AC0", func_800656C0); diff --git a/src/jp/main_40BF0.c b/src/jp/main_40BF0.c deleted file mode 100644 index 3e947cb154..0000000000 --- a/src/jp/main_40BF0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_40BF0", func_800657F0); - -INCLUDE_ASM(s32, "main_40BF0", func_80065920); diff --git a/src/jp/main_40DD0.c b/src/jp/main_40DD0.c deleted file mode 100644 index d2e42653b5..0000000000 --- a/src/jp/main_40DD0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_40DD0", func_800659D0); diff --git a/src/jp/main_40DE0.c b/src/jp/main_40DE0.c deleted file mode 100644 index b6f1d8a213..0000000000 --- a/src/jp/main_40DE0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_40DE0", func_800659E0); - -INCLUDE_ASM(s32, "main_40DE0", func_80065BEC); diff --git a/src/jp/main_41020.c b/src/jp/main_41020.c deleted file mode 100644 index 8c16ea869f..0000000000 --- a/src/jp/main_41020.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41020", func_80065C20); diff --git a/src/jp/main_41040.c b/src/jp/main_41040.c deleted file mode 100644 index d46760c74c..0000000000 --- a/src/jp/main_41040.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41040", func_80065C40); diff --git a/src/jp/main_41090.c b/src/jp/main_41090.c deleted file mode 100644 index a81bd63ebc..0000000000 --- a/src/jp/main_41090.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41090", func_80065C90); diff --git a/src/jp/main_41140.c b/src/jp/main_41140.c deleted file mode 100644 index 7fc250a271..0000000000 --- a/src/jp/main_41140.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41140", func_80065D40); - -INCLUDE_ASM(s32, "main_41140", func_80065D94); - -INCLUDE_ASM(s32, "main_41140", func_80065E00); diff --git a/src/jp/main_41230.c b/src/jp/main_41230.c deleted file mode 100644 index d3b608ccf8..0000000000 --- a/src/jp/main_41230.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41230", func_80065E30); - -INCLUDE_ASM(s32, "main_41230", func_80065F00); diff --git a/src/jp/main_41320.c b/src/jp/main_41320.c deleted file mode 100644 index 0109be2cec..0000000000 --- a/src/jp/main_41320.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41320", func_80065F20); diff --git a/src/jp/main_413F0.c b/src/jp/main_413F0.c deleted file mode 100644 index 3ffd743f72..0000000000 --- a/src/jp/main_413F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_413F0", func_80065FF0); diff --git a/src/jp/main_41510.c b/src/jp/main_41510.c deleted file mode 100644 index 1522308955..0000000000 --- a/src/jp/main_41510.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41510", func_80066110); diff --git a/src/jp/main_415D0.c b/src/jp/main_415D0.c deleted file mode 100644 index 6d8dd1e8f3..0000000000 --- a/src/jp/main_415D0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_415D0", func_800661D0); diff --git a/src/jp/main_41610.c b/src/jp/main_41610.c deleted file mode 100644 index 8bcb99fa66..0000000000 --- a/src/jp/main_41610.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41610", func_80066210); diff --git a/src/jp/main_41660.c b/src/jp/main_41660.c deleted file mode 100644 index 3de7c520bc..0000000000 --- a/src/jp/main_41660.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41660", func_80066260); diff --git a/src/jp/main_41670.c b/src/jp/main_41670.c deleted file mode 100644 index 44dbd5c872..0000000000 --- a/src/jp/main_41670.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41670", func_80066270); diff --git a/src/jp/main_41700.c b/src/jp/main_41700.c deleted file mode 100644 index 4a1234fc61..0000000000 --- a/src/jp/main_41700.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41700", func_80066300); diff --git a/src/jp/main_41720.c b/src/jp/main_41720.c deleted file mode 100644 index 3abdee55ec..0000000000 --- a/src/jp/main_41720.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41720", func_80066320); diff --git a/src/jp/main_41850.c b/src/jp/main_41850.c deleted file mode 100644 index 6e06f78865..0000000000 --- a/src/jp/main_41850.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41850", func_80066450); - -INCLUDE_ASM(s32, "main_41850", func_800664A4); - -INCLUDE_ASM(s32, "main_41850", func_800665E0); - -INCLUDE_ASM(s32, "main_41850", func_80066660); diff --git a/src/jp/main_41B70.c b/src/jp/main_41B70.c deleted file mode 100644 index 16ae832965..0000000000 --- a/src/jp/main_41B70.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41B70", func_80066770); diff --git a/src/jp/main_41C30.c b/src/jp/main_41C30.c deleted file mode 100644 index 893d493804..0000000000 --- a/src/jp/main_41C30.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41C30", func_80066830); diff --git a/src/jp/main_41CF0.c b/src/jp/main_41CF0.c deleted file mode 100644 index b52b970435..0000000000 --- a/src/jp/main_41CF0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41CF0", func_800668F0); diff --git a/src/jp/main_41D30.c b/src/jp/main_41D30.c deleted file mode 100644 index cd994a7cc8..0000000000 --- a/src/jp/main_41D30.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41D30", func_80066930); diff --git a/src/jp/main_41D80.c b/src/jp/main_41D80.c deleted file mode 100644 index f42dd85794..0000000000 --- a/src/jp/main_41D80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41D80", func_80066980); diff --git a/src/jp/main_41DC0.c b/src/jp/main_41DC0.c deleted file mode 100644 index efb086906a..0000000000 --- a/src/jp/main_41DC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41DC0", func_800669C0); diff --git a/src/jp/main_41E00.c b/src/jp/main_41E00.c deleted file mode 100644 index e86f2dbe26..0000000000 --- a/src/jp/main_41E00.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41E00", func_80066A00); diff --git a/src/jp/main_41E40.c b/src/jp/main_41E40.c deleted file mode 100644 index 83485cfb93..0000000000 --- a/src/jp/main_41E40.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_41E40", func_80066A40); - -INCLUDE_ASM(s32, "main_41E40", func_80066BE0); diff --git a/src/jp/main_42180.c b/src/jp/main_42180.c deleted file mode 100644 index a7c9614be5..0000000000 --- a/src/jp/main_42180.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42180", func_80066D80); diff --git a/src/jp/main_421E0.c b/src/jp/main_421E0.c deleted file mode 100644 index f9ba2c68f1..0000000000 --- a/src/jp/main_421E0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_421E0", func_80066DE0); diff --git a/src/jp/main_42230.c b/src/jp/main_42230.c deleted file mode 100644 index 6140bb7f9e..0000000000 --- a/src/jp/main_42230.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42230", func_80066E30); diff --git a/src/jp/main_423A0.c b/src/jp/main_423A0.c deleted file mode 100644 index 81f4761df9..0000000000 --- a/src/jp/main_423A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_423A0", func_80066FA0); diff --git a/src/jp/main_423F0.c b/src/jp/main_423F0.c deleted file mode 100644 index f871b94abb..0000000000 --- a/src/jp/main_423F0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_423F0", func_80066FF0); diff --git a/src/jp/main_42440.c b/src/jp/main_42440.c deleted file mode 100644 index ddab193afe..0000000000 --- a/src/jp/main_42440.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42440", func_80067040); diff --git a/src/jp/main_42750.c b/src/jp/main_42750.c deleted file mode 100644 index 9b26b8b7d3..0000000000 --- a/src/jp/main_42750.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42750", func_80067350); diff --git a/src/jp/main_427B0.c b/src/jp/main_427B0.c deleted file mode 100644 index e1c3fd8f31..0000000000 --- a/src/jp/main_427B0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_427B0", func_800673B0); diff --git a/src/jp/main_42820.c b/src/jp/main_42820.c deleted file mode 100644 index 5c79673437..0000000000 --- a/src/jp/main_42820.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42820", func_80067420); diff --git a/src/jp/main_42880.c b/src/jp/main_42880.c deleted file mode 100644 index f55ab79305..0000000000 --- a/src/jp/main_42880.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42880", func_80067480); diff --git a/src/jp/main_428E0.c b/src/jp/main_428E0.c deleted file mode 100644 index e08f6a13b5..0000000000 --- a/src/jp/main_428E0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_428E0", func_800674E0); diff --git a/src/jp/main_42960.c b/src/jp/main_42960.c deleted file mode 100644 index f4c3d4d01f..0000000000 --- a/src/jp/main_42960.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42960", func_80067560); diff --git a/src/jp/main_429E0.c b/src/jp/main_429E0.c deleted file mode 100644 index 9b5da74433..0000000000 --- a/src/jp/main_429E0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_429E0", func_800675E0); diff --git a/src/jp/main_42AE0.c b/src/jp/main_42AE0.c deleted file mode 100644 index 67050c80cd..0000000000 --- a/src/jp/main_42AE0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42AE0", func_800676E0); diff --git a/src/jp/main_42B0.c b/src/jp/main_42B0.c deleted file mode 100644 index cb13b014a5..0000000000 --- a/src/jp/main_42B0.c +++ /dev/null @@ -1,89 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42B0", func_80028EB0); - -INCLUDE_ASM(s32, "main_42B0", func_80028ED8); - -INCLUDE_ASM(s32, "main_42B0", func_80028F4C); - -INCLUDE_ASM(s32, "main_42B0", func_80028FA0); - -INCLUDE_ASM(s32, "main_42B0", func_80028FB0); - -INCLUDE_ASM(s32, "main_42B0", func_80028FF0); - -INCLUDE_ASM(s32, "main_42B0", func_8002902C); - -INCLUDE_ASM(s32, "main_42B0", func_80029124); - -INCLUDE_ASM(s32, "main_42B0", func_800291DC); - -INCLUDE_ASM(s32, "main_42B0", func_80029284); - -INCLUDE_ASM(s32, "main_42B0", func_80029394); - -INCLUDE_ASM(s32, "main_42B0", func_80029470); - -INCLUDE_ASM(s32, "main_42B0", func_80029484); - -INCLUDE_ASM(s32, "main_42B0", func_800295C0); - -INCLUDE_ASM(s32, "main_42B0", func_800295E0); - -INCLUDE_ASM(s32, "main_42B0", func_800296E0); - -INCLUDE_ASM(s32, "main_42B0", func_800296FC); - -INCLUDE_ASM(s32, "main_42B0", func_80029794); - -INCLUDE_ASM(s32, "main_42B0", func_80029820); - -INCLUDE_ASM(s32, "main_42B0", func_800298C0); - -INCLUDE_ASM(s32, "main_42B0", func_800298F4); - -INCLUDE_ASM(s32, "main_42B0", func_80029954); - -INCLUDE_ASM(s32, "main_42B0", func_800299BC); - -INCLUDE_ASM(s32, "main_42B0", func_80029A3C); - -INCLUDE_ASM(s32, "main_42B0", func_80029A84); - -INCLUDE_ASM(s32, "main_42B0", func_80029AE4); - -INCLUDE_ASM(s32, "main_42B0", func_80029BE8); - -INCLUDE_ASM(s32, "main_42B0", func_80029C40); - -INCLUDE_ASM(s32, "main_42B0", func_80029DE0); - -INCLUDE_ASM(s32, "main_42B0", func_80029E10); - -INCLUDE_ASM(s32, "main_42B0", func_80029E94); - -INCLUDE_ASM(s32, "main_42B0", func_80029EEC); - -INCLUDE_ASM(s32, "main_42B0", func_80029F5C); - -INCLUDE_ASM(s32, "main_42B0", func_80029FF4); - -INCLUDE_ASM(s32, "main_42B0", func_8002A074); - -INCLUDE_ASM(s32, "main_42B0", func_8002A12C); - -INCLUDE_ASM(s32, "main_42B0", func_8002A190); - -INCLUDE_ASM(s32, "main_42B0", func_8002A1F4); - -INCLUDE_ASM(s32, "main_42B0", func_8002A2AC); - -INCLUDE_ASM(s32, "main_42B0", func_8002A310); - -INCLUDE_ASM(s32, "main_42B0", func_8002A374); - -INCLUDE_ASM(s32, "main_42B0", func_8002A8C4); - -INCLUDE_ASM(s32, "main_42B0", func_8002AA84); - -INCLUDE_ASM(s32, "main_42B0", func_8002AB1C); diff --git a/src/jp/main_42BA0.c b/src/jp/main_42BA0.c deleted file mode 100644 index e40f78c014..0000000000 --- a/src/jp/main_42BA0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42BA0", func_800677A0); diff --git a/src/jp/main_42C00.c b/src/jp/main_42C00.c deleted file mode 100644 index ff82a2dd0d..0000000000 --- a/src/jp/main_42C00.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42C00", func_80067800); diff --git a/src/jp/main_42CE0.c b/src/jp/main_42CE0.c deleted file mode 100644 index 35bf5716d8..0000000000 --- a/src/jp/main_42CE0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42CE0", func_800678E0); diff --git a/src/jp/main_42D40.c b/src/jp/main_42D40.c deleted file mode 100644 index 9bdcc0a350..0000000000 --- a/src/jp/main_42D40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42D40", func_80067940); diff --git a/src/jp/main_42DC0.c b/src/jp/main_42DC0.c deleted file mode 100644 index 36989a4a6d..0000000000 --- a/src/jp/main_42DC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42DC0", func_800679C0); diff --git a/src/jp/main_42E50.c b/src/jp/main_42E50.c deleted file mode 100644 index cb235d0784..0000000000 --- a/src/jp/main_42E50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42E50", func_80067A50); diff --git a/src/jp/main_42F00.c b/src/jp/main_42F00.c deleted file mode 100644 index 2d0cce915b..0000000000 --- a/src/jp/main_42F00.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_42F00", func_80067B00); - -INCLUDE_ASM(s32, "main_42F00", func_80067C60); diff --git a/src/jp/main_431E0.c b/src/jp/main_431E0.c deleted file mode 100644 index 7a2b96e92c..0000000000 --- a/src/jp/main_431E0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_431E0", func_80067DE0); - -INCLUDE_ASM(s32, "main_431E0", func_80067F24); diff --git a/src/jp/main_43570.c b/src/jp/main_43570.c deleted file mode 100644 index 93b6ced59b..0000000000 --- a/src/jp/main_43570.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_43570", func_80068170); - -INCLUDE_ASM(s32, "main_43570", func_8006847C); diff --git a/src/jp/main_439A0.c b/src/jp/main_439A0.c deleted file mode 100644 index 79fcdbcc0c..0000000000 --- a/src/jp/main_439A0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_439A0", func_800685A0); - -INCLUDE_ASM(s32, "main_439A0", func_8006874C); diff --git a/src/jp/main_43BC0.c b/src/jp/main_43BC0.c deleted file mode 100644 index f4ffd85e73..0000000000 --- a/src/jp/main_43BC0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_43BC0", func_800687C0); - -INCLUDE_ASM(s32, "main_43BC0", func_80068C00); diff --git a/src/jp/main_441A0.c b/src/jp/main_441A0.c deleted file mode 100644 index 1d95e4e98a..0000000000 --- a/src/jp/main_441A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_441A0", func_80068DA0); diff --git a/src/jp/main_44360.c b/src/jp/main_44360.c deleted file mode 100644 index 714d7c0c05..0000000000 --- a/src/jp/main_44360.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_44360", func_80068F60); diff --git a/src/jp/main_44470.c b/src/jp/main_44470.c deleted file mode 100644 index fe2a61593a..0000000000 --- a/src/jp/main_44470.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_44470", func_80069070); - -INCLUDE_ASM(s32, "main_44470", func_80069170); - -INCLUDE_ASM(s32, "main_44470", func_80069368); diff --git a/src/jp/main_44840.c b/src/jp/main_44840.c deleted file mode 100644 index cb4af675fd..0000000000 --- a/src/jp/main_44840.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_44840", func_80069440); diff --git a/src/jp/main_448A0.c b/src/jp/main_448A0.c deleted file mode 100644 index 8d8aa464d0..0000000000 --- a/src/jp/main_448A0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_448A0", func_800694A0); - -INCLUDE_ASM(s32, "main_448A0", func_80069590); - -INCLUDE_ASM(s32, "main_448A0", func_80069624); diff --git a/src/jp/main_44AB0.c b/src/jp/main_44AB0.c deleted file mode 100644 index 28950529a6..0000000000 --- a/src/jp/main_44AB0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_44AB0", func_800696B0); diff --git a/src/jp/main_44B20.c b/src/jp/main_44B20.c deleted file mode 100644 index e150c58cd3..0000000000 --- a/src/jp/main_44B20.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_44B20", func_80069720); - -INCLUDE_ASM(s32, "main_44B20", func_80069754); - -INCLUDE_ASM(s32, "main_44B20", func_80069798); - -INCLUDE_ASM(s32, "main_44B20", func_80069A84); - -INCLUDE_ASM(s32, "main_44B20", func_80069BE8); - -INCLUDE_ASM(s32, "main_44B20", func_80069DB4); - -INCLUDE_ASM(s32, "main_44B20", func_80069E6C); diff --git a/src/jp/main_455B0.c b/src/jp/main_455B0.c deleted file mode 100644 index 6634e02c99..0000000000 --- a/src/jp/main_455B0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_455B0", func_8006A1B0); diff --git a/src/jp/main_457A0.c b/src/jp/main_457A0.c deleted file mode 100644 index 90754a758b..0000000000 --- a/src/jp/main_457A0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_457A0", func_8006A3A0); diff --git a/src/jp/main_45A10.c b/src/jp/main_45A10.c deleted file mode 100644 index 9d9c9c41de..0000000000 --- a/src/jp/main_45A10.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_45A10", func_8006A610); diff --git a/src/jp/main_45A30.c b/src/jp/main_45A30.c deleted file mode 100644 index f81243d073..0000000000 --- a/src/jp/main_45A30.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_45A30", func_8006A630); - -INCLUDE_ASM(s32, "main_45A30", func_8006A6E8); - -INCLUDE_ASM(s32, "main_45A30", func_8006A9C0); diff --git a/src/jp/main_45DD0.c b/src/jp/main_45DD0.c deleted file mode 100644 index 9b15bc4ca4..0000000000 --- a/src/jp/main_45DD0.c +++ /dev/null @@ -1,19 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_45DD0", func_8006A9D0); - -INCLUDE_ASM(s32, "main_45DD0", func_8006A9E0); - -INCLUDE_ASM(s32, "main_45DD0", func_8006AF5C); - -INCLUDE_ASM(s32, "main_45DD0", func_8006B04C); - -INCLUDE_ASM(s32, "main_45DD0", func_8006B154); - -INCLUDE_ASM(s32, "main_45DD0", func_8006B19C); - -INCLUDE_ASM(s32, "main_45DD0", func_8006B1B4); - -INCLUDE_ASM(s32, "main_45DD0", func_8006B340); - -INCLUDE_ASM(s32, "main_45DD0", func_8006B3B0); diff --git a/src/jp/main_467D0.c b/src/jp/main_467D0.c deleted file mode 100644 index b068775792..0000000000 --- a/src/jp/main_467D0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_467D0", func_8006B3D0); - -INCLUDE_ASM(s32, "main_467D0", func_8006B410); diff --git a/src/jp/main_46860.c b/src/jp/main_46860.c deleted file mode 100644 index 72145fa77d..0000000000 --- a/src/jp/main_46860.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_46860", func_8006B460); - -INCLUDE_ASM(s32, "main_46860", func_8006B530); - -INCLUDE_ASM(s32, "main_46860", func_8006B550); diff --git a/src/jp/main_46AC0.c b/src/jp/main_46AC0.c deleted file mode 100644 index 3f6ca2498c..0000000000 --- a/src/jp/main_46AC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_46AC0", func_8006B6C0); diff --git a/src/jp/main_46C30.c b/src/jp/main_46C30.c deleted file mode 100644 index e3a4103271..0000000000 --- a/src/jp/main_46C30.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_46C30", func_8006B830); diff --git a/src/jp/main_46C50.c b/src/jp/main_46C50.c deleted file mode 100644 index fea94661f6..0000000000 --- a/src/jp/main_46C50.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_46C50", func_8006B850); - -INCLUDE_ASM(s32, "main_46C50", func_8006B960); - -INCLUDE_ASM(s32, "main_46C50", func_8006BBB0); - -INCLUDE_ASM(s32, "main_46C50", func_8006BFFC); - -INCLUDE_ASM(s32, "main_46C50", func_8006C094); diff --git a/src/jp/main_47A40.c b/src/jp/main_47A40.c deleted file mode 100644 index d4a0f0a4fc..0000000000 --- a/src/jp/main_47A40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47A40", func_8006C640); diff --git a/src/jp/main_47A50.c b/src/jp/main_47A50.c deleted file mode 100644 index 1355eca63c..0000000000 --- a/src/jp/main_47A50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47A50", func_8006C650); diff --git a/src/jp/main_47A60.c b/src/jp/main_47A60.c deleted file mode 100644 index cc02053c68..0000000000 --- a/src/jp/main_47A60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47A60", func_8006C660); diff --git a/src/jp/main_47A70.c b/src/jp/main_47A70.c deleted file mode 100644 index 0d80443e8e..0000000000 --- a/src/jp/main_47A70.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47A70", func_8006C670); - -INCLUDE_ASM(s32, "main_47A70", func_8006C680); - -INCLUDE_ASM(s32, "main_47A70", func_8006C690); - -INCLUDE_ASM(s32, "main_47A70", func_8006C6A0); diff --git a/src/jp/main_47AC0.c b/src/jp/main_47AC0.c deleted file mode 100644 index 8e89f2742f..0000000000 --- a/src/jp/main_47AC0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47AC0", func_8006C6C0); - -INCLUDE_ASM(s32, "main_47AC0", func_8006C6D0); - -INCLUDE_ASM(s32, "main_47AC0", func_8006C6E0); - -INCLUDE_ASM(s32, "main_47AC0", func_8006C710); diff --git a/src/jp/main_47BA0.c b/src/jp/main_47BA0.c deleted file mode 100644 index 958617a71e..0000000000 --- a/src/jp/main_47BA0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47BA0", func_8006C7A0); diff --git a/src/jp/main_47BF0.c b/src/jp/main_47BF0.c deleted file mode 100644 index 02aae17e6b..0000000000 --- a/src/jp/main_47BF0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47BF0", func_8006C7F0); diff --git a/src/jp/main_47C40.c b/src/jp/main_47C40.c deleted file mode 100644 index 9d54a619d7..0000000000 --- a/src/jp/main_47C40.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47C40", func_8006C840); - -INCLUDE_ASM(s32, "main_47C40", func_8006C8AC); diff --git a/src/jp/main_47D30.c b/src/jp/main_47D30.c deleted file mode 100644 index 4a5cc4f130..0000000000 --- a/src/jp/main_47D30.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47D30", func_8006C930); diff --git a/src/jp/main_47E10.c b/src/jp/main_47E10.c deleted file mode 100644 index b55c65af1d..0000000000 --- a/src/jp/main_47E10.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47E10", func_8006CA10); diff --git a/src/jp/main_47E70.c b/src/jp/main_47E70.c deleted file mode 100644 index 9fca0ed973..0000000000 --- a/src/jp/main_47E70.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47E70", func_8006CA70); diff --git a/src/jp/main_47F80.c b/src/jp/main_47F80.c deleted file mode 100644 index b685ae6311..0000000000 --- a/src/jp/main_47F80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47F80", func_8006CB80); diff --git a/src/jp/main_47FA0.c b/src/jp/main_47FA0.c deleted file mode 100644 index 8b87c14d96..0000000000 --- a/src/jp/main_47FA0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_47FA0", func_8006CBA0); diff --git a/src/jp/main_48000.c b/src/jp/main_48000.c deleted file mode 100644 index 584f4b735b..0000000000 --- a/src/jp/main_48000.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_48000", func_8006CC00); - -INCLUDE_ASM(s32, "main_48000", func_8006D060); - -INCLUDE_ASM(s32, "main_48000", func_8006D1B8); - -INCLUDE_ASM(s32, "main_48000", func_8006D320); - -INCLUDE_ASM(s32, "main_48000", func_8006D49C); - -INCLUDE_ASM(s32, "main_48000", func_8006D540); diff --git a/src/jp/main_48A00.c b/src/jp/main_48A00.c deleted file mode 100644 index 2cda62a2bf..0000000000 --- a/src/jp/main_48A00.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_48A00", func_8006D600); - -INCLUDE_ASM(s32, "main_48A00", func_8006D684); diff --git a/src/jp/main_48BC0.c b/src/jp/main_48BC0.c deleted file mode 100644 index f5c576833c..0000000000 --- a/src/jp/main_48BC0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_48BC0", func_8006D7C0); diff --git a/src/jp/main_48BE0.c b/src/jp/main_48BE0.c deleted file mode 100644 index f531094fe1..0000000000 --- a/src/jp/main_48BE0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_48BE0", func_8006D7E0); diff --git a/src/jp/main_491A0.c b/src/jp/main_491A0.c deleted file mode 100644 index bcb8bd69e5..0000000000 --- a/src/jp/main_491A0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_491A0", func_8006DDA0); - -INCLUDE_ASM(s32, "main_491A0", func_8006E2F0); diff --git a/src/jp/main_49C50.c b/src/jp/main_49C50.c deleted file mode 100644 index 5381b9c3cd..0000000000 --- a/src/jp/main_49C50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_49C50", func_8006E850); diff --git a/src/jp/main_4A120.c b/src/jp/main_4A120.c deleted file mode 100644 index 28072a1fc7..0000000000 --- a/src/jp/main_4A120.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_4A120", func_8006ED20); - -INCLUDE_ASM(s32, "main_4A120", func_8006ED50); diff --git a/src/jp/main_4A190.c b/src/jp/main_4A190.c deleted file mode 100644 index 6d999a3d4f..0000000000 --- a/src/jp/main_4A190.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_4A190", func_8006ED90); diff --git a/src/jp/main_4A1D0.c b/src/jp/main_4A1D0.c deleted file mode 100644 index 136b2e9016..0000000000 --- a/src/jp/main_4A1D0.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_4A1D0", func_8006EDD0); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006EEF8); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006EF00); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006EF08); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006EF38); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006EF40); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006EF48); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F098); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F164); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F27C); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F2E8); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F404); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F530); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F5FC); - -INCLUDE_ASM(s32, "main_4A1D0", func_8006F73C); diff --git a/src/jp/main_4AC70.c b/src/jp/main_4AC70.c deleted file mode 100644 index f81cfa5816..0000000000 --- a/src/jp/main_4AC70.c +++ /dev/null @@ -1,293 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_4AC70", func_8006F870); - -INCLUDE_ASM(s32, "main_4AC70", func_8006F8D0); - -INCLUDE_ASM(s32, "main_4AC70", func_8006F930); - -INCLUDE_ASM(s32, "main_4AC70", func_8006F990); - -INCLUDE_ASM(s32, "main_4AC70", func_8006F9F0); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FA50); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FAB0); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FB10); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FB70); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FBD0); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FC30); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FC90); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FCF0); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FD50); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FDB0); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FE10); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FE70); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FED0); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FF30); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FF90); - -INCLUDE_ASM(s32, "main_4AC70", func_8006FFF0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070050); - -INCLUDE_ASM(s32, "main_4AC70", func_800700B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070110); - -INCLUDE_ASM(s32, "main_4AC70", func_80070170); - -INCLUDE_ASM(s32, "main_4AC70", func_800701D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070230); - -INCLUDE_ASM(s32, "main_4AC70", func_80070290); - -INCLUDE_ASM(s32, "main_4AC70", func_800702F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070350); - -INCLUDE_ASM(s32, "main_4AC70", func_800703B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070410); - -INCLUDE_ASM(s32, "main_4AC70", func_80070470); - -INCLUDE_ASM(s32, "main_4AC70", func_800704D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070530); - -INCLUDE_ASM(s32, "main_4AC70", func_80070590); - -INCLUDE_ASM(s32, "main_4AC70", func_800705F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070650); - -INCLUDE_ASM(s32, "main_4AC70", func_800706B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070710); - -INCLUDE_ASM(s32, "main_4AC70", func_80070770); - -INCLUDE_ASM(s32, "main_4AC70", func_800707D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070830); - -INCLUDE_ASM(s32, "main_4AC70", func_80070890); - -INCLUDE_ASM(s32, "main_4AC70", func_800708F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070950); - -INCLUDE_ASM(s32, "main_4AC70", func_800709B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070A10); - -INCLUDE_ASM(s32, "main_4AC70", func_80070A70); - -INCLUDE_ASM(s32, "main_4AC70", func_80070AD0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070B30); - -INCLUDE_ASM(s32, "main_4AC70", func_80070B90); - -INCLUDE_ASM(s32, "main_4AC70", func_80070BF0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070C50); - -INCLUDE_ASM(s32, "main_4AC70", func_80070CB0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070D10); - -INCLUDE_ASM(s32, "main_4AC70", func_80070D70); - -INCLUDE_ASM(s32, "main_4AC70", func_80070DD0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070E30); - -INCLUDE_ASM(s32, "main_4AC70", func_80070E90); - -INCLUDE_ASM(s32, "main_4AC70", func_80070EF0); - -INCLUDE_ASM(s32, "main_4AC70", func_80070F50); - -INCLUDE_ASM(s32, "main_4AC70", func_80070FB0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071010); - -INCLUDE_ASM(s32, "main_4AC70", func_80071070); - -INCLUDE_ASM(s32, "main_4AC70", func_800710D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071130); - -INCLUDE_ASM(s32, "main_4AC70", func_80071190); - -INCLUDE_ASM(s32, "main_4AC70", func_800711F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071250); - -INCLUDE_ASM(s32, "main_4AC70", func_800712B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071310); - -INCLUDE_ASM(s32, "main_4AC70", func_80071370); - -INCLUDE_ASM(s32, "main_4AC70", func_800713D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071430); - -INCLUDE_ASM(s32, "main_4AC70", func_80071490); - -INCLUDE_ASM(s32, "main_4AC70", func_800714F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071550); - -INCLUDE_ASM(s32, "main_4AC70", func_800715B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071610); - -INCLUDE_ASM(s32, "main_4AC70", func_80071670); - -INCLUDE_ASM(s32, "main_4AC70", func_800716D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071730); - -INCLUDE_ASM(s32, "main_4AC70", func_80071790); - -INCLUDE_ASM(s32, "main_4AC70", func_800717F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071850); - -INCLUDE_ASM(s32, "main_4AC70", func_800718B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071910); - -INCLUDE_ASM(s32, "main_4AC70", func_80071970); - -INCLUDE_ASM(s32, "main_4AC70", func_800719D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071A30); - -INCLUDE_ASM(s32, "main_4AC70", func_80071A90); - -INCLUDE_ASM(s32, "main_4AC70", func_80071AF0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071B50); - -INCLUDE_ASM(s32, "main_4AC70", func_80071BB0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071C10); - -INCLUDE_ASM(s32, "main_4AC70", func_80071C70); - -INCLUDE_ASM(s32, "main_4AC70", func_80071CD0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071D30); - -INCLUDE_ASM(s32, "main_4AC70", func_80071D90); - -INCLUDE_ASM(s32, "main_4AC70", func_80071DF0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071E50); - -INCLUDE_ASM(s32, "main_4AC70", func_80071EB0); - -INCLUDE_ASM(s32, "main_4AC70", func_80071F10); - -INCLUDE_ASM(s32, "main_4AC70", func_80071F70); - -INCLUDE_ASM(s32, "main_4AC70", func_80071FD0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072030); - -INCLUDE_ASM(s32, "main_4AC70", func_80072090); - -INCLUDE_ASM(s32, "main_4AC70", func_800720F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072150); - -INCLUDE_ASM(s32, "main_4AC70", func_800721B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072210); - -INCLUDE_ASM(s32, "main_4AC70", func_80072270); - -INCLUDE_ASM(s32, "main_4AC70", func_800722D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072330); - -INCLUDE_ASM(s32, "main_4AC70", func_80072390); - -INCLUDE_ASM(s32, "main_4AC70", func_800723F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072450); - -INCLUDE_ASM(s32, "main_4AC70", func_800724B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072510); - -INCLUDE_ASM(s32, "main_4AC70", func_80072570); - -INCLUDE_ASM(s32, "main_4AC70", func_800725D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072630); - -INCLUDE_ASM(s32, "main_4AC70", func_80072690); - -INCLUDE_ASM(s32, "main_4AC70", func_800726F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072750); - -INCLUDE_ASM(s32, "main_4AC70", func_800727B0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072810); - -INCLUDE_ASM(s32, "main_4AC70", func_80072870); - -INCLUDE_ASM(s32, "main_4AC70", func_800728D0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072930); - -INCLUDE_ASM(s32, "main_4AC70", func_80072990); - -INCLUDE_ASM(s32, "main_4AC70", func_800729F0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072A50); - -INCLUDE_ASM(s32, "main_4AC70", func_80072AB0); - -INCLUDE_ASM(s32, "main_4AC70", func_80072B10); - -INCLUDE_ASM(s32, "main_4AC70", func_80072B90); - -INCLUDE_ASM(s32, "main_4AC70", func_80072BAC); - -INCLUDE_ASM(s32, "main_4AC70", func_80072BBC); - -INCLUDE_ASM(s32, "main_4AC70", func_80072C70); - -INCLUDE_ASM(s32, "main_4AC70", func_80072CAC); - -INCLUDE_ASM(s32, "main_4AC70", func_80072CBC); - -INCLUDE_ASM(s32, "main_4AC70", func_80072CCC); - -INCLUDE_ASM(s32, "main_4AC70", func_80072CD4); - -INCLUDE_ASM(s32, "main_4AC70", func_80072D0C); - -INCLUDE_ASM(s32, "main_4AC70", func_80072DF4); diff --git a/src/jp/main_5FC0.c b/src/jp/main_5FC0.c deleted file mode 100644 index a8a31e9e67..0000000000 --- a/src/jp/main_5FC0.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_5FC0", func_8002ABC0); - -INCLUDE_ASM(s32, "main_5FC0", func_8002ABE8); - -INCLUDE_ASM(s32, "main_5FC0", func_8002AC10); - -INCLUDE_ASM(s32, "main_5FC0", func_8002AC38); - -INCLUDE_ASM(s32, "main_5FC0", func_8002AC60); - -INCLUDE_ASM(s32, "main_5FC0", func_8002AC9C); - -INCLUDE_ASM(s32, "main_5FC0", func_8002ACA4); - -INCLUDE_ASM(s32, "main_5FC0", func_8002ACEC); - -INCLUDE_ASM(s32, "main_5FC0", func_8002AD34); - -INCLUDE_ASM(s32, "main_5FC0", func_8002AD70); - -INCLUDE_ASM(s32, "main_5FC0", func_8002ADB4); diff --git a/src/jp/main_6200.c b/src/jp/main_6200.c deleted file mode 100644 index 5ff8a5e8a4..0000000000 --- a/src/jp/main_6200.c +++ /dev/null @@ -1,37 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_6200", func_8002AE00); - -INCLUDE_ASM(s32, "main_6200", func_8002AF00); - -INCLUDE_ASM(s32, "main_6200", func_8002AF30); - -INCLUDE_ASM(s32, "main_6200", func_8002AF98); - -INCLUDE_ASM(s32, "main_6200", func_8002B00C); - -INCLUDE_ASM(s32, "main_6200", func_8002B090); - -INCLUDE_ASM(s32, "main_6200", func_8002B0B8); - -INCLUDE_ASM(s32, "main_6200", func_8002B114); - -INCLUDE_ASM(s32, "main_6200", func_8002B290); - -INCLUDE_ASM(s32, "main_6200", func_8002B334); - -INCLUDE_ASM(s32, "main_6200", func_8002B3EC); - -INCLUDE_ASM(s32, "main_6200", func_8002B450); - -INCLUDE_ASM(s32, "main_6200", func_8002B5C8); - -INCLUDE_ASM(s32, "main_6200", func_8002B5F0); - -INCLUDE_ASM(s32, "main_6200", func_8002B80C); - -INCLUDE_ASM(s32, "main_6200", func_8002B828); - -INCLUDE_ASM(s32, "main_6200", func_8002B908); - -INCLUDE_ASM(s32, "main_6200", func_8002B9DC); diff --git a/src/jp/main_6E00.c b/src/jp/main_6E00.c deleted file mode 100644 index 06a64e8498..0000000000 --- a/src/jp/main_6E00.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_6E00", func_8002BA00); - -INCLUDE_ASM(s32, "main_6E00", func_8002BA38); - -INCLUDE_ASM(s32, "main_6E00", func_8002BA40); - -INCLUDE_ASM(s32, "main_6E00", func_8002BE9C); - -INCLUDE_ASM(s32, "main_6E00", func_8002BEAC); - -INCLUDE_ASM(s32, "main_6E00", func_8002BEC4); - -INCLUDE_ASM(s32, "main_6E00", func_8002BED4); - -INCLUDE_ASM(s32, "main_6E00", func_8002BEE4); diff --git a/src/jp/main_7300.c b/src/jp/main_7300.c deleted file mode 100644 index 51a58905f4..0000000000 --- a/src/jp/main_7300.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_7300", func_8002BF00); - -INCLUDE_ASM(s32, "main_7300", func_8002BF70); - -INCLUDE_ASM(s32, "main_7300", func_8002C014); - -INCLUDE_ASM(s32, "main_7300", func_8002C194); - -INCLUDE_ASM(s32, "main_7300", func_8002C1C8); - -INCLUDE_ASM(s32, "main_7300", func_8002C278); - -INCLUDE_ASM(s32, "main_7300", func_8002C2E4); - -INCLUDE_ASM(s32, "main_7300", func_8002C370); - -INCLUDE_ASM(s32, "main_7300", func_8002C770); - -INCLUDE_ASM(s32, "main_7300", func_8002C7DC); - -INCLUDE_ASM(s32, "main_7300", func_8002C850); - -INCLUDE_ASM(s32, "main_7300", func_8002C870); - -INCLUDE_ASM(s32, "main_7300", func_8002C90C); diff --git a/src/jp/main_7E00.c b/src/jp/main_7E00.c deleted file mode 100644 index 1343df66b9..0000000000 --- a/src/jp/main_7E00.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_7E00", func_8002CA00); diff --git a/src/jp/main_80A0.c b/src/jp/main_80A0.c deleted file mode 100644 index 49bfa8d054..0000000000 --- a/src/jp/main_80A0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_80A0", func_8002CCA0); - -INCLUDE_ASM(s32, "main_80A0", func_8002CF24); diff --git a/src/jp/main_8490.c b/src/jp/main_8490.c deleted file mode 100644 index 38b19230ef..0000000000 --- a/src/jp/main_8490.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_8490", func_8002D090); - -INCLUDE_ASM(s32, "main_8490", func_8002D3CC); - -INCLUDE_ASM(s32, "main_8490", func_8002DB84); - -INCLUDE_ASM(s32, "main_8490", func_8002DCC8); - -INCLUDE_ASM(s32, "main_8490", func_8002DDFC); - -INCLUDE_ASM(s32, "main_8490", func_8002DFA4); - -INCLUDE_ASM(s32, "main_8490", func_8002E178); - -INCLUDE_ASM(s32, "main_8490", func_8002E1C8); - -INCLUDE_ASM(s32, "main_8490", func_8002E3E4); - -INCLUDE_ASM(s32, "main_8490", func_8002E45C); - -INCLUDE_ASM(s32, "main_8490", func_8002E4BC); diff --git a/src/jp/main_99A0.c b/src/jp/main_99A0.c deleted file mode 100644 index c217ec0b64..0000000000 --- a/src/jp/main_99A0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_99A0", func_8002E5A0); - -INCLUDE_ASM(s32, "main_99A0", func_8002E988); - -INCLUDE_ASM(s32, "main_99A0", func_8002EF20); - -INCLUDE_ASM(s32, "main_99A0", func_8002F4E0); diff --git a/src/jp/main_AA20.c b/src/jp/main_AA20.c deleted file mode 100644 index 898adee9d1..0000000000 --- a/src/jp/main_AA20.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_AA20", func_8002F620); diff --git a/src/jp/main_AD70.c b/src/jp/main_AD70.c deleted file mode 100644 index 132ea424d4..0000000000 --- a/src/jp/main_AD70.c +++ /dev/null @@ -1,17 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_AD70", func_8002F970); - -INCLUDE_ASM(s32, "main_AD70", func_8002FC90); - -INCLUDE_ASM(s32, "main_AD70", func_8002FEA0); - -INCLUDE_ASM(s32, "main_AD70", func_8002FFDC); - -INCLUDE_ASM(s32, "main_AD70", func_800300E0); - -INCLUDE_ASM(s32, "main_AD70", func_800300E8); - -INCLUDE_ASM(s32, "main_AD70", func_8003018C); - -INCLUDE_ASM(s32, "main_AD70", func_80031124); diff --git a/src/jp/main_D2A0.c b/src/jp/main_D2A0.c deleted file mode 100644 index e6194c4842..0000000000 --- a/src/jp/main_D2A0.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_D2A0", func_80031EA0); - -INCLUDE_ASM(s32, "main_D2A0", func_80031F6C); - -INCLUDE_ASM(s32, "main_D2A0", func_80032274); - -INCLUDE_ASM(s32, "main_D2A0", func_80032534); - -INCLUDE_ASM(s32, "main_D2A0", func_80032600); - -INCLUDE_ASM(s32, "main_D2A0", func_800328F4); - -INCLUDE_ASM(s32, "main_D2A0", func_80033024); - -INCLUDE_ASM(s32, "main_D2A0", func_80033178); - -INCLUDE_ASM(s32, "main_D2A0", func_80033180); - -INCLUDE_ASM(s32, "main_D2A0", func_800331B8); diff --git a/src/jp/main_E5D0.c b/src/jp/main_E5D0.c deleted file mode 100644 index b8687fceb3..0000000000 --- a/src/jp/main_E5D0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_E5D0", func_800331D0); - -INCLUDE_ASM(s32, "main_E5D0", func_800331F8); - -INCLUDE_ASM(s32, "main_E5D0", func_80033418); diff --git a/src/jp/main_E860.c b/src/jp/main_E860.c deleted file mode 100644 index 75519d0ab1..0000000000 --- a/src/jp/main_E860.c +++ /dev/null @@ -1,23 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_E860", func_80033460); - -INCLUDE_ASM(s32, "main_E860", func_80033470); - -INCLUDE_ASM(s32, "main_E860", func_80033488); - -INCLUDE_ASM(s32, "main_E860", func_800334C0); - -INCLUDE_ASM(s32, "main_E860", func_80033504); - -INCLUDE_ASM(s32, "main_E860", func_80033560); - -INCLUDE_ASM(s32, "main_E860", func_80033574); - -INCLUDE_ASM(s32, "main_E860", func_800337E4); - -INCLUDE_ASM(s32, "main_E860", func_80033818); - -INCLUDE_ASM(s32, "main_E860", func_80033850); - -INCLUDE_ASM(s32, "main_E860", func_80033AF4); diff --git a/src/jp/main_EF00.c b/src/jp/main_EF00.c deleted file mode 100644 index 824e1d6698..0000000000 --- a/src/jp/main_EF00.c +++ /dev/null @@ -1,21 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "main_EF00", func_80033B00); - -INCLUDE_ASM(s32, "main_EF00", func_80033D34); - -INCLUDE_ASM(s32, "main_EF00", func_80034038); - -INCLUDE_ASM(s32, "main_EF00", func_80034054); - -INCLUDE_ASM(s32, "main_EF00", func_800345C0); - -INCLUDE_ASM(s32, "main_EF00", func_800345FC); - -INCLUDE_ASM(s32, "main_EF00", func_80034874); - -INCLUDE_ASM(s32, "main_EF00", func_8003487C); - -INCLUDE_ASM(s32, "main_EF00", func_800348BC); - -INCLUDE_ASM(s32, "main_EF00", func_80034C70); diff --git a/src/jp/os/nusys/3B150.c b/src/jp/os/nusys/3B150.c new file mode 100644 index 0000000000..3bfe4f81e6 --- /dev/null +++ b/src/jp/os/nusys/3B150.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/nusys/3B150", nuContRmbForceStop); + +INCLUDE_ASM(s32, "os/nusys/3B150", func_8005FD70); + +INCLUDE_ASM(s32, "os/nusys/3B150", func_8005FD90); diff --git a/src/jp/os/nusys/code_3B150.c b/src/jp/os/nusys/code_3B150.c deleted file mode 100644 index 97de98ed9d..0000000000 --- a/src/jp/os/nusys/code_3B150.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/nusys/code_3B150", nuContRmbForceStop); - -INCLUDE_ASM(s32, "os/nusys/code_3B150", func_8005FD70); - -INCLUDE_ASM(s32, "os/nusys/code_3B150", func_8005FD90); diff --git a/src/code_13870_len_6980.c b/src/npc.c similarity index 60% rename from src/code_13870_len_6980.c rename to src/npc.c index e2699a51d9..27ba29133e 100644 --- a/src/code_13870_len_6980.c +++ b/src/npc.c @@ -1,12 +1,13 @@ #include "common.h" #include "map.h" +#include "npc.h" -void func_8003E670(void); +s32 func_802DE2AC(s32 arg0, s32 arg1, f32 arg2); -void NOP_npc_callback(void) { +void npc_callback_no_op(void) { } -void mtx_ident_mirror_y(Matrix4f mtx) { +void npc_mtx_ident_mirror_y(Matrix4f mtx) { guMtxIdentF(*mtx); mtx[0][0] = 1.0f; mtx[1][1] = -1.0f; @@ -14,68 +15,67 @@ void mtx_ident_mirror_y(Matrix4f mtx) { mtx[3][3] = 1.0f; } -INCLUDE_ASM(s32, "code_13870_len_6980", clear_npcs); +INCLUDE_ASM(void, "npc", npc_list_clear, void); -void init_npc_list(void) { +void npc_list_update_current(void) { if (!gGameStatusPtr->isBattle) { gCurrentNpcListPtr = &gWorldNpcList; } else { gCurrentNpcListPtr = &gBattleNpcList; } + D_8009A604 = 0; D_800A0B94 = 1; } -//pointless function called by step_game_loop -void func_8003857C(void) { - s32 phi_v1 = 0; - s32 temp_v0 = phi_v1 < 0x40; +void npc_iter_no_op(void) { + s32 i; - while (temp_v0) { - phi_v1++; - temp_v0 = phi_v1 < 0x40; + for (i = 0; i < ARRAY_COUNT(*gCurrentNpcListPtr); i++) { + // Needed to avoid loop optimization. + do {} while (FALSE); } } -INCLUDE_ASM(s32, "code_13870_len_6980", _create_npc, NpcBlueprint* blueprint, s32 animList[], s32 skipLoadingAnims); +INCLUDE_ASM(void, "npc", npc_create, NpcBlueprint* blueprint, NpcAnimID animList[], s32 skipLoadingAnims); -void create_basic_npc(s32* arg0) { - _create_npc(arg0, 0, 0); +void npc_create_basic(NpcBlueprint* blueprint) { + npc_create(blueprint, NULL, FALSE); } -void create_standard_npc(s32* arg0, s32 arg1) { - _create_npc(arg0, arg1, 0); +void npc_create_standard(NpcBlueprint* blueprint, NpcAnimID animList[]) { + npc_create(blueprint, animList, FALSE); } -void create_partner_npc(NpcBlueprint* blueprint) { - _create_npc(blueprint, NULL, TRUE); +void npc_create_partner(NpcBlueprint* blueprint) { + npc_create(blueprint, NULL, TRUE); } -INCLUDE_ASM(s32, "code_13870_len_6980", free_npc_by_index); +INCLUDE_ASM(void, "npc", npc_free_by_index, s32 listIndex); -INCLUDE_ASM(s32, "code_13870_len_6980", free_npc); +INCLUDE_ASM(void, "npc", npc_free, Npc* npc); Npc* get_npc_by_index(s32 listIndex) { - return gCurrentNpcListPtr[0][listIndex & ~0x800]; + return (*gCurrentNpcListPtr)[listIndex & ~0x800]; } -INCLUDE_ASM(s32, "code_13870_len_6980", npc_do_world_collision); +INCLUDE_ASM(void, "npc", npc_do_world_collision, Npc* npc); -INCLUDE_ASM(s32, "code_13870_len_6980", npc_do_other_npc_collision); +INCLUDE_ASM(void, "npc", npc_do_other_npc_collision, Npc* npc); -INCLUDE_ASM(s32, "code_13870_len_6980", npc_do_player_collision); +INCLUDE_ASM(s32, "npc", npc_do_player_collision, Npc* npc); -INCLUDE_ASM(s32, "code_13870_len_6980", func_80039688); +INCLUDE_ASM(void, "npc", npc_do_gravity, Npc* npc); -INCLUDE_ASM(s32, "code_13870_len_6980", func_800397E8); +INCLUDE_ASM(s32, "npc", func_800397E8); -INCLUDE_ASM(s32, "code_13870_len_6980", update_npcs); +INCLUDE_ASM(void, "npc", npc_list_update, void); -INCLUDE_ASM(s32, "code_13870_len_6980", func_80039DA4); +INCLUDE_ASM(s32, "npc", func_80039DA4); -INCLUDE_ASM(s32, "code_13870_len_6980", appendGfx_npc); +INCLUDE_ASM(void, "npc", npc_appendGfx, Npc* npc); -INCLUDE_ASM(s32, "code_13870_len_6980", render_npcs); +INCLUDE_ASM(void, "npc", npc_list_render, void); void npc_move_heading(Npc* npc, f32 speed, f32 yaw) { f32 angle = (yaw * TAU) / 360.0f; @@ -86,9 +86,9 @@ void npc_move_heading(Npc* npc, f32 speed, f32 yaw) { npc->pos.z += -speed * cos; } -INCLUDE_ASM(Npc*, "code_13870_len_6980", get_npc_unsafe, NpcID npcId); +INCLUDE_ASM(Npc*, "npc", get_npc_unsafe, NpcID npcID); -INCLUDE_ASM(Npc*, "code_13870_len_6980", get_npc_safe, NpcID npcId); +INCLUDE_ASM(Npc*, "npc", get_npc_safe, NpcID npcID); void enable_npc_shadow(Npc* npc) { Shadow* shadow; @@ -111,8 +111,6 @@ void disable_npc_shadow(Npc* npc) { } } -func_802DE2AC(s32 arg0, s32 arg1, f32 arg2); - void set_npc_sprite(Npc* npc, s32 anim, s32 arg2) { s32 flagsTemp; @@ -181,21 +179,21 @@ void update_npc_blur(Npc* npc) { blurBuf->index = index; } -INCLUDE_ASM(s32, "code_13870_len_6980", appendGfx_npc_blur); +INCLUDE_ASM(void, "npc", appendGfx_npc_blur, Npc* npc); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B184); +INCLUDE_ASM(s32, "npc", func_8003B184); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B198); +INCLUDE_ASM(s32, "npc", func_8003B198); void func_8003B1A8(void) { } -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B1B0); +INCLUDE_ASM(s32, "npc", func_8003B1B0); -void set_npc_yaw(Npc* npc, f32 angle) { - npc->yaw = angle; +void set_npc_yaw(Npc* npc, f32 yaw) { + npc->yaw = yaw; - if (get_clamped_angle_diff(gCameras[gCurrentCameraID].currentYaw, angle) >= 0.0f) { + if (get_clamped_angle_diff(gCameras[gCurrentCameraID].currentYaw, yaw) >= 0.0f) { npc->yawCamOffset = 180; npc->isFacingAway = TRUE; } else { @@ -204,37 +202,37 @@ void set_npc_yaw(Npc* npc, f32 angle) { } } -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B3D0); +INCLUDE_ASM(s32, "npc", func_8003B3D0); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B3F8); +INCLUDE_ASM(s32, "npc", func_8003B3F8); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B420); +INCLUDE_ASM(s32, "npc", func_8003B420); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B44C); +INCLUDE_ASM(s32, "npc", func_8003B44C); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B464); +INCLUDE_ASM(s32, "npc", func_8003B464); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B47C); +INCLUDE_ASM(s32, "npc", func_8003B47C); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B500); +INCLUDE_ASM(s32, "npc", func_8003B500); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B5B4); +INCLUDE_ASM(s32, "npc", func_8003B5B4); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003B96C); +INCLUDE_ASM(s32, "npc", func_8003B96C); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003BA60); +INCLUDE_ASM(s32, "npc", func_8003BA60); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003BED8); +INCLUDE_ASM(s32, "npc", func_8003BED8); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C3D8); +INCLUDE_ASM(s32, "npc", func_8003C3D8); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C428); +INCLUDE_ASM(s32, "npc", func_8003C428); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C444); +INCLUDE_ASM(s32, "npc", func_8003C444); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C53C); +INCLUDE_ASM(s32, "npc", func_8003C53C); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C61C); +INCLUDE_ASM(s32, "npc", func_8003C61C); void func_8003C658(void) { } @@ -242,61 +240,108 @@ void func_8003C658(void) { void func_8003C660(void) { } -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C668); +INCLUDE_ASM(s32, "npc", func_8003C668); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C78C); +INCLUDE_ASM(s32, "npc", func_8003C78C); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C7A8); +INCLUDE_ASM(s32, "npc", func_8003C7A8); void func_8003C8AC(void) { } -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C8B4); +INCLUDE_ASM(s32, "npc", func_8003C8B4); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C984); +INCLUDE_ASM(s32, "npc", func_8003C984); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003C9A8); +INCLUDE_ASM(s32, "npc", func_8003C9A8); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CB20); +INCLUDE_ASM(s32, "npc", func_8003CB20); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CB44); +INCLUDE_ASM(s32, "npc", func_8003CB44); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CC8C); +INCLUDE_ASM(s32, "npc", func_8003CC8C); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CCB0); +INCLUDE_ASM(s32, "npc", func_8003CCB0); void func_8003CFA0(void) { } -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFA8); +INCLUDE_ASM(s32, "npc", func_8003CFA8); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003CFB4); +Npc* npc_find_near(f32 x, f32 y, f32 z, f32 radius) { + Npc* closestNpc = NULL; + f32 closestDist = radius; + f32 maxDist = radius; + s32 i; -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D0C4); + for (i = 0; i < ARRAY_COUNT(*gCurrentNpcListPtr); i++) { + Npc* npc = (*gCurrentNpcListPtr)[i]; -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D1D4); + if (npc != NULL && npc->flags != 0 && !(npc->flags & NPC_FLAG_SIMPLE_XZ_HITBOX)) { + if (!(npc->flags & (NPC_FLAG_80000000 | NPC_FLAG_4))) { + f32 distance = fabsf(dist2D(npc->pos.x, npc->pos.z, x, z)); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D2F8); + if (distance <= maxDist) { + if (distance < closestDist) { + closestDist = distance; + closestNpc = npc; + } + } + } + } + } -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D3BC); + return closestNpc; +} -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D624); +Npc* npc_find_near_simple(f32 x, f32 y, f32 z, f32 radius) { + Npc* closestNpc = NULL; + f32 closestDist = radius; + f32 maxDist = radius; + s32 i; -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D660); + for (i = 0; i < ARRAY_COUNT(*gCurrentNpcListPtr); i++) { + Npc* npc = (*gCurrentNpcListPtr)[i]; -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003D788); + if (npc != NULL && npc->flags != 0 && (npc->flags & NPC_FLAG_SIMPLE_XZ_HITBOX)) { + if (!(npc->flags & (NPC_FLAG_80000000 | NPC_FLAG_4))) { + f32 distance = fabsf(dist2D(npc->pos.x, npc->pos.z, x, z)); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003DA38); + if (distance <= maxDist) { + if (distance < closestDist) { + closestDist = distance; + closestNpc = npc; + } + } + } + } + } -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003DC38); + return closestNpc; +} -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003DFA0); +INCLUDE_ASM(s32, "npc", func_8003D1D4); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E0D4); +INCLUDE_ASM(s32, "npc", func_8003D2F8); -INCLUDE_ASM(s32, "code_13870_len_6980", func_8003E1D0); +INCLUDE_ASM(s32, "npc", func_8003D3BC); + +INCLUDE_ASM(s32, "npc", func_8003D624); + +INCLUDE_ASM(s32, "npc", func_8003D660); + +INCLUDE_ASM(s32, "npc", func_8003D788); + +INCLUDE_ASM(s32, "npc", func_8003DA38); + +INCLUDE_ASM(s32, "npc", func_8003DC38); + +INCLUDE_ASM(s32, "npc", func_8003DFA0); + +INCLUDE_ASM(s32, "npc", func_8003E0D4); + +INCLUDE_ASM(s32, "npc", func_8003E1D0); -/// @see set_defeated void COPY_set_defeated(s32 mapID, s32 encounterID) { EncounterStatus* currentEncounter = &gCurrentEncounter; s32 encounterIdx = encounterID / 32; @@ -346,7 +391,7 @@ void func_8003E338(void) { func_80045AC0(); gGameState = 0; - bind_dynamic_entity_3(0, func_8003E670); + bind_dynamic_entity_3(0, npc_dyn_entity_draw_no_op); } void clear_encounter_status(void) { @@ -387,7 +432,7 @@ void clear_encounter_status(void) { func_80045AC0(); gGameState = 0; - bind_dynamic_entity_3(NULL, func_8003E670); + bind_dynamic_entity_3(NULL, npc_dyn_entity_draw_no_op); } void func_8003E50C(void) { @@ -454,7 +499,7 @@ void draw_first_strike_ui(void) { } } -void func_8003E670(void) { +void npc_dyn_entity_draw_no_op(void) { } void make_npcs(s8 flags, s8 mapID, s32* npcGroupList) { @@ -487,22 +532,22 @@ void make_npcs(s8 flags, s8 mapID, s32* npcGroupList) { } } -INCLUDE_ASM(s32, "code_13870_len_6980", kill_encounter); +INCLUDE_ASM(s32, "npc", kill_encounter); -INCLUDE_ASM(s32, "code_13870_len_6980", kill_enemy); +INCLUDE_ASM(s32, "npc", kill_enemy); -INCLUDE_ASM(s32, "code_13870_len_6980", bind_enemy_ai); +INCLUDE_ASM(s32, "npc", bind_enemy_ai); -INCLUDE_ASM(s32, "code_13870_len_6980", bind_enemy_aux); +INCLUDE_ASM(s32, "npc", bind_enemy_aux); -INCLUDE_ASM(s32, "code_13870_len_6980", bind_enemy_interact); +INCLUDE_ASM(s32, "npc", bind_enemy_interact); -INCLUDE_ASM(s32, "code_13870_len_6980", bind_npc_ai); +INCLUDE_ASM(s32, "npc", bind_npc_ai); -INCLUDE_ASM(s32, "code_13870_len_6980", bind_npc_aux); +INCLUDE_ASM(s32, "npc", bind_npc_aux); -INCLUDE_ASM(s32, "code_13870_len_6980", bind_npc_interact); +INCLUDE_ASM(s32, "npc", bind_npc_interact); -INCLUDE_ASM(Enemy*, "code_13870_len_6980", get_enemy, NpcID npcId); +INCLUDE_ASM(Enemy*, "npc", get_enemy, NpcID npcId); -INCLUDE_ASM(s32, "code_13870_len_6980", get_enemy_safe); +INCLUDE_ASM(s32, "npc", get_enemy_safe); diff --git a/src/npc.h b/src/npc.h new file mode 100644 index 0000000000..ea0a51bbcb --- /dev/null +++ b/src/npc.h @@ -0,0 +1,234 @@ +#ifndef _NPC_H_ +#define _NPC_H_ + +#include "common.h" +#include "map.h" // TODO move npc-related structs here + +/// The default Npc::onUpdate and Npc::onRender callback. +void npc_callback_no_op(void); + +void npc_dyn_entity_draw_no_op(void); + +void npc_mtx_ident_mirror_y(Matrix4f mtx); + +void npc_list_clear(void); + +/// Points the current NPC list to the world or battle lists depending on game state. +void npc_list_update_current(void); + +/// Iterates over the NPC list, doing absolutely nothing. +/// Presumably did something once upon a time but got commented out. +void npc_iter_no_op(void); + +void npc_create(NpcBlueprint* blueprint, NpcAnimID animList[], s32 skipLoadingAnims); + +void npc_create_basic(NpcBlueprint* blueprint); + +void npc_create_standard(NpcBlueprint* blueprint, NpcAnimID animList[]); + +void npc_create_partner(NpcBlueprint* blueprint); + +void npc_free_by_index(s32 listIndex); + +void npc_free(Npc* npc); + +Npc* get_npc_by_index(s32 listIndex); + +void npc_do_world_collision(Npc* npc); + +void npc_do_other_npc_collision(Npc* npc); + +/// @returns TRUE if a collision occurred +s32 npc_do_player_collision(Npc* npc); + +void npc_do_gravity(Npc* npc); + +s32 func_800397E8(); + +/// Updates all NPCs. +void npc_list_update(void); + +s32 func_80039DA4(); + +void npc_appendGfx(Npc* npc); + +/// Renders all NPCs. +void npc_list_render(void); + +void npc_move_heading(Npc* npc, f32 speed, f32 yaw); + +Npc* get_npc_unsafe(NpcID npcID); + +/// @returns NULL if not found +Npc* get_npc_safe(NpcID npcID); + +void enable_npc_shadow(Npc* npc); + +void disable_npc_shadow(Npc* npc); + +void update_npc_blur(Npc* npc); + +void appendGfx_npc_blur(Npc* npc); + +s32 func_8003B184(); + +s32 func_8003B198(); + +void func_8003B1A8(void); + +s32 func_8003B1B0(); + +void set_npc_yaw(Npc* npc, f32 yaw); + +s32 func_8003B3D0(); + +s32 func_8003B3F8(); + +s32 func_8003B420(); + +s32 func_8003B44C(); + +s32 func_8003B464(); + +s32 func_8003B47C(); + +s32 func_8003B500(); + +s32 func_8003B5B4(); + +s32 func_8003B96C(); + +s32 func_8003BA60(); + +s32 func_8003BED8(); + +s32 func_8003C3D8(); + +s32 func_8003C428(); + +s32 func_8003C444(); + +s32 func_8003C53C(); + +s32 func_8003C61C(); + +void func_8003C658(void); + +void func_8003C660(void); + +s32 func_8003C668(); + +s32 func_8003C78C(); + +s32 func_8003C7A8(); + +void func_8003C8AC(void); + +s32 func_8003C8B4(); + +s32 func_8003C984(); + +s32 func_8003C9A8(); + +s32 func_8003CB20(); + +s32 func_8003CB44(); + +s32 func_8003CC8C(); + +s32 func_8003CCB0(); + +void func_8003CFA0(void); + +s32 func_8003CFA8(); + +/// Finds the closest NPC to a given point within a radius. Ignores Y position. +/// +/// NPCs with NPC_FLAG_SIMPLE_XZ_HITBOX set are ignored. +/// See also npc_find_near_simple(), which requires that NPC_FLAG_SIMPLE_XZ_HITBOX be set. +/// +/// @param x X position +/// @param y Y position (unused) +/// @param z Z position +/// @param radius No NPCs further than this distance will be considered +/// +/// @returns NULL if there are no NPCs within radius +Npc* npc_find_near(f32 x, f32 y, f32 z, f32 radius); + +/// Finds the closest simple-hitbox NPC to a given point within a radius. Ignores Y position. +/// +/// Only NPCs with NPC_FLAG_SIMPLE_XZ_HITBOX set are considered. +/// See also npc_find_near(), which requires that NPC_FLAG_SIMPLE_XZ_HITBOX be unset. +/// +/// @param x X position +/// @param y Y position (unused) +/// @param z Z position +/// @param radius No NPCs further than this distance will be considered +/// +/// @returns NULL if there are no NPCs within radius +Npc* npc_find_near_simple(f32 x, f32 y, f32 z, f32 radius); + +s32 func_8003D1D4(); + +s32 func_8003D2F8(); + +s32 func_8003D3BC(); + +s32 func_8003D624(); + +s32 func_8003D660(); + +s32 func_8003D788(); + +s32 func_8003DA38(); + +s32 func_8003DC38(); + +s32 func_8003DFA0(); + +s32 func_8003E0D4(); + +s32 func_8003E1D0(); + +/// Duplicate of set_defeated(). +void COPY_set_defeated(s32 mapID, s32 encounterID); + +void func_8003E338(void); + +void clear_encounter_status(void); + +void func_8003E50C(void); + +void func_8003E514(s8 arg0); + +void update_counters(void); + +void draw_encounter_ui(void); + +void draw_first_strike_ui(void); + +void npc_dyn_entity_draw_no_op(void); + +void make_npcs(s8 flags, s8 mapID, s32* npcGroupList); + +s32 kill_encounter(); + +s32 kill_enemy(); + +s32 bind_enemy_ai(); + +s32 bind_enemy_aux(); + +s32 bind_enemy_interact(); + +s32 bind_npc_ai(); + +s32 bind_npc_aux(); + +s32 bind_npc_interact(); + +Enemy* get_enemy(NpcID npcID); + +s32 get_enemy_safe(); + +#endif diff --git a/src/os/code_39cb0_len_100.c b/src/os/39cb0_len_100.c similarity index 93% rename from src/os/code_39cb0_len_100.c rename to src/os/39cb0_len_100.c index 1b505b6cc2..d6ed959906 100644 --- a/src/os/code_39cb0_len_100.c +++ b/src/os/39cb0_len_100.c @@ -32,5 +32,5 @@ void boot_idle(void) { } } #else -INCLUDE_ASM(void, "os/code_39cb0_len_100", boot_idle, void); +INCLUDE_ASM(void, "os/39cb0_len_100", boot_idle, void); #endif diff --git a/src/os/code_3FEA0.c b/src/os/3FEA0.c similarity index 75% rename from src/os/code_3FEA0.c rename to src/os/3FEA0.c index cb0abbf4fb..b898c85158 100644 --- a/src/os/code_3FEA0.c +++ b/src/os/3FEA0.c @@ -8,9 +8,9 @@ s32 proutSprintf(); char spaces[] = " "; char zeroes[] = "00000000000000000000000000000000"; -INCLUDE_ASM(s32, "os/code_3FEA0", _Printf); +INCLUDE_ASM(s32, "os/3FEA0", _Printf); -INCLUDE_ASM(s32, "os/code_3FEA0", _Putfld); +INCLUDE_ASM(s32, "os/3FEA0", _Putfld); int sprintf(char* s, const char* fmt, ...) { s32 ret; @@ -28,4 +28,4 @@ int sprintf(char* s, const char* fmt, ...) { } -INCLUDE_ASM(s32, "os/code_3FEA0", proutSprintf); +INCLUDE_ASM(s32, "os/3FEA0", proutSprintf); diff --git a/src/os/3b710_len_40.c b/src/os/3b710_len_40.c new file mode 100644 index 0000000000..966bd54957 --- /dev/null +++ b/src/os/3b710_len_40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/3b710_len_40", nuGfxSwapCfbFuncSet); diff --git a/src/os/code_3b750_len_20.c b/src/os/3b750_len_20.c similarity index 100% rename from src/os/code_3b750_len_20.c rename to src/os/3b750_len_20.c diff --git a/src/os/3b770_len_80.c b/src/os/3b770_len_80.c new file mode 100644 index 0000000000..dedbd4c15d --- /dev/null +++ b/src/os/3b770_len_80.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/3b770_len_80", nuGfxRetraceWait); diff --git a/src/os/3b7f0_len_120.c b/src/os/3b7f0_len_120.c new file mode 100644 index 0000000000..bd57a43285 --- /dev/null +++ b/src/os/3b7f0_len_120.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/3b7f0_len_120", nuSiCallBackAdd); + +INCLUDE_ASM(s32, "os/3b7f0_len_120", nuSiCallBackRemove); diff --git a/src/os/3bd20_len_c0.c b/src/os/3bd20_len_c0.c new file mode 100644 index 0000000000..7bb4a84d63 --- /dev/null +++ b/src/os/3bd20_len_c0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/3bd20_len_c0", nuContQueryRead); diff --git a/src/os/3c490_len_3c0.c b/src/os/3c490_len_3c0.c new file mode 100644 index 0000000000..de9f61494c --- /dev/null +++ b/src/os/3c490_len_3c0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/3c490_len_3c0", __osDevMgrMain); diff --git a/src/os/3c850_len_f0.c b/src/os/3c850_len_f0.c new file mode 100644 index 0000000000..01763080b6 --- /dev/null +++ b/src/os/3c850_len_f0.c @@ -0,0 +1,9 @@ +#include "common.h" + +u32 __osPiAccessQueueEnabled = 0; + +INCLUDE_ASM(s32, "os/3c850_len_f0", __osPiCreateAccessQueue); + +INCLUDE_ASM(s32, "os/3c850_len_f0", __osPiGetAccess); + +INCLUDE_ASM(s32, "os/3c850_len_f0", __osPiRelAccess); diff --git a/src/os/3c940_len_140.c b/src/os/3c940_len_140.c new file mode 100644 index 0000000000..e6b52b1b00 --- /dev/null +++ b/src/os/3c940_len_140.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(u32, "os/3c940_len_140", osAiGetLength, void); + +INCLUDE_ASM(u32, "os/3c940_len_140", osAiGetStatus, void); + +INCLUDE_ASM(s32, "os/3c940_len_140", osAiSetFrequency, u32 freq); diff --git a/src/os/3ca80_len_a0.c b/src/os/3ca80_len_a0.c new file mode 100644 index 0000000000..06b416b409 --- /dev/null +++ b/src/os/3ca80_len_a0.c @@ -0,0 +1,5 @@ +#include "common.h" + +u8 hdwrBugFlag = 0; // Local Static to osAiSetNextBuffer. + +INCLUDE_ASM(s32, "os/3ca80_len_a0", osAiSetNextBuffer, void* buf, u32 unk); diff --git a/src/os/code_3cd00_len_5f0.c b/src/os/3cd00_len_5f0.c similarity index 57% rename from src/os/code_3cd00_len_5f0.c rename to src/os/3cd00_len_5f0.c index 0d6643b435..e7a2741c48 100644 --- a/src/os/code_3cd00_len_5f0.c +++ b/src/os/3cd00_len_5f0.c @@ -21,10 +21,10 @@ s32 osContStartQuery(OSMesgQueue* mq) { return ret; } -INCLUDE_ASM(void, "os/code_3cd00_len_5f0", osContGetQuery, OSContStatus* status); +INCLUDE_ASM(void, "os/3cd00_len_5f0", osContGetQuery, OSContStatus* status); -INCLUDE_ASM(s32, "os/code_3cd00_len_5f0", osContStartReadData, OSMesgQueue* queue); +INCLUDE_ASM(s32, "os/3cd00_len_5f0", osContStartReadData, OSMesgQueue* queue); -INCLUDE_ASM(void, "os/code_3cd00_len_5f0", osContGetReadData, OSContPad* pad); +INCLUDE_ASM(void, "os/3cd00_len_5f0", osContGetReadData, OSContPad* pad); -INCLUDE_ASM(s32, "os/code_3cd00_len_5f0", osPackReadData); +INCLUDE_ASM(s32, "os/3cd00_len_5f0", osPackReadData); diff --git a/src/os/3d2f0_len_10.c b/src/os/3d2f0_len_10.c new file mode 100644 index 0000000000..71196fc12d --- /dev/null +++ b/src/os/3d2f0_len_10.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(f32, "os/3d2f0_len_10", sqrtf, f32 value); diff --git a/src/os/3d300_len_30.c b/src/os/3d300_len_30.c new file mode 100644 index 0000000000..f5ca895a1f --- /dev/null +++ b/src/os/3d300_len_30.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s16, "os/3d300_len_30", coss, u16 angle); diff --git a/src/os/code_3dcc0_len_a60.c b/src/os/3dcc0_len_a60.c similarity index 66% rename from src/os/code_3dcc0_len_a60.c rename to src/os/3dcc0_len_a60.c index 326edfcf44..72b0a9345c 100644 --- a/src/os/code_3dcc0_len_a60.c +++ b/src/os/3dcc0_len_a60.c @@ -1,10 +1,10 @@ #include "common.h" -INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, +INCLUDE_ASM(void, "os/3dcc0_len_a60", guLookAtHiliteF, float mf[4][4], LookAt* l, Hilite* h, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, float zl1, float xl2, float yl2, float zl2, int twidth, int theight); -INCLUDE_ASM(void, "os/code_3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye, +INCLUDE_ASM(void, "os/3dcc0_len_a60", guLookAtHilite, Mtx* m, LookAt* l, Hilite* h, float xEye, float yEye, float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp, float xl1, float yl1, float zl1, float xl2, float yl2, float zl2, int twidth, int theight); diff --git a/src/os/3e720_len_5f0.c b/src/os/3e720_len_5f0.c new file mode 100644 index 0000000000..b5f16d2457 --- /dev/null +++ b/src/os/3e720_len_5f0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye, + float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); + +INCLUDE_ASM(void, "os/3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye, + float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/3ef90_len_600.c b/src/os/3ef90_len_600.c new file mode 100644 index 0000000000..237a6df992 --- /dev/null +++ b/src/os/3ef90_len_600.c @@ -0,0 +1,8 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect, + float near, float far, float scale); + +INCLUDE_ASM(void, "os/3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, + float near, + float far, float scale); diff --git a/src/os/3f310_len_3c0.c b/src/os/3f310_len_3c0.c new file mode 100644 index 0000000000..681acc6aaf --- /dev/null +++ b/src/os/3f310_len_3c0.c @@ -0,0 +1,9 @@ +#include "common.h" + +f32 dtor = M_DTOR; + +INCLUDE_ASM(void, "os/3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x, + float y, float z); + +INCLUDE_ASM(void, "os/3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y, + float z); diff --git a/src/os/3f6d0_len_320.c b/src/os/3f6d0_len_320.c new file mode 100644 index 0000000000..b40f1e3921 --- /dev/null +++ b/src/os/3f6d0_len_320.c @@ -0,0 +1,7 @@ +#include "common.h" + +f32 D_80093DD0 = M_DTOR; + +INCLUDE_ASM(s32, "os/3f6d0_len_320", guRotateAnglesF); + +INCLUDE_ASM(s32, "os/3f6d0_len_320", guRotateAngles); diff --git a/src/os/3fa50_len_f60.c b/src/os/3fa50_len_f60.c new file mode 100644 index 0000000000..7fc8be8a95 --- /dev/null +++ b/src/os/3fa50_len_f60.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/3fa50_len_f60", bcopy, const void* src, void* dst, int size); + +INCLUDE_ASM(void, "os/3fa50_len_f60", bzero, void* buf, int size); + +INCLUDE_ASM(s32, "os/3fa50_len_f60", strchr); + +INCLUDE_ASM(s32, "os/3fa50_len_f60", strlen); + +INCLUDE_ASM(s32, "os/3fa50_len_f60", memcpy); diff --git a/src/os/40E10.c b/src/os/40E10.c new file mode 100644 index 0000000000..e00a5229b4 --- /dev/null +++ b/src/os/40E10.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/40E10", osSpTaskLoad, OSTask* tp); + +INCLUDE_ASM(void, "os/40E10", osSpTaskStartGo, OSTask* tp); diff --git a/src/os/40c20_len_1f0.c b/src/os/40c20_len_1f0.c new file mode 100644 index 0000000000..ce656a3075 --- /dev/null +++ b/src/os/40c20_len_1f0.c @@ -0,0 +1,7 @@ +#include "common.h" + +u32 __osPreNMI = 0; + +INCLUDE_ASM(s32, "os/40c20_len_1f0", osSendMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); + +INCLUDE_ASM(void, "os/40c20_len_1f0", osSetEventMesg, OSEvent event, OSMesgQueue* queue, OSMesg mesg); diff --git a/src/os/41050_len_120.c b/src/os/41050_len_120.c new file mode 100644 index 0000000000..6cc3fc0bbc --- /dev/null +++ b/src/os/41050_len_120.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41050_len_120", osSpTaskYield, void); diff --git a/src/os/41170_len_f0.c b/src/os/41170_len_f0.c new file mode 100644 index 0000000000..e858aef9fb --- /dev/null +++ b/src/os/41170_len_f0.c @@ -0,0 +1,9 @@ +#include "common.h" + +u32 __osSiAccessQueueEnabled = 0; + +INCLUDE_ASM(s32, "os/41170_len_f0", __osSiCreateAccessQueue); + +INCLUDE_ASM(s32, "os/41170_len_f0", __osSiGetAccess); + +INCLUDE_ASM(s32, "os/41170_len_f0", __osSiRelAccess); diff --git a/src/os/41420_len_120.c b/src/os/41420_len_120.c new file mode 100644 index 0000000000..c636d53f04 --- /dev/null +++ b/src/os/41420_len_120.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41420_len_120", osStartThread, OSThread* thread); diff --git a/src/os/41540_len_c0.c b/src/os/41540_len_c0.c new file mode 100644 index 0000000000..3266a7e39b --- /dev/null +++ b/src/os/41540_len_c0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41540_len_c0", osStopThread, OSThread* thread); diff --git a/src/os/41600_len_40.c b/src/os/41600_len_40.c new file mode 100644 index 0000000000..45c0db11d5 --- /dev/null +++ b/src/os/41600_len_40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/41600_len_40", __osDequeueThread); diff --git a/src/os/41640_len_50.c b/src/os/41640_len_50.c new file mode 100644 index 0000000000..5e4df0cae6 --- /dev/null +++ b/src/os/41640_len_50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41640_len_50", osYieldThread, void); diff --git a/src/os/41690_len_10.c b/src/os/41690_len_10.c new file mode 100644 index 0000000000..ac9a922866 --- /dev/null +++ b/src/os/41690_len_10.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/41690_len_10", osGetActiveQueue); diff --git a/src/os/416a0_len_90.c b/src/os/416a0_len_90.c new file mode 100644 index 0000000000..fd4908c186 --- /dev/null +++ b/src/os/416a0_len_90.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(OSTime, "os/416a0_len_90", osGetTime, void); diff --git a/src/os/41730_len_20.c b/src/os/41730_len_20.c new file mode 100644 index 0000000000..77171137df --- /dev/null +++ b/src/os/41730_len_20.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41730_len_20", osSetTime, OSTime time); diff --git a/src/os/41750_len_450.c b/src/os/41750_len_450.c new file mode 100644 index 0000000000..588d357d99 --- /dev/null +++ b/src/os/41750_len_450.c @@ -0,0 +1,4 @@ +#include "common.h" + +INCLUDE_ASM(int, "os/41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, + OSMesg mesg); diff --git a/src/os/41880.c b/src/os/41880.c new file mode 100644 index 0000000000..a9726c91f0 --- /dev/null +++ b/src/os/41880.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/41880", osTimerServicesInit); + +INCLUDE_ASM(s32, "os/41880", osTimerInterrupt); + +INCLUDE_ASM(s32, "os/41880", osSetTimerIntr); + +INCLUDE_ASM(s32, "os/41880", osInsertTimer); diff --git a/src/os/41ba0_len_c0.c b/src/os/41ba0_len_c0.c new file mode 100644 index 0000000000..8365ebc58b --- /dev/null +++ b/src/os/41ba0_len_c0.c @@ -0,0 +1,4 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2, + s32 unk3); diff --git a/src/os/41c60_len_c0.c b/src/os/41c60_len_c0.c new file mode 100644 index 0000000000..b732af1102 --- /dev/null +++ b/src/os/41c60_len_c0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/41c60_len_c0", osProbeTLB); diff --git a/src/os/41d20_len_40.c b/src/os/41d20_len_40.c new file mode 100644 index 0000000000..48b6016824 --- /dev/null +++ b/src/os/41d20_len_40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41d20_len_40", osUnmapTLB, s32 unk); diff --git a/src/os/41d60_len_50.c b/src/os/41d60_len_50.c new file mode 100644 index 0000000000..3c17f5e99b --- /dev/null +++ b/src/os/41d60_len_50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41d60_len_50", osUnmapTLBAll, void); diff --git a/src/os/41db0_len_40.c b/src/os/41db0_len_40.c new file mode 100644 index 0000000000..163b4b8110 --- /dev/null +++ b/src/os/41db0_len_40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void*, "os/41db0_len_40", osViGetCurrentFramebuffer, void); diff --git a/src/os/41df0_len_40.c b/src/os/41df0_len_40.c new file mode 100644 index 0000000000..80ee5cdf56 --- /dev/null +++ b/src/os/41df0_len_40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void*, "os/41df0_len_40", osViGetNextFramebuffer, void); diff --git a/src/os/41e30_len_40.c b/src/os/41e30_len_40.c new file mode 100644 index 0000000000..6b1cc37651 --- /dev/null +++ b/src/os/41e30_len_40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(u32, "os/41e30_len_40", osViGetCurrentMode, void); diff --git a/src/os/41e70_len_340.c b/src/os/41e70_len_340.c new file mode 100644 index 0000000000..60ee766ba4 --- /dev/null +++ b/src/os/41e70_len_340.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/41e70_len_340", osCreateViManager, OSPri pri); + +INCLUDE_ASM(s32, "os/41e70_len_340", viMgrMain); diff --git a/src/os/421b0_len_60.c b/src/os/421b0_len_60.c new file mode 100644 index 0000000000..78e16b69fc --- /dev/null +++ b/src/os/421b0_len_60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/421b0_len_60", osViSetEvent, OSMesgQueue* queue, OSMesg mesg, u32 unk); diff --git a/src/os/42210_len_50.c b/src/os/42210_len_50.c new file mode 100644 index 0000000000..f794eed123 --- /dev/null +++ b/src/os/42210_len_50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42210_len_50", osViSetMode, OSViMode* mode); diff --git a/src/os/42260_len_170.c b/src/os/42260_len_170.c new file mode 100644 index 0000000000..16193a5c81 --- /dev/null +++ b/src/os/42260_len_170.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42260_len_170", osViSetSpecialFeatures, u32 feat); diff --git a/src/os/423d0_len_50.c b/src/os/423d0_len_50.c new file mode 100644 index 0000000000..e57002efdf --- /dev/null +++ b/src/os/423d0_len_50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/423d0_len_50", osViSetYScale, f32 scale); diff --git a/src/os/42420_len_50.c b/src/os/42420_len_50.c new file mode 100644 index 0000000000..d23e7bdf92 --- /dev/null +++ b/src/os/42420_len_50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42420_len_50", osViSwapBuffer, void* buf); diff --git a/src/os/42470_len_310.c b/src/os/42470_len_310.c new file mode 100644 index 0000000000..a7fa835860 --- /dev/null +++ b/src/os/42470_len_310.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/42470_len_310", osViSwapContext); diff --git a/src/os/42780_len_120.c b/src/os/42780_len_120.c new file mode 100644 index 0000000000..086cddd2a5 --- /dev/null +++ b/src/os/42780_len_120.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42780_len_120", osViBlack, u8 unk); diff --git a/src/os/42900_len_80.c b/src/os/42900_len_80.c new file mode 100644 index 0000000000..e21a0b1ac7 --- /dev/null +++ b/src/os/42900_len_80.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42900_len_80", guMtxF2L, float mf[4][4], Mtx* m); diff --git a/src/os/42980_len_80.c b/src/os/42980_len_80.c new file mode 100644 index 0000000000..8b03ef0a55 --- /dev/null +++ b/src/os/42980_len_80.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42980_len_80", guMtxL2F, float mf[4][4], Mtx* m); diff --git a/src/os/42a00_len_100.c b/src/os/42a00_len_100.c new file mode 100644 index 0000000000..869195f221 --- /dev/null +++ b/src/os/42a00_len_100.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42a00_len_100", guMtxCatF, float m[4][4], float n[4][4], float r[4][4]); diff --git a/src/os/42b00_len_c0.c b/src/os/42b00_len_c0.c new file mode 100644 index 0000000000..2692c9139c --- /dev/null +++ b/src/os/42b00_len_c0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42b00_len_c0", guScale, Mtx* m, float x, float y, float z); diff --git a/src/os/42bc0_len_60.c b/src/os/42bc0_len_60.c new file mode 100644 index 0000000000..db916f408a --- /dev/null +++ b/src/os/42bc0_len_60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42bc0_len_60", guScaleF, float mf[4][4], float x, float y, float z); diff --git a/src/os/42c20_len_e0.c b/src/os/42c20_len_e0.c new file mode 100644 index 0000000000..ca9c9e9ce0 --- /dev/null +++ b/src/os/42c20_len_e0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42c20_len_e0", guTranslate, Mtx* m, float x, float y, float z); diff --git a/src/os/42d00_len_60.c b/src/os/42d00_len_60.c new file mode 100644 index 0000000000..e2e2877725 --- /dev/null +++ b/src/os/42d00_len_60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42d00_len_60", guTranslateF, float mf[4][4], float x, float y, float z); diff --git a/src/os/42d60_len_80.c b/src/os/42d60_len_80.c new file mode 100644 index 0000000000..3d780ab011 --- /dev/null +++ b/src/os/42d60_len_80.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/42d60_len_80", guMtxCat); diff --git a/src/os/42de0_len_90.c b/src/os/42de0_len_90.c new file mode 100644 index 0000000000..71cc07d648 --- /dev/null +++ b/src/os/42de0_len_90.c @@ -0,0 +1,4 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, + float* oz); diff --git a/src/os/42e70_len_390.c b/src/os/42e70_len_390.c new file mode 100644 index 0000000000..2aef8a36fa --- /dev/null +++ b/src/os/42e70_len_390.c @@ -0,0 +1,4 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy, + float* oz); diff --git a/src/os/43200_len_7c0.c b/src/os/43200_len_7c0.c new file mode 100644 index 0000000000..78e8eefaee --- /dev/null +++ b/src/os/43200_len_7c0.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/43200_len_7c0", __osMotorAccess, OSPfs* pfs, s32 unk); + +INCLUDE_ASM(s32, "os/43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); diff --git a/src/os/43590.c b/src/os/43590.c new file mode 100644 index 0000000000..d045fd4bd0 --- /dev/null +++ b/src/os/43590.c @@ -0,0 +1,6 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/43590", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, + int unk5, s32* unk6); + +INCLUDE_ASM(s32, "os/43590", osPfsDeclearPage); diff --git a/src/os/439c0_len_220.c b/src/os/439c0_len_220.c new file mode 100644 index 0000000000..ca7a86bc1b --- /dev/null +++ b/src/os/439c0_len_220.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/439c0_len_220", osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4); + +INCLUDE_ASM(s32, "os/439c0_len_220", osPfsReleasePages); diff --git a/src/os/43be0_len_5e0.c b/src/os/43be0_len_5e0.c new file mode 100644 index 0000000000..410337137c --- /dev/null +++ b/src/os/43be0_len_5e0.c @@ -0,0 +1,6 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4, + u8* unk5); + +INCLUDE_ASM(s32, "os/43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state); diff --git a/src/os/441c0_len_1c0.c b/src/os/441c0_len_1c0.c new file mode 100644 index 0000000000..36cf81ec7d --- /dev/null +++ b/src/os/441c0_len_1c0.c @@ -0,0 +1,4 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, + s32* unk5); diff --git a/src/os/44380_len_4e0.c b/src/os/44380_len_4e0.c new file mode 100644 index 0000000000..d1cd8afd2b --- /dev/null +++ b/src/os/44380_len_4e0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/44380_len_4e0", osPfsFreeBlocks, OSPfs* pfs, s32* unk1); diff --git a/src/os/44490.c b/src/os/44490.c new file mode 100644 index 0000000000..8dd2e20cbb --- /dev/null +++ b/src/os/44490.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/44490", osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); + +INCLUDE_ASM(s32, "os/44490", osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); + +INCLUDE_ASM(s32, "os/44490", osPfsCheckRamArea); diff --git a/src/os/44860_len_60.c b/src/os/44860_len_60.c new file mode 100644 index 0000000000..ae52d4503a --- /dev/null +++ b/src/os/44860_len_60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/44860_len_60", osPfsRepairId, OSPfs* pfs); diff --git a/src/os/448c0_len_210.c b/src/os/448c0_len_210.c new file mode 100644 index 0000000000..5e5cef1699 --- /dev/null +++ b/src/os/448c0_len_210.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/448c0_len_210", osPfsGetStatus); + +INCLUDE_ASM(s32, "os/448c0_len_210", osPfsRequestOneChannel); + +INCLUDE_ASM(s32, "os/448c0_len_210", osPfsGetOneChannelData); diff --git a/src/os/44ad0_len_70.c b/src/os/44ad0_len_70.c new file mode 100644 index 0000000000..91af3d6ae3 --- /dev/null +++ b/src/os/44ad0_len_70.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/44ad0_len_70", osPfsSelectBank); diff --git a/src/os/44b40_len_a90.c b/src/os/44b40_len_a90.c new file mode 100644 index 0000000000..6bd7ba0f7a --- /dev/null +++ b/src/os/44b40_len_a90.c @@ -0,0 +1,15 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/44b40_len_a90", osSumcalc); + +INCLUDE_ASM(s32, "os/44b40_len_a90", osIdCheckSum); + +INCLUDE_ASM(s32, "os/44b40_len_a90", osRepairPackId); + +INCLUDE_ASM(s32, "os/44b40_len_a90", osCheckPackId); + +INCLUDE_ASM(s32, "os/44b40_len_a90", osGetId); + +INCLUDE_ASM(s32, "os/44b40_len_a90", osCheckId); + +INCLUDE_ASM(s32, "os/44b40_len_a90", osPfsRWInode); diff --git a/src/os/455d0_len_1f0.c b/src/os/455d0_len_1f0.c new file mode 100644 index 0000000000..f2a20a94ba --- /dev/null +++ b/src/os/455d0_len_1f0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/455d0_len_1f0", osContRamRead); diff --git a/src/os/457c0_len_270.c b/src/os/457c0_len_270.c new file mode 100644 index 0000000000..f86fa7f54b --- /dev/null +++ b/src/os/457c0_len_270.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/457c0_len_270", osContRamWrite); diff --git a/src/os/45a30_len_20.c b/src/os/45a30_len_20.c new file mode 100644 index 0000000000..36b49e1c76 --- /dev/null +++ b/src/os/45a30_len_20.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/45a30_len_20", osAfterPreNMI, void); diff --git a/src/os/45a50_len_3a0.c b/src/os/45a50_len_3a0.c new file mode 100644 index 0000000000..17fd4788c6 --- /dev/null +++ b/src/os/45a50_len_3a0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/45a50_len_3a0", func_8006A650) + +INCLUDE_ASM(void, "os/45a50_len_3a0", __osInitialize_common, void); + +INCLUDE_ASM(s32, "os/45a50_len_3a0", func_8006A9E0) diff --git a/src/os/467f0_len_90.c b/src/os/467f0_len_90.c new file mode 100644 index 0000000000..72e4e2d345 --- /dev/null +++ b/src/os/467f0_len_90.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/467f0_len_90", osSetGlobalIntMask); + +INCLUDE_ASM(s32, "os/467f0_len_90", osResetGlobalIntMask); diff --git a/src/os/46880_len_260.c b/src/os/46880_len_260.c new file mode 100644 index 0000000000..21bc934074 --- /dev/null +++ b/src/os/46880_len_260.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/46880_len_260", osPiRawStartDma); + +INCLUDE_ASM(s32, "os/46880_len_260", osPiGetCmdQueue); + +INCLUDE_ASM(s32, "os/46880_len_260", osEPiRawReadIo); diff --git a/src/os/46ae0_len_170.c b/src/os/46ae0_len_170.c new file mode 100644 index 0000000000..2e564308f4 --- /dev/null +++ b/src/os/46ae0_len_170.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/46ae0_len_170", osEPiRawWriteIo); diff --git a/src/os/46c50_len_20.c b/src/os/46c50_len_20.c new file mode 100644 index 0000000000..7376bec932 --- /dev/null +++ b/src/os/46c50_len_20.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/46c50_len_20", __osAiDeviceBusy); diff --git a/src/os/46c70_len_e00.c b/src/os/46c70_len_e00.c new file mode 100644 index 0000000000..4e1b359580 --- /dev/null +++ b/src/os/46c70_len_e00.c @@ -0,0 +1,11 @@ +#include "common.h" + +INCLUDE_ASM(int, "os/46c70_len_e00", bcmp, const void* src, const void* dst, int size); + +INCLUDE_ASM(s32, "os/46c70_len_e00", _Litob); + +INCLUDE_ASM(s32, "os/46c70_len_e00", _Ldtob); + +INCLUDE_ASM(s32, "os/46c70_len_e00", _Ldunscale); + +INCLUDE_ASM(s32, "os/46c70_len_e00", _Genld); diff --git a/src/os/47a70_len_10.c b/src/os/47a70_len_10.c new file mode 100644 index 0000000000..193598a5c6 --- /dev/null +++ b/src/os/47a70_len_10.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47a70_len_10", osGetSR); diff --git a/src/os/47a80_len_10.c b/src/os/47a80_len_10.c new file mode 100644 index 0000000000..4a6ace601a --- /dev/null +++ b/src/os/47a80_len_10.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47a80_len_10", osSetCompare); diff --git a/src/os/47a90_len_50.c b/src/os/47a90_len_50.c new file mode 100644 index 0000000000..28207996be --- /dev/null +++ b/src/os/47a90_len_50.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47a90_len_50", osSetFpcCsr); + +INCLUDE_ASM(s32, "os/47a90_len_50", osSetSR); + +INCLUDE_ASM(s32, "os/47a90_len_50", osSetWatchLo); + +INCLUDE_ASM(s32, "os/47a90_len_50", osSpDeviceBusy); diff --git a/src/os/47ae0_len_e0.c b/src/os/47ae0_len_e0.c new file mode 100644 index 0000000000..710dcf42ae --- /dev/null +++ b/src/os/47ae0_len_e0.c @@ -0,0 +1,9 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47ae0_len_e0", osSpGetStatus); + +INCLUDE_ASM(s32, "os/47ae0_len_e0", osSpSetStatus); + +INCLUDE_ASM(s32, "os/47ae0_len_e0", osSpSetPc); + +INCLUDE_ASM(s32, "os/47ae0_len_e0", osSpRawStartDma); diff --git a/src/os/47bc0_len_50.c b/src/os/47bc0_len_50.c new file mode 100644 index 0000000000..8892c05564 --- /dev/null +++ b/src/os/47bc0_len_50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47bc0_len_50", osSiRawReadIo); diff --git a/src/os/47c10_len_50.c b/src/os/47c10_len_50.c new file mode 100644 index 0000000000..49e6e326d1 --- /dev/null +++ b/src/os/47c10_len_50.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47c10_len_50", osSiRawWriteIo); diff --git a/src/os/code_47c60_len_f0.c b/src/os/47c60_len_f0.c similarity index 92% rename from src/os/code_47c60_len_f0.c rename to src/os/47c60_len_f0.c index a60f6372f6..0c47d6c3f8 100644 --- a/src/os/code_47c60_len_f0.c +++ b/src/os/47c60_len_f0.c @@ -2,7 +2,7 @@ #include "common.h" -INCLUDE_ASM(s32, "os/code_47c60_len_f0", osContAddressCrc); +INCLUDE_ASM(s32, "os/47c60_len_f0", osContAddressCrc); u8 osContDataCrc(u8* data) { s32 ret; diff --git a/src/os/47d50_len_e0.c b/src/os/47d50_len_e0.c new file mode 100644 index 0000000000..cb739ffb0d --- /dev/null +++ b/src/os/47d50_len_e0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/47d50_len_e0", osDestroyThread, OSThread* thread); diff --git a/src/os/47e30_len_60.c b/src/os/47e30_len_60.c new file mode 100644 index 0000000000..77c35c17e0 --- /dev/null +++ b/src/os/47e30_len_60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/47e30_len_60", osMapTLBRdb, void); diff --git a/src/os/47e90_len_110.c b/src/os/47e90_len_110.c new file mode 100644 index 0000000000..7ee8bf8c50 --- /dev/null +++ b/src/os/47e90_len_110.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47e90_len_110", osViInit); diff --git a/src/os/47fa0_len_20.c b/src/os/47fa0_len_20.c new file mode 100644 index 0000000000..2f37864f03 --- /dev/null +++ b/src/os/47fa0_len_20.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/47fa0_len_20", osViGetCurrentContext); diff --git a/src/os/47fc0_len_60.c b/src/os/47fc0_len_60.c new file mode 100644 index 0000000000..e01c5e2ea1 --- /dev/null +++ b/src/os/47fc0_len_60.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/47fc0_len_60", guNormalize, float* x, float* y, float* z); diff --git a/src/os/48020_len_a00.c b/src/os/48020_len_a00.c new file mode 100644 index 0000000000..0226af1822 --- /dev/null +++ b/src/os/48020_len_a00.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/48020_len_a00", osPfsChecker, OSPfs* pfs); + +INCLUDE_ASM(s32, "os/48020_len_a00", corrupted_init); + +INCLUDE_ASM(s32, "os/48020_len_a00", corrupted); + +INCLUDE_ASM(s32, "os/48020_len_a00", osPfsIsPlug, OSMesgQueue* queue, u8* unk); + +INCLUDE_ASM(s32, "os/48020_len_a00", osPfsRequestData); + +INCLUDE_ASM(s32, "os/48020_len_a00", osPfsGetInitData); diff --git a/src/os/48c00_len_5c0.c b/src/os/48c00_len_5c0.c new file mode 100644 index 0000000000..3da2a2ff49 --- /dev/null +++ b/src/os/48c00_len_5c0.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/48c00_len_5c0", func_8006D800); diff --git a/src/os/491c0_len_f80.c b/src/os/491c0_len_f80.c new file mode 100644 index 0000000000..83b174ea28 --- /dev/null +++ b/src/os/491c0_len_f80.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/491c0_len_f80", func_8006DDC0); + +INCLUDE_ASM(s32, "os/491c0_len_f80", func_8006E310); diff --git a/src/os/49C70.c b/src/os/49C70.c new file mode 100644 index 0000000000..ca88caa7c1 --- /dev/null +++ b/src/os/49C70.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/49C70", func_8006E870); diff --git a/src/os/4a140_len_70.c b/src/os/4a140_len_70.c new file mode 100644 index 0000000000..ae9285dc94 --- /dev/null +++ b/src/os/4a140_len_70.c @@ -0,0 +1,5 @@ +#include "common.h" + +INCLUDE_ASM(char*, "os/4a140_len_70", strcpy, char* destination, const char* source); + +INCLUDE_ASM(s32, "os/4a140_len_70", strcmp, const char* str1, const char* str2); diff --git a/src/os/4a1b0_len_40.c b/src/os/4a1b0_len_40.c new file mode 100644 index 0000000000..20aabf3472 --- /dev/null +++ b/src/os/4a1b0_len_40.c @@ -0,0 +1,3 @@ +#include "common.h" + +INCLUDE_ASM(void*, "os/4a1b0_len_40", memset, void* ptr, s32 value, s32 num); diff --git a/src/os/4a1f0_len_170.c b/src/os/4a1f0_len_170.c new file mode 100644 index 0000000000..26e07c4076 --- /dev/null +++ b/src/os/4a1f0_len_170.c @@ -0,0 +1,14 @@ +#include "common.h" + +INCLUDE_ASM(void, "os/4a1f0_len_170", decode_yay0, void* src, void* dest); + +void func_8006EF18() { +} + +void func_8006EF20() { +} + +INCLUDE_ASM(s32, "os/4a1f0_len_170", func_8006EF28); + +void func_8006EF58() { +} diff --git a/src/os/4a360_len_930.c b/src/os/4a360_len_930.c new file mode 100644 index 0000000000..c71c02f429 --- /dev/null +++ b/src/os/4a360_len_930.c @@ -0,0 +1,22 @@ +#include "common.h" + +void func_8006EF60() { +} + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashInit); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashReadStatus); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashReadId); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashClearStatus); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashAllErase); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashSectorErase); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashWriteBuffer); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashWriteArray); + +INCLUDE_ASM(s32, "os/4a360_len_930", osFlashReadArray); diff --git a/src/os/code_3b710_len_40.c b/src/os/code_3b710_len_40.c deleted file mode 100644 index 7457687a0e..0000000000 --- a/src/os/code_3b710_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3b710_len_40", nuGfxSwapCfbFuncSet); diff --git a/src/os/code_3b770_len_80.c b/src/os/code_3b770_len_80.c deleted file mode 100644 index a3ab4f0783..0000000000 --- a/src/os/code_3b770_len_80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3b770_len_80", nuGfxRetraceWait); diff --git a/src/os/code_3b7f0_len_120.c b/src/os/code_3b7f0_len_120.c deleted file mode 100644 index f42db094ee..0000000000 --- a/src/os/code_3b7f0_len_120.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3b7f0_len_120", nuSiCallBackAdd); - -INCLUDE_ASM(s32, "os/code_3b7f0_len_120", nuSiCallBackRemove); diff --git a/src/os/code_3bd20_len_c0.c b/src/os/code_3bd20_len_c0.c deleted file mode 100644 index cf221c270f..0000000000 --- a/src/os/code_3bd20_len_c0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3bd20_len_c0", nuContQueryRead); diff --git a/src/os/code_3c490_len_3c0.c b/src/os/code_3c490_len_3c0.c deleted file mode 100644 index 28a03b1a8e..0000000000 --- a/src/os/code_3c490_len_3c0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_3c490_len_3c0", __osDevMgrMain); diff --git a/src/os/code_3c850_len_f0.c b/src/os/code_3c850_len_f0.c deleted file mode 100644 index 9f91864cf4..0000000000 --- a/src/os/code_3c850_len_f0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -u32 __osPiAccessQueueEnabled = 0; - -INCLUDE_ASM(s32, "os/code_3c850_len_f0", __osPiCreateAccessQueue); - -INCLUDE_ASM(s32, "os/code_3c850_len_f0", __osPiGetAccess); - -INCLUDE_ASM(s32, "os/code_3c850_len_f0", __osPiRelAccess); diff --git a/src/os/code_3c940_len_140.c b/src/os/code_3c940_len_140.c deleted file mode 100644 index 68e1361ca4..0000000000 --- a/src/os/code_3c940_len_140.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(u32, "os/code_3c940_len_140", osAiGetLength, void); - -INCLUDE_ASM(u32, "os/code_3c940_len_140", osAiGetStatus, void); - -INCLUDE_ASM(s32, "os/code_3c940_len_140", osAiSetFrequency, u32 freq); diff --git a/src/os/code_3ca80_len_a0.c b/src/os/code_3ca80_len_a0.c deleted file mode 100644 index 84c340f214..0000000000 --- a/src/os/code_3ca80_len_a0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -u8 hdwrBugFlag = 0; // Local Static to osAiSetNextBuffer. - -INCLUDE_ASM(s32, "os/code_3ca80_len_a0", osAiSetNextBuffer, void* buf, u32 unk); diff --git a/src/os/code_3d2f0_len_10.c b/src/os/code_3d2f0_len_10.c deleted file mode 100644 index 59062e9031..0000000000 --- a/src/os/code_3d2f0_len_10.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(f32, "os/code_3d2f0_len_10", sqrtf, f32 value); diff --git a/src/os/code_3d300_len_30.c b/src/os/code_3d300_len_30.c deleted file mode 100644 index 788f679ae8..0000000000 --- a/src/os/code_3d300_len_30.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s16, "os/code_3d300_len_30", coss, u16 angle); diff --git a/src/os/code_3e720_len_5f0.c b/src/os/code_3e720_len_5f0.c deleted file mode 100644 index f35dd89b4b..0000000000 --- a/src/os/code_3e720_len_5f0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflectF, float mf[4][4], LookAt* l, float xEye, float yEye, - float zEye, float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); - -INCLUDE_ASM(void, "os/code_3e720_len_5f0", guLookAtReflect, Mtx* m, LookAt* l, float xEye, float yEye, float zEye, - float xAt, float yAt, float zAt, float xUp, float yUp, float zUp); diff --git a/src/os/code_3ef90_len_600.c b/src/os/code_3ef90_len_600.c deleted file mode 100644 index 48cd06a5cd..0000000000 --- a/src/os/code_3ef90_len_600.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspectiveF, float mf[4][4], u16* perspNorm, float fovy, float aspect, - float near, float far, float scale); - -INCLUDE_ASM(void, "os/code_3ef90_len_600", guPerspective, Mtx* m, u16* perspNorm, float fovy, float aspect, - float near, - float far, float scale); diff --git a/src/os/code_3f310_len_3c0.c b/src/os/code_3f310_len_3c0.c deleted file mode 100644 index 153732cea6..0000000000 --- a/src/os/code_3f310_len_3c0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -f32 dtor = M_DTOR; - -INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPositionF, float mf[4][4], float r, float p, float h, float s, float x, - float y, float z); - -INCLUDE_ASM(void, "os/code_3f310_len_3c0", guPosition, Mtx* m, float r, float p, float h, float s, float x, float y, - float z); diff --git a/src/os/code_3f6d0_len_320.c b/src/os/code_3f6d0_len_320.c deleted file mode 100644 index ee0ccf7c4b..0000000000 --- a/src/os/code_3f6d0_len_320.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -f32 D_80093DD0 = M_DTOR; - -INCLUDE_ASM(s32, "os/code_3f6d0_len_320", guRotateAnglesF); - -INCLUDE_ASM(s32, "os/code_3f6d0_len_320", guRotateAngles); diff --git a/src/os/code_3fa50_len_f60.c b/src/os/code_3fa50_len_f60.c deleted file mode 100644 index 7162a73909..0000000000 --- a/src/os/code_3fa50_len_f60.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_3fa50_len_f60", bcopy, const void* src, void* dst, int size); - -INCLUDE_ASM(void, "os/code_3fa50_len_f60", bzero, void* buf, int size); - -INCLUDE_ASM(s32, "os/code_3fa50_len_f60", strchr); - -INCLUDE_ASM(s32, "os/code_3fa50_len_f60", strlen); - -INCLUDE_ASM(s32, "os/code_3fa50_len_f60", memcpy); diff --git a/src/os/code_40E10.c b/src/os/code_40E10.c deleted file mode 100644 index 142cf0773c..0000000000 --- a/src/os/code_40E10.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_40E10", osSpTaskLoad, OSTask* tp); - -INCLUDE_ASM(void, "os/code_40E10", osSpTaskStartGo, OSTask* tp); diff --git a/src/os/code_40c20_len_1f0.c b/src/os/code_40c20_len_1f0.c deleted file mode 100644 index efedb81508..0000000000 --- a/src/os/code_40c20_len_1f0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -u32 __osPreNMI = 0; - -INCLUDE_ASM(s32, "os/code_40c20_len_1f0", osSendMesg, OSMesgQueue* queue, OSMesg mesg, s32 unk); - -INCLUDE_ASM(void, "os/code_40c20_len_1f0", osSetEventMesg, OSEvent event, OSMesgQueue* queue, OSMesg mesg); diff --git a/src/os/code_41050_len_120.c b/src/os/code_41050_len_120.c deleted file mode 100644 index ca86eaeb0a..0000000000 --- a/src/os/code_41050_len_120.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41050_len_120", osSpTaskYield, void); diff --git a/src/os/code_41170_len_f0.c b/src/os/code_41170_len_f0.c deleted file mode 100644 index 462920e929..0000000000 --- a/src/os/code_41170_len_f0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -u32 __osSiAccessQueueEnabled = 0; - -INCLUDE_ASM(s32, "os/code_41170_len_f0", __osSiCreateAccessQueue); - -INCLUDE_ASM(s32, "os/code_41170_len_f0", __osSiGetAccess); - -INCLUDE_ASM(s32, "os/code_41170_len_f0", __osSiRelAccess); diff --git a/src/os/code_41420_len_120.c b/src/os/code_41420_len_120.c deleted file mode 100644 index 007b3713c8..0000000000 --- a/src/os/code_41420_len_120.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41420_len_120", osStartThread, OSThread* thread); diff --git a/src/os/code_41540_len_c0.c b/src/os/code_41540_len_c0.c deleted file mode 100644 index 2585f7b87d..0000000000 --- a/src/os/code_41540_len_c0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41540_len_c0", osStopThread, OSThread* thread); diff --git a/src/os/code_41600_len_40.c b/src/os/code_41600_len_40.c deleted file mode 100644 index e96e7cb2de..0000000000 --- a/src/os/code_41600_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_41600_len_40", __osDequeueThread); diff --git a/src/os/code_41640_len_50.c b/src/os/code_41640_len_50.c deleted file mode 100644 index b9bc922c0c..0000000000 --- a/src/os/code_41640_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41640_len_50", osYieldThread, void); diff --git a/src/os/code_41690_len_10.c b/src/os/code_41690_len_10.c deleted file mode 100644 index 0b7cad2984..0000000000 --- a/src/os/code_41690_len_10.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_41690_len_10", osGetActiveQueue); diff --git a/src/os/code_416a0_len_90.c b/src/os/code_416a0_len_90.c deleted file mode 100644 index 2d0937015d..0000000000 --- a/src/os/code_416a0_len_90.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(OSTime, "os/code_416a0_len_90", osGetTime, void); diff --git a/src/os/code_41730_len_20.c b/src/os/code_41730_len_20.c deleted file mode 100644 index 3f54830e18..0000000000 --- a/src/os/code_41730_len_20.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41730_len_20", osSetTime, OSTime time); diff --git a/src/os/code_41750_len_450.c b/src/os/code_41750_len_450.c deleted file mode 100644 index 7cd2939c44..0000000000 --- a/src/os/code_41750_len_450.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(int, "os/code_41750_len_450", osSetTimer, OSTimer* timer, OSTime start, OSTime end, OSMesgQueue* queue, - OSMesg mesg); diff --git a/src/os/code_41880.c b/src/os/code_41880.c deleted file mode 100644 index b7c7bb1965..0000000000 --- a/src/os/code_41880.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_41880", osTimerServicesInit); - -INCLUDE_ASM(s32, "os/code_41880", osTimerInterrupt); - -INCLUDE_ASM(s32, "os/code_41880", osSetTimerIntr); - -INCLUDE_ASM(s32, "os/code_41880", osInsertTimer); diff --git a/src/os/code_41ba0_len_c0.c b/src/os/code_41ba0_len_c0.c deleted file mode 100644 index fa887f4ee4..0000000000 --- a/src/os/code_41ba0_len_c0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41ba0_len_c0", osMapTLB, s32 unk, OSPageMask pageMask, void* buf, u32 unk1, u32 unk2, - s32 unk3); diff --git a/src/os/code_41c60_len_c0.c b/src/os/code_41c60_len_c0.c deleted file mode 100644 index 88c9db62d7..0000000000 --- a/src/os/code_41c60_len_c0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_41c60_len_c0", osProbeTLB); diff --git a/src/os/code_41d20_len_40.c b/src/os/code_41d20_len_40.c deleted file mode 100644 index fd043e663e..0000000000 --- a/src/os/code_41d20_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41d20_len_40", osUnmapTLB, s32 unk); diff --git a/src/os/code_41d60_len_50.c b/src/os/code_41d60_len_50.c deleted file mode 100644 index 7f59498c5e..0000000000 --- a/src/os/code_41d60_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41d60_len_50", osUnmapTLBAll, void); diff --git a/src/os/code_41db0_len_40.c b/src/os/code_41db0_len_40.c deleted file mode 100644 index 29249b29ba..0000000000 --- a/src/os/code_41db0_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void*, "os/code_41db0_len_40", osViGetCurrentFramebuffer, void); diff --git a/src/os/code_41df0_len_40.c b/src/os/code_41df0_len_40.c deleted file mode 100644 index 543e25c965..0000000000 --- a/src/os/code_41df0_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void*, "os/code_41df0_len_40", osViGetNextFramebuffer, void); diff --git a/src/os/code_41e30_len_40.c b/src/os/code_41e30_len_40.c deleted file mode 100644 index 3970a894e5..0000000000 --- a/src/os/code_41e30_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(u32, "os/code_41e30_len_40", osViGetCurrentMode, void); diff --git a/src/os/code_41e70_len_340.c b/src/os/code_41e70_len_340.c deleted file mode 100644 index ecdbe871f8..0000000000 --- a/src/os/code_41e70_len_340.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_41e70_len_340", osCreateViManager, OSPri pri); - -INCLUDE_ASM(s32, "os/code_41e70_len_340", viMgrMain); diff --git a/src/os/code_421b0_len_60.c b/src/os/code_421b0_len_60.c deleted file mode 100644 index f3d2330cc6..0000000000 --- a/src/os/code_421b0_len_60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_421b0_len_60", osViSetEvent, OSMesgQueue* queue, OSMesg mesg, u32 unk); diff --git a/src/os/code_42210_len_50.c b/src/os/code_42210_len_50.c deleted file mode 100644 index 854a47b55e..0000000000 --- a/src/os/code_42210_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42210_len_50", osViSetMode, OSViMode* mode); diff --git a/src/os/code_42260_len_170.c b/src/os/code_42260_len_170.c deleted file mode 100644 index 4574c07866..0000000000 --- a/src/os/code_42260_len_170.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42260_len_170", osViSetSpecialFeatures, u32 feat); diff --git a/src/os/code_423d0_len_50.c b/src/os/code_423d0_len_50.c deleted file mode 100644 index 4c34d08b2d..0000000000 --- a/src/os/code_423d0_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_423d0_len_50", osViSetYScale, f32 scale); diff --git a/src/os/code_42420_len_50.c b/src/os/code_42420_len_50.c deleted file mode 100644 index 8bf75cc94d..0000000000 --- a/src/os/code_42420_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42420_len_50", osViSwapBuffer, void* buf); diff --git a/src/os/code_42470_len_310.c b/src/os/code_42470_len_310.c deleted file mode 100644 index d027ee1d2e..0000000000 --- a/src/os/code_42470_len_310.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_42470_len_310", osViSwapContext); diff --git a/src/os/code_42780_len_120.c b/src/os/code_42780_len_120.c deleted file mode 100644 index 3326616e99..0000000000 --- a/src/os/code_42780_len_120.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42780_len_120", osViBlack, u8 unk); diff --git a/src/os/code_42900_len_80.c b/src/os/code_42900_len_80.c deleted file mode 100644 index 20055cb0de..0000000000 --- a/src/os/code_42900_len_80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42900_len_80", guMtxF2L, float mf[4][4], Mtx* m); diff --git a/src/os/code_42980_len_80.c b/src/os/code_42980_len_80.c deleted file mode 100644 index 2fb4f4d12e..0000000000 --- a/src/os/code_42980_len_80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42980_len_80", guMtxL2F, float mf[4][4], Mtx* m); diff --git a/src/os/code_42a00_len_100.c b/src/os/code_42a00_len_100.c deleted file mode 100644 index c2413f1d90..0000000000 --- a/src/os/code_42a00_len_100.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42a00_len_100", guMtxCatF, float m[4][4], float n[4][4], float r[4][4]); diff --git a/src/os/code_42b00_len_c0.c b/src/os/code_42b00_len_c0.c deleted file mode 100644 index 73645bc559..0000000000 --- a/src/os/code_42b00_len_c0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42b00_len_c0", guScale, Mtx* m, float x, float y, float z); diff --git a/src/os/code_42bc0_len_60.c b/src/os/code_42bc0_len_60.c deleted file mode 100644 index 9e61700a01..0000000000 --- a/src/os/code_42bc0_len_60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42bc0_len_60", guScaleF, float mf[4][4], float x, float y, float z); diff --git a/src/os/code_42c20_len_e0.c b/src/os/code_42c20_len_e0.c deleted file mode 100644 index 752fd2a592..0000000000 --- a/src/os/code_42c20_len_e0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42c20_len_e0", guTranslate, Mtx* m, float x, float y, float z); diff --git a/src/os/code_42d00_len_60.c b/src/os/code_42d00_len_60.c deleted file mode 100644 index 4f2e1ec615..0000000000 --- a/src/os/code_42d00_len_60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42d00_len_60", guTranslateF, float mf[4][4], float x, float y, float z); diff --git a/src/os/code_42d60_len_80.c b/src/os/code_42d60_len_80.c deleted file mode 100644 index 09232ddedf..0000000000 --- a/src/os/code_42d60_len_80.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_42d60_len_80", guMtxCat); diff --git a/src/os/code_42de0_len_90.c b/src/os/code_42de0_len_90.c deleted file mode 100644 index 41138cfd5a..0000000000 --- a/src/os/code_42de0_len_90.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42de0_len_90", guMtxXFML, Mtx* m, float x, float y, float z, float* ox, float* oy, - float* oz); diff --git a/src/os/code_42e70_len_390.c b/src/os/code_42e70_len_390.c deleted file mode 100644 index 46e0a42925..0000000000 --- a/src/os/code_42e70_len_390.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_42e70_len_390", guMtxXFMF, float mf[4][4], float x, float y, float z, float* ox, float* oy, - float* oz); diff --git a/src/os/code_43200_len_7c0.c b/src/os/code_43200_len_7c0.c deleted file mode 100644 index 82ebd410c3..0000000000 --- a/src/os/code_43200_len_7c0.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_43200_len_7c0", __osMotorAccess, OSPfs* pfs, s32 unk); - -INCLUDE_ASM(s32, "os/code_43200_len_7c0", osMotorInit, OSMesgQueue* queue, OSPfs* pfs, int unk); diff --git a/src/os/code_43590.c b/src/os/code_43590.c deleted file mode 100644 index af255c9469..0000000000 --- a/src/os/code_43590.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_43590", osPfsAllocateFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, - int unk5, s32* unk6); - -INCLUDE_ASM(s32, "os/code_43590", osPfsDeclearPage); diff --git a/src/os/code_439c0_len_220.c b/src/os/code_439c0_len_220.c deleted file mode 100644 index e380b0c72e..0000000000 --- a/src/os/code_439c0_len_220.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_439c0_len_220", osPfsDeleteFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4); - -INCLUDE_ASM(s32, "os/code_439c0_len_220", osPfsReleasePages); diff --git a/src/os/code_43be0_len_5e0.c b/src/os/code_43be0_len_5e0.c deleted file mode 100644 index de4d7aa18c..0000000000 --- a/src/os/code_43be0_len_5e0.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsReadWriteFile, OSPfs* pfs, s32 unk1, u8 unk2, int unk3, int unk4, - u8* unk5); - -INCLUDE_ASM(s32, "os/code_43be0_len_5e0", osPfsFileState, OSPfs* pfs, s32 unk, OSPfsState* state); diff --git a/src/os/code_441c0_len_1c0.c b/src/os/code_441c0_len_1c0.c deleted file mode 100644 index 818bfe8feb..0000000000 --- a/src/os/code_441c0_len_1c0.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_441c0_len_1c0", osPfsFindFile, OSPfs* pfs, u16 unk1, u32 unk2, u8* unk3, u8* unk4, - s32* unk5); diff --git a/src/os/code_44380_len_4e0.c b/src/os/code_44380_len_4e0.c deleted file mode 100644 index 6f375b3b5b..0000000000 --- a/src/os/code_44380_len_4e0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_44380_len_4e0", osPfsFreeBlocks, OSPfs* pfs, s32* unk1); diff --git a/src/os/code_44490.c b/src/os/code_44490.c deleted file mode 100644 index 9770d9be49..0000000000 --- a/src/os/code_44490.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_44490", osPfsNumFiles, OSPfs* pfs, s32* unk1, s32* unk2); - -INCLUDE_ASM(s32, "os/code_44490", osPfsInitPak, OSMesgQueue* queue, OSPfs* pfs, int unk1); - -INCLUDE_ASM(s32, "os/code_44490", osPfsCheckRamArea); diff --git a/src/os/code_44860_len_60.c b/src/os/code_44860_len_60.c deleted file mode 100644 index 0a81df02a5..0000000000 --- a/src/os/code_44860_len_60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_44860_len_60", osPfsRepairId, OSPfs* pfs); diff --git a/src/os/code_448c0_len_210.c b/src/os/code_448c0_len_210.c deleted file mode 100644 index 7365b2fab3..0000000000 --- a/src/os/code_448c0_len_210.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_448c0_len_210", osPfsGetStatus); - -INCLUDE_ASM(s32, "os/code_448c0_len_210", osPfsRequestOneChannel); - -INCLUDE_ASM(s32, "os/code_448c0_len_210", osPfsGetOneChannelData); diff --git a/src/os/code_44ad0_len_70.c b/src/os/code_44ad0_len_70.c deleted file mode 100644 index 9deb292e4c..0000000000 --- a/src/os/code_44ad0_len_70.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_44ad0_len_70", osPfsSelectBank); diff --git a/src/os/code_44b40_len_a90.c b/src/os/code_44b40_len_a90.c deleted file mode 100644 index b19a0d9b1f..0000000000 --- a/src/os/code_44b40_len_a90.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_44b40_len_a90", osSumcalc); - -INCLUDE_ASM(s32, "os/code_44b40_len_a90", osIdCheckSum); - -INCLUDE_ASM(s32, "os/code_44b40_len_a90", osRepairPackId); - -INCLUDE_ASM(s32, "os/code_44b40_len_a90", osCheckPackId); - -INCLUDE_ASM(s32, "os/code_44b40_len_a90", osGetId); - -INCLUDE_ASM(s32, "os/code_44b40_len_a90", osCheckId); - -INCLUDE_ASM(s32, "os/code_44b40_len_a90", osPfsRWInode); diff --git a/src/os/code_455d0_len_1f0.c b/src/os/code_455d0_len_1f0.c deleted file mode 100644 index b593590303..0000000000 --- a/src/os/code_455d0_len_1f0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_455d0_len_1f0", osContRamRead); diff --git a/src/os/code_457c0_len_270.c b/src/os/code_457c0_len_270.c deleted file mode 100644 index 9e8650f090..0000000000 --- a/src/os/code_457c0_len_270.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_457c0_len_270", osContRamWrite); diff --git a/src/os/code_45a30_len_20.c b/src/os/code_45a30_len_20.c deleted file mode 100644 index 3f8b420f7c..0000000000 --- a/src/os/code_45a30_len_20.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_45a30_len_20", osAfterPreNMI, void); diff --git a/src/os/code_45a50_len_3a0.c b/src/os/code_45a50_len_3a0.c deleted file mode 100644 index 2c7b03cf70..0000000000 --- a/src/os/code_45a50_len_3a0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_45a50_len_3a0", func_8006A650) - -INCLUDE_ASM(void, "os/code_45a50_len_3a0", __osInitialize_common, void); - -INCLUDE_ASM(s32, "os/code_45a50_len_3a0", func_8006A9E0) diff --git a/src/os/code_467f0_len_90.c b/src/os/code_467f0_len_90.c deleted file mode 100644 index 9a80fb50cd..0000000000 --- a/src/os/code_467f0_len_90.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_467f0_len_90", osSetGlobalIntMask); - -INCLUDE_ASM(s32, "os/code_467f0_len_90", osResetGlobalIntMask); diff --git a/src/os/code_46880_len_260.c b/src/os/code_46880_len_260.c deleted file mode 100644 index d69ff7fd83..0000000000 --- a/src/os/code_46880_len_260.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_46880_len_260", osPiRawStartDma); - -INCLUDE_ASM(s32, "os/code_46880_len_260", osPiGetCmdQueue); - -INCLUDE_ASM(s32, "os/code_46880_len_260", osEPiRawReadIo); diff --git a/src/os/code_46ae0_len_170.c b/src/os/code_46ae0_len_170.c deleted file mode 100644 index babc01689b..0000000000 --- a/src/os/code_46ae0_len_170.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_46ae0_len_170", osEPiRawWriteIo); diff --git a/src/os/code_46c50_len_20.c b/src/os/code_46c50_len_20.c deleted file mode 100644 index ba1ce44e76..0000000000 --- a/src/os/code_46c50_len_20.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_46c50_len_20", __osAiDeviceBusy); diff --git a/src/os/code_46c70_len_e00.c b/src/os/code_46c70_len_e00.c deleted file mode 100644 index f164425340..0000000000 --- a/src/os/code_46c70_len_e00.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(int, "os/code_46c70_len_e00", bcmp, const void* src, const void* dst, int size); - -INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Litob); - -INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Ldtob); - -INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Ldunscale); - -INCLUDE_ASM(s32, "os/code_46c70_len_e00", _Genld); diff --git a/src/os/code_47a70_len_10.c b/src/os/code_47a70_len_10.c deleted file mode 100644 index 75b53a2f20..0000000000 --- a/src/os/code_47a70_len_10.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47a70_len_10", osGetSR); diff --git a/src/os/code_47a80_len_10.c b/src/os/code_47a80_len_10.c deleted file mode 100644 index a20dd8385c..0000000000 --- a/src/os/code_47a80_len_10.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47a80_len_10", osSetCompare); diff --git a/src/os/code_47a90_len_50.c b/src/os/code_47a90_len_50.c deleted file mode 100644 index 4b1fd084fc..0000000000 --- a/src/os/code_47a90_len_50.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47a90_len_50", osSetFpcCsr); - -INCLUDE_ASM(s32, "os/code_47a90_len_50", osSetSR); - -INCLUDE_ASM(s32, "os/code_47a90_len_50", osSetWatchLo); - -INCLUDE_ASM(s32, "os/code_47a90_len_50", osSpDeviceBusy); diff --git a/src/os/code_47ae0_len_e0.c b/src/os/code_47ae0_len_e0.c deleted file mode 100644 index 9480e91498..0000000000 --- a/src/os/code_47ae0_len_e0.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47ae0_len_e0", osSpGetStatus); - -INCLUDE_ASM(s32, "os/code_47ae0_len_e0", osSpSetStatus); - -INCLUDE_ASM(s32, "os/code_47ae0_len_e0", osSpSetPc); - -INCLUDE_ASM(s32, "os/code_47ae0_len_e0", osSpRawStartDma); diff --git a/src/os/code_47bc0_len_50.c b/src/os/code_47bc0_len_50.c deleted file mode 100644 index d64550095d..0000000000 --- a/src/os/code_47bc0_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47bc0_len_50", osSiRawReadIo); diff --git a/src/os/code_47c10_len_50.c b/src/os/code_47c10_len_50.c deleted file mode 100644 index fa7dd12a49..0000000000 --- a/src/os/code_47c10_len_50.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47c10_len_50", osSiRawWriteIo); diff --git a/src/os/code_47d50_len_e0.c b/src/os/code_47d50_len_e0.c deleted file mode 100644 index 2da73dea71..0000000000 --- a/src/os/code_47d50_len_e0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_47d50_len_e0", osDestroyThread, OSThread* thread); diff --git a/src/os/code_47e30_len_60.c b/src/os/code_47e30_len_60.c deleted file mode 100644 index fec849347a..0000000000 --- a/src/os/code_47e30_len_60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_47e30_len_60", osMapTLBRdb, void); diff --git a/src/os/code_47e90_len_110.c b/src/os/code_47e90_len_110.c deleted file mode 100644 index 2ce12fc5d3..0000000000 --- a/src/os/code_47e90_len_110.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47e90_len_110", osViInit); diff --git a/src/os/code_47fa0_len_20.c b/src/os/code_47fa0_len_20.c deleted file mode 100644 index ceb29614fa..0000000000 --- a/src/os/code_47fa0_len_20.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_47fa0_len_20", osViGetCurrentContext); diff --git a/src/os/code_47fc0_len_60.c b/src/os/code_47fc0_len_60.c deleted file mode 100644 index b3714af772..0000000000 --- a/src/os/code_47fc0_len_60.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_47fc0_len_60", guNormalize, float* x, float* y, float* z); diff --git a/src/os/code_48020_len_a00.c b/src/os/code_48020_len_a00.c deleted file mode 100644 index f6cb6a7a58..0000000000 --- a/src/os/code_48020_len_a00.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_48020_len_a00", osPfsChecker, OSPfs* pfs); - -INCLUDE_ASM(s32, "os/code_48020_len_a00", corrupted_init); - -INCLUDE_ASM(s32, "os/code_48020_len_a00", corrupted); - -INCLUDE_ASM(s32, "os/code_48020_len_a00", osPfsIsPlug, OSMesgQueue* queue, u8* unk); - -INCLUDE_ASM(s32, "os/code_48020_len_a00", osPfsRequestData); - -INCLUDE_ASM(s32, "os/code_48020_len_a00", osPfsGetInitData); diff --git a/src/os/code_48c00_len_5c0.c b/src/os/code_48c00_len_5c0.c deleted file mode 100644 index e8b6c18733..0000000000 --- a/src/os/code_48c00_len_5c0.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_48c00_len_5c0", func_8006D800); diff --git a/src/os/code_491c0_len_f80.c b/src/os/code_491c0_len_f80.c deleted file mode 100644 index 0fb716125d..0000000000 --- a/src/os/code_491c0_len_f80.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_491c0_len_f80", func_8006DDC0); - -INCLUDE_ASM(s32, "os/code_491c0_len_f80", func_8006E310); diff --git a/src/os/code_49C70.c b/src/os/code_49C70.c deleted file mode 100644 index 7ece93e6d2..0000000000 --- a/src/os/code_49C70.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/code_49C70", func_8006E870); diff --git a/src/os/code_4a140_len_70.c b/src/os/code_4a140_len_70.c deleted file mode 100644 index 61ae8a6e99..0000000000 --- a/src/os/code_4a140_len_70.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(char*, "os/code_4a140_len_70", strcpy, char* destination, const char* source); - -INCLUDE_ASM(s32, "os/code_4a140_len_70", strcmp, const char* str1, const char* str2); diff --git a/src/os/code_4a1b0_len_40.c b/src/os/code_4a1b0_len_40.c deleted file mode 100644 index 44936e5197..0000000000 --- a/src/os/code_4a1b0_len_40.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void*, "os/code_4a1b0_len_40", memset, void* ptr, s32 value, s32 num); diff --git a/src/os/code_4a1f0_len_170.c b/src/os/code_4a1f0_len_170.c deleted file mode 100644 index 26493fb8ee..0000000000 --- a/src/os/code_4a1f0_len_170.c +++ /dev/null @@ -1,14 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(void, "os/code_4a1f0_len_170", decode_yay0, void* src, void* dest); - -void func_8006EF18() { -} - -void func_8006EF20() { -} - -INCLUDE_ASM(s32, "os/code_4a1f0_len_170", func_8006EF28); - -void func_8006EF58() { -} diff --git a/src/os/code_4a360_len_930.c b/src/os/code_4a360_len_930.c deleted file mode 100644 index 7c3c5c23de..0000000000 --- a/src/os/code_4a360_len_930.c +++ /dev/null @@ -1,22 +0,0 @@ -#include "common.h" - -void func_8006EF60() { -} - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashInit); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashReadStatus); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashReadId); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashClearStatus); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashAllErase); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashSectorErase); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashWriteBuffer); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashWriteArray); - -INCLUDE_ASM(s32, "os/code_4a360_len_930", osFlashReadArray); diff --git a/src/os/nusys/code_3B4A0.c b/src/os/nusys/3B4A0.c similarity index 70% rename from src/os/nusys/code_3B4A0.c rename to src/os/nusys/3B4A0.c index 91ac185c0c..161cae01ed 100644 --- a/src/os/nusys/code_3B4A0.c +++ b/src/os/nusys/3B4A0.c @@ -9,4 +9,4 @@ void nuContRmbForceStopEnd(void) { nuSiSendMesg(NU_CONT_RMB_FORCESTOPEND_MSG, NULL); } -INCLUDE_ASM(void, "os/nusys/code_3B4A0", nuPiReadRomOverlay, NUPiOverlaySegment* segment); +INCLUDE_ASM(void, "os/nusys/3B4A0", nuPiReadRomOverlay, NUPiOverlaySegment* segment); diff --git a/src/os/nusys/7e40_len_3f0.c b/src/os/nusys/7e40_len_3f0.c new file mode 100644 index 0000000000..67c3af3acd --- /dev/null +++ b/src/os/nusys/7e40_len_3f0.c @@ -0,0 +1,7 @@ +#include "common.h" + +INCLUDE_ASM(s32, "os/nusys/7e40_len_3f0", nuGfxTaskMgr); + +INCLUDE_ASM(s32, "os/nusys/7e40_len_3f0", nuGfxTaskMgrInit); + +INCLUDE_ASM(s32, "os/nusys/7e40_len_3f0", nuGfxTaskStart); diff --git a/src/os/nusys/code_7e40_len_3f0.c b/src/os/nusys/code_7e40_len_3f0.c deleted file mode 100644 index aa8ed825cf..0000000000 --- a/src/os/nusys/code_7e40_len_3f0.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "common.h" - -INCLUDE_ASM(s32, "os/nusys/code_7e40_len_3f0", nuGfxTaskMgr); - -INCLUDE_ASM(s32, "os/nusys/code_7e40_len_3f0", nuGfxTaskMgrInit); - -INCLUDE_ASM(s32, "os/nusys/code_7e40_len_3f0", nuGfxTaskStart); diff --git a/src/code_135EE0.c b/src/pause/135EE0.c similarity index 63% rename from src/code_135EE0.c rename to src/pause/135EE0.c index 8c3d7fde84..a43cf87399 100644 --- a/src/code_135EE0.c +++ b/src/pause/135EE0.c @@ -6,12 +6,12 @@ void pause_set_cursor_opacity(s32 val) { gPauseMenuCursorTargetOpacity = val; } #else -INCLUDE_ASM(s32, "code_135EE0", pause_set_cursor_opacity); +INCLUDE_ASM(s32, "pause/135EE0", pause_set_cursor_opacity); #endif -INCLUDE_ASM(s32, "code_135EE0", func_80242BAC); +INCLUDE_ASM(s32, "pause/135EE0", func_80242BAC); -INCLUDE_ASM(s32, "code_135EE0", func_80242D04); +INCLUDE_ASM(s32, "pause/135EE0", func_80242D04); // Delay slot issue with gPauseMenuCursorTargetOpacity (needs .data) #ifdef NON_MATCHING @@ -63,30 +63,30 @@ void pause_interp_cursor(void) { gPauseMenuCursorTargetOpacity = 255; } #else -INCLUDE_ASM(s32, "code_135EE0", pause_interp_cursor); +INCLUDE_ASM(s32, "pause/135EE0", pause_interp_cursor); #endif -INCLUDE_ASM(s32, "code_135EE0", func_80242F90); +INCLUDE_ASM(s32, "pause/135EE0", func_80242F90); -INCLUDE_ASM(s32, "code_135EE0", func_80242FBC); +INCLUDE_ASM(s32, "pause/135EE0", func_80242FBC); -INCLUDE_ASM(s32, "code_135EE0", func_80242FF4); +INCLUDE_ASM(s32, "pause/135EE0", func_80242FF4); -INCLUDE_ASM(s32, "code_135EE0", func_80243090); +INCLUDE_ASM(s32, "pause/135EE0", func_80243090); -INCLUDE_ASM(s32, "code_135EE0", func_802430E4); +INCLUDE_ASM(s32, "pause/135EE0", func_802430E4); -INCLUDE_ASM(s32, "code_135EE0", func_8024313C); +INCLUDE_ASM(s32, "pause/135EE0", func_8024313C); -INCLUDE_ASM(s32, "code_135EE0", func_80243188); +INCLUDE_ASM(s32, "pause/135EE0", func_80243188); -INCLUDE_ASM(s32, "code_135EE0", func_80243238); +INCLUDE_ASM(s32, "pause/135EE0", func_80243238); -INCLUDE_ASM(s32, "code_135EE0", func_802432E8); +INCLUDE_ASM(s32, "pause/135EE0", func_802432E8); -INCLUDE_ASM(s32, "code_135EE0", func_80243388); +INCLUDE_ASM(s32, "pause/135EE0", func_80243388); -INCLUDE_ASM(s32, "code_135EE0", pause_interp_text_scroll); +INCLUDE_ASM(s32, "pause/135EE0", pause_interp_text_scroll); s32 pause_interp_vertical_scroll(s32 deltaBefore) { s32 val; @@ -123,21 +123,21 @@ void pause_update_cursor(s32 arg0, s32 offsetX, s32 offsetY) { void func_80243568(void) { } -INCLUDE_ASM(s32, "code_135EE0", pause_textbox_draw_contents); +INCLUDE_ASM(s32, "pause/135EE0", pause_textbox_draw_contents); -INCLUDE_ASM(s32, "code_135EE0", pause_tutorial_draw_contents); +INCLUDE_ASM(s32, "pause/135EE0", pause_tutorial_draw_contents); -INCLUDE_ASM(s32, "code_135EE0", pause_init); +INCLUDE_ASM(s32, "pause/135EE0", pause_init); -INCLUDE_ASM(s32, "code_135EE0", pause_tutorial_input); +INCLUDE_ASM(s32, "pause/135EE0", pause_tutorial_input); -INCLUDE_ASM(s32, "code_135EE0", pause_handle_input); +INCLUDE_ASM(s32, "pause/135EE0", pause_handle_input); -INCLUDE_ASM(s32, "code_135EE0", pause_cleanup); +INCLUDE_ASM(s32, "pause/135EE0", pause_cleanup); -INCLUDE_ASM(s32, "code_135EE0", pause_get_total_equipped_bp_cost); +INCLUDE_ASM(s32, "pause/135EE0", pause_get_total_equipped_bp_cost); -INCLUDE_ASM(void, "code_135EE0", pause_draw_rect, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, +INCLUDE_ASM(void, "pause/135EE0", pause_draw_rect, s32 ulx, s32 uly, s32 lrx, s32 lry, s32 tileDescriptor, s32 uls, s32 ult, s32 dsdx, s32 dtdy); -INCLUDE_ASM(s32, "code_135EE0", pause_sort_item_list); +INCLUDE_ASM(s32, "pause/135EE0", pause_sort_item_list); diff --git a/src/pause/137ED0.c b/src/pause/137ED0.c new file mode 100644 index 0000000000..396716ab51 --- /dev/null +++ b/src/pause/137ED0.c @@ -0,0 +1,31 @@ +#include "common.h" + +void pause_tabs_draw_invis(void) { +} + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_draw_stats); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_draw_badges); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_draw_items); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_draw_party); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_draw_spirits); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_draw_map); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_init); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_handle_input); + +INCLUDE_ASM(s32, "pause/137ED0", pause_tabs_update); + +void pause_tabs_cleanup(void) { + s32* iconIDs = gPauseMenuTabIconIDs; + s32 i; + + for (i = 0; i < ARRAY_COUNT(gPauseMenuTabIconIDs); i++) { + free_icon(iconIDs[i]); + } +} diff --git a/src/code_138CC0.c b/src/pause/138CC0.c similarity index 83% rename from src/code_138CC0.c rename to src/pause/138CC0.c index 1c5edaee16..86da077972 100644 --- a/src/code_138CC0.c +++ b/src/pause/138CC0.c @@ -1,10 +1,10 @@ #include "common.h" -INCLUDE_ASM(s32, "code_138CC0", pause_stats_draw_contents); +INCLUDE_ASM(s32, "pause/138CC0", pause_stats_draw_contents); -INCLUDE_ASM(s32, "code_138CC0", pause_stats_init); +INCLUDE_ASM(s32, "pause/138CC0", pause_stats_init); -INCLUDE_ASM(s32, "code_138CC0", pause_stats_handle_input); +INCLUDE_ASM(s32, "pause/138CC0", pause_stats_handle_input); void pause_stats_cleanup(void) { s32* iconIDs = gStatsMenuIconIDs; @@ -103,19 +103,19 @@ s32 pause_badges_scroll_offset_x(s32 x) { return x; } -INCLUDE_ASM(s32, "code_138CC0", pause_badges_try_remove); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_try_remove); -INCLUDE_ASM(s32, "code_138CC0", pause_badges_try_equip); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_try_equip); -INCLUDE_ASM(s32, "code_138CC0", pause_badges_draw_bp_orbs); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_draw_bp_orbs); -INCLUDE_ASM(s32, "code_138CC0", pause_badges_draw_contents); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_draw_contents); -INCLUDE_ASM(s32, "code_138CC0", pause_badges_load_badges); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_load_badges); -INCLUDE_ASM(s32, "code_138CC0", pause_badges_init); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_init); -INCLUDE_ASM(s32, "code_138CC0", pause_badges_handle_input); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_handle_input); void pause_badges_update(void) { PauseItemPage* menuPages = gBadgeMenuPages; @@ -142,4 +142,4 @@ void pause_badges_update(void) { *currentScrollPos += pause_interp_vertical_scroll(gBadgeMenuTargetScrollPos - *currentScrollPos); } -INCLUDE_ASM(s32, "code_138CC0", pause_badges_cleanup); +INCLUDE_ASM(s32, "pause/138CC0", pause_badges_cleanup); diff --git a/src/pause/13E120.c b/src/pause/13E120.c new file mode 100644 index 0000000000..563ffd3d6e --- /dev/null +++ b/src/pause/13E120.c @@ -0,0 +1,21 @@ +#include "common.h" + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_load_portrait); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_draw_contents); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_draw_title); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_draw_movelist); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_draw_movelist_title); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_draw_movelist_flower); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_init); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_handle_input); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_update); + +INCLUDE_ASM(s32, "pause/13E120", pause_partners_cleanup); diff --git a/src/pause/13FD40.c b/src/pause/13FD40.c new file mode 100644 index 0000000000..0753ae2283 --- /dev/null +++ b/src/pause/13FD40.c @@ -0,0 +1,13 @@ +#include "common.h" + +INCLUDE_ASM(s32, "pause/13FD40", pause_spirits_draw_contents); + +INCLUDE_ASM(s32, "pause/13FD40", pause_spirits_draw_title); + +INCLUDE_ASM(s32, "pause/13FD40", pause_spirits_init); + +INCLUDE_ASM(s32, "pause/13FD40", pause_spirits_handle_input); + +INCLUDE_ASM(s32, "pause/13FD40", pause_spirits_update); + +INCLUDE_ASM(s32, "pause/13FD40", pause_spirits_cleanup); diff --git a/src/pause/140C70.c b/src/pause/140C70.c new file mode 100644 index 0000000000..c0f98bd7c1 --- /dev/null +++ b/src/pause/140C70.c @@ -0,0 +1,17 @@ +#include "common.h" + +INCLUDE_ASM(s32, "pause/140C70", func_8024D930); + +INCLUDE_ASM(s32, "pause/140C70", pause_map_draw_border_arrows); + +INCLUDE_ASM(s32, "pause/140C70", pause_map_draw_contents); + +INCLUDE_ASM(s32, "pause/140C70", pause_map_draw_title); + +INCLUDE_ASM(s32, "pause/140C70", pause_map_init); + +INCLUDE_ASM(s32, "pause/140C70", pause_map_handle_input); + +INCLUDE_ASM(s32, "pause/140C70", pause_map_update); + +INCLUDE_ASM(s32, "pause/140C70", pause_map_cleanup); diff --git a/src/code_1421C0.c b/src/pause/1421C0.c similarity index 57% rename from src/code_1421C0.c rename to src/pause/1421C0.c index 7e26d9697e..e38a12bd42 100644 --- a/src/code_1421C0.c +++ b/src/pause/1421C0.c @@ -6,7 +6,7 @@ s32 pause_get_menu_string(s32 index) { return gPauseMenuStrings[index]; } #else -INCLUDE_ASM(s32, "code_1421C0", pause_get_menu_string); +INCLUDE_ASM(s32, "pause/1421C0", pause_get_menu_string); #endif -INCLUDE_ASM(s32, "code_1421C0", pause_draw_menu_label); +INCLUDE_ASM(s32, "pause/1421C0", pause_draw_menu_label); diff --git a/src/pause_items.c b/src/pause/pause_items.c similarity index 96% rename from src/pause_items.c rename to src/pause/pause_items.c index 98a2da7089..253197e83e 100644 --- a/src/pause_items.c +++ b/src/pause/pause_items.c @@ -48,7 +48,7 @@ s32 pause_items_scroll_offset_x(s32 beforeX) { return beforeX; } -INCLUDE_ASM(s32, "pause_items", pause_items_draw_contents); +INCLUDE_ASM(s32, "pause/pause_items", pause_items_draw_contents); extern u32 D_802705C4; @@ -135,7 +135,7 @@ void pause_items_load_items(s32 invItems) { gItemMenuTargetScrollPos = gItemMenuCurrentScrollPos = pause_items_get_pos_y(0, 0); } #else -INCLUDE_ASM(s32, "pause_items", pause_items_load_items); +INCLUDE_ASM(s32, "pause/pause_items", pause_items_load_items); #endif void pause_items_init(s8* arg0) { @@ -161,7 +161,7 @@ void pause_items_init(s8* arg0) { *arg0 = 1; } -INCLUDE_ASM(s32, "pause_items", pause_items_handle_input); +INCLUDE_ASM(s32, "pause/pause_items", pause_items_handle_input); void pause_items_update(void) { s32* currPos = &gItemMenuCurrentScrollPos; diff --git a/src/world/actions.c b/src/world/actions.c index ac09947ee8..52b6e4a272 100644 --- a/src/world/actions.c +++ b/src/world/actions.c @@ -38,7 +38,7 @@ void* D_800F7C7C[] = { &D_800F7BE8, &D_800F7BE8, &D_800F7BBC, &D_800F7B94 }; s32 D_800F7C8C[] = { // TODO: struct for dma table // TODO: ld addrs - (s32) &func_802B6000_E24920, &code_code_E23260_ROM_START, &code_code_E23260_ROM_END, 0x01000000, + (s32) &func_802B6000_E24920, &E23260_ROM_START, &E23260_ROM_END, 0x01000000, (s32) &func_802B6000_E24920, 0x00E236E0, 0x00E24040, 0x01000000, (s32) &func_802B6288_E23968, 0x00E236E0, 0x00E24040, 0x01000000, (s32) &func_802B60B4_E240F4, 0x00E24040, 0x00E245D0, 0x01000000, diff --git a/src/world/area_dgb/dgb_01/BFD880.c b/src/world/area_dgb/dgb_01/BFD880.c index f22807deca..dc99e320bd 100644 --- a/src/world/area_dgb/dgb_01/BFD880.c +++ b/src/world/area_dgb/dgb_01/BFD880.c @@ -2,6 +2,6 @@ #include "ld_addrs.h" ApiStatus N(func_80240000_BFD880)(void) { - dma_copy(&code_code_C20F40_ROM_START, &code_code_C20F40_ROM_END, &gBackgroundImage); + dma_copy(C20F40_ROM_START, C20F40_ROM_END, &gBackgroundImage); return ApiStatus_DONE2; } diff --git a/src/world/partners.c b/src/world/partners.c index 6aef808b8c..e095d306db 100644 --- a/src/world/partners.c +++ b/src/world/partners.c @@ -55,7 +55,7 @@ s32 D_800F7FF4 = 4; s32 D_800F7FF8 = 5; s32 D_800F7FFC = 7; s32 D_800F8000[] = { 8, 0, 0, 0 }; -s32 D_800F8010[] = { &code_code_3251D0_ROM_START, &code_code_3251D0_ROM_END, (s32) &D_802C05CC, 0x00000000 }; +s32 D_800F8010[] = { _3251D0_ROM_START, _3251D0_ROM_END, (s32) &D_802C05CC, 0x00000000 }; s32 D_800F8020 = 0; s32 D_800F8024 = 0; s32 D_800F8028 = 0; @@ -254,7 +254,7 @@ f32 D_800F833C = 0; f32 D_800F8340 = 0; f32 D_800F8344 = 0; -NpcID create_basic_npc(NpcBlueprint* blueprint); +NpcID npc_create_basic(NpcBlueprint* blueprint); extern s32 D_802C0000; @@ -310,7 +310,7 @@ void load_partner_npc(void) { blueprint.initialAnim = (*partner)->idle; blueprint.onUpdate = NULL; blueprint.onRender = NULL; - D_8010CFD0 = npcIndex = create_basic_npc(blueprintPtr); + D_8010CFD0 = npcIndex = npc_create_basic(blueprintPtr); *partnerNpcPtr = get_npc_by_index(npcIndex); @@ -335,7 +335,7 @@ void load_partner_npc(void) { } void func_800EA6A8(void) { - free_npc_by_index(D_8010CFD0); + npc_free_by_index(D_8010CFD0); } INCLUDE_ASM(s32, "world/partners", _use_partner_ability); diff --git a/src/world/world.c b/src/world/world.c index 976ed59287..f05e7040c8 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -133,7 +133,7 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { func_802DD8F8((*gameStatus2)->unk_84); func_8011E224(); clear_entity_models(); - clear_npcs(); + npc_list_clear(); func_80141100(); clear_trigger_data(); clear_model_data(); @@ -274,17 +274,17 @@ s32 get_asset_offset(char* assetName, s32* compressedSize) { #define MAP(map) \ .id = #map, \ .config = &map##_config, \ - .dmaStart = &code_##map##_ROM_START, \ - .dmaEnd = &code_##map##_ROM_END, \ - .dmaDest = &code_##map##_VRAM \ + .dmaStart = map##_ROM_START, \ + .dmaEnd = map##_ROM_END, \ + .dmaDest = map##_VRAM \ // Should be removed once the data section containing .init and .config of all maps have been disassembled #define MAP_UNSPLIT(map, configVRAM) \ .id = #map, \ .config = (MapConfig*)(configVRAM), \ - .dmaStart = &code_##map##_ROM_START, \ - .dmaEnd = &code_##map##_ROM_END, \ - .dmaDest = &code_##map##_VRAM \ + .dmaStart = map##_ROM_START, \ + .dmaEnd = map##_ROM_END, \ + .dmaDest = map##_VRAM \ // these, along with all the *_maps, almost certainly belong in the next file diff --git a/tools/compile_dsl_macros.py b/tools/build/cc_dsl/compile_script.py similarity index 100% rename from tools/compile_dsl_macros.py rename to tools/build/cc_dsl/compile_script.py diff --git a/tools/build/configure.py b/tools/build/configure.py new file mode 100755 index 0000000000..d8c07f69a2 --- /dev/null +++ b/tools/build/configure.py @@ -0,0 +1,490 @@ +#!/usr/bin/env python3 + +from typing import List, Dict, Set, Union +from pathlib import Path +import sys +import ninja_syntax +from glob import glob + +VERSIONS = ["us", "jp"] +ROOT = Path(__file__).parent.parent.parent +BUILD_TOOLS = ROOT / "tools" / "build" # directory where this file is (TODO: use relative_to) +YAY0_COMPRESS_TOOL = f"{BUILD_TOOLS}/yay0/Yay0compress" +CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc" + +def rm_recursive(path: Path): + if path.exists(): + if path.is_dir(): + for f in path.iterdir(): + rm_recursive(f) + + path.rmdir() + else: + path.unlink() + +def exec_shell(command: List[str]) -> str: + import subprocess + + ret = subprocess.run(command, stdout=subprocess.PIPE, text=True) + return ret.stdout + +def write_ninja_rules(ninja: ninja_syntax.Writer, cpp: str): + # platform-specific + if sys.platform == "darwin": + os_dir = "mac" + iconv = "tools/iconv.py UTF-8 SHIFT-JIS" + elif sys.platform == "linux": + from os import uname + + if uname()[4] == "aarch64": + os_dir = "arm" + else: + os_dir = "linux" + + iconv = "iconv --from UTF-8 --to SHIFT-JIS" + else: + raise Exception(f"unsupported platform {sys.platform}") + + cross = "mips-linux-gnu-" + + ninja.variable("python", sys.executable) + + ninja.rule("ld", + description="link($version) $out", + command=f"{cross}ld -T ver/$version/undefined_syms.txt -T ver/$version/undefined_syms_auto.txt -T ver/$version/undefined_funcs_auto.txt -T ver/$version/dead_syms.txt -Map $mapfile --no-check-sections -T $in -o $out", + ) + + ninja.rule("z64", + description="rom $out", + command=f"{cross}objcopy $in $out -O binary && {BUILD_TOOLS}/rom/n64crc $out", + ) + + ninja.rule("sha1sum", + description="check $in", + command=f"sha1sum -c $in && touch $out", + ) + + ninja.rule("cc", + description="cc($version) $in", + command=f"bash -o pipefail -c '{cpp} -w -Iver/$version/build/include -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -D VERSION=$version -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -MD -MF $out.d $in -o - | {iconv} | {BUILD_TOOLS}/{os_dir}/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -o - | {BUILD_TOOLS}/{os_dir}/mips-nintendo-nu64-as -EB -G 0 - -o $out'", + depfile="$out.d", + deps="gcc", + ) + + ninja.rule("cc_dsl", + description="cc_dsl($version) $in", + command=f"bash -o pipefail -c '{cpp} -w -Iver/$version/build/include -Iinclude -Isrc -D _LANGUAGE_C -D _FINALROM -D VERSION=$version -ffreestanding -DF3DEX_GBI_2 -D_MIPS_SZLONG=32 -MD -MF $out.d $in -o - | $python {BUILD_TOOLS}/cc_dsl/compile_script.py | {iconv} | {BUILD_TOOLS}/{os_dir}/cc1 -O2 -quiet -G 0 -mcpu=vr4300 -mfix4300 -mips3 -mgp32 -mfp32 -Wuninitialized -Wshadow -o - | {BUILD_TOOLS}/{os_dir}/mips-nintendo-nu64-as -EB -G 0 - -o $out'", + depfile="$out.d", + deps="gcc", + ) + + ninja.rule("bin", + description="bin $in", + command=f"{cross}ld -r -b binary $in -o $out", + ) + + ninja.rule("as", + description="as $in", + command=f"{cross}as -EB -march=vr4300 -mtune=vr4300 -Iinclude $in -o $out", + ) + + ninja.rule("img", + description="img($img_type) $in", + command=f"$python {BUILD_TOOLS}/img/build.py $img_type $in $out $img_flags", + ) + + ninja.rule("img_header", + description="img_header $in", + command=f"$python {BUILD_TOOLS}/img/header.py $in $out", + ) + + ninja.rule("yay0", + description="yay0 $in", + command=f"{BUILD_TOOLS}/yay0/Yay0compress $in $out", + ) + + ninja.rule("sprite", + description="sprite $sprite_name", + command=f"$python {BUILD_TOOLS}/sprites/sprite.py $out $sprite_dir", + ) + + ninja.rule("sprite_combine", + description="sprite_combine $in", + command=f"$python {BUILD_TOOLS}/sprites/combine.py $out $in", + ) + + ninja.rule("sprite_header", + description="sprite_header $sprite_name", + command=f"$python {BUILD_TOOLS}/sprites/header.py $out $sprite_dir $sprite_id", + ) + + ninja.rule("msg", + description="msg $in", + command=f"$python {BUILD_TOOLS}/msg/parse_compile.py $in $out", + ) + + ninja.rule("msg_combine", + description="msg_combine $out", + command=f"$python {BUILD_TOOLS}/msg/combine.py $out $in", + ) + + ninja.rule("mapfs", + description="mapfs $out", + command=f"$python {BUILD_TOOLS}/mapfs/combine.py $out $in", + ) + +def write_ninja_for_tools(ninja: ninja_syntax.Writer): + ninja.rule("cc_tool", + description="cc_tool $in", + command=f"cc -w $in -O3 -o $out", + ) + + ninja.build(YAY0_COMPRESS_TOOL, "cc_tool", f"{BUILD_TOOLS}/yay0/Yay0compress.c") + ninja.build(CRC_TOOL, "cc_tool", f"{BUILD_TOOLS}/rom/n64crc.c") + +class Configure: + def __init__(self, version: str): + self.version = version + self.version_path = ROOT / f"ver/{version}" + self.linker_entries = None + + def split(self, assets: bool, code: bool): + import split + + modes = ["ld"] + if assets: + modes.extend(["bin", "Yay0", "img", "PaperMarioMapFS", "PaperMarioMessages", "PaperMarioNpcSprites"]) + if code: + modes.extend(["code", "c", "data", "rodata"]) + + split.main( + str(self.version_path / "splat.yaml"), + None, + str(self.version_path / "baserom.z64"), + modes, + verbose=False, + ) + self.linker_entries = split.linker_writer.entries[:] + + def build_path(self) -> Path: + return Path(f"ver/{self.version}/build") + + def elf_path(self) -> Path: + # TODO: read basename and build_path from splat.yaml + return Path(f"ver/{self.version}/build/papermario.elf") + + def rom_path(self) -> Path: + return self.elf_path().with_suffix(".z64") + + def rom_ok_path(self) -> Path: + return self.elf_path().with_suffix(".ok") + + def linker_script_path(self) -> Path: + # TODO: read from splat.yaml + return Path(f"ver/{self.version}/papermario.ld") + + def map_path(self) -> Path: + return self.elf_path().with_suffix(".map") + + def resolve_src_paths(self, src_paths: List[Path]) -> List[str]: + out = [] + + for path in src_paths: + if path.parents[0] == "assets": + # TODO resolve asset + pass + + if path.is_dir(): + out.extend(glob(str(path) + "/**/*", recursive=True)) + else: + out.append(str(path)) + + return out + + def write_ninja(self, ninja: ninja_syntax.Writer, skip_outputs: Set[str]): + import segtypes + import segtypes.n64.data # Doesn't get imported on jp for some odd reason (should maybe be a * import?) + + assert self.linker_entries is not None + + built_objects = set() + generated_headers = [] + + def build(object_paths: Union[Path, List[Path]], src_paths: List[Path], task: str, variables: Dict[str, str] = {}): + if not isinstance(object_paths, list): + object_paths = [object_paths] + + object_strs = [str(obj) for obj in object_paths] + needs_build = False + + for object_path in object_paths: + if object_path.suffixes[-1] == ".o": + built_objects.add(str(object_path)) + elif object_path.suffixes[-1] == ".h": + generated_headers.append(str(object_path)) + + # don't rebuild objects if we've already seen all of them + if not str(object_path) in skip_outputs: + needs_build = True + + if needs_build: + skip_outputs.update(object_strs) + + implicit = [] + order_only = [] + + if task == "yay0": + implicit.append(YAY0_COMPRESS_TOOL) + elif task == "cc" or task == "cc_dsl": + order_only.append("generated_headers_" + self.version) + + ninja.build( + object_strs, # $out + task, + self.resolve_src_paths(src_paths), # $in + variables={ "version": self.version, **variables }, + implicit=implicit, + order_only=order_only, + ) + + # Build objects + for entry in self.linker_entries: + seg = entry.segment + + if isinstance(seg, segtypes.n64.header.N64SegHeader): + build(entry.object_path, entry.src_paths, "as") + elif isinstance(seg, segtypes.n64.asm.N64SegAsm) or (isinstance(seg, segtypes.n64.data.N64SegData) and not seg.type[0] == "."): + build(entry.object_path, entry.src_paths, "as") + elif isinstance(seg, segtypes.n64.c.N64SegC) or (isinstance(seg, segtypes.n64.data.N64SegData) and seg.type[0] == "."): + task = "cc" + with entry.src_paths[0].open() as f: + s = f.read() + if "SCRIPT(" in s or "#pragma SCRIPT" in s: + task = "cc_dsl" + + build(entry.object_path, entry.src_paths, task) + elif isinstance(seg, segtypes.n64.bin.N64SegBin): + build(entry.object_path, entry.src_paths, "bin") + elif isinstance(seg, segtypes.n64.Yay0.N64SegYay0): + compressed_path = entry.object_path.with_suffix("") # remove .o + build(compressed_path, entry.src_paths, "yay0") + build(entry.object_path, [compressed_path], "bin") + elif isinstance(seg, segtypes.n64.img.N64SegImg): + flags = "" + if seg.flip_horizontal: + flags += "--flip-x " + if seg.flip_vertical: + flags += "--flip-y " + + build(entry.object_path.with_suffix(".bin"), entry.src_paths, "img", variables={ + "img_type": seg.type, + "img_flags": flags, + }) + build(entry.object_path, [entry.object_path.with_suffix(".bin")], "bin") + + build(self.build_path() / "include" / seg.dir / (seg.name + ".png.h"), entry.src_paths, "img_header") + elif isinstance(seg, segtypes.n64.palette.N64SegPalette): + build(entry.object_path.with_suffix(".bin"), entry.src_paths, "img", variables={ + "img_type": seg.type, + "img_flags": "", + }) + build(entry.object_path, [entry.object_path.with_suffix(".bin")], "bin") + elif seg.type == "PaperMarioNpcSprites": + sprite_yay0s = [] + + for sprite_id, sprite_dir in enumerate(entry.src_paths, 1): + sprite_name = sprite_dir.name + + bin_path = entry.object_path.with_suffix("") / (sprite_name + ".bin") + yay0_path = bin_path.with_suffix(".Yay0") + sprite_yay0s.append(yay0_path) + + variables = { + "sprite_id": sprite_id, + "sprite_name": sprite_name, + "sprite_dir": str(sprite_dir), + } + + build(bin_path, [sprite_dir], "sprite", variables=variables) + build(yay0_path, [bin_path], "yay0") + build( + self.build_path() / "include" / seg.dir / seg.name / (sprite_name + ".h"), + [sprite_dir], + "sprite_header", + variables=variables, + ) + + build(entry.object_path.with_suffix(".bin"), sprite_yay0s, "sprite_combine") + build(entry.object_path, [entry.object_path.with_suffix(".bin")], "bin") + elif seg.type == "PaperMarioMessages": + msg_bins = [] + + for section_idx, msg_path in enumerate(entry.src_paths): + bin_path = entry.object_path.with_suffix("") / f"{section_idx:02X}.bin" + msg_bins.append(bin_path) + build(bin_path, [msg_path], "msg") + + build([ + entry.object_path.with_suffix(".bin"), + self.build_path() / "include" / "message_ids.h", + ], msg_bins, "msg_combine") + build(entry.object_path, [entry.object_path.with_suffix(".bin")], "bin") + elif seg.type == "PaperMarioMapFS": + bin_yay0s: List[Path] = [] # flat list of (uncompressed path, compressed? path) pairs + + for path in entry.src_paths: + name = path.stem + bin_path = entry.object_path.with_suffix("").with_suffix("") / f"{name}.bin" + + if name.startswith("party_"): + compress = True + build(bin_path, [path], "img", variables={ + "img_type": "party", + "img_flags": "", + }) + elif name.endswith("_bg"): + compress = True + build(bin_path, [path], "img", variables={ + "img_type": "bg", + "img_flags": "", + }) + elif name.endswith("_tex"): + compress = False + bin_path = path + else: + compress = True + bin_path = path + + if compress: + yay0_path = bin_path.with_suffix(".Yay0") + build(yay0_path, [bin_path], "yay0") + else: + yay0_path = bin_path + + bin_yay0s.append(bin_path) + bin_yay0s.append(yay0_path) + + # combine + build(entry.object_path.with_suffix(""), bin_yay0s, "mapfs") + build(entry.object_path, [entry.object_path.with_suffix("")], "bin") + else: + raise Exception(f"don't know how to build {seg.__class__.__name__} '{seg.name}'") + + # Build elf, z64, ok + ninja.build( + str(self.elf_path()), + "ld", + str(self.linker_script_path()), + implicit=[str(obj) for obj in built_objects], + variables={ "version": self.version, "mapfile": str(self.map_path()) }, + ) + ninja.build( + str(self.rom_path()), + "z64", + str(self.elf_path()), + implicit=[CRC_TOOL], + ) + ninja.build( + str(self.rom_ok_path()), + "sha1sum", + f"ver/{self.version}/checksum.sha1", + implicit=[str(self.rom_path())], + ) + + ninja.build("generated_headers_" + self.version, "phony", generated_headers) + + def make_current(self, ninja: ninja_syntax.Writer): + current = Path("ver/current") + + try: + current.unlink() + except Exception: + pass + + current.symlink_to(self.version) + + ninja.build("ver/current/build/papermario.z64", "phony", str(self.rom_path())) + +if __name__ == "__main__": + from argparse import ArgumentParser + + parser = ArgumentParser(description="Paper Mario build.ninja generator") + parser.add_argument("version", nargs="*", default=[], help="Version(s) to configure for. Most tools will operate on the first-provided only. Supported versions: " + ','.join(VERSIONS)) + parser.add_argument("--cpp", help="GNU C preprocessor command") + parser.add_argument("--clean", action="store_true", help="Delete assets and previously-built files") + parser.add_argument("--splat", default="tools/splat", help="Path to splat tool to use") + parser.add_argument("--split-code", action="store_true", help="Re-split code segments to asm files") + parser.add_argument("--no-split-assets", action="store_true", help="Don't split assets from the baserom(s)") + args = parser.parse_args() + + exec_shell(["make", "-C", str(ROOT / args.splat)]) + + # on macOS, /usr/bin/cpp defaults to clang rather than gcc (but we need gcc's) + if args.cpp is None and sys.platform == "darwin" and "Free Software Foundation" not in shell("cpp --version"): + print("error: system C preprocessor is not GNU!") + print("This is a known issue on macOS - only clang's cpp is installed by default.") + print("Use 'brew' to obtain GNU cpp, then run this script again with the --cpp option, e.g.") + print(" ./configure.py --cpp cpp-10") + exit(1) + + # default version behaviour is to only do those that exist + if len(args.version) > 0: + versions = args.version + else: + versions = [] + + for version in VERSIONS: + rom = ROOT / f"ver/{version}/baserom.z64" + + print(f"configure: looking for baserom {rom}", end="") + + if rom.exists(): + print("...found") + versions.append(version) + else: + print("...missing") + + if len(versions) == 0: + print("error: no baseroms found") + exit(1) + + if args.clean: + print("configure: cleaning...") + + exec_shell(["ninja", "-t", "clean"]) + + for version in versions: + rm_recursive(ROOT / f"assets/{version}") + rm_recursive(ROOT / f"ver/{version}/assets") + rm_recursive(ROOT / f"ver/{version}/build") + rm_recursive(ROOT / f"ver/{version}/.splat_cache") + + # add splat to python import path + sys.path.append(str((ROOT / args.splat).resolve())) + + ninja = ninja_syntax.Writer(open(str(ROOT / "build.ninja"), "w"), width=9999) + + write_ninja_rules(ninja, args.cpp or "cpp") + write_ninja_for_tools(ninja) + + skip_files = set() + all_rom_oks: List[str] = [] + first_configure = None + + for version in versions: + print(f"configure: configuring version {version}") + + configure = Configure(version) + + if not first_configure: + first_configure = configure + + configure.split(not args.no_split_assets, args.split_code) + configure.write_ninja(ninja, skip_files) + + all_rom_oks.append(str(configure.rom_ok_path())) + + first_configure.make_current(ninja) + + ninja.build("all", "phony", all_rom_oks) + ninja.default("all") diff --git a/tools/img/build.py b/tools/build/img/build.py similarity index 99% rename from tools/img/build.py rename to tools/build/img/build.py index 0c90ae59e8..391d66b134 100755 --- a/tools/img/build.py +++ b/tools/build/img/build.py @@ -2,7 +2,6 @@ from sys import argv, stderr from math import floor, ceil -from itertools import zip_longest from glob import glob import png @@ -34,6 +33,7 @@ def rgb_to_intensity(r, g, b): return round(r * 0.2126 + g * 0.7152 + 0.0722 * b) def iter_in_groups(iterable, n, fillvalue=None): + from itertools import zip_longest args = [iter(iterable)] * n return zip_longest(*args, fillvalue=fillvalue) diff --git a/tools/img/header.py b/tools/build/img/header.py similarity index 94% rename from tools/img/header.py rename to tools/build/img/header.py index 9dbc0a1657..452e0758aa 100755 --- a/tools/img/header.py +++ b/tools/build/img/header.py @@ -18,7 +18,7 @@ if __name__ == "__main__": if cname.startswith("src_"): cname = cname[4:] elif cname.startswith("assets_"): - cname = cname[7:] + cname = "_".join(cname.split("_")[2:]) with open(outfile, "w") as f: f.write("// Generated file, do not edit.\n") diff --git a/tools/linux/cc1 b/tools/build/linux/cc1 similarity index 100% rename from tools/linux/cc1 rename to tools/build/linux/cc1 diff --git a/tools/linux/mips-nintendo-nu64-as b/tools/build/linux/mips-nintendo-nu64-as similarity index 100% rename from tools/linux/mips-nintendo-nu64-as rename to tools/build/linux/mips-nintendo-nu64-as diff --git a/tools/mac/cc1 b/tools/build/mac/cc1 similarity index 100% rename from tools/mac/cc1 rename to tools/build/mac/cc1 diff --git a/tools/mac/mips-nintendo-nu64-as b/tools/build/mac/mips-nintendo-nu64-as similarity index 100% rename from tools/mac/mips-nintendo-nu64-as rename to tools/build/mac/mips-nintendo-nu64-as diff --git a/tools/build_assets_bin.py b/tools/build/mapfs/combine.py similarity index 100% rename from tools/build_assets_bin.py rename to tools/build/mapfs/combine.py diff --git a/tools/msg/combine.py b/tools/build/msg/combine.py similarity index 100% rename from tools/msg/combine.py rename to tools/build/msg/combine.py diff --git a/tools/msg/parse_compile.py b/tools/build/msg/parse_compile.py similarity index 54% rename from tools/msg/parse_compile.py rename to tools/build/msg/parse_compile.py index 30239cb18a..92ae3b854e 100755 --- a/tools/msg/parse_compile.py +++ b/tools/build/msg/parse_compile.py @@ -21,45 +21,44 @@ def try_convert_int(s): def parse_command(source): if source[0] != "[": - return None, [], source + return None, [], {}, source source = source[1:] # "[" inside_brackets = "" while source[0] != "]": if source[0] == "\n": - return None, [], source + return None, [], {}, source inside_brackets += source[0] source = source[1:] source = source[1:] # "]" - command, *raw_args = inside_brackets.split(":") + command, *raw_args = inside_brackets.split(" ") - """ args = [] named_args = {} - if "=" in command: - key, value = command.split("=", 1) - command = key - named_args[key] = try_convert_int(value) - - for arg in args: + for arg in raw_args: if "=" in arg: key, value = arg.split("=", 1) - named_args[key.lower()] = try_convert_int(value.lower()) + + if "," in value: + named_args[key.lower()] = [try_convert_int(v) for v in value.lower().split(",")] + else: + named_args[key.lower()] = try_convert_int(value.lower()) else: - args.append(try_convert_int(arg)) - """ + if "," in arg: + args.append([try_convert_int(value) for value in arg.lower().split(",")]) + else: + args.append(try_convert_int(arg.lower())) - args = [] - for arg in raw_args: - args.append(try_convert_int(arg.lower())) + # args = [] + # for arg in raw_args: + # args.append(try_convert_int(arg.lower())) - return command.lower(), args, source + return command.lower(), args, named_args, source def color_to_code(color, style): - """ COLORS = { "diary": { "normal": 0x00, @@ -93,13 +92,11 @@ def color_to_code(color, style): "green": 0x1B, } } - """ - COLORS = {} if type(color) is int: return color - return COLORS.get(ctx, { + return COLORS.get(style, { # [style:left], [style:right] "normal": 0x0A, "red": 0x20, @@ -111,30 +108,6 @@ def color_to_code(color, style): "yellow": 0x26, }).get(color) -def resolve_effect(fx): - if type(fx) is int: - return fx - - FX = { - "jitter": 0x00, - "wavy": 0x01, - "noise": 0x02, - "fadednoise": 0x03, # 1 arg - "unknown": 0x04, - "fadedjitter": 0x05, # 1 arg - "rainbow": 0x06, - "faded": 0x07, # 1 arg - "wavyb": 0x08, - "rainbowb": 0x09, - "shrinking": 0x0a, - "growing": 0x0b, - "sizejitter": 0x0c, - "sizewave": 0x0d, - "dropshadow": 0x0e, - } - - return FX.get(fx) - CHARSET = { #"𝅘𝅥𝅮": 0x00, "!": 0x01, @@ -384,8 +357,10 @@ if __name__ == "__main__": font_stack = [0] sound_stack = [0] color_stack = [0x0A] + fx_stack = [] style = None explicit_end = False + choiceindex = -1 while len(source) > 0: if source[0] == "\r" or source[0] == "\t": @@ -459,7 +434,7 @@ if __name__ == "__main__": source = source[1:] """ else: - command, args, source = parse_command(source) + command, args, named_args, source = parse_command(source) if command: if command == "end": @@ -467,8 +442,6 @@ if __name__ == "__main__": explicit_end = True elif command == "raw": message.bytes += [*args] - #elif command == "func": - # message.bytes += [0xFF, *args] elif command == "br": message.bytes += [0xF0] elif command == "wait": @@ -481,11 +454,11 @@ if __name__ == "__main__": message.bytes += [0xF2, args[0]] elif command == "next": message.bytes += [0xFB] - elif command == "func_04": + elif command == "yield": message.bytes += [0xFF, 0x04] - elif command == "pushcolor": + elif command == "savecolor": message.bytes += [0xFF, 0x24] - elif command == "popcolor": + elif command == "restorecolor": message.bytes += [0xFF, 0x25] elif command == "color": if len(args) != 1: @@ -499,7 +472,7 @@ if __name__ == "__main__": exit(1) message.bytes += [0xFF, 0x05, color] - color_stack.append(color) + #color_stack.append(color) #elif command == "/color": # color_stack.pop() # message.bytes += [0xFF, 0x05, color_stack[0]] @@ -520,35 +493,55 @@ if __name__ == "__main__": elif style == "tattle": message.bytes += [0x04] elif style == "choice": - if len(args) != 4: - print(f"{filename}:{lineno}: 'choice' style requires 4 parameters") + pos = named_args.get("pos") + + if not isinstance(pos, list) or len(pos) != 2: + print(f"{filename}:{lineno}: 'choice' style requires pos=_,_") exit(1) - message.bytes += [0x05, *args] + size = named_args.get("size") + + if not isinstance(size, list) or len(size) != 2: + print(f"{filename}:{lineno}: 'choice' style requires size=_,_") + exit(1) + + message.bytes += [0x05, pos[0], pos[1], size[0], size[1]] elif style == "inspect": message.bytes += [0x06] elif style == "sign": message.bytes += [0x07] elif style == "lamppost": - if len(args) != 1: - print(f"{filename}:{lineno}: 'lamppost' style requires 1 parameter") + height = named_args.get("height") + + if not isinstance(height, int): + print(f"{filename}:{lineno}: 'lamppost' style requires height=_") exit(1) - message.bytes += [0x08, args[0]] + message.bytes += [0x08, height] elif style == "postcard": - if len(args) != 1: - print(f"{filename}:{lineno}: 'lamppost' style requires 1 parameter") + index = named_args.get("index") + + if not isinstance(index, int): + print(f"{filename}:{lineno}: 'postcard' style requires index=_") exit(1) - message.bytes += [0x09, args[0]] + message.bytes += [0x09, index] elif style == "popup": message.bytes += [0x0A] elif style == "upgrade": - if len(args) != 4: - print(f"{filename}:{lineno}: 'upgrade' style requires 4 parameters") + pos = named_args.get("pos") + + if not isinstance(pos, list) or len(pos) != 2: + print(f"{filename}:{lineno}: 'upgrade' style requires pos=_,_") exit(1) - message.bytes += [0x0C, *args] + size = named_args.get("size") + + if not isinstance(size, list) or len(size) != 2: + print(f"{filename}:{lineno}: 'upgrade' style requires size=_,_") + exit(1) + + message.bytes += [0x0C, pos[0], pos[1], size[0], size[1]] elif style == "narrate": message.bytes += [0x0D] elif style == "epilogue": @@ -560,8 +553,10 @@ if __name__ == "__main__": font = args[0] - if font == "normal": + if font == "standard": font = 0 + elif font == "menu": + font = 1 elif font == "title": font = 3 elif font == "subtitle": @@ -572,7 +567,7 @@ if __name__ == "__main__": exit(1) message.bytes += [0xFF, 0x00, font] - font_stack.append(font) + #font_stack.append(font) if font == 3 or font == 4: charset = CHARSET_CREDITS @@ -594,7 +589,7 @@ if __name__ == "__main__": message.bytes += [0xFF, 0x09] elif command == "delayon": message.bytes += [0xFF, 0x0A] - elif command == "kerning": + elif command == "charwidth": if len(args) != 1: print(f"{filename}:{lineno}: {command} command requires 1 parameter") exit(1) @@ -607,19 +602,32 @@ if __name__ == "__main__": message.bytes += [0xFF, 0x0C, args[0]] elif command == "size": + args = args[0] + + if len(args) == 1: + args.append(args[0]) + if len(args) != 2: print(f"{filename}:{lineno}: {command} command requires 2 parameters") exit(1) - message.bytes += [0xFF, 0x0D, *args] + message.bytes += [0xFF, 0x0D, args[0], args[1]] elif command == "sizereset": message.bytes += [0xFF, 0x0E] elif command == "speed": - if len(args) != 2: - print(f"{filename}:{lineno}: {command} command requires 2 parameters") + delay = named_args.get("delay") + + if not isinstance(delay, int): + print(f"{filename}:{lineno}: {command} command requires delay=_") exit(1) - message.bytes += [0xFF, 0x0F, *args] + chars = named_args.get("chars") + + if not isinstance(delay, int): + print(f"{filename}:{lineno}: {command} command requires chars=_") + exit(1) + + message.bytes += [0xFF, 0x0F, delay, chars] # elif command == "pos": # if "y" not in named_args: # print(f"{filename}:{lineno}: pos command requires parameter: y (x is optional)") @@ -629,69 +637,150 @@ if __name__ == "__main__": # message.bytes += [0xFF, 0x10, named_args["x"], named_args["y"]] # else: # message.bytes += [0xFF, 0x11, named_args["y"]] - elif command == "setprintpos": - if len(args) != 2: - print(f"{filename}:{lineno}: {command} command requires 2 parameters") + elif command == "setposx": + if len(args) != 1: + print(f"{filename}:{lineno}: {command} command requires 1 parameter") exit(1) - message.bytes += [0xFF, 0x10, *args] - elif command == "setprinty": + message.bytes += [0xFF, 0x10, args[0] >> 8, args[0] & 0xFF] + elif command == "setposy": if len(args) != 1: print(f"{filename}:{lineno}: {command} command requires 1 parameter") exit(1) message.bytes += [0xFF, 0x11, *args] - elif command == "indent": - if len(args) != 1: - print(f"{filename}:{lineno}: indent command requires 1 parameter") + elif command == "right": + if len(args) == 0: + message.bytes += [0x95] + else: + if len(args) != 1: + print(f"{filename}:{lineno}: {command} command requires 1 parameter") + exit(1) + + message.bytes += [0xFF, 0x12, args[0]] + elif command == "down": + if len(args) == 0: + message.bytes += [0x93] + else: + if len(args) != 1: + print(f"{filename}:{lineno}: {command} command requires 1 parameter") + exit(1) + + message.bytes += [0xFF, 0x13, args[0]] + elif command == "up": + if len(args) == 0: + message.bytes += [0x92] + else: + if len(args) != 1: + print(f"{filename}:{lineno}: {command} command requires 1 parameter") + exit(1) + + message.bytes += [0xFF, 0x14, args[0]] + elif command == "inlineimage": + index = named_args.get("index") + + if not isinstance(index, int): + print(f"{filename}:{lineno}: {command} command requires index=_") exit(1) - message.bytes += [0xFF, 0x12, args[0]] - # elif command == "image": - # if len(args) == 1: - # message.bytes += [0xFF, 0x15, args[0]] - # elif len(args) == 7: - # message.bytes += [0xFF, 0x18, *args] - # else: - # print(f"{filename}:{lineno}: image command requires 1 or 7 parameters") - # exit(1) - elif command == "image1": - if len(args) != 1: - print(f"{filename}:{lineno}: {command} command requires 1 parameters") + message.bytes += [0xFF, 0x15, index] + elif command == "animsprite": + spriteid = named_args.get("spriteid") + raster = named_args.get("raster") + + # TODO: named sprite id and raster + + if not isinstance(spriteid, int): + print(f"{filename}:{lineno}: {command} command requires spriteid=_") + exit(1) + if not isinstance(raster, int): + print(f"{filename}:{lineno}: {command} command requires raster=_") exit(1) - message.bytes += [0xFF, 0x15, *args] - elif command == "image7": - if len(args) != 7: - print(f"{filename}:{lineno}: {command} command requires 7 parameters") + message.bytes += [0xFF, 0x16, spriteid >> 8, spriteid & 0xFF, raster] + elif command == "itemicon": + itemid = named_args.get("itemid") + + # TODO: itemname + + if not isinstance(itemid, int): + print(f"{filename}:{lineno}: {command} command requires itemid=_") exit(1) - message.bytes += [0xFF, 0x18, *args] - elif command == "sprite": - if len(args) != 3: - print(f"{filename}:{lineno}: sprite command requires 3 parameters") + message.bytes += [0xFF, 0x17, itemid >> 8, itemid & 0xFF] + elif command == "image": + index = named_args.get("index") + pos = named_args.get("pos") # xx,y + hasborder = named_args.get("hasborder") + alpha = named_args.get("alpha") + fadeamount = named_args.get("fadeamount") + + if not isinstance(index, int): + print(f"{filename}:{lineno}: {command} command requires index=_") + exit(1) + if not isinstance(pos, list) or len(pos) != 2: + print(f"{filename}:{lineno}: {command} command requires pos=_,_") + exit(1) + if not isinstance(hasborder, int): + print(f"{filename}:{lineno}: {command} command requires hasborder=_") + exit(1) + if not isinstance(alpha, int): + print(f"{filename}:{lineno}: {command} command requires alpha=_") + exit(1) + if not isinstance(fadeamount, int): + print(f"{filename}:{lineno}: {command} command requires fadeamount=_") exit(1) - message.bytes += [0xFF, 0x16, *args] - elif command == "item": - if len(args) != 2: - print(f"{filename}:{lineno}: item command requires 2 parameters") + message.bytes += [0xFF, 0x18, index, pos[0] >> 8, pos[0] & 0xFF, pos[1], hasborder, alpha, fadeamount] + elif command == "hideimage": + fadeamount = named_args.get("fadeamount", 0) + + if not isinstance(fadeamount, int): + print(f"{filename}:{lineno}: {command} command requires fadeamount=_") exit(1) - message.bytes += [0xFF, 0x17, *args] + message.bytes += [0xFF, 0x19, fadeamount] + elif command == "animdelay": + index = named_args.get("index") + delay = named_args.get("delay") + + if not isinstance(index, int): + print(f"{filename}:{lineno}: {command} command requires index=_") + exit(1) + if not isinstance(delay, int): + print(f"{filename}:{lineno}: {command} command requires delay=_") + exit(1) + + message.bytes += [0xFF, 0x1A, 0, index, delay] + elif command == "animloop": + message.bytes += [0xFF, 0x1B, 0, 0] + elif command == "animdone": + message.bytes += [0xFF, 0x1C, 0] + elif command == "setcursorpos": + index = named_args.get("index") + pos = named_args.get("pos") + + if not isinstance(index, int): + print(f"{filename}:{lineno}: {command} command requires index=_") + exit(1) + if not isinstance(pos, list) or len(pos) != 2: + print(f"{filename}:{lineno}: {command} command requires pos=_,_") + exit(1) + + message.bytes += [0xFF, 0x1D, index, pos, pos] elif command == "cursor": if len(args) != 1: print(f"{filename}:{lineno}: cursor command requires 1 parameter") exit(1) message.bytes += [0xFF, 0x1E, *args] - elif command == "option": + elif command == "option" and choiceindex == -1: if len(args) != 1: print(f"{filename}:{lineno}: option command requires 1 parameter") exit(1) message.bytes += [0xFF, 0x21, *args] - elif command == "endchoice": + elif command == "endchoice" and choiceindex == -1: if len(args) != 1: print(f"{filename}:{lineno}: {command} command requires 1 parameter") exit(1) @@ -703,147 +792,221 @@ if __name__ == "__main__": exit(1) message.bytes += [0xFF, 0x20, args[0]] - elif command == "startfx": - message.bytes += [0xFF, 0x26, resolve_effect(args[0]), *args[1:]] - elif command == "endfx": - message.bytes += [0xFF, 0x27, resolve_effect(args[0]), *args[1:]] - # elif command == "shaky": - # message.bytes += [0xFF, 0x26, 0x00] - # elif command == "/shaky": - # message.bytes += [0xFF, 0x27, 0x00] - # elif command == "wavy": - # message.bytes += [0xFF, 0x26, 0x01] - # elif command == "/wavy": - # message.bytes += [0xFF, 0x27, 0x01] - # elif command == "shaky": - # if "opacity" in named_args: - # print(f"{filename}:{lineno}: shaky command doesn't accept parameter 'fade' (hint: did you mean 'faded-shaky'?)") - # exit(1) - # message.bytes += [0xFF, 0x26, 0x00] - # elif command == "/shaky": - # message.bytes += [0xFF, 0x27, 0x00] - # elif command == "noise": - # message.bytes += [0xFF, 0x26, 0x03, named_args.get("fade", 3)] - # elif command == "/noise": - # message.bytes += [0xFF, 0x27, 0x03] - # elif command == "faded-shaky": - # message.bytes += [0xFF, 0x26, 0x05, named_args.get("fade", 5)] - # elif command == "/faded-shaky": - # message.bytes += [0xFF, 0x27, 0x05] - # elif command == "fade": - # message.bytes += [0xFF, 0x26, 0x07, named_args.get("fade", 7)] - # elif command == "/fade": - # message.bytes += [0xFF, 0x27, 0x07] - # elif command == "shout" or command == "shrinking": - # message.bytes += [0xFF, 0x26, 0x0A] - # elif command == "/shout" or command == "/shrinking": - # message.bytes += [0xFF, 0x27, 0x0A] - # elif command == "whisper" or command == "growing": - # message.bytes += [0xFF, 0x26, 0x0B] - # elif command == "/whisper" or command == "/growing": - # message.bytes += [0xFF, 0x27, 0x0B] - # elif command == "scream" or command == "shaky-size": - # message.bytes += [0xFF, 0x26, 0x0C] - # elif command == "/scream" or command == "/shaky-size": - # message.bytes += [0xFF, 0x27, 0x0C] - # elif command == "chortle" or command == "wavy-size": - # message.bytes += [0xFF, 0x26, 0x0D] - # elif command == "/chortle" or command == "/wavy-size": - # message.bytes += [0xFF, 0x27, 0x0D] - # elif command == "shadow": - # message.bytes += [0xFF, 0x26, 0x0E] - # elif command == "/shadow": - # message.bytes += [0xFF, 0x27, 0x0E] + # elif command == "startfx": + # message.bytes += [0xFF, 0x26, resolve_effect(args[0]), *args[1:]] + # elif command == "endfx": + # message.bytes += [0xFF, 0x27, resolve_effect(args[0]), *args[1:]] + elif command == "/fx": + message.bytes += [0xFF, 0x27, fx_stack.pop()] + elif command == "shake": + fx_stack.append(0x00) + message.bytes += [0xFF, 0x26, 0x00] + elif command == "/shake": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x00] + elif command == "wave": + fx_stack.append(0x01) + message.bytes += [0xFF, 0x26, 0x01] + elif command == "/wave": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x01] + elif command == "noiseoutline": + fx_stack.append(0x02) + message.bytes += [0xFF, 0x26, 0x02] + elif command == "/noiseoutline": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x02] + elif command == "static": + if len(args) != 1: + print(f"{filename}:{lineno}: {command} command requires 1 parameter") + exit(1) + + fx_stack.append(0x03) + message.bytes += [0xFF, 0x26, 0x03, args[0]] + elif command == "/static": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x03] + elif command == "blur": + _dir = named_args.get("dir") + + if _dir == "x": + _dir = 0 + elif _dir == "y": + _dir = 1 + elif _dir == "xy": + _dir = 2 + + if not isinstance(_dir, int): + print(f"{filename}:{lineno}: {command} command requires dir=_") + exit(1) + + fx_stack.append(0x05) + message.bytes += [0xFF, 0x26, 0x05, _dir] + elif command == "/blur": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x05] + elif command == "rainbow": + fx_stack.append(0x06) + message.bytes += [0xFF, 0x27, 0x06] + elif command == "/rainbow": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x06] + elif command == "ditherfade": + if len(args) != 1: + print(f"{filename}:{lineno}: {command} command requires 1 parameter") + exit(1) + + fx_stack.append(0x07) + message.bytes += [0xFF, 0x26, 0x07, args[0]] + elif command == "/ditherfade": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x07] + elif command == "printrising": + fx_stack.append(0x0A) + message.bytes += [0xFF, 0x26, 0x0A] + elif command == "/printrising": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x0A] + elif command == "printgrowing": + fx_stack.append(0x0B) + message.bytes += [0xFF, 0x26, 0x0B] + elif command == "/printgrowing": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x0B] + elif command == "sizejitter": + fx_stack.append(0x0C) + message.bytes += [0xFF, 0x26, 0x0C] + elif command == "/sizejitter": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x0C] + elif command == "sizewave": + fx_stack.append(0x0D) + message.bytes += [0xFF, 0x26, 0x0D] + elif command == "/sizewave": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x0D] + elif command == "dropshadow": + fx_stack.append(0x0E) + message.bytes += [0xFF, 0x26, 0x0E] + elif command == "/dropshadow": + fx_stack.pop() + message.bytes += [0xFF, 0x27, 0x0E] elif command == "var": if len(args) != 1: print(f"{filename}:{lineno}: var command requires 1 parameter") exit(1) message.bytes += [0xFF, 0x28, *args] - elif command == "func_29": + elif command == "centerx": if len(args) != 1: print(f"{filename}:{lineno}: {command} command requires 1 parameter") exit(1) message.bytes += [0xFF, 0x29, *args] + elif command == "rewindoff": + message.bytes += [0xFF, 0x2A, 0] + elif command == "rewindon": + message.bytes += [0xFF, 0x2A, 1] + elif command == "customvoice": + soundids = named_args.get("soundids") + + if not isinstance(soundids, list) or len(pos) != 2: + print(f"{filename}:{lineno}: {command} command requires soundids=_,_") + exit(1) + + message.bytes += [ + 0xFF, 0x2C, + soundids[0] >> 24, (soundids[0] >> 16) & 0xFF, (soundids[0] >> 8) & 0xFF, soundids[0] & 0xFF, + soundids[1] >> 24, (soundids[1] >> 16) & 0xFF, (soundids[1] >> 8) & 0xFF, soundids[1] & 0xFF, + ] elif command == "volume": if len(args) != 1: print(f"{filename}:{lineno}: {command} command requires 1 parameter") exit(1) message.bytes += [0xFF, 0x2E, *args] - elif command == "speechsound": + elif command == "voice": if len(args) != 1: print(f"{filename}:{lineno}: {command} command requires 1 parameter") exit(1) sound = args[0] - # if sound == "normal": - # sound = 0 - # elif sound == "bowser": - # sound = 1 - # elif sound == "star": - # sound = 2 + if sound == "normal": + sound = 0 + elif sound == "bowser": + sound = 1 + elif sound == "star" or sound == "spirit": + sound = 2 if type(sound) is not int: - print(f"{filename}:{lineno}: unknown sound '{sound}'") + print(f"{filename}:{lineno}: unknown voice '{sound}'") exit(1) message.bytes += [0xFF, 0x2F, sound] - sound_stack.append(sound) + #sound_stack.append(sound) # elif command == "/sound": # sound_stack.pop() # message.bytes += [0xFF, 0x2F, sound_stack[0]] - # elif command == "a": - # color_code = color_to_code(named_args.get("color", "blue"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x98, 0xFF, 0x25] - # elif command == "b": - # color_code = color_to_code(named_args.get("color", "green"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x99, 0xFF, 0x25] - # elif command == "l": - # color_code = color_to_code(named_args.get("color", "gray"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9A, 0xFF, 0x25] - # elif command == "r": - # color_code = color_to_code(named_args.get("color", "gray"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9B, 0xFF, 0x25] - # elif command == "z": - # color_code = color_to_code(named_args.get("color", "gray"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9C, 0xFF, 0x25] - # elif command == "c-up": - # color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9D, 0xFF, 0x25] - # elif command == "c-down": - # color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9E, 0xFF, 0x25] - # elif command == "c-left": - # color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9F, 0xFF, 0x25] - # elif command == "c-right": - # color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0xA0, 0xFF, 0x25] - # elif command == "start": - # color_code = color_to_code(named_args.get("color", "red"), named_args.get("ctx", "button")) - # message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0xA1, 0xFF, 0x25] elif command == "a": - message.bytes += [0x98] + color_code = color_to_code("blue", "button") + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x98, 0xFF, 0x25] elif command == "b": - message.bytes += [0x99] + color_code = color_to_code(named_args.get("color", "green"), named_args.get("ctx", "button")) + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x99, 0xFF, 0x25] elif command == "l": - message.bytes += [0x9a] + color_code = color_to_code(named_args.get("color", "gray"), named_args.get("ctx", "button")) + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9A, 0xFF, 0x25] elif command == "r": - message.bytes += [0x9b] + color_code = color_to_code(named_args.get("color", "gray"), named_args.get("ctx", "button")) + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9B, 0xFF, 0x25] elif command == "z": - message.bytes += [0x9c] + color_code = color_to_code("grey", "button") + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9C, 0xFF, 0x25] elif command == "c-up": - message.bytes += [0x9d] + color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9D, 0xFF, 0x25] elif command == "c-down": - message.bytes += [0x9e] + color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9E, 0xFF, 0x25] elif command == "c-left": - message.bytes += [0x9f] + color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0x9F, 0xFF, 0x25] elif command == "c-right": - message.bytes += [0xa0] + color_code = color_to_code(named_args.get("color", "yellow"), named_args.get("ctx", "button")) + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0xA0, 0xFF, 0x25] elif command == "start": + color_code = color_to_code(named_args.get("color", "red"), named_args.get("ctx", "button"))# + assert color_code is not None + message.bytes += [0xFF, 0x24, 0xFF, 0x05, color_code, 0xA1, 0xFF, 0x25] + elif command == "~a": + message.bytes += [0x98] + elif command == "~b": + message.bytes += [0x99] + elif command == "~l": + message.bytes += [0x9a] + elif command == "~r": + message.bytes += [0x9b] + elif command == "~z": + message.bytes += [0x9c] + elif command == "~c-up": + message.bytes += [0x9d] + elif command == "~c-down": + message.bytes += [0x9e] + elif command == "~c-left": + message.bytes += [0x9f] + elif command == "~c-right": + message.bytes += [0xa0] + elif command == "~start": message.bytes += [0xa1] elif command == "note": message.bytes += [0x00] @@ -851,54 +1014,41 @@ if __name__ == "__main__": message.bytes += [0x90] elif command == "star": message.bytes += [0x91] - elif command == "up": - if len(args) == 1: - message.bytes += [0xFF, 0x14, args[0]] - else: - message.bytes += [0x92] - elif command == "down": - if len(args) == 1: - message.bytes += [0xFF, 0x13, args[0]] - else: - message.bytes += [0x93] elif command == "left": message.bytes += [0x94] - elif command == "right": - message.bytes += [0x95] elif command == "circle": message.bytes += [0x96] elif command == "cross": message.bytes += [0x97] - # elif command == "wait": - # print(f"{filename}:{lineno}: unknown command 'wait' (hint: did you mean 'prompt'?)") - # exit(1) - # elif command == "pause": - # print(f"{filename}:{lineno}: unknown command 'pause' (hint: did you mean 'sleep'?)") - # exit(1) - elif command == "func_1a": - if len(args) != 3: - print(f"{filename}:{lineno}: {command} command requires 3 parameters") - exit(1) - - message.bytes += [0xFF, 0x1A, *args] - elif command == "func_1b": - if len(args) != 2: - print(f"{filename}:{lineno}: {command} command requires 2 parameters") - exit(1) - - message.bytes += [0xFF, 0x1B, *args] - elif command == "func_1c": - if len(args) != 1: - print(f"{filename}:{lineno}: {command} command requires 1 parameter") - exit(1) - - message.bytes += [0xFF, 0x1C, *args] - elif command == "startanim": + elif command == "savepos": message.bytes += [0xFF, 0x22] - elif command == "endanim": + elif command == "restorepos": message.bytes += [0xFF, 0x23] - elif command == "func_2b": + elif command == "enablecdownnext": message.bytes += [0xFF, 0x2b] + elif command == "beginchoice": + choiceindex = 0 + message.bytes += [0xFF, 0x09] # delayoff + elif command == "option" and choiceindex >= 0: + message.bytes += [0xFF, 0x1E, choiceindex] # cursor n + message.bytes += [0xFF, 0x21, choiceindex] # option n + choiceindex += 1 + elif command == "endchoice" and choiceindex >= 0: + cancel = named_args.get("cancel") + + message.bytes += [0xFF, 0x21, 255] # option 255 + message.bytes += [0xFF, 0x0A] # delayon + + if isinstance(cancel, int): + message.bytes += [0xFF, 0x20, cancel] # setcancel n + + message.bytes += [0xFF, 0x1F, choiceindex] # endchoice n + + choiceindex = -1 + elif command == "animation" and choiceindex >= 0: + # TODO + print(f"{filename}:{lineno}: '{command}' tag is not yet implemented") + exit(1) else: print(f"{filename}:{lineno}: unknown command '{command}'") exit(1) @@ -909,6 +1059,11 @@ if __name__ == "__main__": #message.bytes += [0xFD] explicit_end = False + # sanity check + for b in message.bytes: + if not isinstance(b, int): + print(b) + # padding while len(message.bytes) % 4 != 0: message.bytes += [0x00] @@ -916,6 +1071,7 @@ if __name__ == "__main__": message = None source = source[1:] # } indent_level = 0 + choiceindex = -1 continue if source[0] == "\\": @@ -935,7 +1091,7 @@ if __name__ == "__main__": exit(1) if message != None: - print(f"{filename}: missing [/message]") + print(f"{filename}: missing [end]") exit(1) with open(outfile, "wb") as f: diff --git a/tools/build/rom/.gitignore b/tools/build/rom/.gitignore new file mode 100644 index 0000000000..921fc41b78 --- /dev/null +++ b/tools/build/rom/.gitignore @@ -0,0 +1 @@ +n64crc diff --git a/tools/n64crc.c b/tools/build/rom/n64crc.c similarity index 100% rename from tools/n64crc.c rename to tools/build/rom/n64crc.c diff --git a/tools/compile_npc_sprites.py b/tools/build/sprites/combine.py similarity index 100% rename from tools/compile_npc_sprites.py rename to tools/build/sprites/combine.py diff --git a/tools/gen_sprite_animations_h.py b/tools/build/sprites/header.py similarity index 87% rename from tools/gen_sprite_animations_h.py rename to tools/build/sprites/header.py index 77d7f3c72b..4d0808bcaa 100755 --- a/tools/gen_sprite_animations_h.py +++ b/tools/build/sprites/header.py @@ -2,9 +2,9 @@ from sys import argv, path from pathlib import Path -import os -path.append(os.path.join(os.path.dirname(__file__), "splat")) -from splat_ext.PaperMarioNpcSprites import Sprite +path.append(str(Path(__file__).parent.parent.parent / "splat")) +path.append(str(Path(__file__).parent.parent.parent / "splat_ext")) +from PaperMarioNpcSprites import Sprite if __name__ == "__main__": if len(argv) < 4: diff --git a/tools/compile_npc_sprite.py b/tools/build/sprites/sprite.py similarity index 86% rename from tools/compile_npc_sprite.py rename to tools/build/sprites/sprite.py index 2b65ff44ed..7bba7a2fff 100755 --- a/tools/compile_npc_sprite.py +++ b/tools/build/sprites/sprite.py @@ -1,11 +1,28 @@ #! /usr/bin/python3 +from math import floor, ceil from sys import argv, path from pathlib import Path -import os -path.append(os.path.join(os.path.dirname(__file__), "splat")) -from splat_ext.PaperMarioNpcSprites import Sprite -from img.build import pack_color, iter_in_groups +path.append(str(Path(__file__).parent.parent.parent / "splat")) +path.append(str(Path(__file__).parent.parent.parent / "splat_ext")) +from PaperMarioNpcSprites import Sprite + +def pack_color(r, g, b, a): + r = floor(31 * (r / 255)) + g = floor(31 * (g / 255)) + b = floor(31 * (b / 255)) + + s = round(a / 0xFF) + s |= (r & 0x1F) << 11 + s |= (g & 0x1F) << 6 + s |= (b & 0x1F) << 1 + + return s + +def iter_in_groups(iterable, n, fillvalue=None): + from itertools import zip_longest + args = [iter(iterable)] * n + return zip_longest(*args, fillvalue=fillvalue) if __name__ == "__main__": if len(argv) != 3: diff --git a/tools/build/yay0/.gitignore b/tools/build/yay0/.gitignore new file mode 100644 index 0000000000..7326e0559c --- /dev/null +++ b/tools/build/yay0/.gitignore @@ -0,0 +1 @@ +Yay0compress diff --git a/tools/Yay0compress.c b/tools/build/yay0/Yay0compress.c similarity index 100% rename from tools/Yay0compress.c rename to tools/build/yay0/Yay0compress.c diff --git a/tools/splat/.gitignore b/tools/splat/.gitignore index 90f0ad8ea3..d3c5510c6b 100644 --- a/tools/splat/.gitignore +++ b/tools/splat/.gitignore @@ -2,4 +2,5 @@ venv/ .vscode/ __pycache__/ +.mypy_cache/ util/n64/Yay0decompress diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo index 637874fd3b..8132b59447 100644 --- a/tools/splat/.gitrepo +++ b/tools/splat/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = https://github.com/ethteck/splat.git branch = master - commit = 4be92a4786c0f23075b225b3e198d1553d111146 - parent = 9d544b15d0d9956760c10884d917ee739d5b1fb8 + commit = a44631e1941e8451897bc93faad8c8d6a45ea696 + parent = ba8528bb245492473d6290c9c16f7fa55d0593f1 method = merge cmdver = 0.4.3 diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md index a6a35ac34d..b991375fff 100644 --- a/tools/splat/CHANGELOG.md +++ b/tools/splat/CHANGELOG.md @@ -1,15 +1,56 @@ # splat Release Notes -## 0.5 -* n64splat name changed to splat - * Some refactoring was done to support other platforms besides n64 in the future - * New `platform` option, which defaults to `n64` - * This will cause breaking changes in custom segments, so please refer to one of the changes in one of the n64 base segments for details -* Support for custom artifact paths - * New `undefined_syms_auto_path` option - * New `undefined_funcs_auto_path` option - * New `cache_path` option - * (All path-like options' names now end with `_path`) +## 0.7: The Path Update + +* Significantly better performance, especially when using the cache feature (`--use-cache` CLI arg). +* BREAKING: Some cli args for splat have been renamed. Please consult the usage output (-h or no args) for more information. + * `--new` has been renamed to `--use-cache` + * `--modes` arg changes: + * Image modes have been combined into the `img` mode + * Code and ASM modes have been combined into the `code` mode +* BREAKING: The `name` attribute of a segment now should no longer be a subdirectory but rather a meaningful name for the segment which will be used as the name of the linker section. If your `name` was previously a directory, please change it into a `dir`. +* BREAKING: `subsections` has been renamed to `subsegments` +* New `dir` segment attribute specifies a subdirectory into which files will be saved. You can combine `dir` ("foo") with a subsection file name containing a subdirectory ("bar/out"), and the paths will be joined (foo/bar/out.c) + * If the `dir` attribute is specified but the `name` isn't, the `name` becomes `dir` with directory separation slashes replaced with underscores (foo/bar/baz -> foo_bar_baz) +* BREAKING: Many configuration options have been renamed. `_dir` options have been changed to the suffix `_path`. +* BREAKING: Assets (non-code, like `bin` and images) are now placed in the directory `asset_path` (defaults to `assets`). +* Linker symbol header generation. Set the `linker_symbol_header_path` option to use. + * `typedef u8[] Addr;` is recommended in your `common.h` header. +* You can now provide `auto` as the `start` attribute for a segment, e.g. `[auto, c, my_file]`. This causes the segment to not be extracted, but linked. This feature is intended for modding. +* Providing just a ROM address but no type or name for a segment is now valid anywhere in `segments` or `subsegments` rather than just at the end of the ROM. It specifies the end of the previous segment for types that need it (`palette`, `bin`, `Yay0`) and causes the linker to simply write padding until that address. +* The linker script file is left untouched if the contents have not changed since the previous split. +* You can now group together segments with `type: group` (similar to `code`). Note that any ASM or C segments must live under a `type: code` segment, not a basic `group`. + +### 0.6.5: Bugfixes, rodata migration, and made options static + +If you wrote a custom extension, options should be imported and statically referenced +`from util import options` + +see options.py for more info on how to now get and set options + +BREAKING: vram can only be specified on a segment if the segment is defined as a dict in the config + +### 0.6.3: More refactoring +**Breaking Change**: The command line args to split.py have changed. Currently, only the config path is now a required argument to splat. The old `rom` and `outdir` parameters are now optional (`--rom`, `--outdir`). Now, you can add rom and out directory paths in the yaml. + +The `out_dir` option specifies a directory relative to the config file. If your config file is in a subdirectory of the main repo, you can set `out_dir: ../`, for example. + +The `target_path` option spcifies a path to the binary file to split, relative to the `out_dir`. If your `baserom.z64` is in the top-level of the repo, you can set `target_path: baserom.z64`, for example. + +### 0.6.2: subsegments +I've begun a refactor of the code "files" code, which makes everything cleaner and easier to extend. +There's also a new option, `create_new_c_files`, which disables the creation of nonexistent c files. This behavior is on by default, but if you want to disable it for any reason, you now have the option to do so. + +I am also working on adding bss support as well. It should almost be all set, aside from the changes needed in the linker script. + +**Breaking change**: The `files` field in `code` segments should now be renamed to `subsegments`. + +### 0.6.1: `assets_dir` option + +This release adds a new `assets_dir` option in `splat.yaml`s that allows you to override the default `img`, `bin`, and other directories that segments output to. + +Want to interdisperse split assets with your sourcecode? `assets_dir: src`! +Want to have all assets live in a single directory? `assets_dir: assets`! ## 0.6: The Symbol Update Internally, there's a new Symbol class which stores information about a symbol and is stored in a couple places during disassembly. Many things should be improved, such as reconciling symbols within overlays, things being named functions vs data symbols, and more. @@ -23,33 +64,13 @@ Internally, there's a new Symbol class which stores information about a symbol a **data example**: `gSomeDataVar = 0x80024233; // type:data size:0x100` -### 0.6.1: `assets_dir` option - -This release adds a new `assets_dir` option in `splat.yaml`s that allows you to override the default `img`, `bin`, and other directories that segments output to. - -Want to interdisperse split assets with your sourcecode? `assets_dir: src`! -Want to have all assets live in a single directory? `assets_dir: assets`! - -### 0.6.2: Subsections -I've begun a refactor of the code "files" code, which makes everything cleaner and easier to extend. -There's also a new option, `create_new_c_files`, which disables the creation of nonexistent c files. This behavior is on by default, but if you want to disable it for any reason, you now have the option to do so. - -I am also working on adding bss support as well. It should almost be all set, aside from the changes needed in the linker script. - -**Breaking change**: The `files` field in `code` segments should now be renamed to `subsections`. - -### 0.6.3: More refactoring -**Breaking Change**: The command line args to split.py have changed. Currently, only the config path is now a required argument to splat. The old `rom` and `outdir` parameters are now optional (`--rom`, `--outdir`). Now, you can add rom and out directory paths in the yaml. - -The `out_dir` option specifies a directory relative to the config file. If your config file is in a subdirectory of the main repo, you can set `out_dir: ../`, for example. - -The `target_path` option spcifies a path to the binary file to split, relative to the `out_dir`. If your `baserom.z64` is in the top-level of the repo, you can set `target_path: baserom.z64`, for example. - -### 0.6.5: Bugfixes, rodata migration, and made options static - -If you wrote a custom extension, options should be imported and statically referenced -`from util import options` - -see options.py for more info on how to now get and set options - -BREAKING: vram can only be specified on a segment if the segment is defined as a dict in the config \ No newline at end of file +## 0.5 The Rename Update +* n64splat name changed to splat + * Some refactoring was done to support other platforms besides n64 in the future + * New `platform` option, which defaults to `n64` + * This will cause breaking changes in custom segments, so please refer to one of the changes in one of the n64 base segments for details +* Support for custom artifact paths + * New `undefined_syms_auto_path` option + * New `undefined_funcs_auto_path` option + * New `cache_path` option + * (All path-like options' names now end with `_path`) diff --git a/tools/splat/create_config.py b/tools/splat/create_config.py index 02db313a86..f4f60f92aa 100755 --- a/tools/splat/create_config.py +++ b/tools/splat/create_config.py @@ -3,7 +3,6 @@ import argparse from util.n64 import rominfo from util.n64 import find_code_length -from segtypes.n64.code import N64SegCode parser = argparse.ArgumentParser(description="Create a splat config from a rom (currently only n64 .z64 roms supported)") parser.add_argument("rom", help="path to a .z64 rom") @@ -20,7 +19,7 @@ options: find_file_boundaries: True compiler: IDO platform: n64 - out_dir: . + base_dir: . target_path: baserom.z64 """.format(rom.name.title(), rom.get_country_name(), basename) @@ -41,7 +40,7 @@ options: type: code start: 0x1000 vram: 0x{:X} - subsections: + subsegments: - [0x1000, asm] - type: bin start: 0x{:X} diff --git a/tools/splat/list_objects.py b/tools/splat/list_objects.py deleted file mode 100644 index 53a5bf8a85..0000000000 --- a/tools/splat/list_objects.py +++ /dev/null @@ -1,33 +0,0 @@ -#! /usr/bin/python3 - -import argparse -import yaml -from pathlib import PurePath -from util import options - -from split import initialize_segments - -parser = argparse.ArgumentParser(description="List output objects for linker script") -parser.add_argument("config", help="path to a compatible config .yaml file") - -def main(config_path): - # Load config - with open(config_path) as f: - config = yaml.safe_load(f.read()) - - options.initialize(config) - replace_ext = options.get("ld_o_replace_extension", True) - - # Initialize segments - all_segments = initialize_segments(options, config_path, config["segments"]) - - for segment in all_segments: - for subdir, path, obj_type, start in segment.get_ld_files(): - path = PurePath(subdir) / PurePath(path) - path = path.with_suffix(".o" if replace_ext else path.suffix + ".o") - - print(path) - -if __name__ == "__main__": - args = parser.parse_args() - main(args.config) diff --git a/tools/splat/mypy.ini b/tools/splat/mypy.ini new file mode 100644 index 0000000000..fdf05957c3 --- /dev/null +++ b/tools/splat/mypy.ini @@ -0,0 +1,3 @@ +[mypy] +ignore_missing_imports = True +mypy_path = stubs \ No newline at end of file diff --git a/tools/splat/requirements.txt b/tools/splat/requirements.txt index 1a273b575c..58180b1fc0 100644 --- a/tools/splat/requirements.txt +++ b/tools/splat/requirements.txt @@ -1,4 +1,5 @@ -PyYAML>=5.3.1,<6 -pypng==0.0.20 -colorama>=0.4.4,<0.5 -capstone>=4.0.2,<5 +PyYAML +pylibyaml +pypng +colorama +capstone diff --git a/tools/splat/segtypes/address_range.py b/tools/splat/segtypes/address_range.py new file mode 100644 index 0000000000..e1bf995636 --- /dev/null +++ b/tools/splat/segtypes/address_range.py @@ -0,0 +1,9 @@ +from dataclasses import dataclass + +@dataclass +class AddressRange: + start: int + end: int + + def contains(self, addr: int) -> bool: + return self.start <= addr < self.end \ No newline at end of file diff --git a/tools/splat/segtypes/linker_entry.py b/tools/splat/segtypes/linker_entry.py new file mode 100644 index 0000000000..9b28ef83d6 --- /dev/null +++ b/tools/splat/segtypes/linker_entry.py @@ -0,0 +1,172 @@ +from typing import Union, List +from pathlib import Path +from util import options +from segtypes.segment import Segment +import re + +# clean 'foo/../bar' to 'bar' +def clean_up_path(path: Path) -> Path: + return path.resolve().relative_to(options.get_base_path().resolve()) + +def path_to_object_path(path: Path) -> Path: + path = options.get_build_path() / path.with_suffix(path.suffix + ".o").relative_to(options.get_base_path()) + return clean_up_path(path) + +def write_file_if_different(path: Path, new_content: str): + if path.exists(): + old_content = path.read_text() + else: + old_content = "" + + if old_content != new_content: + path.parent.mkdir(parents=True, exist_ok=True) + with path.open("w") as f: + f.write(new_content) + +def to_cname(symbol: str) -> str: + symbol = re.sub(r"[^0-9a-zA-Z_]", "_", symbol) + + if symbol[0] in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']: + symbol = "_" + symbol + + return symbol + +class LinkerEntry: + def __init__(self, segment: Segment, src_paths: List[Path], object_path: Path, section: str): + self.segment = segment + self.src_paths = [clean_up_path(p) for p in src_paths] + self.object_path = path_to_object_path(object_path) + self.section = section + +class LinkerWriter(): + def __init__(self): + self.shiftable: bool = options.get("shiftable", False) + self.entries: List[LinkerEntry] = [] + + self.buffer: List[str] = [] + self.symbols: List[str] = [] + + self._indent_level = 0 + + self._writeln("SECTIONS") + self._begin_block() + + def add(self, segment: Segment): + entries = segment.get_linker_entries() + self.entries.extend(entries) + + self._begin_segment(segment) + + do_next = False + for i, entry in enumerate(entries): + if entry.section == "linker": # TODO: isinstance is preferable + self._end_block() + self._begin_segment(entry.segment) + + start = entry.segment.rom_start + if isinstance(start, int): + # Create new sections for non-0x10 alignment (hack) + if start % 0x10 != 0 and i != 0 or do_next: + self._end_block() + self._begin_segment(entry.segment) + do_next = False + + if start % 0x10 != 0 and i != 0: + do_next = True + + path_cname = re.sub(r"[^0-9a-zA-Z_]", "_", str(entry.segment.dir / entry.segment.name) + ".".join(entry.object_path.suffixes[:-1])) + self._write_symbol(path_cname, ".") + + if entry.section != "linker": + self._writeln(f"{entry.object_path}({entry.section});") + + self._end_segment(segment) + + def save_linker_script(self): + self._writeln("/DISCARD/ :") + self._begin_block() + self._writeln("*(*);") + self._end_block() + + self._end_block() # SECTIONS + + assert self._indent_level == 0 + + write_file_if_different(options.get_ld_script_path(), "\n".join(self.buffer) + "\n") + + def save_symbol_header(self): + path = options.get_linker_symbol_header_path() + + if path: + write_file_if_different(path, + "#ifndef _HEADER_SYMBOLS_H_\n" + "#define _HEADER_SYMBOLS_H_\n" + "\n" + "#include \"common.h\"\n" + "\n" + + "".join(f"extern Addr {symbol};\n" for symbol in self.symbols) + + "\n" + "#endif\n" + ) + + def _writeln(self, line: str): + if len(line) == 0: + self.buffer.append(line) + else: + self.buffer.append(" " * self._indent_level + line) + + def _begin_block(self): + self._writeln("{") + self._indent_level += 1 + + def _end_block(self): + self._indent_level -= 1 + self._writeln("}") + + def _write_symbol(self, symbol: str, value: Union[str, int]): + import re + + symbol = to_cname(symbol) + + if isinstance(value, int): + value = f"0x{value:X}" + + self._writeln(f"{symbol} = {value};") + self.symbols.append(symbol) + + def _begin_segment(self, segment: Segment): + # force location if not shiftable/auto + if not self.shiftable and isinstance(segment.rom_start, int): + self._writeln(f". = 0x{segment.rom_start:X};") + else: + # align + self._writeln(f". = ALIGN(0x10);") + + vram = segment.vram_start + vram_str = f"0x{vram:X}" if isinstance(vram, int) else "" + + if segment.parent: + name = to_cname(segment.parent.name + "_" + segment.name) + else: + name = to_cname(segment.name) + + self._write_symbol(f"{name}_ROM_START", ".") + self._write_symbol(f"{name}_VRAM", f"ADDR(.{name})") + self._writeln(f".{name} {vram_str} : AT({name}_ROM_START) SUBALIGN({segment.subalign})") + self._begin_block() + + def _end_segment(self, segment: Segment): + self._end_block() + + if segment.parent: + name = to_cname(segment.parent.name + "_" + segment.name) + else: + name = to_cname(segment.name) + + # force end if not shiftable/auto + if not self.shiftable and isinstance(segment.rom_start, int) and isinstance(segment.rom_end, int): + self._write_symbol(f"{to_cname(name)}_ROM_END", segment.rom_end) + else: + self._write_symbol(f"{to_cname(name)}_ROM_END", ".") + + self._writeln("") diff --git a/tools/splat/segtypes/n64/Yay0.py b/tools/splat/segtypes/n64/Yay0.py index db759dfdf6..b263813666 100644 --- a/tools/splat/segtypes/n64/Yay0.py +++ b/tools/splat/segtypes/n64/Yay0.py @@ -1,25 +1,31 @@ -import os from segtypes.n64.segment import N64Segment from util.n64 import Yay0decompress from util import options +from util import log class N64SegYay0(N64Segment): - def split(self, rom_bytes, base_path): - out_dir = self.create_parent_dir(os.path.join(base_path, options.get("assets_dir", "bin")), self.name) + def split(self, rom_bytes): + out_dir = options.get_asset_path() / self.dir + out_dir.mkdir(parents=True, exist_ok=True) - path = os.path.join(out_dir, os.path.basename(self.name) + ".bin") - with open(path, "wb") as f: + if self.rom_end == "auto": + log.error(f"segment {self.name} needs to know where it ends; add a position marker [0xDEADBEEF] after it") + + out_path = out_dir / f"{self.name}.bin" + with open(out_path, "wb") as f: self.log(f"Decompressing {self.name}...") compressed_bytes = rom_bytes[self.rom_start : self.rom_end] decompressed_bytes = Yay0decompress.decompress_yay0(compressed_bytes) f.write(decompressed_bytes) - self.log(f"Wrote {self.name} to {path}") + self.log(f"Wrote {self.name} to {out_path}") - def get_ld_files(self): - return [(options.get("assets_dir", "bin"), f"{self.name}.Yay0", ".data", self.rom_start)] + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry - - @staticmethod - def get_default_name(addr): - return "Yay0/{:X}".format(addr) + return [LinkerEntry( + self, + [options.get_asset_path() / self.dir / f"{self.name}.bin"], + options.get_asset_path() / self.dir / f"{self.name}.Yay0", + self.get_linker_section() + )] diff --git a/tools/splat/segtypes/n64/asm.py b/tools/splat/segtypes/n64/asm.py new file mode 100644 index 0000000000..3030d50741 --- /dev/null +++ b/tools/splat/segtypes/n64/asm.py @@ -0,0 +1,47 @@ +from segtypes.n64.codesubsegment import N64SegCodeSubsegment +from typing import Optional +from pathlib import Path + +from util import options + + +class N64SegAsm(N64SegCodeSubsegment): + def out_path(self) -> Optional[Path]: + return options.get_asm_path() / self.dir / f"{self.name}.s" + + @staticmethod + def get_file_header(): + ret = [] + + ret.append(".include \"macro.inc\"") + ret.append("") + ret.append("# assembler directives") + ret.append(".set noat # allow manual use of $at") + ret.append(".set noreorder # don't insert nops after branches") + ret.append(".set gp=64 # allow use of 64-bit general purpose registers") + ret.append("") + ret.append(".section .text, \"ax\"") + ret.append("") + + return ret + + def scan(self, rom_bytes: bytes): + if self.rom_start != "auto" and self.rom_end != "auto" and self.rom_start != self.rom_end: + self.funcs_text = self.disassemble_code(rom_bytes) + + def split(self, rom_bytes: bytes): + if not self.rom_start == self.rom_end: + out_path = self.out_path() + if out_path: + out_path.parent.mkdir(parents=True, exist_ok=True) + + out_lines = self.get_file_header() + for func in self.funcs_text: + out_lines.extend(self.funcs_text[func][0]) + out_lines.append("") + + self.split_write(out_path, out_lines) + + def split_write(self, out_path, out_lines): + with open(out_path, "w", newline="\n") as f: + f.write("\n".join(out_lines)) diff --git a/tools/splat/segtypes/n64/bin.py b/tools/splat/segtypes/n64/bin.py index b655ef3e78..ba27a0d91b 100644 --- a/tools/splat/segtypes/n64/bin.py +++ b/tools/splat/segtypes/n64/bin.py @@ -1,22 +1,20 @@ -import os -from segtypes.n64.segment import N64Segment from pathlib import Path -from segtypes.segment import Segment +from typing import Optional +from segtypes.n64.segment import N64Segment from util import options +from util import log class N64SegBin(N64Segment): - def split(self, rom_bytes, base_path): - out_dir = Segment.create_split_dir(base_path, options.get("assets_dir", "bin")) + def out_path(self) -> Optional[Path]: + return options.get_asset_path() / self.dir / f"{self.name}.bin" + + def split(self, rom_bytes): + path = self.out_path() + path.parent.mkdir(parents=True, exist_ok=True) - bin_path = os.path.join(out_dir, self.name + ".bin") - Path(bin_path).parent.mkdir(parents=True, exist_ok=True) - with open(bin_path, "wb") as f: - f.write(rom_bytes[self.rom_start: self.rom_end]) - self.log(f"Wrote {self.name} to {bin_path}") + if self.rom_end == "auto": + log.error(f"segment {self.name} needs to know where it ends; add a position marker [0xDEADBEEF] after it") - def get_ld_files(self): - return [(options.get("assets_dir", "bin"), f"{self.name}.bin", ".data", self.rom_start)] - - @staticmethod - def get_default_name(addr): - return "bin_{:X}".format(addr) + with open(path, "wb") as f: + f.write(rom_bytes[self.rom_start : self.rom_end]) + self.log(f"Wrote {self.name} to {path}") diff --git a/tools/splat/segtypes/n64/bss.py b/tools/splat/segtypes/n64/bss.py new file mode 100644 index 0000000000..2606ce7812 --- /dev/null +++ b/tools/splat/segtypes/n64/bss.py @@ -0,0 +1,22 @@ +from segtypes.n64.data import N64SegData +from util import log + +class N64SegBss(N64SegData): + def get_linker_section(self) -> str: + return ".bss" + + def scan(self, rom_bytes: bytes): + pass + + def split(self, rom_bytes: bytes): + pass + + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry + + if self.sibling: + path = self.sibling.out_path() + else: + log.error("Unlinked bss sections currently unsupported") + + return [LinkerEntry(self, [path], path, self.get_linker_section())] diff --git a/tools/splat/segtypes/n64/c.py b/tools/splat/segtypes/n64/c.py new file mode 100644 index 0000000000..a177b5294c --- /dev/null +++ b/tools/splat/segtypes/n64/c.py @@ -0,0 +1,150 @@ +from segtypes.n64.codesubsegment import N64SegCodeSubsegment +from segtypes.n64.group import N64SegGroup +from typing import Optional, Set +import os +import re +from pathlib import Path + +from util import options + + +class N64SegC(N64SegCodeSubsegment): + defined_funcs: Set[str] = set() + + STRIP_C_COMMENTS_RE = re.compile( + r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"', + re.DOTALL | re.MULTILINE + ) + + C_FUNC_RE = re.compile( + r"^(static\s+)?[^\s]+\s+([^\s(]+)\(([^;)]*)\)[^;]+?{", + re.MULTILINE + ) + + @staticmethod + def strip_c_comments(text): + def replacer(match): + s = match.group(0) + if s.startswith("/"): + return " " + else: + return s + return re.sub(N64SegC.STRIP_C_COMMENTS_RE, replacer, text) + + @staticmethod + def get_funcs_defined_in_c(c_file): + with open(c_file, "r") as f: + text = N64SegC.strip_c_comments(f.read()) + + return set(m.group(2) for m in N64SegC.C_FUNC_RE.finditer(text)) + + def out_path(self) -> Optional[Path]: + return options.get_src_path() / self.dir / f"{self.name}.c" + + def scan(self, rom_bytes: bytes): + if self.rom_start is not None and self.rom_end is not None and self.rom_start != self.rom_end: + path = self.out_path() + if path: + if options.get("do_c_func_detection", True) and os.path.exists(path): + # TODO run cpp? + self.defined_funcs = self.get_funcs_defined_in_c(path) + self.mark_c_funcs_as_defined(self.defined_funcs) + + self.funcs_text = self.disassemble_code(rom_bytes) + + def split(self, rom_bytes: bytes): + if not self.rom_start == self.rom_end: + asm_out_dir = options.get_asm_path() / "nonmatchings" / self.dir + asm_out_dir.mkdir(parents=True, exist_ok=True) + + for func in self.funcs_text: + func_name = self.parent.get_symbol(func, type="func", local_only=True).name + + if func_name not in self.defined_funcs: + self.create_c_asm_file(self.funcs_text, func, asm_out_dir, func_name) + + c_path = self.out_path() + if c_path: + if not os.path.exists(c_path) and options.get("create_new_c_files", True): + self.create_c_file(self.funcs_text, asm_out_dir, c_path) + + def get_gcc_inc_header(self): + ret = [] + ret.append(".set noat # allow manual use of $at") + ret.append(".set noreorder # don't insert nops after branches") + ret.append("") + + return ret + + def get_c_preamble(self): + ret = [] + + preamble = options.get("generated_c_preamble", "#include \"common.h\"") + ret.append(preamble) + ret.append("") + + return ret + + def mark_c_funcs_as_defined(self, c_funcs): + for func_name in c_funcs: + found = False + for func_addr in self.seg_symbols: + for symbol in self.seg_symbols[func_addr]: + if symbol.name == func_name: + symbol.defined = True + found = True + break + if found: + break + + def create_c_asm_file(self, funcs_text, func, out_dir, func_name): + if options.get_compiler() == "GCC": + out_lines = self.get_gcc_inc_header() + else: + out_lines = [] + + if self.parent and isinstance(self.parent, N64SegGroup): + if func in self.parent.rodata_syms: + func_rodata = list({s for s in self.parent.rodata_syms[func] if s.disasm_str}) + func_rodata.sort(key=lambda s:s.vram_start) + + if len(func_rodata) > 0: + rsub = self.parent.get_subsegment_for_ram(func_rodata[0].vram_start) + if rsub and rsub.type != "rodata": + out_lines.append(".section .rodata") + + for sym in func_rodata: + if sym.disasm_str: + out_lines.extend(sym.disasm_str.replace("\n\n", "\n").split("\n")) + + out_lines.append("") + out_lines.append(".section .text") + out_lines.append("") + + out_lines.extend(funcs_text[func][0]) + out_lines.append("") + + outpath = Path(os.path.join(out_dir, self.name, func_name + ".s")) + outpath.parent.mkdir(parents=True, exist_ok=True) + + with open(outpath, "w", newline="\n") as f: + f.write("\n".join(out_lines)) + self.log(f"Disassembled {func_name} to {outpath}") + + def create_c_file(self, funcs_text, asm_out_dir, c_path): + c_lines = self.get_c_preamble() + + for func in funcs_text: + func_name = self.get_symbol(func, type="func", local_only=True).name + if options.get_compiler() == "GCC": + c_lines.append("INCLUDE_ASM(s32, \"{}\", {});".format(self.name, func_name)) + else: + asm_outpath = Path(os.path.join(asm_out_dir, self.name, func_name + ".s")) + rel_asm_outpath = os.path.relpath(asm_outpath, options.get_base_path()) + c_lines.append(f"#pragma GLOBAL_ASM(\"{rel_asm_outpath}\")") + c_lines.append("") + + Path(c_path).parent.mkdir(parents=True, exist_ok=True) + with open(c_path, "w") as f: + f.write("\n".join(c_lines)) + print(f"Wrote {self.name} to {c_path}") diff --git a/tools/splat/segtypes/n64/ci8.py b/tools/splat/segtypes/n64/ci8.py index 916f9ab515..91158b98cd 100644 --- a/tools/splat/segtypes/n64/ci8.py +++ b/tools/splat/segtypes/n64/ci8.py @@ -1,52 +1,37 @@ +from typing import TYPE_CHECKING, Optional from segtypes.n64.rgba16 import N64SegRgba16 import png -import os +from util import log from util import options +if TYPE_CHECKING: + from segtypes.n64.palette import N64SegPalette as Palette class N64SegCi8(N64SegRgba16): - def __init__(self, segment, next_segment): - super().__init__(segment, next_segment) + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) - self.path = None + self.palette: 'Optional[Palette]' = None + self.palette_name = self.name - def split(self, rom_bytes, base_path): - out_dir = self.create_parent_dir(base_path + "/" + options.get("assets_dir", "img"), self.name) - self.path = os.path.join(out_dir, os.path.basename(self.name) + ".png") + def split(self, rom_bytes): + path = options.get_asset_path() / self.dir / (self.name + ".png") + path.parent.mkdir(parents=True, exist_ok=True) - data = rom_bytes[self.rom_start: self.rom_end] + data = rom_bytes[self.rom_start:self.rom_end] - self.image = self.__class__.parse_image(data, self.width, self.height, self.flip_horizontal, self.flip_vertical) - - def postsplit(self, segments): - palettes = [seg for seg in segments if seg.type == "palette" and seg.image_name == self.name] - - if len(palettes) == 0: - self.error(f"no palette sibling segment exists\n(hint: add a segment with type 'palette' and name '{self.name}')") + if self.palette is None: + # TODO: output with blank palette + log.error(f"no palette sibling segment exists\n(hint: add a segment with type 'palette' and name '{self.name}')") return - seen_paths = [] + w = png.Writer(self.width, self.height, palette=self.palette.parse_palette(rom_bytes)) + image = self.__class__.parse_image(data, self.width, self.height, self.flip_horizontal, self.flip_vertical) - for pal_seg in palettes: - if pal_seg.path in seen_paths: - self.error(f"palette name '{pal_seg.name}' is not unique") - return - seen_paths.append(pal_seg.path) - - w = png.Writer(self.width, self.height, palette=pal_seg.palette) - - with open(pal_seg.path, "wb") as f: - w.write_array(f, self.image) - self.log(f"Wrote {pal_seg.name} to {pal_seg.path}") - - # canonical version of image (not palette!) data - if self.path not in seen_paths: - w = png.Writer(self.width, self.height, palette=palettes[0].palette) - - with open(self.path, "wb") as f: - w.write_array(f, self.image) - self.log( - f"No unnamed palette for {self.name}; wrote image data to {self.path}") + with open(self.out_path(), "wb") as f: + w.write_array(f, image) + + self.palette.extract = False @staticmethod def parse_image(data, width, height, flip_h=False, flip_v=False): diff --git a/tools/splat/segtypes/n64/code.py b/tools/splat/segtypes/n64/code.py index 8a572e3874..122b30c44d 100644 --- a/tools/splat/segtypes/n64/code.py +++ b/tools/splat/segtypes/n64/code.py @@ -1,468 +1,13 @@ -import os -import re -from segtypes.n64.rgba32 import N64SegRgba32 -from segtypes.n64.rgba16 import N64SegRgba16 -import sys -from collections import OrderedDict -from pathlib import Path, PurePath - -import png -from capstone import * -from capstone.mips import * -from segtypes.n64.ci4 import N64SegCi4 -from segtypes.n64.ci8 import N64SegCi8 -from segtypes.n64.i4 import N64SegI4 -from segtypes.n64.i8 import N64SegI8 -from segtypes.n64.ia4 import N64SegIa4 -from segtypes.n64.ia8 import N64SegIa8 -from segtypes.n64.ia16 import N64SegIa16 -from segtypes.n64.palette import N64SegPalette -from segtypes.n64.segment import N64Segment +from segtypes.n64.group import N64SegGroup +from typing import Optional from segtypes.segment import Segment -from util import floats -from util import options -from util.symbol import Symbol +from util import symbols +from util.symbols import Symbol -double_mnemonics = ["ldc1", "sdc1"] -word_mnemonics = ["addiu", "sw", "lw", "jtbl"] -float_mnemonics = ["lwc1", "swc1"] -short_mnemonics = ["addiu", "lh", "sh", "lhu"] -byte_mnemonics = ["lb", "sb", "lbu"] -img_types = ["i4", "i8", "ia4", "ia8", "ia16", "rgba16", "rgba32", "ci4", "ci8"] - -class Subsegment(): - def __init__(self, start, end, name, type, vram, args, parent): - self.rom_start = start - self.rom_end = end - self.size = self.rom_end - self.rom_start - self.name = name - self.vram_start = vram - self.vram_end = vram + self.size - self.type = type - self.args = args - self.parent = parent - - def contains_vram(self, addr): - return self.vram_start <= addr < self.vram_end - - def get_out_subdir(self): - if self.type.startswith("."): - if self.parent: - return self.parent.get_out_subdir() - else: - return options.get("src_path", "src") - elif self.type in ["c"]: - return options.get("src_path", "src") - elif self.type in ["asm", "hasm", "header"]: - return "asm" - elif self.type == "bin": - return options.get("assets_dir", "bin") - elif self.type in ["i4", "i8", "ia4", "ia8", "ia16", "rgba16", "rgba32", "ci4", "ci8", "palette"]: - return options.get("assets_dir", "img") - return self.type - - def get_ld_obj_type(self, section_name): - if self.type in "c": - return ".text" - elif self.type in ["bin", ".data", "data", "i4", "i8", "ia4", "ia8", "ia16", "rgba16", "rgba32", "ci4", "ci8", "palette"]: - return ".data" - elif self.type in [".rodata", "rodata"]: - return ".rodata" - elif self.type in [".bss", "bss"]: - return ".bss" - return section_name - - def get_ext(self): - if self.type.startswith("."): - if self.parent: - return self.parent.get_ext() - else: - return "c" - elif self.type in ["c"]: - return "c" - elif self.type in ["asm", "hasm", "header"]: - return "s" - elif self.type == "bin": - return "bin" - elif self.type in img_types: - return "png" - elif self.type == "palette": - return "pal.png" - return self.type - - def get_ld_file(self): - subdir = self.get_out_subdir() - obj_type = self.get_ld_obj_type(".text") - ext = self.get_ext() - - return subdir, f"{self.name}.{ext}", obj_type, self.rom_start - - def should_run(self): - return options.mode_active(self.type) - - def get_generic_out_path(self, base_path): - return os.path.join( - base_path, - self.get_out_subdir(), - self.name + "." + self.get_ext() - ) - - def scan_inner(self, segment, rom_bytes, base_path, generic_out_path): - pass - - def scan(self, segment, rom_bytes, base_path): - if self.should_run() and not self.name.startswith("."): - self.scan_inner(segment, rom_bytes, base_path, self.get_generic_out_path(base_path)) - - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - pass - - def split(self, segment, rom_bytes, base_path): - if "skip" not in self.args and self.should_run() and not self.name.startswith("."): - self.split_inner(segment, rom_bytes, base_path, self.get_generic_out_path(base_path)) - - @staticmethod - def create(typ, start, end, name, vram, args, parent): - if typ in ["data", ".data", "rodata", ".rodata"]: - sub_class = DataSubsegment - elif typ in ["bss", ".bss"]: - sub_class = BssSubsegment - elif typ == "bin": - sub_class = BinSubsegment - elif typ in ["c", "asm", "hasm"]: - sub_class = CodeSubsegment - elif typ == "palette": - sub_class = PaletteSubsegment - elif typ == "rgba32": - sub_class = RGBA32Subsegment - elif typ == "rgba16": - sub_class = RGBA16Subsegment - elif typ == "ci4": - sub_class = CI4Subsegment - elif typ == "ci8": - sub_class = CI8Subsegment - elif typ == "i4": - sub_class = I4Subsegment - elif typ == "i8": - sub_class = I8Subsegment - elif typ == "ia4": - sub_class = Ia4Subsegment - elif typ == "ia8": - sub_class = Ia8Subsegment - elif typ == "ia16": - sub_class = Ia16Subsegment - elif typ == "linker": - sub_class = LinkerSubsegment - else: - sub_class = Subsegment - - return sub_class(start, end, name, typ, vram, args, parent) - -class CodeSubsegment(Subsegment): - defined_funcs = set() - md = Cs(CS_ARCH_MIPS, CS_MODE_MIPS64 + CS_MODE_BIG_ENDIAN) - md.detail = True - md.skipdata = True - - STRIP_C_COMMENTS_RE = re.compile( - r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"', - re.DOTALL | re.MULTILINE - ) - - C_FUNC_RE = re.compile( - r"^(static\s+)?[^\s]+\s+([^\s(]+)\(([^;)]*)\)[^;]+?{", - re.MULTILINE - ) - - def strip_c_comments(text): - def replacer(match): - s = match.group(0) - if s.startswith("/"): - return " " - else: - return s - return re.sub(CodeSubsegment.STRIP_C_COMMENTS_RE, replacer, text) - - @staticmethod - def get_funcs_defined_in_c(text): - return set(m.group(2) for m in CodeSubsegment.C_FUNC_RE.finditer(text)) - - @staticmethod - def get_standalone_asm_header(): - ret = [] - - ret.append(".include \"macro.inc\"") - ret.append("") - ret.append("# assembler directives") - ret.append(".set noat # allow manual use of $at") - ret.append(".set noreorder # don't insert nops after branches") - ret.append(".set gp=64 # allow use of 64-bit general purpose registers") - ret.append("") - ret.append(".section .text, \"ax\"") - ret.append("") - - return ret - - @staticmethod - def get_funcs_defined_in_c(c_file): - with open(c_file, "r") as f: - text = CodeSubsegment.strip_c_comments(f.read()) - - return set(m.group(2) for m in CodeSubsegment.C_FUNC_RE.finditer(text)) - - def scan_inner(self, segment, rom_bytes, base_path, generic_out_path): - if not self.rom_start == self.rom_end: - if self.type == "c": - if options.get("do_c_func_detection", True) and os.path.exists(generic_out_path): - # TODO run cpp? - self.defined_funcs = CodeSubsegment.get_funcs_defined_in_c(generic_out_path) - segment.mark_c_funcs_as_defined(self.defined_funcs) - - insns = [insn for insn in CodeSubsegment.md.disasm(rom_bytes[self.rom_start : self.rom_end], self.vram_start)] - - funcs = segment.process_insns(insns, self.rom_start) - - # TODO: someday make func a subclass of symbol and store this disasm info there too - for func in funcs: - segment.get_symbol(func, type="func", create=True, define=True, local_only=True) - - funcs = segment.determine_symbols(funcs) - segment.gather_jumptable_labels(rom_bytes) - self.funcs_text = segment.add_labels(funcs) - - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - if not self.rom_start == self.rom_end: - if self.type == "c": - asm_out_dir = Segment.create_split_dir(base_path, os.path.join("asm", "nonmatchings")) - - for func in self.funcs_text: - func_name = segment.get_symbol(func, type="func", local_only=True).name - - if func_name not in self.defined_funcs: - segment.create_c_asm_file(self.funcs_text, func, asm_out_dir, self, func_name) - - if not os.path.exists(generic_out_path) and options.get("create_new_c_files", True): - segment.create_c_file(self.funcs_text, self, asm_out_dir, base_path, generic_out_path) - else: - asm_out_dir = Segment.create_split_dir(base_path, "asm") - out_lines = self.get_standalone_asm_header() - for func in self.funcs_text: - out_lines.extend(self.funcs_text[func][0]) - out_lines.append("") - - outpath = Path(os.path.join(asm_out_dir, self.name + ".s")) - outpath.parent.mkdir(parents=True, exist_ok=True) - - if self.type == "asm" or not os.path.exists(outpath): - with open(outpath, "w", newline="\n") as f: - f.write("\n".join(out_lines)) - -class DataSubsegment(Subsegment): - def scan_inner(self, segment, rom_bytes, base_path, generic_out_path): - if not self.type.startswith(".") or self.type == ".rodata": - self.file_text = segment.disassemble_data(self, rom_bytes) - - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - if not self.type.startswith("."): - asm_out_dir = Segment.create_split_dir(base_path, os.path.join("asm", "data")) - - outpath = Path(os.path.join(asm_out_dir, self.name + f".{self.type}.s")) - outpath.parent.mkdir(parents=True, exist_ok=True) - - if self.file_text: - with open(outpath, "w", newline="\n") as f: - f.write(self.file_text) - -class BssSubsegment(DataSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - #self.rom_start = 0 - self.rom_end = 0 - if type == "bss": - self.size = self.args[0] - self.vram_end = self.vram_start + self.size - -class BinSubsegment(Subsegment): - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - Path(generic_out_path).parent.mkdir(parents=True, exist_ok=True) - with open(generic_out_path, "wb") as f: - f.write(rom_bytes[self.rom_start : self.rom_end]) - -class LinkerSubsegment(Subsegment): - def get_ld_file(self): - return "", self.name, self.type, self.rom_start - -class ImageSubsegment(Subsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - if len(self.args) >= 2: - self.width, self.height = self.args - - def should_run(self): - return super().should_run() or options.mode_active("img") - - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - img_bytes = rom_bytes[self.rom_start : self.rom_end] - image = self.impl_class.parse_image(img_bytes, self.width, self.height, flip_h=False, flip_v=False) - w = self.impl_class.get_writer(self.width, self.height) - self.write(generic_out_path, w, image) - - def write(self, out_path, writer, image): - Path(out_path).parent.mkdir(parents=True, exist_ok=True) - with open(out_path, "wb") as f: - writer.write_array(f, image) - -class PaletteSubsegment(ImageSubsegment): - def scan_inner(self, segment, rom_bytes, base_path, generic_out_path): - img_bytes = rom_bytes[self.rom_start : self.rom_end] - - self.palette = N64SegPalette.parse_palette(img_bytes) - self.image_name = self.name.split(".", 1)[0] - - if self.image_name not in segment.palettes: - segment.palettes[self.image_name] = [self] - else: - segment.palettes[self.image_name].append(self) - - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - pass - -class CI4Subsegment(ImageSubsegment): - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - img_bytes = rom_bytes[self.rom_start : self.rom_end] - image = N64SegCi4.parse_image(img_bytes, self.width, self.height) - - for image_name in segment.palettes: - if self.name == image_name: - for palette in segment.palettes[self.name]: - w = png.Writer(self.width, self.height, palette=palette.palette) - out_path = re.sub(r"\.pal\.png", ".png", palette.get_generic_out_path(base_path)) - - self.write(out_path, w, image) - -class CI8Subsegment(ImageSubsegment): - def split_inner(self, segment, rom_bytes, base_path, generic_out_path): - img_bytes = rom_bytes[self.rom_start : self.rom_end] - image = N64SegCi8.parse_image(img_bytes, self.width, self.height) - - for image_name in segment.palettes: - if self.name == image_name: - for palette in segment.palettes[self.name]: - w = png.Writer(self.width, self.height, palette=palette.palette) - out_path = re.sub(r"\.pal\.png", ".png", palette.get_generic_out_path(base_path)) - - self.write(out_path, w, image) - -class RGBA32Subsegment(ImageSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - self.impl_class = N64SegRgba32 - -class RGBA16Subsegment(ImageSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - self.impl_class = N64SegRgba16 - -class I4Subsegment(ImageSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - self.impl_class = N64SegI4 - -class I8Subsegment(ImageSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - self.impl_class = N64SegI8 - -class Ia4Subsegment(ImageSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - self.impl_class = N64SegIa4 - -class Ia8Subsegment(ImageSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - self.impl_class = N64SegIa8 - -class Ia16Subsegment(ImageSubsegment): - def __init__(self, start, end, name, type, vram, args, parent): - super().__init__(start, end, name, type, vram, args, parent) - self.impl_class = N64SegIa16 - -class N64SegCode(N64Segment): - palettes = {} - - def parse_subsegments(self, segment_yaml): - prefix = self.name if self.name.endswith("/") else f"{self.name}_" - - base_segments = {} - ret = [] - prev_start = -1 - - if "subsections" not in segment_yaml: - print(f"Error: Code segment {self.name} is missing a 'subsections' field") - sys.exit(2) - - for i, subsection_yaml in enumerate(segment_yaml["subsections"]): - if type(subsection_yaml) is dict: - start = subsection_yaml["start"] - end = subsection_yaml["end"] - name = subsection_yaml.get("name", None) - typ = subsection_yaml["type"] - args = subsection_yaml.get("args", []) - else: - start = subsection_yaml[0] - end = self.rom_end if i == len(segment_yaml["subsections"]) - 1 else segment_yaml["subsections"][i + 1][0] - name = None if len(subsection_yaml) < 3 else subsection_yaml[2] - typ = subsection_yaml[1] - args = subsection_yaml[3:] - - if start < prev_start: - print(f"Error: Code segment {self.name} contains subsections which are out of ascending rom order (0x{prev_start:X} followed by 0x{start:X})") - sys.exit(1) - - if not name: - name = self.get_default_name(start) if self.name == self.get_default_name(self.rom_start) else f"{prefix}{start:X}" - elif self.name.endswith("/"): - name = self.name + name - - vram = self.rom_to_ram(start) - - subsegment = Subsegment.create(typ, start, end, name, vram, args, base_segments.get(name, None)) - - if self.rodata_vram_start == -1 and "rodata" in typ: - self.rodata_vram_start = vram - if self.rodata_vram_end == -1 and "bss" in typ: - self.rodata_vram_end = vram - - ret.append(subsegment) - - if typ in ["c", "asm", "hasm"]: - base_segments[name] = subsegment - - prev_start = start - - if self.rodata_vram_start != -1 and self.rodata_vram_end == -1: - self.rodata_vram_end = self.vram_end - - return ret - - def __init__(self, segment, next_segment): - super().__init__(segment, next_segment) - - # TODO Note: These start/end vram options don't really do anything yet - self.data_vram_start = segment.get("data_vram_start", -1) - self.data_vram_end = segment.get("data_vram_end", -1) - self.rodata_vram_start = segment.get("rodata_vram_start", -1) - self.rodata_vram_end = segment.get("rodata_vram_end", -1) - self.bss_vram_start = segment.get("bss_vram_start", -1) - self.bss_vram_end = segment.get("bss_vram_end", -1) - - self.subsegments = self.parse_subsegments(segment) - self.is_overlay = segment.get("overlay", False) - self.all_symbols = () - self.seg_symbols = {} # Symbols known to be in this segment - self.ext_symbols = {} # Symbols not in this segment but also not from other overlapping ram address ranges - self.symbol_ranges = [] +# code group +class N64SegCode(N64SegGroup): + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) self.reported_file_split = False self.labels_to_add = set() @@ -470,20 +15,22 @@ class N64SegCode(N64Segment): self.jtbl_jumps = {} self.jumptables = {} - self.rodata_syms = {} + @property + def needs_symbols(self) -> bool: + return True - @staticmethod - def get_default_name(addr): - return f"code_{addr:X}" + def check_rodata_sym(self, func_addr: int, sym: Symbol): + if self.rodata_vram_start != None and self.rodata_vram_end != None: + if self.rodata_vram_start <= sym.vram_start < self.rodata_vram_end: + if func_addr not in self.rodata_syms: + self.rodata_syms[func_addr] = [] + self.rodata_syms[func_addr].append(sym) - def get_ld_files(self): - return [sub.get_ld_file() for sub in self.subsegments] - - def get_ld_section_name(self): - path = PurePath(self.name) - name = path.name if path.name != "" else path.parent - - return f"code_{name}" + def get_subsegment_for_ram(self, addr) -> Optional[Segment]: + for sub in self.subsegments: + if sub.contains_vram(addr): + return sub + return None def retrieve_symbol(self, d, k, t): if k not in d: @@ -500,26 +47,7 @@ class N64SegCode(N64Segment): return None return items[0] - def retrieve_symbol_from_ranges(self, vram, rom=None): - rom_matches = [] - ram_matches = [] - - for symbol in self.symbol_ranges: - if symbol.contains_vram(vram): - if symbol.rom and rom and symbol.contains_rom(rom): - rom_matches.append(symbol) - else: - ram_matches.append(symbol) - - ret = rom_matches + ram_matches - - if len(ret) > 0: - return ret[0] - else: - return None - - def get_symbol(self, addr, type=None, create=False, define=False, reference=False, offsets=False, local_only=False, - skip_dead=False): + def get_symbol(self, addr, type=None, create=False, define=False, reference=False, offsets=False, local_only=False, dead=True): ret = None rom = None @@ -534,12 +62,16 @@ class N64SegCode(N64Segment): # Search for symbol ranges if not ret and offsets: - ret = self.retrieve_symbol_from_ranges(addr, rom) + ret = symbols.retrieve_from_ranges(addr, rom) + + # Reject dead symbols unless we allow them + if not dead and ret and ret.dead: + ret = None # Create the symbol if it doesn't exist if not ret and create: ret = Symbol(addr, rom=rom, type=type) - self.all_symbols.append(ret) + symbols.all_symbols.append(ret) if in_segment: if self.is_overlay: @@ -553,9 +85,6 @@ class N64SegCode(N64Segment): self.ext_symbols[addr].append(ret) if ret: - if skip_dead and ret.dead: - return None - if define: ret.defined = True if reference: @@ -563,574 +92,3 @@ class N64SegCode(N64Segment): return ret - def get_gcc_inc_header(self): - ret = [] - ret.append(".set noat # allow manual use of $at") - ret.append(".set noreorder # don't insert nops after branches") - ret.append("") - - return ret - - @staticmethod - def is_nops(insns): - for insn in insns: - if insn.mnemonic != "nop": - return False - return True - - @staticmethod - def is_branch_insn(mnemonic): - return (mnemonic.startswith("b") and not mnemonic.startswith("binsl") and not mnemonic == "break") or mnemonic == "j" - - def process_insns(self, insns, rom_addr): - ret = OrderedDict() - - func_addr = None - func = [] - end_func = False - labels = [] - - # Collect labels - for insn in insns: - if self.is_branch_insn(insn.mnemonic): - op_str_split = insn.op_str.split(" ") - branch_target = op_str_split[-1] - branch_addr = int(branch_target, 0) - labels.append((insn.address, branch_addr)) - - # Main loop - for i, insn in enumerate(insns): - mnemonic = insn.mnemonic - op_str = insn.op_str - func_addr = insn.address if len(func) == 0 else func[0][0].address - - if mnemonic == "move": - # Let's get the actual instruction out - opcode = insn.bytes[3] & 0b00111111 - op_str += ", $zero" - - if opcode == 37: - mnemonic = "or" - elif opcode == 45: - mnemonic = "daddu" - elif opcode == 33: - mnemonic = "addu" - else: - print("INVALID INSTRUCTION " + insn) - elif mnemonic == "jal": - jal_addr = int(op_str, 0) - jump_func = self.get_symbol(jal_addr, type="func", create=True, reference=True) - op_str = jump_func.name - elif self.is_branch_insn(insn.mnemonic): - op_str_split = op_str.split(" ") - branch_target = op_str_split[-1] - branch_target_int = int(branch_target, 0) - label = "" - - label = self.get_symbol(branch_target_int, type="label", reference=True, local_only=True) - - if label: - label_name = label.name - else: - self.labels_to_add.add(branch_target_int) - label_name = f".L{branch_target[2:].upper()}" - - op_str = " ".join(op_str_split[:-1] + [label_name]) - elif mnemonic == "mtc0" or mnemonic == "mfc0": - rd = (insn.bytes[2] & 0xF8) >> 3 - op_str = op_str.split(" ")[0] + " $" + str(rd) - - func.append((insn, mnemonic, op_str, rom_addr)) - rom_addr += 4 - - if mnemonic == "jr": - # Record potential jtbl jumps - if op_str != "$ra": - self.jtbl_jumps[insn.address] = op_str - - keep_going = False - for label in labels: - if (label[0] > insn.address and label[1] <= insn.address) or (label[0] <= insn.address and label[1] > insn.address): - keep_going = True - break - if not keep_going: - end_func = True - continue - - if i < len(insns) - 1 and self.get_symbol(insns[i + 1].address, local_only=True, type="func", skip_dead=True): - end_func = True - - if end_func: - if self.is_nops(insns[i:]) or i < len(insns) - 1 and insns[i + 1].mnemonic != "nop": - end_func = False - ret[func_addr] = func - func = [] - - # Add the last function (or append nops to the previous one) - if not self.is_nops([i[0] for i in func]): - ret[func_addr] = func - else: - next(reversed(ret.values())).extend(func) - - return ret - - def get_subsection_for_ram(self, addr): - for sub in self.subsegments: - if sub.contains_vram(addr): - return sub - return None - - def update_access_mnemonic(self, sym, mnemonic): - if not sym.access_mnemonic: - sym.access_mnemonic = mnemonic - elif sym.access_mnemonic == "addiu": - sym.access_mnemonic = mnemonic - elif sym.access_mnemonic in double_mnemonics: - return - elif sym.access_mnemonic in float_mnemonics and mnemonic in double_mnemonics: - sym.access_mnemonic = mnemonic - elif sym.access_mnemonic in short_mnemonics: - return - elif sym.access_mnemonic in byte_mnemonics: - return - else: - sym.access_mnemonic = mnemonic - - # Determine symbols - def determine_symbols(self, funcs): - hi_lo_max_distance = options.get("hi_lo_max_distance", 6) - ret = {} - - for func_addr in funcs: - func = funcs[func_addr] - func_end_addr = func[-1][0].address + 4 - - possible_jtbl_jumps = [(k, v) for k, v in self.jtbl_jumps.items() if k >= func_addr and k < func_end_addr] - possible_jtbl_jumps.sort(key=lambda x:x[0]) - - for i in range(len(func)): - insn = func[i][0] - - # Ensure the first item in the list is always ahead of where we're looking - while len(possible_jtbl_jumps) > 0 and possible_jtbl_jumps[0][0] < insn.address: - del possible_jtbl_jumps[0] - - if insn.mnemonic == "lui": - op_split = insn.op_str.split(", ") - reg = op_split[0] - - if not op_split[1].startswith("0x"): - continue - - lui_val = int(op_split[1], 0) - if lui_val >= 0x8000: - for j in range(i + 1, min(i + hi_lo_max_distance, len(func))): - s_insn = func[j][0] - - s_op_split = s_insn.op_str.split(", ") - - if s_insn.mnemonic == "lui" and reg == s_op_split[0]: - break - - if s_insn.mnemonic in ["addiu", "ori"]: - s_reg = s_op_split[-2] - else: - s_reg = s_op_split[-1][s_op_split[-1].rfind("(") + 1: -1] - - if reg == s_reg: - if s_insn.mnemonic not in ["addiu", "lw", "sw", "lh", "sh", "lhu", "lb", "sb", "lbu", "lwc1", "swc1", "ldc1", "sdc1"]: - break - - # Match! - reg_ext = "" - - junk_search = re.search( - r"[\(]", s_op_split[-1]) - if junk_search is not None: - if junk_search.start() == 0: - break - s_str = s_op_split[-1][:junk_search.start()] - reg_ext = s_op_split[-1][junk_search.start():] - else: - s_str = s_op_split[-1] - - symbol_addr = (lui_val * 0x10000) + int(s_str, 0) - - sym = None - offset_str = "" - - if symbol_addr > func_addr and symbol_addr < self.vram_end and len(possible_jtbl_jumps) > 0 and func_end_addr - s_insn.address >= 0x30: - for jump in possible_jtbl_jumps: - if jump[1] == s_op_split[0]: - dist_to_jump = possible_jtbl_jumps[0][0] - s_insn.address - if dist_to_jump <= 16: - sym = self.get_symbol(symbol_addr, create=True, reference=True, type="jtbl", local_only=True) - self.jumptables[symbol_addr] = (func_addr, func_end_addr) - break - - if not sym: - sym = self.get_symbol(symbol_addr, create=True, offsets=True, reference=True) - offset = symbol_addr - sym.vram_start - if offset != 0: - offset_str = f"+0x{offset:X}" - - if self.rodata_vram_start != -1 and self.rodata_vram_end != -1: - if self.rodata_vram_start <= sym.vram_start < self.rodata_vram_end: - if func_addr not in self.rodata_syms: - self.rodata_syms[func_addr] = [] - self.rodata_syms[func_addr].append(sym) - - self.update_access_mnemonic(sym, s_insn.mnemonic) - - sym_label = sym.name + offset_str - - func[i] += ("%hi({})".format(sym_label),) - func[j] += ("%lo({}){}".format(sym_label, reg_ext),) - break - ret[func_addr] = func - return ret - - def add_labels(self, funcs): - ret = {} - - for func in funcs: - func_text = [] - - # Add function glabel - rom_addr = funcs[func][0][3] - sym = self.get_symbol(func, type="func", create=True, define=True, local_only=True) - func_text.append(f"glabel {sym.name}") - - indent_next = False - - mnemonic_ljust = options.get("mnemonic_ljust", 11) - rom_addr_padding = options.get("rom_address_padding", None) - - for insn in funcs[func]: - insn_addr = insn[0].address - # Add a label if we need one - if insn_addr in self.jtbl_glabels_to_add: - func_text.append(f"glabel L{insn_addr:X}_{insn[3]:X}") - elif insn_addr in self.labels_to_add: - self.labels_to_add.remove(insn_addr) - func_text.append(".L{:X}:".format(insn_addr)) - - if rom_addr_padding: - rom_str = "{0:0{1}X}".format(insn[3], rom_addr_padding) - else: - rom_str = "{:X}".format(insn[3]) - - asm_comment = "/* {} {:X} {} */".format(rom_str, insn_addr, insn[0].bytes.hex().upper()) - - if len(insn) > 4: - op_str = ", ".join(insn[2].split(", ")[:-1] + [insn[4]]) - else: - op_str = insn[2] - - if self.is_branch_insn(insn[0].mnemonic): - branch_addr = int(insn[0].op_str.split(",")[-1].strip(), 0) - if branch_addr in self.jtbl_glabels_to_add: - label_str = f"L{branch_addr:X}_{self.ram_to_rom(branch_addr):X}" - op_str = ", ".join(insn[2].split(", ")[:-1] + [label_str]) - - insn_text = insn[1] - if indent_next: - indent_next = False - insn_text = " " + insn_text - - asm_insn_text = " {}{}".format(insn_text.ljust(mnemonic_ljust), op_str).rstrip() - - func_text.append(asm_comment + asm_insn_text) - - if insn[0].mnemonic != "branch" and insn[0].mnemonic.startswith("b") or insn[0].mnemonic.startswith("j"): - indent_next = True - - ret[func] = (func_text, rom_addr) - - if options.get("find_file_boundaries"): - # If this is not the last function in the file - if func != list(funcs.keys())[-1]: - - # Find where the function returns - jr_pos = None - for i, insn in enumerate(reversed(funcs[func])): - if insn[0].mnemonic == "jr" and insn[0].op_str == "$ra": - jr_pos = i - break - - # If there is more than 1 nop after the return - if jr_pos and jr_pos > 1 and self.is_nops([i[0] for i in funcs[func][-jr_pos + 1:]]): - new_file_addr = funcs[func][-1][3] + 4 - if (new_file_addr % 16) == 0: - if not self.reported_file_split: - self.reported_file_split = True - print(f"Segment {self.name}, function at vram {func:X} ends with extra nops, indicating a likely file split.") - print("File split suggestions for this segment will follow in config yaml format:") - print(f" - [0x{new_file_addr:X}, asm]") - - return ret - - def should_run(self): - return True - - @staticmethod - def is_valid_ascii(bytes): - if len(bytes) < 8: - return False - - num_empty_bytes = 0 - for b in bytes: - if b == 0: - num_empty_bytes += 1 - - empty_ratio = num_empty_bytes / len(bytes) - if empty_ratio > 0.2: - return False - - return True - - def get_symbols_for_file(self, sub): - ret = [] - - for symbol_addr in self.seg_symbols: - for symbol in self.seg_symbols[symbol_addr]: - if not symbol.dead and sub.contains_vram(symbol.vram_start): - ret.append(symbol) - - ret.sort(key=lambda s:s.vram_start) - - # Ensure we start at the beginning - if len(ret) == 0 or ret[0].vram_start != sub.vram_start: - ret.insert(0, self.get_symbol(sub.vram_start, create=True, define=True, local_only=True)) - - # Make a dummy symbol here that marks the end of the previous symbol's disasm range - ret.append(Symbol(sub.vram_end)) - - return ret - - def disassemble_symbol(self, sym_bytes, sym_type): - if sym_type == "jtbl": - sym_str = ".word " - else: - sym_str = f".{sym_type} " - - if sym_type == "double": - slen = 8 - elif sym_type == "short": - slen = 2 - elif sym_type == "byte": - slen = 1 - else: - slen = 4 - - if sym_type == "ascii": - try: - ascii_str = sym_bytes.decode("EUC-JP") - ascii_str = ascii_str.replace("\\", "\\\\") - ascii_str = ascii_str.replace("\x00", "\\0") - sym_str += f'"{ascii_str}"' - return sym_str - except: - return self.disassemble_symbol(sym_bytes, "word") - - i = 0 - while i < len(sym_bytes): - adv_amt = min(slen, len(sym_bytes) - i) - bits = int.from_bytes(sym_bytes[i : i + adv_amt], "big") - - if sym_type == "jtbl": - if bits == 0: - byte_str = "0" - else: - rom_addr = self.ram_to_rom(bits) - - if rom_addr: - byte_str = f"L{bits:X}_{rom_addr:X}" - else: - byte_str = f"0x{bits:X}" - elif slen == 4 and bits >= 0x80000000: - sym = self.get_symbol(bits, reference=True) - if sym: - byte_str = sym.name - else: - byte_str = '0x{0:0{1}X}'.format(bits, 2 * slen) - else: - byte_str = '0x{0:0{1}X}'.format(bits, 2 * slen) - - if sym_type in ["float", "double"]: - if sym_type == "float": - float_str = floats.format_f32_imm(bits) - else: - float_str = floats.format_f64_imm(bits) - - # Fall back to .word if we see weird float values - # TODO: cut the symbol in half maybe where we see the first nan or something - if "e-" in float_str or "nan" in float_str: - return self.disassemble_symbol(sym_bytes, "word") - else: - byte_str = float_str - - sym_str += byte_str - - i += adv_amt - - if i < len(sym_bytes): - sym_str += ", " - - return sym_str - - def disassemble_data(self, sub, rom_bytes): - rodata_encountered = sub.type == "rodata" - ret = ".include \"macro.inc\"\n\n" - ret += f'.section .{sub.type}' - - if sub.size == 0: - return None - - syms = self.get_symbols_for_file(sub) - - for i in range(len(syms) - 1): - mnemonic = syms[i].access_mnemonic - sym = self.get_symbol(syms[i].vram_start, create=True, define=True, local_only=True) - sym_str = f"\n\nglabel {sym.name}\n" - dis_start = self.ram_to_rom(syms[i].vram_start) - dis_end = self.ram_to_rom(syms[i + 1].vram_start) - sym_len = dis_end - dis_start - - if sub.type == "bss": - ret += f".space 0x{sym_len:X}" - else: - sym_bytes = rom_bytes[dis_start : dis_end] - - # Checking if the mnemonic is addiu may be too picky - we'll see - if self.is_valid_ascii(sym_bytes) and mnemonic == "addiu": - stype = "ascii" - elif syms[i].type == "jtbl": - stype = "jtbl" - elif len(sym_bytes) % 8 == 0 and mnemonic in double_mnemonics: - stype = "double" - elif len(sym_bytes) % 4 == 0 and mnemonic in float_mnemonics: - stype = "float" - elif len(sym_bytes) % 4 == 0 and sym.vram_start % 4 == 0 and (mnemonic in word_mnemonics or not mnemonic): - stype = "word" - elif len(sym_bytes) % 2 == 0 and sym.vram_start % 2 == 0 and (mnemonic in short_mnemonics or not mnemonic): - stype = "short" - else: - stype = "byte" - - # If we're starting from a weird place, make sure our container size is correct - if dis_start % 4 != 0 and stype != "byte" and sym_len > 1: - stype = "short" - if dis_start % 2 != 0: - stype = "byte" - - if not rodata_encountered and mnemonic == "jtbl": - rodata_encountered = True - ret += "\n\n\n.section .rodata" - - sym_str += self.disassemble_symbol(sym_bytes, stype) - sym.disasm_str = sym_str - ret += sym_str - - ret += "\n" - - return ret - - def get_c_preamble(self): - ret = [] - - preamble = options.get("generated_c_preamble", "#include \"common.h\"") - ret.append(preamble) - ret.append("") - - return ret - - def gather_jumptable_labels(self, rom_bytes): - # TODO: use the seg_symbols for this - # jumptables = [j.type == "jtbl" for j in self.seg_symbols] - for jumptable in self.jumptables: - start, end = self.jumptables[jumptable] - rom_offset = self.rom_start + jumptable - self.vram_start - - if rom_offset <= 0: - return - - while (rom_offset): - word = rom_bytes[rom_offset : rom_offset + 4] - word_int = int.from_bytes(word, "big") - if word_int >= start and word_int <= end: - self.jtbl_glabels_to_add.add(word_int) - else: - break - - rom_offset += 4 - - def mark_c_funcs_as_defined(self, c_funcs): - for func_name in c_funcs: - found = False - for func_addr in self.seg_symbols: - for symbol in self.seg_symbols[func_addr]: - if symbol.name == func_name: - symbol.defined = True - found = True - break - if found: - break - - def create_c_asm_file(self, funcs_text, func, out_dir, sub, func_name): - if options.get("compiler", "IDO") == "GCC": - out_lines = self.get_gcc_inc_header() - else: - out_lines = [] - - if func in self.rodata_syms: - func_rodata = list({s for s in self.rodata_syms[func] if s.disasm_str}) - func_rodata.sort(key=lambda s:s.vram_start) - - if len(func_rodata) > 0: - rsub = self.get_subsection_for_ram(func_rodata[0].vram_start) - if rsub and rsub.type != "rodata": - out_lines.append(".section .rodata") - - for sym in func_rodata: - if sym.disasm_str: - out_lines.extend(sym.disasm_str.replace("\n\n", "\n").split("\n")) - - out_lines.append("") - out_lines.append(".section .text") - out_lines.append("") - - out_lines.extend(funcs_text[func][0]) - out_lines.append("") - - outpath = Path(os.path.join(out_dir, sub.name, func_name + ".s")) - outpath.parent.mkdir(parents=True, exist_ok=True) - - with open(outpath, "w", newline="\n") as f: - f.write("\n".join(out_lines)) - self.log(f"Disassembled {func_name} to {outpath}") - - def create_c_file(self, funcs_text, sub, asm_out_dir, base_path, c_path): - c_lines = self.get_c_preamble() - - for func in funcs_text: - func_name = self.get_symbol(func, type="func", local_only=True).name - if options.get("compiler", "IDO") == "GCC": - c_lines.append("INCLUDE_ASM(s32, \"{}\", {});".format(sub.name, func_name)) - else: - asm_outpath = Path(os.path.join(asm_out_dir, sub.name, func_name + ".s")) - rel_asm_outpath = os.path.relpath(asm_outpath, base_path) - c_lines.append(f"#pragma GLOBAL_ASM(\"{rel_asm_outpath}\")") - c_lines.append("") - - Path(c_path).parent.mkdir(parents=True, exist_ok=True) - with open(c_path, "w") as f: - f.write("\n".join(c_lines)) - print(f"Wrote {sub.name} to {c_path}") - - def split(self, rom_bytes, base_path): - for sub in self.subsegments: - sub.scan(self, rom_bytes, base_path) - - for sub in self.subsegments: - sub.split(self, rom_bytes, base_path) diff --git a/tools/splat/segtypes/n64/codesubsegment.py b/tools/splat/segtypes/n64/codesubsegment.py new file mode 100644 index 0000000000..9bd4855fa3 --- /dev/null +++ b/tools/splat/segtypes/n64/codesubsegment.py @@ -0,0 +1,363 @@ +from typing import Optional +from util import options +from segtypes.n64.code import N64SegCode +from collections import OrderedDict +import re + +from capstone import Cs, CS_ARCH_MIPS, CS_MODE_MIPS64, CS_MODE_BIG_ENDIAN +from capstone.mips import * + +from segtypes.segment import Segment + +# abstract class for c, asm, data, etc +class N64SegCodeSubsegment(Segment): + double_mnemonics = ["ldc1", "sdc1"] + word_mnemonics = ["addiu", "sw", "lw", "jtbl"] + float_mnemonics = ["lwc1", "swc1"] + short_mnemonics = ["addiu", "lh", "sh", "lhu"] + byte_mnemonics = ["lb", "sb", "lbu"] + + md = Cs(CS_ARCH_MIPS, CS_MODE_MIPS64 + CS_MODE_BIG_ENDIAN) + md.detail = True + md.skipdata = True + + @property + def needs_symbols(self) -> bool: + return True + + def get_linker_section(self) -> str: + return ".text" + + @staticmethod + def is_nops(insns): + for insn in insns: + if insn.mnemonic != "nop": + return False + return True + + @staticmethod + def is_branch_insn(mnemonic): + return (mnemonic.startswith("b") and not mnemonic.startswith("binsl") and not mnemonic == "break") or mnemonic == "j" + + def disassemble_code(self, rom_bytes): + insns = [insn for insn in N64SegCodeSubsegment.md.disasm(rom_bytes[self.rom_start : self.rom_end], self.vram_start)] + + funcs = self.process_insns(insns, self.rom_start) + + # TODO: someday make func a subclass of symbol and store this disasm info there too + for func in funcs: + self.parent.get_symbol(func, type="func", create=True, define=True, local_only=True) + + funcs = self.determine_symbols(funcs) + self.gather_jumptable_labels(rom_bytes) + return self.add_labels(funcs) + + def process_insns(self, insns, rom_addr): + assert(isinstance(self.parent, N64SegCode)) + self.parent: N64SegCode = self.parent + + ret = OrderedDict() + + func_addr = None + func = [] + end_func = False + labels = [] + + # Collect labels + for insn in insns: + if self.is_branch_insn(insn.mnemonic): + op_str_split = insn.op_str.split(" ") + branch_target = op_str_split[-1] + branch_addr = int(branch_target, 0) + labels.append((insn.address, branch_addr)) + + # Main loop + for i, insn in enumerate(insns): + mnemonic = insn.mnemonic + op_str = insn.op_str + func_addr = insn.address if len(func) == 0 else func[0][0].address + + if mnemonic == "move": + # Let's get the actual instruction out + opcode = insn.bytes[3] & 0b00111111 + op_str += ", $zero" + + if opcode == 37: + mnemonic = "or" + elif opcode == 45: + mnemonic = "daddu" + elif opcode == 33: + mnemonic = "addu" + else: + print("INVALID INSTRUCTION " + insn) + elif mnemonic == "jal": + jal_addr = int(op_str, 0) + jump_func = self.parent.get_symbol(jal_addr, type="func", create=True, reference=True) + op_str = jump_func.name + elif self.is_branch_insn(insn.mnemonic): + op_str_split = op_str.split(" ") + branch_target = op_str_split[-1] + branch_target_int = int(branch_target, 0) + label = "" + + label = self.parent.get_symbol(branch_target_int, type="label", reference=True, local_only=True) + + if label: + label_name = label.name + else: + self.parent.labels_to_add.add(branch_target_int) + label_name = f".L{branch_target[2:].upper()}" + + op_str = " ".join(op_str_split[:-1] + [label_name]) + elif mnemonic == "mtc0" or mnemonic == "mfc0": + rd = (insn.bytes[2] & 0xF8) >> 3 + op_str = op_str.split(" ")[0] + " $" + str(rd) + + func.append((insn, mnemonic, op_str, rom_addr)) + rom_addr += 4 + + if mnemonic == "jr": + # Record potential jtbl jumps + if op_str != "$ra": + self.parent.jtbl_jumps[insn.address] = op_str + + keep_going = False + for label in labels: + if (label[0] > insn.address and label[1] <= insn.address) or (label[0] <= insn.address and label[1] > insn.address): + keep_going = True + break + if not keep_going: + end_func = True + continue + + if i < len(insns) - 1 and self.parent.get_symbol(insns[i + 1].address, local_only=True, type="func", dead=False): + end_func = True + + if end_func: + if self.is_nops(insns[i:]) or i < len(insns) - 1 and insns[i + 1].mnemonic != "nop": + end_func = False + ret[func_addr] = func + func = [] + + # Add the last function (or append nops to the previous one) + if not self.is_nops([i[0] for i in func]): + ret[func_addr] = func + else: + next(reversed(ret.values())).extend(func) + + return ret + + def update_access_mnemonic(self, sym, mnemonic): + if not sym.access_mnemonic: + sym.access_mnemonic = mnemonic + elif sym.access_mnemonic == "addiu": + sym.access_mnemonic = mnemonic + elif sym.access_mnemonic in self.double_mnemonics: + return + elif sym.access_mnemonic in self.float_mnemonics and mnemonic in self.double_mnemonics: + sym.access_mnemonic = mnemonic + elif sym.access_mnemonic in self.short_mnemonics: + return + elif sym.access_mnemonic in self.byte_mnemonics: + return + else: + sym.access_mnemonic = mnemonic + + # Determine symbols + def determine_symbols(self, funcs): + hi_lo_max_distance = options.get("hi_lo_max_distance", 6) + ret = {} + + for func_addr in funcs: + func = funcs[func_addr] + func_end_addr = func[-1][0].address + 4 + + possible_jtbl_jumps = [(k, v) for k, v in self.parent.jtbl_jumps.items() if k >= func_addr and k < func_end_addr] + possible_jtbl_jumps.sort(key=lambda x:x[0]) + + for i in range(len(func)): + insn = func[i][0] + + # Ensure the first item in the list is always ahead of where we're looking + while len(possible_jtbl_jumps) > 0 and possible_jtbl_jumps[0][0] < insn.address: + del possible_jtbl_jumps[0] + + if insn.mnemonic == "lui": + op_split = insn.op_str.split(", ") + reg = op_split[0] + + if not op_split[1].startswith("0x"): + continue + + lui_val = int(op_split[1], 0) + if lui_val >= 0x8000: + for j in range(i + 1, min(i + hi_lo_max_distance, len(func))): + s_insn = func[j][0] + + s_op_split = s_insn.op_str.split(", ") + + if s_insn.mnemonic == "lui" and reg == s_op_split[0]: + break + + if s_insn.mnemonic in ["addiu", "ori"]: + s_reg = s_op_split[-2] + else: + s_reg = s_op_split[-1][s_op_split[-1].rfind("(") + 1: -1] + + + if reg == s_reg: + if s_insn.mnemonic not in ["addiu", "lw", "sw", "lh", "sh", "lhu", "lb", "sb", "lbu", "lwc1", "swc1", "ldc1", "sdc1"]: + break + + # Match! + reg_ext = "" + + junk_search = re.search( + r"[\(]", s_op_split[-1]) + if junk_search is not None: + if junk_search.start() == 0: + break + s_str = s_op_split[-1][:junk_search.start()] + reg_ext = s_op_split[-1][junk_search.start():] + else: + s_str = s_op_split[-1] + + symbol_addr = (lui_val * 0x10000) + int(s_str, 0) + + sym = None + offset_str = "" + + if symbol_addr > func_addr and symbol_addr < self.parent.vram_end and len(possible_jtbl_jumps) > 0 and func_end_addr - s_insn.address >= 0x30: + for jump in possible_jtbl_jumps: + if jump[1] == s_op_split[0]: + dist_to_jump = possible_jtbl_jumps[0][0] - s_insn.address + if dist_to_jump <= 16: + sym = self.parent.get_symbol(symbol_addr, create=True, reference=True, type="jtbl", local_only=True) + + self.parent.jumptables[symbol_addr] = (func_addr, func_end_addr) + break + + if not sym: + sym = self.parent.get_symbol(symbol_addr, create=True, offsets=True, reference=True) + offset = symbol_addr - sym.vram_start + if offset != 0: + offset_str = f"+0x{offset:X}" + + if self.parent: + self.parent.check_rodata_sym(func_addr, sym) + + self.update_access_mnemonic(sym, s_insn.mnemonic) + + sym_label = sym.name + offset_str + + func[i] += ("%hi({})".format(sym_label),) + func[j] += ("%lo({}){}".format(sym_label, reg_ext),) + break + ret[func_addr] = func + return ret + + def add_labels(self, funcs): + ret = {} + + for func in funcs: + func_text = [] + + # Add function glabel + rom_addr = funcs[func][0][3] + sym = self.parent.get_symbol(func, type="func", create=True, define=True, local_only=True) + func_text.append(f"glabel {sym.name}") + + indent_next = False + + mnemonic_ljust = options.get("mnemonic_ljust", 11) + rom_addr_padding = options.get("rom_address_padding", None) + + for insn in funcs[func]: + insn_addr = insn[0].address + # Add a label if we need one + if insn_addr in self.parent.jtbl_glabels_to_add: + func_text.append(f"glabel L{insn_addr:X}_{insn[3]:X}") + elif insn_addr in self.parent.labels_to_add: + self.parent.labels_to_add.remove(insn_addr) + func_text.append(".L{:X}:".format(insn_addr)) + + if rom_addr_padding: + rom_str = "{0:0{1}X}".format(insn[3], rom_addr_padding) + else: + rom_str = "{:X}".format(insn[3]) + + asm_comment = "/* {} {:X} {} */".format(rom_str, insn_addr, insn[0].bytes.hex().upper()) + + if len(insn) > 4: + op_str = ", ".join(insn[2].split(", ")[:-1] + [insn[4]]) + else: + op_str = insn[2] + + if self.is_branch_insn(insn[0].mnemonic): + branch_addr = int(insn[0].op_str.split(",")[-1].strip(), 0) + if branch_addr in self.parent.jtbl_glabels_to_add: + label_str = f"L{branch_addr:X}_{self.ram_to_rom(branch_addr):X}" + op_str = ", ".join(insn[2].split(", ")[:-1] + [label_str]) + + insn_text = insn[1] + if indent_next: + indent_next = False + insn_text = " " + insn_text + + asm_insn_text = " {}{}".format(insn_text.ljust(mnemonic_ljust), op_str).rstrip() + + func_text.append(asm_comment + asm_insn_text) + + if insn[0].mnemonic != "branch" and insn[0].mnemonic.startswith("b") or insn[0].mnemonic.startswith("j"): + indent_next = True + + ret[func] = (func_text, rom_addr) + + if options.get("find_file_boundaries"): + # If this is not the last function in the file + if func != list(funcs.keys())[-1]: + + # Find where the function returns + jr_pos: Optional[int] = None + for i, insn in enumerate(reversed(funcs[func])): + if insn[0].mnemonic == "jr" and insn[0].op_str == "$ra": + jr_pos = i + break + + # If there is more than 1 nop after the return + if jr_pos is not None and jr_pos > 1 and self.is_nops([i[0] for i in funcs[func][-jr_pos + 1:]]): + new_file_addr = funcs[func][-1][3] + 4 + if (new_file_addr % 16) == 0: + if not self.parent.reported_file_split: + self.parent.reported_file_split = True + print(f"Segment {self.name}, function at vram {func:X} ends with extra nops, indicating a likely file split.") + print("File split suggestions for this segment will follow in config yaml format:") + print(f" - [0x{new_file_addr:X}, asm]") + + return ret + + def gather_jumptable_labels(self, rom_bytes): + # TODO: use the seg_symbols for this + # jumptables = [j.type == "jtbl" for j in self.seg_symbols] + for jumptable in self.parent.jumptables: + start, end = self.parent.jumptables[jumptable] + rom_offset = self.rom_start + jumptable - self.vram_start + + if rom_offset <= 0: + return + + while (rom_offset): + word = rom_bytes[rom_offset : rom_offset + 4] + word_int = int.from_bytes(word, "big") + if word_int >= start and word_int <= end: + self.parent.jtbl_glabels_to_add.add(word_int) + else: + break + + rom_offset += 4 + + def should_scan(self) -> bool: + return options.mode_active("code") + + def should_split(self) -> bool: + return self.extract and options.mode_active("code") diff --git a/tools/splat/segtypes/n64/data.py b/tools/splat/segtypes/n64/data.py new file mode 100644 index 0000000000..542e4c2b96 --- /dev/null +++ b/tools/splat/segtypes/n64/data.py @@ -0,0 +1,199 @@ +from segtypes.n64.codesubsegment import N64SegCodeSubsegment +from pathlib import Path +from typing import Optional +from util.symbols import Symbol +from util import floats, options + +class N64SegData(N64SegCodeSubsegment): + def out_path(self) -> Optional[Path]: + if self.type.startswith("."): + if self.sibling: + # C file + return self.sibling.out_path() + else: + # Implied C file + return options.get_src_path() / self.dir / f"{self.name}.c" + else: + # ASM + return options.get_asm_path() / "data" / self.dir / f"{self.name}.{self.type}.s" + + def scan(self, rom_bytes: bytes): + self.file_text = self.disassemble_data(rom_bytes) + + def split(self, rom_bytes: bytes): + if self.file_text: + path = self.out_path() + + if path: + path.parent.mkdir(parents=True, exist_ok=True) + + with open(path, "w", newline="\n") as f: + f.write(self.file_text) + + def get_linker_section(self) -> str: + return ".data" + + def get_symbols(self): + ret = [] + + for symbol_addr in self.seg_symbols: + for symbol in self.seg_symbols[symbol_addr]: + if not symbol.dead and self.contains_vram(symbol.vram_start): + ret.append(symbol) + + ret.sort(key=lambda s:s.vram_start) + + # Ensure we start at the beginning + if len(ret) == 0 or ret[0].vram_start != self.vram_start: + ret.insert(0, self.parent.get_symbol(self.vram_start, create=True, define=True, local_only=True)) + + # Make a dummy symbol here that marks the end of the previous symbol's disasm range + ret.append(Symbol(self.vram_end)) + + return ret + + @staticmethod + def is_valid_ascii(bytes): + if len(bytes) < 8: + return False + + num_empty_bytes = 0 + for b in bytes: + if b == 0: + num_empty_bytes += 1 + + empty_ratio = num_empty_bytes / len(bytes) + if empty_ratio > 0.2: + return False + + return True + + def disassemble_symbol(self, sym_bytes, sym_type): + if sym_type == "jtbl": + sym_str = ".word " + else: + sym_str = f".{sym_type} " + + if sym_type == "double": + slen = 8 + elif sym_type == "short": + slen = 2 + elif sym_type == "byte": + slen = 1 + else: + slen = 4 + + if sym_type == "ascii": + try: + ascii_str = sym_bytes.decode("EUC-JP") + ascii_str = ascii_str.replace("\\", "\\\\") + ascii_str = ascii_str.replace("\x00", "\\0") + ascii_str = ascii_str.replace("\n", "\\n") + sym_str += f'"{ascii_str}"' + return sym_str + except: + return self.disassemble_symbol(sym_bytes, "word") + + i = 0 + while i < len(sym_bytes): + adv_amt = min(slen, len(sym_bytes) - i) + bits = int.from_bytes(sym_bytes[i : i + adv_amt], "big") + + if sym_type == "jtbl": + if bits == 0: + byte_str = "0" + else: + rom_addr = self.parent.ram_to_rom(bits) + + if rom_addr: + byte_str = f"L{bits:X}_{rom_addr:X}" + else: + byte_str = f"0x{bits:X}" + elif slen == 4 and bits >= 0x80000000: + sym = self.parent.get_symbol(bits, reference=True) + if sym: + byte_str = sym.name + else: + byte_str = '0x{0:0{1}X}'.format(bits, 2 * slen) + else: + byte_str = '0x{0:0{1}X}'.format(bits, 2 * slen) + + if sym_type in ["float", "double"]: + if sym_type == "float": + float_str = floats.format_f32_imm(bits) + else: + float_str = floats.format_f64_imm(bits) + + # Fall back to .word if we see weird float values + # TODO: cut the symbol in half maybe where we see the first nan or something + if "e-" in float_str or "nan" in float_str: + return self.disassemble_symbol(sym_bytes, "word") + else: + byte_str = float_str + + sym_str += byte_str + + i += adv_amt + + if i < len(sym_bytes): + sym_str += ", " + + return sym_str + + def disassemble_data(self, rom_bytes): + rodata_encountered = "rodata" in self.type + ret = ".include \"macro.inc\"\n\n" + ret += f'.section {self.get_linker_section()}' + + if self.size == 0: + return None + + syms = self.get_symbols() + + for i in range(len(syms) - 1): + mnemonic = syms[i].access_mnemonic + sym = self.parent.get_symbol(syms[i].vram_start, create=True, define=True, local_only=True) + + sym_str = f"\n\nglabel {sym.name}\n" + dis_start = self.parent.ram_to_rom(syms[i].vram_start) + dis_end = self.parent.ram_to_rom(syms[i + 1].vram_start) + sym_len = dis_end - dis_start + + if self.type == "bss": + ret += f".space 0x{sym_len:X}" + else: + sym_bytes = rom_bytes[dis_start : dis_end] + + # Checking if the mnemonic is addiu may be too picky - we'll see + if self.is_valid_ascii(sym_bytes) and mnemonic == "addiu": + stype = "ascii" + elif syms[i].type == "jtbl": + stype = "jtbl" + elif len(sym_bytes) % 8 == 0 and mnemonic in N64SegCodeSubsegment.double_mnemonics: + stype = "double" + elif len(sym_bytes) % 4 == 0 and mnemonic in N64SegCodeSubsegment.float_mnemonics: + stype = "float" + elif len(sym_bytes) % 4 == 0 and sym.vram_start % 4 == 0 and (mnemonic in N64SegCodeSubsegment.word_mnemonics or not mnemonic): + stype = "word" + elif len(sym_bytes) % 2 == 0 and sym.vram_start % 2 == 0 and (mnemonic in N64SegCodeSubsegment.short_mnemonics or not mnemonic): + stype = "short" + else: + stype = "byte" + + # If we're starting from a weird place, make sure our container size is correct + if dis_start % 4 != 0 and stype != "byte" and sym_len > 1: + stype = "short" + if dis_start % 2 != 0: + stype = "byte" + + if not rodata_encountered and mnemonic == "jtbl": + rodata_encountered = True + ret += "\n\n\n.section .rodata" + + sym_str += self.disassemble_symbol(sym_bytes, stype) + sym.disasm_str = sym_str + ret += sym_str + + ret += "\n" + + return ret diff --git a/tools/splat/segtypes/n64/group.py b/tools/splat/segtypes/n64/group.py new file mode 100644 index 0000000000..28929c908d --- /dev/null +++ b/tools/splat/segtypes/n64/group.py @@ -0,0 +1,112 @@ +from typing import List, Dict, Optional +import sys +from segtypes.n64.segment import N64Segment +from segtypes.segment import RomAddr, Segment +from util.symbols import Symbol + +class N64SegGroup(N64Segment): + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) + + self.rodata_syms: Dict[int, List[Symbol]] = {} + + # TODO Note: These start/end vram options don't really do anything yet + self.data_vram_start: Optional[int] = segment.get("data_vram_start") + self.data_vram_end: Optional[int] = segment.get("data_vram_end") + self.rodata_vram_start: Optional[int] = segment.get("rodata_vram_start") + self.rodata_vram_end: Optional[int] = segment.get("rodata_vram_end") + self.bss_vram_start: Optional[int] = segment.get("bss_vram_start") + self.bss_vram_end: Optional[int] = segment.get("bss_vram_end") + + self.subsegments = self.parse_subsegments(segment) + + @property + def needs_symbols(self) -> bool: + for seg in self.subsegments: + if seg.needs_symbols: + return True + return False + + def parse_subsegments(self, segment_yaml) -> List[Segment]: + base_segments: Dict[str, Segment] = {} + ret = [] + prev_start: RomAddr = -1 + + if "subsegments" not in segment_yaml: + print(f"Error: Group segment {self.name} is missing a 'subsegments' field") + sys.exit(2) + + for i, subsection_yaml in enumerate(segment_yaml["subsegments"]): + # rompos marker + if isinstance(subsection_yaml, list) and len(subsection_yaml) == 1: + continue + + typ = Segment.parse_segment_type(subsection_yaml) + + segment_class = Segment.get_class_for_type(typ) + + start = Segment.parse_segment_start(subsection_yaml) + end = self.rom_end if i == len(segment_yaml["subsegments"]) - 1 else Segment.parse_segment_start(segment_yaml["subsegments"][i + 1]) + + if isinstance(start, int) and isinstance(prev_start, int) and start < prev_start: + print(f"Error: Code segment {self.name} contains subsegments which are out of ascending rom order (0x{prev_start:X} followed by 0x{start:X})") + sys.exit(1) + + segment: Segment = segment_class(subsection_yaml, start, end) + segment.sibling = base_segments.get(segment.name, None) + segment.parent = self + + if segment.rom_start != "auto": + segment.vram_start = self.rom_to_ram(segment.rom_start) + + # TODO: assumes section order - generalize and stuff + if self.data_vram_start == None and "data" in segment.type: + self.data_vram_start = segment.vram_start + if self.rodata_vram_start == None and "rodata" in segment.type: + self.data_vram_end = segment.vram_start + self.rodata_vram_start = segment.vram_start + if self.rodata_vram_end == None and "bss" in segment.type: + self.rodata_vram_end = segment.vram_start + self.bss_vram_start = segment.vram_start + + ret.append(segment) + + # todo change + if typ in ["c", "asm", "hasm"]: + base_segments[segment.name] = segment + + prev_start = start + + if self.rodata_vram_start != None and self.rodata_vram_end == None: + assert self.vram_end is not None + self.rodata_vram_end = self.vram_end + + return ret + + def get_linker_entries(self): + # [item for sublist in t for item in sublist] + return [entry for sub in self.subsegments for entry in sub.get_linker_entries() ] + + def scan(self, rom_bytes): + for sub in self.subsegments: + if sub.should_scan(): + sub.scan(rom_bytes) + + def split(self, rom_bytes): + for sub in self.subsegments: + if sub.should_split(): + sub.split(rom_bytes) + + def should_split(self) -> bool: + return self.extract + + def should_scan(self) -> bool: + return self.extract + + def cache(self): + c = [] + + for sub in self.subsegments: + c.append(sub.cache()) + + return c diff --git a/tools/splat/segtypes/n64/hasm.py b/tools/splat/segtypes/n64/hasm.py new file mode 100644 index 0000000000..dc7e65598a --- /dev/null +++ b/tools/splat/segtypes/n64/hasm.py @@ -0,0 +1,8 @@ +from segtypes.n64.asm import N64SegAsm + + +class N64SegHasm(N64SegAsm): + def split_write(self, out_path, out_lines): + if not out_path.exists(): + with open(out_path, "w", newline="\n") as f: + f.write("\n".join(out_lines)) diff --git a/tools/splat/segtypes/n64/header.py b/tools/splat/segtypes/n64/header.py index 560519b173..0875c8cbf2 100644 --- a/tools/splat/segtypes/n64/header.py +++ b/tools/splat/segtypes/n64/header.py @@ -1,12 +1,10 @@ -import os from segtypes.n64.segment import N64Segment from pathlib import Path -from segtypes.segment import Segment from util import options class N64SegHeader(N64Segment): - def should_run(self): - return N64Segment.should_run(self) or options.mode_active("asm") + def should_split(self): + return self.extract and options.mode_active("code") @staticmethod def get_line(typ, data, comment): @@ -19,9 +17,10 @@ class N64SegHeader(N64Segment): return f".{typ} {dstr} /* {comment} */" - def split(self, rom_bytes, base_path): - out_dir = Segment.create_split_dir(base_path, "asm") + def out_path(self) -> Path: + return options.get_asm_path() / self.dir / f"{self.name}.s" + def split(self, rom_bytes): encoding = options.get("header_encoding", "ASCII") header_lines = [] @@ -34,7 +33,13 @@ class N64SegHeader(N64Segment): header_lines.append(self.get_line("word", rom_bytes[0x14:0x18], "Checksum 2")) header_lines.append(self.get_line("word", rom_bytes[0x18:0x1C], "Unknown 1")) header_lines.append(self.get_line("word", rom_bytes[0x1C:0x20], "Unknown 2")) - header_lines.append(".ascii \"" + rom_bytes[0x20:0x34].decode(encoding).strip().ljust(20) + "\" /* Internal name */") + + if encoding != "word": + header_lines.append(".ascii \"" + rom_bytes[0x20:0x34].decode(encoding).strip().ljust(20) + "\" /* Internal name */") + else: + for i in range(0x20, 0x34, 4): + header_lines.append(self.get_line("word", rom_bytes[i:i+4], "Internal name")) + header_lines.append(self.get_line("word", rom_bytes[0x34:0x38], "Unknown 3")) header_lines.append(self.get_line("word", rom_bytes[0x38:0x3C], "Cartridge")) header_lines.append(self.get_line("ascii", rom_bytes[0x3C:0x3E], "Cartridge ID")) @@ -42,19 +47,11 @@ class N64SegHeader(N64Segment): header_lines.append(self.get_line("byte", rom_bytes[0x3F:0x40], "Version")) header_lines.append("") - s_path = os.path.join(out_dir, self.name + ".s") - Path(s_path).parent.mkdir(parents=True, exist_ok=True) - with open(s_path, "w", newline="\n") as f: + src_path = self.out_path() + src_path.parent.mkdir(parents=True, exist_ok=True) + with open(src_path, "w", newline="\n") as f: f.write("\n".join(header_lines)) - self.log(f"Wrote {self.name} to {s_path}") - - - def get_ld_section_name(self): - return self.name - - - def get_ld_files(self): - return [("asm", f"{self.name}.s", ".data", self.rom_start)] + self.log(f"Wrote {self.name} to {src_path}") @staticmethod def get_default_name(addr): diff --git a/tools/splat/segtypes/n64/img.py b/tools/splat/segtypes/n64/img.py new file mode 100644 index 0000000000..0f674d5372 --- /dev/null +++ b/tools/splat/segtypes/n64/img.py @@ -0,0 +1,11 @@ +from pathlib import Path +from typing import Optional +from segtypes.n64.segment import N64Segment +from util import options + +class N64SegImg(N64Segment): + def out_path(self) -> Optional[Path]: + return options.get_asset_path() / self.dir / f"{self.name}.png" + + def should_split(self) -> bool: + return self.extract and options.mode_active("img") diff --git a/tools/splat/segtypes/n64/linker.py b/tools/splat/segtypes/n64/linker.py new file mode 100644 index 0000000000..d3123be0ae --- /dev/null +++ b/tools/splat/segtypes/n64/linker.py @@ -0,0 +1,8 @@ +from segtypes.n64.segment import N64Segment + +class N64SegLinker(N64Segment): + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry + + return [LinkerEntry(self, [], self.name, "linker")] + diff --git a/tools/splat/segtypes/n64/palette.py b/tools/splat/segtypes/n64/palette.py index 3d51330540..46e8ad80a1 100644 --- a/tools/splat/segtypes/n64/palette.py +++ b/tools/splat/segtypes/n64/palette.py @@ -1,55 +1,69 @@ -import os -import sys - +from typing import TYPE_CHECKING, Optional +from pathlib import Path from segtypes.n64.segment import N64Segment from util import options from util.color import unpack_color from util.iter import iter_in_groups +from util import log +import png +if TYPE_CHECKING: + from segtypes.n64.ci8 import N64SegCi8 as Raster class N64SegPalette(N64Segment): require_unique_name = False - def __init__(self, segment, next_segment): - super().__init__(segment, next_segment) + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) + + self.raster: 'Optional[Raster]' = None # palette segments must be named as one of the following: - # 1) same as the relevant ci4/ci8 segment name (max. 1 palette) - # 2) relevant ci4/ci8 segment name + "." + unique palette name - # 3) unique, referencing the relevant ci4/ci8 segment using `image_name` - self.image_name = segment.get("image_name", self.name.split( - ".")[0]) if type(segment) is dict else self.name.split(".")[0] + # 1) same as the relevant raster segment name (max. 1 palette) + # 2) relevant raster segment name + "." + unique palette name + # 3) unique, referencing the relevant raster segment using `raster_name` + self.raster_name = segment.get( + "raster_name", + self.name.split(".")[0] + ) if type(segment) is dict else self.name.split(".")[0] - if self.max_length(): + if self.rom_end == "auto": + log.error(f"segment {self.name} needs to know where it ends; add a position marker [0xDEADBEEF] after it") + + if self.max_length() and isinstance(self.rom_end, int): expected_len = int(self.max_length()) actual_len = self.rom_end - self.rom_start if actual_len > expected_len and actual_len - expected_len > self.subalign: - print(f"Error: {self.name} should end at 0x{self.rom_start + expected_len:X}, but it ends at 0x{self.rom_end:X}\n(hint: add a 'bin' segment after it)") - sys.exit(1) + log.error(f"Error: {self.name} should end at 0x{self.rom_start + expected_len:X}, but it ends at 0x{self.rom_end:X}\n(hint: add a 'bin' segment after it)") - def should_run(self): - return super().should_run() or ( - options.mode_active("img") or - options.mode_active("ci4") or - options.mode_active("ci8") or - options.mode_active("i4") or - options.mode_active("i8") or - options.mode_active("ia4") or - options.mode_active("ia8") or - options.mode_active("ia16") + def should_split(self): + return super().should_split() or options.mode_active("img") + + def out_path(self) -> Optional[Path]: + return options.get_asset_path() / self.dir / f"{self.name}.png" + + def split(self, rom_bytes): + if self.raster is None: + # TODO: output with no raster + log.error(f"orphaned palette segment: {self.name} lacks ci4/ci8 sibling") + return + + w = png.Writer(self.raster.width, self.raster.height, palette=self.parse_palette(rom_bytes)) + image = self.raster.__class__.parse_image( + rom_bytes[self.raster.rom_start:self.raster.rom_end], + self.raster.width, + self.raster.height, + self.raster.flip_horizontal, + self.raster.flip_vertical ) - def split(self, rom_bytes, base_path): - out_dir = self.create_parent_dir(base_path + "/" + options.get("assets_dir", "img"), self.name) - self.path = os.path.join( - out_dir, os.path.basename(self.name) + ".png") + with open(self.out_path(), "wb") as f: + w.write_array(f, image) - data = rom_bytes[self.rom_start: self.rom_end] + self.raster.extract = False - self.palette = N64SegPalette.parse_palette(data) - - @staticmethod - def parse_palette(data): + def parse_palette(self, rom_bytes): + data = rom_bytes[self.rom_start:self.rom_end] palette = [] for a, b in iter_in_groups(data, 2): @@ -60,7 +74,12 @@ class N64SegPalette(N64Segment): def max_length(self): return 256 * 2 - def get_ld_files(self): - ext = f".{self.type}.png" + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry - return [(options.get("assets_dir", "img"), f"{self.name}{ext}", ".data", self.rom_start)] + return [LinkerEntry( + self, + [options.get_asset_path() / self.dir / f"{self.name}.png"], + options.get_asset_path() / self.dir / f"{self.name}.pal", + self.get_linker_section() + )] diff --git a/tools/splat/segtypes/n64/rgba16.py b/tools/splat/segtypes/n64/rgba16.py index 08a40fce27..8786d9dc1c 100644 --- a/tools/splat/segtypes/n64/rgba16.py +++ b/tools/splat/segtypes/n64/rgba16.py @@ -1,21 +1,21 @@ -import os -from segtypes.n64.segment import N64Segment +from segtypes.n64.img import N64SegImg import png from util import iter +from util import log from util import options from util.color import unpack_color -import sys -class N64SegRgba16(N64Segment): - def __init__(self, segment, next_segment): - super().__init__(segment, next_segment) +# TODO: move common behaviour to N64ImgSegment and have all image segments extend that instead +class N64SegRgba16(N64SegImg): + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) if type(segment) is dict: self.width = segment["width"] self.height = segment["height"] self.flip = segment.get("flip", "noflip") elif len(segment) < 5: - self.error("missing parameters") + log.error("missing parameters") else: self.width = segment[3] self.height = segment[4] @@ -25,8 +25,7 @@ class N64SegRgba16(N64Segment): expected_len = int(self.max_length()) actual_len = self.rom_end - self.rom_start if actual_len > expected_len and actual_len - expected_len > self.subalign: - print(f"Error: {self.name} should end at 0x{self.rom_start + expected_len:X}, but it ends at 0x{self.rom_end:X}\n(hint: add a 'bin' segment after it)") - sys.exit(1) + log.error(f"Error: {self.name} should end at 0x{self.rom_start + expected_len:X}, but it ends at 0x{self.rom_end:X}\n(hint: add a 'bin' segment after it)") @property def flip_vertical(self): @@ -36,12 +35,12 @@ class N64SegRgba16(N64Segment): def flip_horizontal(self): return self.flip == "both" or self.flip.startswith("h") or self.flip == "x" - def should_run(self): - return super().should_run() or options.mode_active("img") + def should_split(self): + return super().should_split() or options.mode_active("img") - def split(self, rom_bytes, base_path): - out_dir = self.create_parent_dir(base_path + "/" + options.get("assets_dir", "img"), self.name) - path = os.path.join(out_dir, os.path.basename(self.name) + ".png") + def split(self, rom_bytes): + path = self.out_path() + path.parent.mkdir(parents=True, exist_ok=True) data = rom_bytes[self.rom_start: self.rom_end] @@ -66,8 +65,3 @@ class N64SegRgba16(N64Segment): def max_length(self): return self.width * self.height * 2 - - def get_ld_files(self): - ext = f".{self.type}.png" - - return [(options.get("assets_dir", "img"), f"{self.name}{ext}", ".data", self.rom_start)] diff --git a/tools/splat/segtypes/n64/rodata.py b/tools/splat/segtypes/n64/rodata.py new file mode 100644 index 0000000000..5cd4dbaee2 --- /dev/null +++ b/tools/splat/segtypes/n64/rodata.py @@ -0,0 +1,18 @@ +from segtypes.n64.data import N64SegData + +class N64SegRodata(N64SegData): + def get_linker_section(self) -> str: + return ".rodata" + + def scan(self, rom_bytes: bytes): + self.file_text = self.disassemble_data(rom_bytes) + + def split(self, rom_bytes: bytes): + if self.file_text: + path = self.out_path() + + if path: + path.parent.mkdir(parents=True, exist_ok=True) + + with open(path, "w", newline="\n") as f: + f.write(self.file_text) diff --git a/tools/splat/segtypes/segment.py b/tools/splat/segtypes/segment.py index bace19dbb7..6ce98b72f1 100644 --- a/tools/splat/segtypes/segment.py +++ b/tools/splat/segtypes/segment.py @@ -1,192 +1,264 @@ -from pathlib import Path, PurePath +import importlib +from typing import Dict, TYPE_CHECKING, Union, Optional, List +from pathlib import Path from util import log from util import options -import re +from util.symbols import Symbol import sys -default_subalign = 16 +# circular import +if TYPE_CHECKING: + from segtypes.linker_entry import LinkerEntry + +RomAddr = Union[int, str] -def parse_segment_start(segment): - return segment[0] if "start" not in segment else segment["start"] - - -def parse_segment_type(segment): - if type(segment) is dict: - return segment["type"] +def parse_segment_vram(segment: Union[dict, list]) -> Optional[int]: + if isinstance(segment, dict) and "vram" in segment: + return int(segment["vram"]) else: - return segment[1] + return None -def parse_segment_name(segment, segment_class): - if type(segment) is dict and "name" in segment: - return segment["name"] - elif type(segment) is list and len(segment) >= 3 and type(segment[2]) is str: - return segment[2] - else: - return segment_class.get_default_name(parse_segment_start(segment)) - - -def parse_segment_vram(segment): - if type(segment) is dict: - return segment.get("vram", 0) - else: - return 0 - - -def parse_segment_subalign(segment): - default = options.get("subalign", default_subalign) - if type(segment) is dict: - return segment.get("subalign", default) +def parse_segment_subalign(segment: Union[dict, list]) -> int: + default = options.get_subalign() + if isinstance(segment, dict): + return int(segment.get("subalign", default)) return default class Segment: require_unique_name = True - def __init__(self, segment, next_segment): - self.rom_start = parse_segment_start(segment) - self.rom_end = parse_segment_start(next_segment) - self.type = parse_segment_type(segment) - self.name = parse_segment_name(segment, self.__class__) - self.vram_start = parse_segment_vram(segment) - self.ld_name_override = segment.get("ld_name") if type(segment) is dict else None - self.extract = segment.get("extract", True) if type(segment) is dict else True - self.config = segment - self.subalign = parse_segment_subalign(segment) + @staticmethod + def get_class_for_type(seg_type): + # so .data loads SegData, for example + if seg_type.startswith("."): + seg_type = seg_type[1:] - self.errors = [] - self.warnings = [] + segment_class = Segment.get_base_segment_class(seg_type) + if segment_class == None: + # Look in extensions + segment_class = Segment.get_extension_segment_class(seg_type) + return segment_class + + @staticmethod + def get_base_segment_class(seg_type): + platform = options.get_platform() + + try: + segmodule = importlib.import_module(f"segtypes.{platform}.{seg_type}") + except ModuleNotFoundError: + return None + + return getattr(segmodule, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}") + + @staticmethod + def get_extension_segment_class(seg_type): + platform = options.get_platform() + + ext_path = options.get_extensions_path() + if not ext_path: + log.error(f"could not load presumed extended segment type '{seg_type}' because no extensions path is configured") + + try: + ext_spec = importlib.util.spec_from_file_location(f"{platform}.segtypes.{seg_type}", ext_path / f"{seg_type}.py") + ext_mod = importlib.util.module_from_spec(ext_spec) + ext_spec.loader.exec_module(ext_mod) + except Exception as err: + log.write(err, status="error") + log.error(f"could not load segment type '{seg_type}'\n(hint: confirm your extension directory is configured correctly)") + + return getattr(ext_mod, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}") + + @staticmethod + def parse_segment_start(segment: Union[dict, list]) -> RomAddr: + if isinstance(segment, dict): + s = segment.get("start", "auto") + else: + s = segment[0] + + if s == "auto": + return "auto" + else: + return int(s) + + @staticmethod + def parse_segment_type(segment: Union[dict, list]) -> str: + if isinstance(segment, dict): + return str(segment["type"]) + else: + return str(segment[1]) + + def parse_segment_name(self, segment: Union[dict, list]) -> str: + if isinstance(segment, dict) and "name" in segment: + return str(segment["name"]) + elif isinstance(segment, dict) and "dir" in segment: + return str(segment["dir"]) + elif isinstance(segment, list) and len(segment) >= 3: + return str(segment[2]) + else: + return str(self.__class__.get_default_name(self.rom_start)) + + def __init__(self, segment: Union[dict, list], rom_start: RomAddr, rom_end: RomAddr): + self.rom_start = rom_start + self.rom_end = rom_end + self.type = Segment.parse_segment_type(segment) + self.name = self.parse_segment_name(segment) + self.given_dir = Path(segment.get("dir", "")) if isinstance(segment, dict) else Path() + self.vram_start = parse_segment_vram(segment) + self.extract = bool(segment.get("extract", True)) if isinstance(segment, dict) else True + self.config = segment + self.given_subalign = parse_segment_subalign(segment) + self.parent:Optional[Segment] = None + self.args:List[str] = [] if isinstance(segment, dict) else segment[3:] + + self.given_is_overlay:Optional[bool] = segment.get("overlay", False) if isinstance(segment, dict) else False + + self.sibling:Optional[Segment] = None + + self.given_seg_symbols: Dict[int, Symbol] = {} # Symbols known to be in this segment + self.given_ext_symbols: Dict[int, Symbol] = {} # Symbols not in this segment but also not from other overlapping ram address ranges + + if "skip" in self.args: + self.extract = False + + if self.rom_start == "auto": + self.extract = False + + if self.type.startswith("."): + self.extract = False + + self.warnings: List[str] = [] self.did_run = False - if self.rom_start > self.rom_end: - print(f"Error: segments out of order - ({self.name} starts at 0x{self.rom_start:X}, but next segment starts at 0x{self.rom_end:X})") - sys.exit(1) + if isinstance(self.rom_start, int) and isinstance(self.rom_end, int): + if self.rom_start > self.rom_end: + print(f"Error: segments out of order - ({self.name} starts at 0x{self.rom_start:X}, but next segment starts at 0x{self.rom_end:X})") + sys.exit(1) + + @property + def needs_symbols(self) -> bool: + return False @property - def size(self): - return self.rom_end - self.rom_start + def dir(self) -> Path: + if self.parent: + return self.parent.dir / self.given_dir + else: + return self.given_dir + + @property + def subalign(self) -> int: + if self.parent: + return self.parent.subalign + else: + return self.given_subalign + + @property + def is_overlay(self) -> bool: + if self.parent: + return self.parent.is_overlay + if self.given_is_overlay is not None: + return self.given_is_overlay + return False @property - def vram_end(self): - return self.vram_start + self.size + def seg_symbols(self) -> Dict[int, Symbol]: + if self.parent: + return self.parent.seg_symbols + else: + return self.given_seg_symbols - def contains_vram(self, vram): - return vram >= self.vram_start and vram < self.vram_end + @property + def ext_symbols(self) -> Dict[int, Symbol]: + if self.parent: + return self.parent.ext_symbols + else: + return self.given_ext_symbols - def contains_rom(self, rom): - return rom >= self.rom_start and rom < self.rom_end - - def rom_to_ram(self, rom_addr): - if rom_addr < self.rom_start or rom_addr > self.rom_end: + @property + def size(self) -> Optional[int]: + if isinstance(self.rom_start, int) and isinstance(self.rom_end, int): + return self.rom_end - self.rom_start + else: return None - return self.vram_start + rom_addr - self.rom_start - - def ram_to_rom(self, ram_addr): - if ram_addr < self.vram_start or ram_addr > self.vram_end: + @property + def vram_end(self) -> Optional[int]: + if self.vram_start is not None and self.size is not None: + return self.vram_start + self.size + else: return None - return self.rom_start + ram_addr - self.vram_start + def contains_vram(self, vram: int) -> bool: + if self.vram_start is not None and self.vram_end is not None: + return vram >= self.vram_start and vram < self.vram_end + else: + return False - @staticmethod - def create_split_dir(base_path, subdir): - out_dir = Path(base_path, subdir) - out_dir.mkdir(parents=True, exist_ok=True) - return out_dir + def contains_rom(self, rom: int) -> bool: + if isinstance(self.rom_start, int) and isinstance(self.rom_end, int): + return rom >= self.rom_start and rom < self.rom_end + else: + return False - @staticmethod - def create_parent_dir(base_path, filename): - out_dir = Path(base_path, filename).parent - out_dir.mkdir(parents=True, exist_ok=True) - return out_dir + def rom_to_ram(self, rom_addr: int) -> Optional[int]: + if not self.contains_rom(rom_addr) and rom_addr != self.rom_end: + return None - def should_run(self): + if self.vram_start is not None and isinstance(self.rom_start, int): + return self.vram_start + rom_addr - self.rom_start + else: + return None + + def ram_to_rom(self, ram_addr: int) -> Optional[int]: + if not self.contains_vram(ram_addr) and ram_addr != self.vram_end: + return None + + if self.vram_start is not None and isinstance(self.rom_start, int): + return self.rom_start + ram_addr - self.vram_start + else: + return None + + def should_scan(self) -> bool: + return self.should_split() + + def should_split(self) -> bool: return self.extract and options.mode_active(self.type) - - def split(self, rom_bytes, base_path): + + def scan(self, rom_bytes: bytes): pass - def postsplit(self, segments): + def split(self, rom_bytes: bytes): pass def cache(self): return (self.config, self.rom_end) - def get_ld_section(self): - replace_ext = options.get("ld_o_replace_extension", True) - sect_name = self.ld_name_override if self.ld_name_override else self.get_ld_section_name() - vram_or_rom = self.rom_start if self.vram_start == 0 else self.vram_start - subalign_str = f"SUBALIGN({self.subalign})" + def get_linker_section(self) -> str: + return ".data" - s = ( - f"SPLAT_BEGIN_SEG({sect_name}, 0x{self.rom_start:X}, 0x{vram_or_rom:X}, {subalign_str})\n" - ) + def out_path(self) -> Optional[Path]: + return None - i = 0 - do_next = False - for subdir, path, obj_type, start in self.get_ld_files(): - # Manual linker segment creation - if obj_type == "linker": - s += ( - "}\n" - f"SPLAT_BEGIN_SEG({path}, 0x{start:X}, 0x{self.rom_to_ram(start):X}, {subalign_str})\n" - ) + def get_linker_entries(self) -> "List[LinkerEntry]": + from segtypes.linker_entry import LinkerEntry - # Create new sections for non-0x10 alignment (hack) - if start % 0x10 != 0 and i != 0 or do_next: - tmp_sect_name = path.replace(".", "_") - tmp_sect_name = tmp_sect_name.replace("/", "_") - s += ( - "}\n" - f"SPLAT_BEGIN_SEG({tmp_sect_name}, 0x{start:X}, 0x{self.rom_to_ram(start):X}, {subalign_str})\n" - ) - do_next = False + path = self.out_path() - if start % 0x10 != 0 and i != 0: - do_next = True - - path_cname = re.sub(r"[^0-9a-zA-Z_]", "_", path) - s += f" {path_cname} = .;\n" - - if subdir == options.get("assets_dir"): - path = PurePath(path) - else: - path = PurePath(subdir) / PurePath(path) - - # Remove leading ..s - while path.parts[0] == "..": - path = path.relative_to("..") - - path = path.with_suffix(".o" if replace_ext else path.suffix + ".o") - - if obj_type != "linker": - s += f" BUILD_DIR/{path}({obj_type});\n" - i += 1 - - s += ( - f"SPLAT_END_SEG({sect_name}, 0x{self.rom_end:X})\n" - ) - - return s - - def get_ld_section_name(self): - return f"data_{self.rom_start:X}" - - # returns list of (basedir, filename, obj_type) - def get_ld_files(self): - return [] + if path: + return [LinkerEntry(self, [path], path, self.get_linker_section())] + else: + return [] def log(self, msg): if options.get("verbose", False): log.write(f"{self.type} {self.name}: {msg}") - def warn(self, msg): + def warn(self, msg: str): self.warnings.append(msg) - def error(self, msg): - self.errors.append(msg) - def max_length(self): return None @@ -194,12 +266,15 @@ class Segment: return self.name == self.get_default_name(self.rom_start) def unique_id(self): - return self.type + "_" + self.name + if self.parent: + s = self.parent.unique_id() + "_" + else: + s = "" + + return s + self.type + "_" + self.name def status(self): - if len(self.errors) > 0: - return "error" - elif len(self.warnings) > 0: + if len(self.warnings) > 0: return "warn" elif self.did_run: return "ok" @@ -207,5 +282,5 @@ class Segment: return "skip" @staticmethod - def get_default_name(addr): - return "{:X}".format(addr) + def get_default_name(addr) -> str: + return f"{addr:X}" diff --git a/tools/splat/split.py b/tools/splat/split.py index 4ade7d3766..83f8eb8001 100755 --- a/tools/splat/split.py +++ b/tools/splat/split.py @@ -1,180 +1,27 @@ #! /usr/bin/python3 +from typing import Dict, List, Union, Set import argparse -import importlib -import importlib.util -import os -from pathlib import Path +import pylibyaml import yaml import pickle from colorama import Style, Fore -from segtypes.segment import parse_segment_type -from segtypes.n64.code import N64SegCode +from segtypes.segment import Segment +from segtypes.linker_entry import LinkerWriter from util import log from util import options -from util.symbol import Symbol -import sys +from util import symbols +from util import palettes -parser = argparse.ArgumentParser( - description="Split a rom given a rom, a config, and output directory") +parser = argparse.ArgumentParser(description="Split a rom given a rom, a config, and output directory") parser.add_argument("config", help="path to a compatible config .yaml file") -parser.add_argument("--rom", help="path to a .z64 rom") -parser.add_argument("--outdir", help="a directory in which to extract the rom") +parser.add_argument("--target", help="path to a file to split (.z64 rom)") +parser.add_argument("--basedir", help="a directory in which to extract the rom") parser.add_argument("--modes", nargs="+", default="all") -parser.add_argument("--verbose", action="store_true", - help="Enable debug logging") -parser.add_argument("--new", action="store_true", - help="Only split changed segments in config") +parser.add_argument("--verbose", action="store_true", help="Enable debug logging") +parser.add_argument("--use-cache", action="store_true", help="Only split changed segments in config") -sym_isolated_map = {} - -def write_ldscript(rom_name, repo_path, sections): - with open(os.path.join(repo_path, rom_name + ".ld"), "w", newline="\n") as f: - f.write( - "#ifndef SPLAT_BEGIN_SEG\n" - "#ifndef SHIFT\n" - "#define SPLAT_BEGIN_SEG(name, start, vram, subalign) \\\n" - " . = start;\\\n" - " name##_ROM_START = .;\\\n" - " name##_VRAM = ADDR(.name);\\\n" - " .name vram : AT(name##_ROM_START) subalign {\n" - "#else\n" - "#define SPLAT_BEGIN_SEG(name, start, vram, subalign) \\\n" - " name##_ROM_START = .;\\\n" - " name##_VRAM = ADDR(.name);\\\n" - " .name vram : AT(name##_ROM_START) subalign {\n" - "#endif\n" - "#endif\n" - "\n" - "#ifndef SPLAT_END_SEG\n" - "#ifndef SHIFT\n" - "#define SPLAT_END_SEG(name, end) \\\n" - " } \\\n" - " . = end;\\\n" - " name##_ROM_END = .;\n" - "#else\n" - "#define SPLAT_END_SEG(name, end) \\\n" - " } \\\n" - " name##_ROM_END = .;\n" - "#endif\n" - "#endif\n" - "\n" - ) - - if options.get("ld_bare", False): - f.write("\n".join(sections)) - else: - f.write( - "SECTIONS\n" - "{\n" - " " - ) - f.write("\n ".join(s.replace("\n", "\n ") for s in sections)[:-4]) - f.write( - - " /DISCARD/ :\n" - " {\n" - " *(*);\n" - " }\n" - "}\n" - ) - - -def parse_file_start(split_file): - return split_file[0] if "start" not in split_file else split_file["start"] - - -def get_symbol_addrs_path(repo_path): - return os.path.join(repo_path, options.get("symbol_addrs_path", "symbol_addrs.txt")) - - -def get_undefined_syms_auto_path(repo_path): - return os.path.join(repo_path, options.get("undefined_syms_auto_path", "undefined_syms_auto.txt")) - - -def get_undefined_funcs_auto_path(repo_path): - return os.path.join(repo_path, options.get("undefined_funcs_auto_path", "undefined_funcs_auto.txt")) - - -def get_cache_path(repo_path): - return os.path.join(repo_path, options.get("cache_path", ".splat_cache")) - - -def gather_symbols(symbol_addrs_path): - symbols = [] - - # Manual list of func name / addrs - if os.path.exists(symbol_addrs_path): - with open(symbol_addrs_path) as f: - func_addrs_lines = f.readlines() - - for line in func_addrs_lines: - line = line.strip() - if not line == "" and not line.startswith("//"): - comment_loc = line.find("//") - line_ext = "" - - if comment_loc != -1: - line_ext = line[comment_loc + 2:].strip() - line = line[:comment_loc].strip() - - line_split = line.split("=") - name = line_split[0].strip() - addr = int(line_split[1].strip()[:-1], 0) - - sym = Symbol(addr, given_name=name) - - if line_ext: - for info in line_ext.split(" "): - if info.startswith("type:"): - type = info.split(":")[1] - sym.type = type - if info.startswith("size:"): - size = int(info.split(":")[1], 0) - sym.size = size - if info.startswith("rom:"): - rom_addr = int(info.split(":")[1], 0) - sym.rom = rom_addr - if info.startswith("dead:"): - sym.dead = True - sym.defined = True - - symbols.append(sym) - return symbols - - -def get_base_segment_class(seg_type, platform): - try: - segmodule = importlib.import_module(f"segtypes.{platform}.{seg_type}") - except ModuleNotFoundError: - return None - - return getattr(segmodule, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}") - - -def get_extension_dir(config_path): - if not options.get("extensions"): - return None - return os.path.join(Path(config_path).parent, options.get("extensions")) - - -def get_extension_class(config_path, seg_type, platform): - ext_dir = get_extension_dir(config_path) - if ext_dir == None: - return None - - try: - ext_spec = importlib.util.spec_from_file_location(f"{platform}.segtypes.{seg_type}", os.path.join(ext_dir, f"{seg_type}.py")) - ext_mod = importlib.util.module_from_spec(ext_spec) - ext_spec.loader.exec_module(ext_mod) - except Exception as err: - log.write(err, status="error") - return None - - return getattr(ext_mod, f"{platform.upper()}Seg{seg_type[0].upper()}{seg_type[1:]}") - -def get_platform(): - return options.get("platform", "n64") +linker_writer: LinkerWriter def fmt_size(size): if size > 1000000: @@ -184,57 +31,40 @@ def fmt_size(size): else: return str(size) + " B" - -def initialize_segments(config_path, config_segments): - seen_segment_names = set() +def initialize_segments(config_segments: Union[dict, list]) -> List[Segment]: + seen_segment_names: Set[str] = set() ret = [] - for i, segment in enumerate(config_segments[:-1]): - seg_type = parse_segment_type(segment) + for i, seg_yaml in enumerate(config_segments): + # rompos marker + if isinstance(seg_yaml, list) and len(seg_yaml) == 1: + continue - platform = get_platform() + seg_type = Segment.parse_segment_type(seg_yaml) - segment_class = get_base_segment_class(seg_type, platform) - if segment_class == None: - # Look in extensions - segment_class = get_extension_class(config_path, seg_type, platform) + segment_class = Segment.get_class_for_type(seg_type) + + this_start = Segment.parse_segment_start(seg_yaml) + next_start = Segment.parse_segment_start(config_segments[i + 1]) - if segment_class == None: - log.write(f"fatal error: could not load segment type '{seg_type}'\n(hint: confirm your extension directory is configured correctly)", status="error") - sys.exit(2) + segment: Segment = segment_class(seg_yaml, this_start, next_start) - segment = segment_class(segment, config_segments[i + 1]) - - if segment_class.require_unique_name: + if segment.require_unique_name: if segment.name in seen_segment_names: - segment.error("segment name is not unique") + log.error(f"segment name '{segment.name}' is not unique") + seen_segment_names.add(segment.name) ret.append(segment) return ret -def is_symbol_isolated(symbol, all_segments): - if symbol in sym_isolated_map: - return sym_isolated_map[symbol] - - relevant_segs = 0 - - for segment in all_segments: - if segment.contains_vram(symbol.vram_start): - relevant_segs += 1 - if relevant_segs > 1: - break - - sym_isolated_map[symbol] = relevant_segs < 2 - return sym_isolated_map[symbol] - -def get_segment_symbols(segment, all_symbols, all_segments): +def get_segment_symbols(segment, all_segments): seg_syms = {} other_syms = {} - for symbol in all_symbols: - if is_symbol_isolated(symbol, all_segments) and not symbol.rom: + for symbol in symbols.all_symbols: + if symbols.is_symbol_isolated(symbol, all_segments) and not symbol.rom: if segment.contains_vram(symbol.vram_start): if symbol.vram_start not in seg_syms: seg_syms[symbol.vram_start] = [] @@ -255,142 +85,7 @@ def get_segment_symbols(segment, all_symbols, all_segments): return seg_syms, other_syms -def main(config_path, out_dir, target_path, modes, verbose, ignore_cache=False): - # Load config - with open(config_path) as f: - config = yaml.safe_load(f.read()) - - options.initialize(config) - options.set("modes", modes) - options.set("verbose", verbose) - - if not out_dir: - out_dir = options.get("out_dir") - if not out_dir: - print("Error: Output dir not specified as a command line arg or via the config yaml (out_dir)") - sys.exit(2) - else: - out_dir = os.path.join(Path(config_path).parent, out_dir) - - if not target_path: - target_path = options.get("target_path") - if not target_path: - print("Error: Target binary path not specified as a command line arg or via the config yaml (target_path)") - sys.exit(2) - else: - target_path = os.path.join(out_dir, target_path) - - with open(target_path, "rb") as f: - rom_bytes = f.read() - - # Create main output dir - Path(out_dir).mkdir(parents=True, exist_ok=True) - - symbol_addrs_path = get_symbol_addrs_path(out_dir) - all_symbols = gather_symbols(symbol_addrs_path) - symbol_ranges = [s for s in all_symbols if s.size > 4] - platform = get_platform() - - processed_segments = [] - ld_sections = [] - - seg_sizes = {} - seg_split = {} - seg_cached = {} - - # Load cache - cache_path = get_cache_path(out_dir) - try: - with open(cache_path, "rb") as f: - cache = pickle.load(f) - except Exception: - cache = {} - - # Initialize segments - all_segments = initialize_segments(config_path, config["segments"]) - - for segment in all_segments: - if platform == "n64" and type(segment) == N64SegCode: # TODO remove special-case sometime - segment_symbols, other_symbols = get_segment_symbols(segment, all_symbols, all_segments) - segment.seg_symbols = segment_symbols - segment.ext_symbols = other_symbols - segment.all_symbols = all_symbols - segment.symbol_ranges = symbol_ranges - - typ = segment.type - if segment.type == "bin" and segment.is_name_default(): - typ = "unk" - - if typ not in seg_sizes: - seg_sizes[typ] = 0 - seg_split[typ] = 0 - seg_cached[typ] = 0 - seg_sizes[typ] += segment.size - - if len(segment.errors) == 0: - if segment.should_run(): - # Check cache - cached = segment.cache() - if not ignore_cache and cached == cache.get(segment.unique_id()): - # Cache hit - seg_cached[typ] += 1 - else: - # Cache miss; split - cache[segment.unique_id()] = cached - - segment.did_run = True - segment.split(rom_bytes, out_dir) - - if len(segment.errors) == 0: - processed_segments.append(segment) - - seg_split[typ] += 1 - - log.dot(status=segment.status()) - ld_sections.append(segment.get_ld_section()) - - for segment in processed_segments: - segment.postsplit(processed_segments) - log.dot(status=segment.status()) - - # Write ldscript - if options.mode_active("ld") and not options.get("skip_ld"): - if verbose: - log.write(f"saving {config['basename']}.ld") - write_ldscript(config['basename'], out_dir, ld_sections) - - undefined_syms_to_write = [s for s in all_symbols if s.referenced and not s.defined and not s.type == "func"] - undefined_funcs_to_write = [s for s in all_symbols if s.referenced and not s.defined and s.type == "func"] - - # Write undefined_funcs_auto.txt - undefined_funcs_auto_path = get_undefined_funcs_auto_path(out_dir) - - to_write = undefined_funcs_to_write - if len(to_write) > 0: - with open(undefined_funcs_auto_path, "w", newline="\n") as f: - for symbol in to_write: - f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") - - # write undefined_syms_auto.txt - undefined_syms_auto_path = get_undefined_syms_auto_path(out_dir) - - to_write = undefined_syms_to_write - if len(to_write) > 0: - with open(undefined_syms_auto_path, "w", newline="\n") as f: - for symbol in to_write: - f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") - - # print warnings during split/postsplit - for segment in all_segments: - if len(segment.warnings) > 0: - log.write(f"{Style.DIM}0x{segment.rom_start:06X}{Style.RESET_ALL} {segment.type} {Style.BRIGHT}{segment.name}{Style.RESET_ALL}:") - - for warn in segment.warnings: - log.write("warning: " + warn, status="warn") - - log.write("") # empty line - - # Statistics +def do_statistics(seg_sizes, rom_bytes, seg_split, seg_cached): unk_size = seg_sizes.get("unk", 0) rest_size = 0 total_size = len(rom_bytes) @@ -399,8 +94,6 @@ def main(config_path, out_dir, target_path, modes, verbose, ignore_cache=False): if typ != "unk": rest_size += seg_sizes[typ] - assert(unk_size + rest_size == total_size) - known_ratio = rest_size / total_size unk_ratio = unk_size / total_size @@ -412,16 +105,155 @@ def main(config_path, out_dir, target_path, modes, verbose, ignore_cache=False): log.write(f"{typ:>20}: {fmt_size(tmp_size):>8} ({tmp_ratio:.2%}) {Fore.GREEN}{seg_split[typ]} split{Style.RESET_ALL}, {Style.DIM}{seg_cached[typ]} cached") log.write(f"{'unknown':>20}: {fmt_size(unk_size):>8} ({unk_ratio:.2%}) from unknown bin files") - # Save cache - if cache != {}: - if verbose: - print("Writing cache") - with open(cache_path, "wb") as f: - pickle.dump(cache, f) +def main(config_path, base_dir, target_path, modes, verbose, use_cache=True): + # Load config + with open(config_path) as f: + config = yaml.load(f.read(), Loader=yaml.SafeLoader) - return 0 # no error + options.initialize(config, config_path, base_dir, target_path) + options.set("modes", modes) + options.set("verbose", verbose) + + with options.get_target_path().open("rb") as f2: + rom_bytes = f2.read() + + # Create main output dir + options.get_base_path().mkdir(parents=True, exist_ok=True) + + processed_segments: List[Segment] = [] + + seg_sizes: Dict[str, int] = {} + seg_split: Dict[str, int] = {} + seg_cached: Dict[str, int] = {} + + # Load cache + if use_cache: + try: + with options.get_cache_path().open("rb") as f3: + cache = pickle.load(f3) + + if verbose: + log.write(f"Loaded cache ({len(cache.keys())} items)") + except Exception: + cache = {} + else: + cache = {} + + # invalidate entire cache if options change + if use_cache and cache.get("__options__") != config.get("options"): + if verbose: + log.write("Options changed, invalidating cache") + + cache = { + "__options__": config.get("options"), + } + + # Initialize segments + all_segments = initialize_segments(config["segments"]) + + # Load and process symbols + if options.mode_active("code"): + log.write("Loading and processing symbols") + symbols.initialize(all_segments) + + # Resolve raster/palette siblings + if options.mode_active("img"): + palettes.initialize(all_segments) + + # Scan + log.write("Starting scan") + for segment in all_segments: + typ = segment.type + if segment.type == "bin" and segment.is_name_default(): + typ = "unk" + + if typ not in seg_sizes: + seg_sizes[typ] = 0 + seg_split[typ] = 0 + seg_cached[typ] = 0 + seg_sizes[typ] += 0 if segment.size is None else segment.size + + if segment.should_scan(): + # Check cache but don't write anything + if use_cache: + if segment.cache() == cache.get(segment.unique_id()): + continue + + if segment.needs_symbols: + segment_symbols, other_symbols = get_segment_symbols(segment, all_segments) + segment.given_seg_symbols = segment_symbols + segment.given_ext_symbols = other_symbols + + segment.did_run = True + segment.scan(rom_bytes) + + processed_segments.append(segment) + + seg_split[typ] += 1 + + log.dot(status=segment.status()) + + # Split + log.write("Starting split") + for segment in all_segments: + if use_cache: + cached = segment.cache() + + if cached == cache.get(segment.unique_id()): + # Cache hit + seg_cached[typ] += 1 + continue + else: + # Cache miss; split + cache[segment.unique_id()] = cached + + if segment.should_split(): + segment.split(rom_bytes) + + log.dot(status=segment.status()) + + if options.mode_active("ld"): + global linker_writer + linker_writer = LinkerWriter() + for segment in all_segments: + linker_writer.add(segment) + linker_writer.save_linker_script() + linker_writer.save_symbol_header() + + # Write undefined_funcs_auto.txt + to_write = [s for s in symbols.all_symbols if s.referenced and not s.defined and not s.dead and s.type == "func"] + if len(to_write) > 0: + with open(options.get_undefined_funcs_auto_path(), "w", newline="\n") as f: + for symbol in to_write: + f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") + + # write undefined_syms_auto.txt + to_write = [s for s in symbols.all_symbols if s.referenced and not s.defined and not s.dead and not s.type == "func"] + if len(to_write) > 0: + with open(options.get_undefined_syms_auto_path(), "w", newline="\n") as f: + for symbol in to_write: + f.write(f"{symbol.name} = 0x{symbol.vram_start:X};\n") + + # print warnings during split + for segment in all_segments: + if len(segment.warnings) > 0: + log.write(f"{Style.DIM}0x{segment.rom_start:06X}{Style.RESET_ALL} {segment.type} {Style.BRIGHT}{segment.name}{Style.RESET_ALL}:") + + for warn in segment.warnings: + log.write("warning: " + warn, status="warn") + + log.write("") # empty line + + # Statistics + do_statistics(seg_sizes, rom_bytes, seg_split, seg_cached) + + # Save cache + if cache != {} and use_cache: + if verbose: + log.write("Writing cache") + with open(options.get_cache_path(), "wb") as f4: + pickle.dump(cache, f4) if __name__ == "__main__": args = parser.parse_args() - error_code = main(args.config, args.outdir, args.rom, args.modes, args.verbose, not args.new) - exit(error_code) + main(args.config, args.basedir, args.target, args.modes, args.verbose, args.use_cache) diff --git a/tools/splat/stubs/colorama.pyi b/tools/splat/stubs/colorama.pyi new file mode 100644 index 0000000000..5d13e507a8 --- /dev/null +++ b/tools/splat/stubs/colorama.pyi @@ -0,0 +1,8 @@ +from typing import Any + +def init(**kwargs): ... + +Fore: Any +Back: Any +Style: Any +Cursor: Any diff --git a/tools/splat/stubs/png.pyi b/tools/splat/stubs/png.pyi new file mode 100644 index 0000000000..e9343771a1 --- /dev/null +++ b/tools/splat/stubs/png.pyi @@ -0,0 +1,72 @@ +from collections import namedtuple +from typing import Any, Optional + +Resolution = namedtuple('_Resolution', 'x y unit_is_meter') + +class Error(Exception): ... +class FormatError(Error): ... +class ProtocolError(Error): ... +class ChunkError(FormatError): ... +class Default: ... + +class Writer: + width: Any = ... + height: Any = ... + transparent: Any = ... + background: Any = ... + gamma: Any = ... + greyscale: Any = ... + alpha: Any = ... + colormap: Any = ... + bitdepth: Any = ... + compression: Any = ... + chunk_limit: Any = ... + interlace: Any = ... + palette: Any = ... + x_pixels_per_unit: Any = ... + y_pixels_per_unit: Any = ... + unit_is_meter: Any = ... + color_type: Any = ... + color_planes: Any = ... + planes: Any = ... + psize: Any = ... + def __init__(self, width: Optional[Any] = ..., height: Optional[Any] = ..., size: Optional[Any] = ..., greyscale: Any = ..., alpha: bool = ..., bitdepth: int = ..., palette: Optional[Any] = ..., transparent: Optional[Any] = ..., background: Optional[Any] = ..., gamma: Optional[Any] = ..., compression: Optional[Any] = ..., interlace: bool = ..., planes: Optional[Any] = ..., colormap: Optional[Any] = ..., maxval: Optional[Any] = ..., chunk_limit: Any = ..., x_pixels_per_unit: Optional[Any] = ..., y_pixels_per_unit: Optional[Any] = ..., unit_is_meter: bool = ...) -> None: ... + def write(self, outfile: Any, rows: Any): ... + def write_passes(self, outfile: Any, rows: Any): ... + def write_packed(self, outfile: Any, rows: Any): ... + def write_preamble(self, outfile: Any) -> None: ... + def write_array(self, outfile: Any, pixels: Any) -> None: ... + def array_scanlines(self, pixels: Any) -> None: ... + def array_scanlines_interlace(self, pixels: Any) -> None: ... + +def write_chunks(out: Any, chunks: Any) -> None: ... +def from_array(a: Any, mode: Optional[Any] = ..., info: Any = ...): ... +fromarray = from_array + +class Image: + rows: Any = ... + info: Any = ... + def __init__(self, rows: Any, info: Any) -> None: ... + def save(self, file: Any) -> None: ... + def write(self, file: Any) -> None: ... + +class Reader: + signature: Any = ... + transparent: Any = ... + atchunk: Any = ... + file: Any = ... + def __init__(self, _guess: Optional[Any] = ..., filename: Optional[Any] = ..., file: Optional[Any] = ..., bytes: Optional[Any] = ...) -> None: ... + def chunk(self, lenient: bool = ...): ... + def chunks(self) -> None: ... + def undo_filter(self, filter_type: Any, scanline: Any, previous: Any): ... + def validate_signature(self) -> None: ... + def preamble(self, lenient: bool = ...) -> None: ... + def process_chunk(self, lenient: bool = ...) -> None: ... + def read(self, lenient: bool = ...): ... + def read_flat(self): ... + def palette(self, alpha: str = ...): ... + def asDirect(self): ... + def asRGB8(self): ... + def asRGBA8(self): ... + def asRGB(self): ... + def asRGBA(self): ... diff --git a/tools/splat/util/log.py b/tools/splat/util/log.py index 03523c46f0..c215441570 100644 --- a/tools/splat/util/log.py +++ b/tools/splat/util/log.py @@ -1,9 +1,13 @@ +import sys from colorama import init, Fore, Style +from typing import Union init(autoreset=True) newline = True +Status = Union[None, str] + def write(*args, status=None, **kwargs): global newline @@ -13,13 +17,17 @@ def write(*args, status=None, **kwargs): print(status_to_ansi(status) + str(args[0]), *args[1:], **kwargs) -def dot(status=None): +def error(*args, **kwargs): + write(*args, **kwargs, status="error") + sys.exit(2) + +def dot(status: Status = None): global newline print(status_to_ansi(status) + ".", end="") newline = False -def status_to_ansi(status): +def status_to_ansi(status: Status): if status == "ok": return Fore.GREEN elif status == "warn": diff --git a/tools/splat/util/n64/rominfo.py b/tools/splat/util/n64/rominfo.py index fe7d058718..57d548968c 100755 --- a/tools/splat/util/n64/rominfo.py +++ b/tools/splat/util/n64/rominfo.py @@ -1,6 +1,8 @@ #! /usr/bin/python3 import argparse +from capstone import * +from capstone.mips import * import zlib parser = argparse.ArgumentParser(description='Gives information on n64 roms') @@ -58,8 +60,11 @@ def get_entry_point(program_counter, cic): return program_counter - cic["offset"] -def get_info(rom_path, encoding="ASCII"): - return get_info_bytes(read_rom(rom_path), encoding) +def get_info(rom_path, encoding="ASCII", bytes=None): + if not bytes: + return get_info_bytes(read_rom(rom_path), encoding) + else: + return get_info_bytes(bytes, encoding) def get_info_bytes(rom_bytes, encoding): @@ -102,10 +107,29 @@ class N64Rom: def get_country_name(self): return country_codes[self.country_code] +def get_compiler_info(rom_bytes, entry_point): + md = Cs(CS_ARCH_MIPS, CS_MODE_MIPS64 + CS_MODE_BIG_ENDIAN) + md.detail = True + + jumps = 0 + branches = 0 + + for insn in md.disasm(rom_bytes[0x1000:], entry_point): + if insn.mnemonic == "j": + jumps += 1 + elif insn.mnemonic == "b": + branches += 1 + + compiler = "IDO" if branches > jumps else "GCC" + + print(f"{branches} branches and {jumps} jumps detected in the first code segment. Compiler is most likely {compiler}") + # TODO: support .n64 extension def main(): args = parser.parse_args() - rom = get_info(args.rom, args.encoding) + rom_bytes = read_rom(args.rom) + rom = get_info(args.rom, args.encoding, rom_bytes) + print("Image name: " + rom.name) print("Country code: " + chr(rom.country_code) + " - " + rom.get_country_name()) print("Libultra version: " + rom.libultra_version) @@ -113,7 +137,9 @@ def main(): print("CRC2: " + rom.crc2) print("CIC: " + rom.cic["ntsc-name"] + " / " + rom.cic["pal-name"]) print("RAM entry point: " + hex(rom.entry_point)) + print("") + get_compiler_info(rom_bytes, rom.entry_point) if __name__ == "__main__": main() diff --git a/tools/splat/util/options.py b/tools/splat/util/options.py index e2c698c169..ed18a0564c 100644 --- a/tools/splat/util/options.py +++ b/tools/splat/util/options.py @@ -1,14 +1,85 @@ +from typing import Dict, Optional +from pathlib import Path +from util import log + opts = {} -def initialize(config): +def initialize(config: Dict, config_path: str, base_path=None, target_path=None): global opts - opts = config.get("options") - + opts = dict(config.get("options", {})) + + if base_path: + opts["base_path"] = Path(base_path) + else: + if not "base_path" in opts: + log.error("Error: Base output dir not specified as a command line arg or via the config yaml (base_path)") + + opts["base_path"] = Path(config_path).parent / opts["base_path"] + + if not target_path: + if "target_path" not in opts: + log.error("Error: Target binary path not specified as a command line arg or via the config yaml (target_path)") + def set(opt, val): opts[opt] = val def get(opt, default=None): return opts.get(opt, default) +def get_platform() -> str: + return opts.get("platform", "N64") + +def get_compiler() -> str: + return opts.get("compiler", "IDO") + +def get_subalign() -> int: + return opts.get("subalign", 16) + def mode_active(mode): - return mode in opts["modes"] or "all" in opts["modes"] \ No newline at end of file + return mode in opts["modes"] or "all" in opts["modes"] + +def get_base_path() -> Path: + return Path(opts["base_path"]) + +def get_asset_path() -> Path: + return get_base_path() / opts.get("asset_path", "assets") + +def get_target_path() -> Path: + return get_base_path() / opts["target_path"] + +def get_src_path() -> Path: + return get_base_path() / opts.get("src_path", "src") + +def get_asm_path() -> Path: + return get_base_path() / opts.get("asm_path", "asm") + +def get_cache_path(): + return get_base_path() / opts.get("cache_path", ".splat_cache") + +def get_undefined_funcs_auto_path(): + return get_base_path() / opts.get("undefined_funcs_auto_path", "undefined_funcs_auto.txt") + +def get_undefined_syms_auto_path(): + return get_base_path() / opts.get("undefined_syms_auto_path", "undefined_syms_auto.txt") + +def get_symbol_addrs_path(): + return get_base_path() / opts.get("symbol_addrs_path", "symbol_addrs.txt") + +def get_build_path(): + return get_base_path() / opts.get("build_path", "build") + +def get_ld_script_path(): + return get_base_path() / opts.get("ld_script_path", f"{opts.get('basename')}.ld") + +def get_linker_symbol_header_path() -> Optional[Path]: + if "linker_symbol_header_path" in opts: + return get_base_path() / str(opts["linker_symbol_header_path"]) + else: + return None + +def get_extensions_path(): + ext_opt = opts.get("extensions_path") + if not ext_opt: + return None + + return get_base_path() / ext_opt diff --git a/tools/splat/util/palettes.py b/tools/splat/util/palettes.py new file mode 100644 index 0000000000..3e03394049 --- /dev/null +++ b/tools/splat/util/palettes.py @@ -0,0 +1,34 @@ +from typing import Dict +from segtypes.n64.palette import N64SegPalette as Palette +from segtypes.n64.ci8 import N64SegCi8 as Raster +from segtypes.n64.group import N64SegGroup + +# Resolve Raster#palette and Palette#raster links +def initialize(all_segments): + global palettes_remaining + + def process(segments): + raster_map: Dict[str, Raster] = {} + palette_map: Dict[str, Palette] = {} + + for segment in segments: + if isinstance(segment, Palette): + palette_map[segment.name] = segment + + if isinstance(segment, Raster): + raster_map[segment.name] = segment + + if isinstance(segment, N64SegGroup): + process(segment.subsegments) + + for raster_name in raster_map: + raster = raster_map[raster_name] + #print(f"{raster_name} -> {raster.palette_name}") + raster.palette = palette_map.get(raster.palette_name) + + for palette_name in palette_map: + palette = palette_map[palette_name] + #print(f"{palette_name} -> {palette.raster_name}") + palette.raster = raster_map.get(palette.raster_name) + + process(all_segments) diff --git a/tools/splat/util/symbol.py b/tools/splat/util/symbol.py deleted file mode 100644 index 5f5d66dff4..0000000000 --- a/tools/splat/util/symbol.py +++ /dev/null @@ -1,51 +0,0 @@ -class Symbol: - - @property - def default_name(self): - suffix = f"_{self.vram_start:X}" - - if self.in_overlay: - suffix += f"_{self.rom:X}" - - if self.type == "func": - prefix = "func" - elif self.type =="jtbl": - prefix = "jtbl" - else: - prefix = "D" - - return prefix + suffix - - @property - def rom_end(self): - return None if not self.rom else self.rom + self.size - - @property - def vram_end(self): - return self.vram_start + self.size - - def set_in_overlay(self): - self.in_overlay = True - - @property - def name(self): - return self.given_name if self.given_name else self.default_name - - def contains_vram(self, offset): - return offset >= self.vram_start and offset < self.vram_end - - def contains_rom(self, offset): - return offset >= self.rom and offset < self.rom_end - - def __init__(self, vram, given_name=None, rom=None, type="unknown", in_overlay=False, size=4): - self.defined = False - self.referenced = False - self.vram_start = vram - self.rom = rom - self.type = type - self.in_overlay = in_overlay - self.size = size - self.given_name = given_name - self.access_mnemonic = None - self.disasm_str = None - self.dead = False diff --git a/tools/splat/util/symbols.py b/tools/splat/util/symbols.py new file mode 100644 index 0000000000..80bad5f74d --- /dev/null +++ b/tools/splat/util/symbols.py @@ -0,0 +1,142 @@ +import os +from typing import Dict, List +from util import options + +all_symbols: "List[Symbol]" = [] +symbol_ranges: "List[Symbol]" = [] +sym_isolated_map: "Dict[Symbol, bool]" = {} + +def initialize(all_segments): + global all_symbols + global symbol_ranges + + all_symbols = [] + symbol_ranges = [] + + symbol_addrs_path = options.get_symbol_addrs_path() + + # Manual list of func name / addrs + if os.path.exists(symbol_addrs_path): + with open(symbol_addrs_path) as f: + func_addrs_lines = f.readlines() + + for line in func_addrs_lines: + line = line.strip() + if not line == "" and not line.startswith("//"): + comment_loc = line.find("//") + line_ext = "" + + if comment_loc != -1: + line_ext = line[comment_loc + 2:].strip() + line = line[:comment_loc].strip() + + line_split = line.split("=") + name = line_split[0].strip() + addr = int(line_split[1].strip()[:-1], 0) + + sym = Symbol(addr, given_name=name) + + if line_ext: + for info in line_ext.split(" "): + if info.startswith("type:"): + type = info.split(":")[1] + sym.type = type + if info.startswith("size:"): + size = int(info.split(":")[1], 0) + sym.size = size + if info.startswith("rom:"): + rom_addr = int(info.split(":")[1], 0) + sym.rom = rom_addr + if info.startswith("dead:"): + sym.dead = True + all_symbols.append(sym) + + # Symbol ranges + if sym.size > 4: + symbol_ranges.append(sym) + + is_symbol_isolated(sym, all_segments) + +def is_symbol_isolated(symbol, all_segments): + if symbol in sym_isolated_map: + return sym_isolated_map[symbol] + + relevant_segs = 0 + + for segment in all_segments: + if segment.contains_vram(symbol.vram_start): + relevant_segs += 1 + if relevant_segs > 1: + break + + sym_isolated_map[symbol] = relevant_segs < 2 + return sym_isolated_map[symbol] + +def retrieve_from_ranges(vram, rom=None): + rom_matches = [] + ram_matches = [] + + for symbol in symbol_ranges: + if symbol.contains_vram(vram): + if symbol.rom and rom and symbol.contains_rom(rom): + rom_matches.append(symbol) + else: + ram_matches.append(symbol) + + ret = rom_matches + ram_matches + + if len(ret) > 0: + return ret[0] + else: + return None + +class Symbol: + @property + def default_name(self): + suffix = f"_{self.vram_start:X}" + + if self.in_overlay: + suffix += f"_{self.rom:X}" + + if self.type == "func": + prefix = "func" + elif self.type =="jtbl": + prefix = "jtbl" + else: + prefix = "D" + + return prefix + suffix + + @property + def rom_end(self): + return None if not self.rom else self.rom + self.size + + @property + def vram_end(self): + return self.vram_start + self.size + + def set_in_overlay(self): + self.in_overlay = True + + @property + def name(self): + return self.given_name if self.given_name else self.default_name + + def contains_vram(self, offset): + return offset >= self.vram_start and offset < self.vram_end + + def contains_rom(self, offset): + return offset >= self.rom and offset < self.rom_end + + def __init__(self, vram, given_name=None, rom=None, type="unknown", in_overlay=False, size=4): + self.defined = False + self.referenced = False + self.vram_start = vram + self.rom = rom + self.type = type + self.in_overlay = in_overlay + self.size = size + self.given_name = given_name + self.access_mnemonic = None + self.disasm_str = None + self.dead = False diff --git a/tools/splat_ext/PaperMarioMapFS.py b/tools/splat_ext/PaperMarioMapFS.py index 65b307e8ee..496ed0b587 100644 --- a/tools/splat_ext/PaperMarioMapFS.py +++ b/tools/splat_ext/PaperMarioMapFS.py @@ -1,13 +1,10 @@ -import os from segtypes.n64.segment import N64Segment -from pathlib import Path from util.n64 import Yay0decompress from util.color import unpack_color from util.iter import iter_in_groups from util import options import png - def decode_null_terminated_ascii(data): length = 0 for byte in data: @@ -17,23 +14,35 @@ def decode_null_terminated_ascii(data): return data[:length].decode('ascii') - def parse_palette(data): - palette = [] + palette = [] - for a, b in iter_in_groups(data, 2): - palette.append(unpack_color([a, b])) + for a, b in iter_in_groups(data, 2): + palette.append(unpack_color([a, b])) - return palette + return palette +def add_file_ext(name: str) -> str: + if name.startswith("party_"): + return name + ".png" + elif name.endswith("_hit") or name.endswith("_shape"): + return name + ".bin" # TODO: xml + elif name.endswith("_tex"): + return name + ".bin" # TODO: texture archive + elif name.endswith("_bg"): + return name + ".png" + else: + return name + ".bin" class N64SegPaperMarioMapFS(N64Segment): - def __init__(self, segment, next_segment): - super().__init__(segment, next_segment) + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) - def split(self, rom_bytes, base_path): - bin_dir = self.create_split_dir(base_path, options.get("assets_dir", "bin")) - img_party_dir = self.create_split_dir(base_path, options.get("assets_dir", "img") + "/party") + self.files = segment["files"] + + def split(self, rom_bytes): + fs_dir = options.get_asset_path() / self.dir / self.name + fs_dir.mkdir(parents=True, exist_ok=True) data = rom_bytes[self.rom_start: self.rom_end] @@ -51,30 +60,16 @@ class N64SegPaperMarioMapFS(N64Segment): if offset == 0: path = None - elif name.startswith("party_"): - path = os.path.join(img_party_dir, "{}.png".format(name)) - elif name.endswith("_hit") or name.endswith("_shape"): - map_dir = self.create_split_dir(base_path, options.get("assets_dir", "bin") + f"/map") - path = os.path.join(map_dir, "{}.bin".format(name)) - elif name.endswith("_tex"): - map_dir = self.create_split_dir(base_path, options.get("assets_dir", "bin") + f"/map") - path = os.path.join(map_dir, "{}.bin".format(name)) - elif name.endswith("_bg"): - map_dir = self.create_split_dir(base_path, options.get("assets_dir", "bin") + f"/map") - path = os.path.join(map_dir, "{}.png".format(name)) else: - path = os.path.join(bin_dir, "{}.bin".format(name)) + path = fs_dir / add_file_ext(name) if name == "end_data": break - bytes = rom_bytes[self.rom_start + 0x20 + - offset: self.rom_start + 0x20 + offset + size] - - Path(path).parent.mkdir(parents=True, exist_ok=True) + bytes_start = self.rom_start + 0x20 + offset + bytes = rom_bytes[bytes_start : bytes_start + size] if is_compressed: - self.log(f"Decompressing {name}...") bytes = Yay0decompress.decompress_yay0(bytes) if name.startswith("party_"): @@ -101,20 +96,20 @@ class N64SegPaperMarioMapFS(N64Segment): # sbk_bg has an alternative palette if name == "sbk_bg": - write_bg_png(bytes, path.split(".")[0] + ".alt.png", header_offset=0x10) + write_bg_png(bytes, fs_dir / f"{name}.alt.png", header_offset=0x10) else: with open(path, "wb") as f: f.write(bytes) - self.log(f"Wrote {name} to {Path(bin_dir, path)}") - asset_idx += 1 + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry - def get_ld_files(self): - return [(options.get("assets_dir", "bin"), self.name, ".data", self.rom_start)] + fs_dir = options.get_asset_path() / self.dir / self.name - - @staticmethod - def get_default_name(addr): - return "assets" + return [LinkerEntry( + self, + [fs_dir / add_file_ext(name) for name in self.files], + fs_dir.with_suffix(".dat"), ".data"), + ] diff --git a/tools/splat_ext/PaperMarioMessages.py b/tools/splat_ext/PaperMarioMessages.py index 15723ab0a6..7fa62fd703 100644 --- a/tools/splat_ext/PaperMarioMessages.py +++ b/tools/splat_ext/PaperMarioMessages.py @@ -1,10 +1,14 @@ +import shutil from segtypes.n64.segment import N64Segment from pathlib import Path from util import options import re +import pylibyaml +import yaml + CHARSET = { - 0x00: "[note]", + 0x00: "[NOTE]", 0x01: "!", 0x02: '"', 0x03: "#", @@ -148,55 +152,60 @@ CHARSET = { 0x8D: "¡", 0x8E: "¿", 0x8F: "ª", - 0x90: "[heart]", - 0x91: "[star]", - 0x92: "[up]", - 0x93: "[down]", - 0x94: "[left]", - 0x95: "[right]", - 0x96: "[circle]", - 0x97: "[cross]", - 0x98: "[a]", - 0x99: "[b]", - 0x9A: "[l]", - 0x9B: "[r]", - 0x9C: "[z]", - 0x9D: "[c-up]", - 0x9E: "[c-down]", - 0x9F: "[c-left]", - 0xA0: "[c-right]", - 0xA1: "[start]", + 0x90: "[HEART]", + 0x91: "[STAR]", + 0x92: "[UP]", + 0x93: "[DOWN]", + 0x94: "[LEFT]", + 0x95: "[RIGHT]", + 0x96: "[CIRCLE]", + 0x97: "[CROSS]", + 0x98: "[~A]", + 0x99: "[~B]", + 0x9A: "[~L]", + 0x9B: "[~R]", + 0x9C: "[~Z]", + 0x9D: "[~C-UP]", + 0x9E: "[~C-DOWN]", + 0x9F: "[~C-LEFT]", + 0xA0: "[~C-RIGHT]", + 0xA1: "[~START]", 0xA2: "“", 0xA3: "”", 0xA4: "‘", 0xA5: "’", 0xF7: " ", - 0xF0: "[br]\n", - 0xF1: "[wait]", - 0xF2: {None: lambda d: (f"[pause:{d[0]}]", 1)}, - 0xFB: "[next]\n", + 0xF0: "[BR]\n", + 0xF1: "[Wait]", + 0xF2: {None: lambda d: (f"[Pause {d[0]}]", 1)}, + 0xF3: "[Variant0]", + 0xF4: "[Variant1]", + 0xF5: "[Variant2]", + 0xF6: "[Variant3]", + 0xFB: "[Next]\n", 0xFC: { - 0x01: "[style:right]\n", - 0x02: "[style:left]\n", - 0x03: "[style:center]\n", - 0x04: "[style:tattle]\n", - 0x05: {None: lambda d: (f"[style:choice:{d[0]}:{d[1]}:{d[2]}:{d[3]}]\n", 4)}, - 0x06: "[style:inspect]\n", - 0x07: "[style:sign]\n", - 0x08: {None: lambda d: (f"[style:lamppost:{d[0]}]\n", 1)}, - 0x09: {None: lambda d: (f"[style:postcard:{d[0]}]\n", 1)}, - 0x0A: "[style:popup]\n", - 0x0C: {None: lambda d: (f"[style:upgrade:{d[0]}:{d[1]}:{d[2]}:{d[3]}]\n", 4)}, - 0x0D: "[style:narrate]\n", - 0x0E: "[style:epilogue]\n", + 0x01: "[Style right]\n", + 0x02: "[Style left]\n", + 0x03: "[Style center]\n", + 0x04: "[Style tattle]\n", + 0x05: {None: lambda d: (f"[Style choice pos={d[0]},{d[1]} size={d[2]},{d[3]}]\n", 4)}, + 0x06: "[Style inspect]\n", + 0x07: "[Style sign]\n", + 0x08: {None: lambda d: (f"[Style lamppost height={d[0]}]\n", 1)}, + 0x09: {None: lambda d: (f"[Style postcard index={d[0]}]\n", 1)}, + 0x0A: "[Style popup]\n", + 0x0C: {None: lambda d: (f"[Style upgrade pos={d[0]},{d[1]} size={d[2]},{d[3]}]\n", 4)}, + 0x0D: "[Style narrate]\n", + 0x0E: "[Style epilogue]\n", }, 0xFF: { 0x00: { - 0: "[font:normal]", - 3: "[font:title]\n", - 4: "[font:subtitle]\n", + 0: "[Font standard]\n", + 1: "[Font menu]\n", + 3: "[Font title]\n", + 4: "[Font subtitle]\n", }, - 0x04: "[func_04]", + 0x04: "[Yield]", 0x05: { # 0x0A: "[color:normal]", # 0x20: "[color:red]", @@ -226,85 +235,89 @@ CHARSET = { # 0x2E: "[color=yellow ctx=popup]", # 0x2F: "[color=normal ctx=popup]", - None: lambda d: (f"[color:0x{d[0]:X}]", 1), + None: lambda d: (f"[Color 0x{d[0]:X}]", 1), }, - 0x07: "[inputOff]\n", - 0x08: "[inputOn]\n", - 0x09: "[delayOff]\n", - 0x0A: "[delayOn]\n", - 0x0B: {None: lambda d: (f"[kerning:{d[0]}]", 1)}, - 0x0C: {None: lambda d: (f"[scroll:{d[0]}]", 1)}, - 0x0D: {None: lambda d: (f"[size:{d[0]}:{d[0]}]\n", 2)}, - 0x0E: "[sizeReset]\n", - 0x0F: {None: lambda d: (f"[speed:{d[0]}:{d[1]}]", 2)}, - 0x10: {None: lambda d: (f"[setPrintPos:{d[0]}:{d[1]}]", 2)}, - 0x11: {None: lambda d: (f"[setPrintY:{d[0]}]", 1)}, - 0x12: {None: lambda d: (f"[indent:{d[0]}]", 1)}, - 0x13: {None: lambda d: (f"[down:{d[0]}]", 1)}, - 0x14: {None: lambda d: (f"[up:{d[0]}]", 1)}, - 0x15: {None: lambda d: (f"[image1:{d[0]}]\n", 1)}, - 0x16: {None: lambda d: (f"[sprite:{d[0]}:{d[1]}:{d[2]}]\n", 3)}, - 0x17: {None: lambda d: (f"[item:{d[0]}:{d[1]}]\n", 2)}, - 0x18: {None: lambda d: (f"[image7:{d[0]}:{d[1]}:{d[2]}:{d[3]}:{d[4]}:{d[5]}:{d[6]}]\n", 7)}, - 0x1A: {None: lambda d: (f"[func_1A:{d[0]}:{d[1]}:{d[2]}]", 3)}, - 0x1B: {None: lambda d: (f"[func_1B:{d[0]}:{d[1]}]", 2)}, - 0x1C: {None: lambda d: (f"[func_1C:{d[0]}]", 1)}, - 0x1E: {None: lambda d: (f"[cursor:{d[0]}]", 1)}, - 0x1F: {None: lambda d: (f"[endChoice:{d[0]}]", 1)}, - 0x20: {None: lambda d: (f"[setCancel:{d[0]}]", 1)}, - 0x21: {None: lambda d: (f"[option:{d[0]}]", 1)}, - 0x22: "[startAnim]", - 0x23: "[endAnim]", - # 0x24: {0xFF: {0x05: { - # 0x10: {0x98: {0xFF: {0x25: "Ⓐ"}}}, - # 0x11: {0x99: {0xFF: {0x25: "Ⓑ"}}}, - # 0x12: {0xA1: {0xFF: {0x25: "Ⓢ"}}}, - # 0x13: { - # 0x9D: {0xFF: {0x25: "▲"}}, - # 0x9E: {0xFF: {0x25: "▼"}}, - # 0x9F: {0xFF: {0x25: "◀"}}, - # 0xA0: {0xFF: {0x25: "▶"}}, - # }, - # 0x14: {0x9C: {0xFF: {0x25: "Ⓩ"}}}, - # }}}, - 0x24: "[pushColor]", - 0x25: "[popColor]", + 0x07: "[InputOff]\n", + 0x08: "[InputOn]\n", + 0x09: "[DelayOff]\n", + 0x0A: "[DelayOn]\n", + 0x0B: {None: lambda d: (f"[CharWidth {d[0]}]", 1)}, + 0x0C: {None: lambda d: (f"[Scroll {d[0]}]", 1)}, + 0x0D: {None: lambda d: (f"[Size {d[0]},{d[1]}]\n", 2)}, + 0x0E: "[SizeReset]\n", + 0x0F: {None: lambda d: (f"[Speed delay={d[0]} chars={d[1]}]", 2)}, + 0x10: {None: lambda d: (f"[SetPosX {(d[0] << 8) + d[1]}]", 2)}, + 0x11: {None: lambda d: (f"[SetPosY {d[0]}]", 1)}, + 0x12: {None: lambda d: (f"[Right {d[0]}]", 1)}, + 0x13: {None: lambda d: (f"[Down {d[0]}]", 1)}, + 0x14: {None: lambda d: (f"[Up {d[0]}]", 1)}, + 0x15: {None: lambda d: (f"[InlineImage index={d[0]}]\n", 1)}, + 0x16: {None: lambda d: (f"[AnimSprite spriteID=0x{d[0]:02X}{d[1]:02X} raster={d[2]}]\n", 3)}, + 0x17: {None: lambda d: (f"[ItemIcon itemID=0x{d[0]:02X}{d[1]:02X}]\n", 2)}, + 0x18: {None: lambda d: (f"[Image index={d[0]} pos={(d[1] << 8) + d[2]},{d[3]} hasBorder={d[4]} alpha={d[5]} fadeAmount={d[6]}]\n", 7)}, + 0x19: {None: lambda d: (f"[HideImage fadeAmount={d[0]}]\n", 1)}, + 0x1A: {None: lambda d: (f"[AnimDelay index={d[1]} delay={d[2]}]", 3)}, + 0x1B: {None: lambda d: (f"[AnimLoop]", 2)}, + 0x1C: {None: lambda d: (f"[AnimDone]", 1)}, + 0x1E: {None: lambda d: (f"[Cursor {d[0]}]", 1)}, + 0x1F: {None: lambda d: (f"[EndChoice {d[0]}]", 1)}, + 0x20: {None: lambda d: (f"[SetCancel {d[0]}]", 1)}, + 0x21: {None: lambda d: (f"[Option {d[0]}]", 1)}, + 0x22: "[SavePos]", + 0x23: "[RestorePos]", + 0x24: {0xFF: {0x05: { + 0x10: {0x98: {0xFF: {0x25: "[A]"}}}, + 0x11: {0x99: {0xFF: {0x25: "[B]"}}}, + 0x12: {0xA1: {0xFF: {0x25: "[START]"}}}, + 0x13: { + 0x9D: {0xFF: {0x25: "[C-UP]"}}, + 0x9E: {0xFF: {0x25: "[C-DOWN]"}}, + 0x9F: {0xFF: {0x25: "[C-LEFT]"}}, + 0xA0: {0xFF: {0x25: "[C-RIGHT]"}}, + }, + 0x14: {0x9C: {0xFF: {0x25: "[Z]"}}}, + }}}, + #0x24: "[SaveColor]", + #0x25: "[RestoreColor]", 0x26: { - 0x00: "[startFX:jitter]", - 0x01: "[startFX:wavy]", - 0x03: {None: lambda d: (f"[startFX:fadedNoise:{d[0]}]", 1)}, - 0x05: {None: lambda d: (f"[startFX:fadedJitter:{d[0]}]", 1)}, - 0x07: {None: lambda d: (f"[startFX:faded:{d[0]}]", 1)}, - 0x0A: "[startFX:shrinking]", - 0x0B: "[startFX:growing]", - 0x0C: "[startFX:sizeJitter]", - 0x0D: "[startFX:sizeWave]", - 0x0E: "[startFX:dropShadow]", + 0x00: "[Shake]", + 0x01: "[Wave]", + 0x02: "[NoiseOutline]", + 0x03: {None: lambda d: (f"[Static {d[0]}]", 1)}, + 0x05: {None: lambda d: (f"[Blur dir={['x', 'y', 'xy'][d[0]]}]", 1)}, + 0x07: {None: lambda d: (f"[DitherFade {d[0]}]", 1)}, + 0x0A: "[PrintRising]", + 0x0B: "[PrintGrowing]", + 0x0C: "[SizeJitter]", + 0x0D: "[SizeWave]", + 0x0E: "[DropShadow]", }, 0x27: { - 0x00: "[endFX:jitter]", - 0x01: "[endFX:wavy]", - 0x03: "[endFX:fadedNoise]", - 0x05: "[endFX:fadedJitter]", - 0x07: "[endFX:faded]", - 0x0A: "[endFX:shrinking]", - 0x0B: "[endFX:growing]", - 0x0C: "[endFX:sizeJitter]", - 0x0D: "[endFX:sizeWave]", - 0x0E: "[endFX:dropShadow]", + 0x00: "[/Shake]", + 0x01: "[/Wave]", + 0x03: "[/Static]", + 0x05: "[/Blur]", + 0x07: "[/DitherFade]", + 0x0A: "[/PrintRising]", + 0x0B: "[/PrintGrowing]", + 0x0C: "[/SizeJitter]", + 0x0D: "[/SizeWave]", + 0x0E: "[/DropShadow]", }, - 0x28: {None: lambda d: (f"[var:{d[0]}]", 1)}, - 0x29: {None: lambda d: (f"[func_29:{d[0]}]", 1)}, - 0x2B: "[func_2B]", - 0x2E: {None: lambda d: (f"[volume:{d[0]}]", 1)}, + 0x28: {None: lambda d: (f"[Var {d[0]}]", 1)}, + 0x29: {None: lambda d: (f"[CenterX {d[0]}]", 1)}, + 0x2B: "[EnableCDownNext]", + 0x2C: {None: lambda d: (f"[CustomVoice soundIDs=0x{d[0]:02X}{d[1]:02X}{d[2]:02X}{d[3]:02X},{d[4]:02X}{d[5]:02X}{d[6]:02X}{d[7]:02X}]", 8)}, + 0x2E: {None: lambda d: (f"[Volume {d[0]}]", 1)}, 0x2F: { - #1: "[speechSound:bowser]\n", - #2: "[speechSound:star]\n", - None: lambda d: (f"[speechSound:{d[0]}]\n", 1), + 0: "[Voice normal]\n", + 1: "[Voice bowser]\n", + 2: "[Voice star]\n", + None: lambda d: (f"[Voice {d[0]}]\n", 1), }, #None: lambda d: (f"[func_{d[0]:02X}]", 1), }, - None: lambda d: (f"[raw:0x{d[0]:02X}]", 1), + None: lambda d: (f"[Raw 0x{d[0]:02X}]", 1), } CHARSET_CREDITS = { @@ -354,12 +367,14 @@ CHARSET_CREDITS = { } class N64SegPaperMarioMessages(N64Segment): - def __init__(self, segment, next_segment): - super().__init__(segment, next_segment) + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) self.files = segment.get("files", []) if type(segment) is dict else [] - self.ids = segment["ids"] - def split(self, rom_bytes, base_path): + with (Path(__file__).parent / f"{self.name}.yaml").open("r") as f: + self.msg_names = yaml.load(f.read(), Loader=yaml.SafeLoader) + + def split(self, rom_bytes): data = rom_bytes[self.rom_start: self.rom_end] section_offsets = [] @@ -373,12 +388,9 @@ class N64SegPaperMarioMessages(N64Segment): section_offsets.append(offset) pos += 4 - msg_dir = Path(base_path, options.get("assets_dir"), self.name) + msg_dir = options.get_asset_path() / self.name msg_dir.mkdir(parents=True, exist_ok=True) - # delete existing files - self.delete_dir_childs(msg_dir) - for i, section_offset in enumerate(section_offsets): name = f"{i:02X}" if len(self.files) >= i: @@ -395,7 +407,7 @@ class N64SegPaperMarioMessages(N64Segment): msg_offsets.append(offset) pos += 4 - self.log(f"Reading {len(msg_offsets)} messages in section {name} (0x{i:02X})") + #self.log(f"Reading {len(msg_offsets)} messages in section {name} (0x{i:02X})") path = msg_dir / Path(name + ".msg") @@ -405,14 +417,9 @@ class N64SegPaperMarioMessages(N64Segment): self.f.write("\n") msg_name = None - for d in self.ids: + for d in self.msg_names: section, index, goodname = d[:3] - if len(d) > 3: - # these will actually do something in the future - context = d[3] - assert context in ["battle_popup", "action_command"] - if i == section and j == index: msg_name = goodname break @@ -424,17 +431,15 @@ class N64SegPaperMarioMessages(N64Segment): self.write_message_markup(data[msg_offset:]) self.f.write("\n}\n") - @staticmethod - def delete_dir_childs(path): - for f in path.iterdir(): - if f.is_dir(): - N64SegPaperMarioMessages.delete_dir_childs(f) - f.rmdir() - else: - f.unlink() - def get_ld_files(self): - return [(options.get("assets_dir"), self.name, ".data", self.rom_start)] + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry + + base_path = options.get_asset_path() / f"{self.name}" + out_paths = [base_path / Path(f + ".msg") for f in self.files] + + return [LinkerEntry(self, out_paths, base_path, ".data")] + @staticmethod def get_default_name(addr): @@ -475,12 +480,17 @@ class N64SegPaperMarioMessages(N64Segment): else: raise ValueError(value) - self.write_markup("[end]") + self.write_markup("[End]") def write_markup(self, markup): self.f.write(re.sub("\n", "\n\t", markup)) - if markup == "[font:title]\n" or markup == "[font:subtitle]\n": + markup_lower = markup.lower() + + if markup_lower == "[font title]\n" or markup_lower == "[font subtitle]\n": self.root_charset = CHARSET_CREDITS - elif markup == "[font:normal]": + elif markup_lower == "[font standard]": self.root_charset = CHARSET + + def cache(self): + return (self.config, self.rom_end, self.msg_names) diff --git a/tools/splat_ext/PaperMarioNpcSprites.py b/tools/splat_ext/PaperMarioNpcSprites.py index 9063722eda..f1f3685f1b 100644 --- a/tools/splat_ext/PaperMarioNpcSprites.py +++ b/tools/splat_ext/PaperMarioNpcSprites.py @@ -7,6 +7,9 @@ from util import options import png import xml.etree.ElementTree as ET +import pylibyaml +import yaml + class Sprite: def __init__(self): self.max_components = 0 @@ -69,8 +72,8 @@ class Sprite: def write_to_dir(self, path): SpriteSheet = ET.Element("SpriteSheet", { - "a": str(self.max_components), - "b": str(self.num_variations), + "maxComponents": str(self.max_components), + "paletteGroups": str(self.num_variations), }) PaletteList = ET.SubElement(SpriteSheet, "PaletteList") @@ -253,52 +256,47 @@ class Component: class N64SegPaperMarioNpcSprites(N64Segment): DEFAULT_SPRITE_NAMES = [f"{i:02X}" for i in range(0xEA)] - def __init__(self, segment, next_segment): - super().__init__(segment, next_segment) + def __init__(self, segment, rom_start, rom_end): + super().__init__(segment, rom_start, rom_end) - if type(segment) is dict and "files" in segment: - self.files = segment["files"] - else: - self.files = DEFAULT_SPRITE_NAMES + self.files = segment["files"] - def split(self, rom_bytes, base_path): - out_dir = self.create_split_dir(base_path, options.get("assets_dir") + "/sprite/" + self.name) + with (Path(__file__).parent / f"{self.name}.yaml").open("r") as f: + self.sprite_cfg = yaml.load(f.read(), Loader=yaml.SafeLoader) + + def split(self, rom_bytes): + out_dir = options.get_asset_path() / self.dir / self.name data = rom_bytes[self.rom_start:self.rom_end] pos = 0 - for i, file in enumerate(self.files): - if type(file) is dict: - sprite_name = file["name"] - else: - sprite_name = file + for i, sprite_name in enumerate(self.files): + #self.log(f"Splitting sprite {sprite_name}...") - self.log(f"Splitting sprite {sprite_name}...") - - sprite_dir = self.create_split_dir(out_dir, sprite_name) + sprite_dir = out_dir / sprite_name + sprite_dir.mkdir(parents=True, exist_ok=True) start = int.from_bytes(data[i * 4 : (i + 1) * 4], byteorder="big") end = int.from_bytes(data[(i + 1) * 4 : (i + 2) * 4], byteorder="big") sprite_data = Yay0decompress.decompress_yay0(data[start:end]) - - """ - with open(sprite_dir / "raw.bin", "wb") as f: - f.write(sprite_data) - """ - sprite = Sprite.from_bytes(sprite_data) - if type(file) is dict: - sprite.image_names = file.get("frames", []) - sprite.palette_names = file.get("palettes", []) - sprite.animation_names = file.get("animations", []) + if sprite_name in self.sprite_cfg: + sprite.image_names = self.sprite_cfg[sprite_name].get("frames", []) + sprite.palette_names = self.sprite_cfg[sprite_name].get("palettes", []) + sprite.animation_names = self.sprite_cfg[sprite_name].get("animations", []) sprite.write_to_dir(sprite_dir) - def get_ld_files(self): - return [(options.get("assets_dir"), "sprite/" + self.name, ".data", self.rom_start)] + def get_linker_entries(self): + from segtypes.linker_entry import LinkerEntry - @staticmethod - def get_default_name(addr): - return "npc" + basepath = options.get_asset_path() / "sprite" / f"{self.name}" + out_paths = [options.get_asset_path() / "sprite" / self.name / (f["name"] if type(f) is dict else f) + for f in self.files] + + return [LinkerEntry(self, out_paths, basepath, ".data")] + + def cache(self): + return (self.config, self.rom_end, self.sprite_cfg) diff --git a/tools/splat_ext/msg.yaml b/tools/splat_ext/msg.yaml new file mode 100644 index 0000000000..fd5078f025 --- /dev/null +++ b/tools/splat_ext/msg.yaml @@ -0,0 +1,397 @@ +# This file describes what to name messages when splitting. + +- [0x19, 0x003B, kmr_03_tattle] +- [0x19, 0x0040, kmr_12_tattle] +- [0x19, 0x0060, sbk_00_tattle] +- [0x19, 0x0061, sbk_01_tattle] +- [0x19, 0x00BB, arn_07_tattle] +- [0x19, 0x00BC, arn_03_tattle] +- [0x19, 0x00BD, arn_05_tattle] +- [0x19, 0x00BE, arn_02_tattle] +- [0x19, 0x00BF, arn_04_tattle] +- [0x19, 0x00C0, dgb_00_tattle] +- [0x19, 0x00C1, dgb_01_tattle] +- [0x19, 0x00C2, dgb_02_tattle] +- [0x19, 0x00C3, dgb_03_tattle] +- [0x19, 0x00C4, dgb_04_tattle] +- [0x19, 0x00C5, dgb_05_tattle] +- [0x19, 0x00C6, dgb_06_tattle] +- [0x19, 0x00C7, dgb_07_tattle] +- [0x19, 0x00C8, dgb_08_tattle] +- [0x19, 0x00C9, dgb_09_tattle] +- [0x19, 0x00CA, dgb_10_tattle] +- [0x19, 0x00CB, dgb_11_tattle] +- [0x19, 0x00CC, dgb_12_tattle] +- [0x19, 0x00CD, dgb_13_tattle] +- [0x19, 0x00CE, dgb_14_tattle] +- [0x19, 0x00CF, dgb_15_tattle] +- [0x19, 0x00D0, dgb_16_tattle] +- [0x19, 0x00D1, dgb_17_tattle] +- [0x19, 0x00D2, dgb_18_tattle] +- [0x19, 0x00D3, arn_08_tattle] +- [0x19, 0x00D4, arn_09_tattle] +- [0x19, 0x00D5, arn_10_tattle] +- [0x19, 0x00D6, arn_12_tattle] +- [0x19, 0x00D7, arn_13_tattle] +- [0x19, 0x00D8, arn_11_tattle] + +- [0x1C, 0x0000, actor_goomba_tattle] +- [0x1C, 0x0001, actor_spiked_goomba_tattle] +- [0x1C, 0x0002, actor_paragoomba_tattle] +- [0x1C, 0x0003, actor_red_goomba_boss_tattle] +- [0x1C, 0x0004, actor_blue_goomba_boss_tattle] +- [0x1C, 0x0005, actor_goomba_king_tattle] +- [0x1C, 0x0006, actor_goomnut_tree_tattle] +- [0x1C, 0x0007, actor_koopa_troopa_tattle] +- [0x1C, 0x0008, actor_paratroopa_tattle] +- [0x1C, 0x0009, actor_fuzzy_tattle] +- [0x1C, 0x000A, actor_bob_omb_tattle] +- [0x1C, 0x000B, actor_bullet_bill_tattle] +- [0x1C, 0x000C, actor_bill_blaster_tattle] +- [0x1C, 0x000D, actor_fake_bowser_tattle] +- [0x1C, 0x000E, actor_red_ninjakoopa_tattle] +- [0x1C, 0x000F, actor_blue_ninjakoopa_tattle] +- [0x1C, 0x0010, actor_yellow_ninjakoopa_tattle] +- [0x1C, 0x0011, actor_green_ninjakoopa_tattle] +- [0x1C, 0x0012, actor_koopa_bros_tattle] +- [0x1C, 0x0013, actor_jr_troopa1_tattle] +- [0x1C, 0x0014, actor_monty_mole_tattle] +- [0x1C, 0x0015, actor_cleft_tattle] +- [0x1C, 0x0016, actor_pokey_tattle] +- [0x1C, 0x0017, actor_bandit_tattle] +- [0x1C, 0x0018, actor_pokey_mummy_tattle] +- [0x1C, 0x0019, actor_buzzy_beetle_tattle] +- [0x1C, 0x001A, actor_swooper_tattle] +- [0x1C, 0x001B, actor_buzzar_tattle] +- [0x1C, 0x001C, actor_tutankoopa_tattle] +- [0x1C, 0x001D, actor_chomp_tattle] +- [0x1C, 0x001E, actor_stone_chomp_tattle] +- [0x1C, 0x001F, actor_piranha_plant_tattle] +- [0x1C, 0x0020, actor_forest_fuzzy_tattle] +- [0x1C, 0x0021, actor_hyper_goomba_tattle] +- [0x1C, 0x0022, actor_hyper_paragoomba_tattle] +- [0x1C, 0x0023, actor_hyper_cleft_tattle] +- [0x1C, 0x0024, actor_clubba_tattle] +- [0x1C, 0x0025, actor_tubba_blubba_invincible_tattle] +- [0x1C, 0x0026, actor_tubba_heart_tattle] +- [0x1C, 0x0027, actor_tubba_blubba_tattle] +- [0x1C, 0x0028, actor_jr_troopa2_tattle] +- [0x1C, 0x0029, actor_shy_guy_tattle] +- [0x1C, 0x002A, actor_groove_guy_tattle] +- [0x1C, 0x002B, actor_spy_guy_tattle] +- [0x1C, 0x002C, actor_pyro_guy_tattle] +- [0x1C, 0x002D, actor_sky_guy_tattle] +- [0x1C, 0x002E, actor_medi_guy_tattle] +- [0x1C, 0x002F, actor_anti_guy_tattle] +- [0x1C, 0x0030, actor_big_lantern_ghost_tattle] +- [0x1C, 0x0031, actor_general_guy_tattle] +- [0x1C, 0x0032, actor_shy_squad_tattle] +- [0x1C, 0x0033, actor_shy_stack_tattle] +- [0x1C, 0x0034, actor_stilt_guy_tattle] +- [0x1C, 0x0035, actor_hurt_plant_tattle] +- [0x1C, 0x0036, actor_m_bush_tattle] +- [0x1C, 0x0037, actor_jungle_fuzzy_tattle] +- [0x1C, 0x0038, actor_spear_guy_tattle] +- [0x1C, 0x0039, actor_putrid_piranha_tattle] +- [0x1C, 0x003A, actor_lava_bubble_tattle] +- [0x1C, 0x003B, actor_spike_top_tattle] +- [0x1C, 0x003C, actor_lava_piranha_phase_1_tattle] +- [0x1C, 0x003D, actor_lava_piranha_phase_2_tattle] +- [0x1C, 0x003E, actor_lava_bud_phase_1_tattle] +- [0x1C, 0x003F, actor_lava_bud_phase_2_tattle] +- [0x1C, 0x0040, actor_petit_piranha_tattle] +- [0x1C, 0x0041, actor_jr_troopa3_tattle] +- [0x1C, 0x0042, actor_lakitu_tattle] +- [0x1C, 0x0043, actor_spiny_tattle] +- [0x1C, 0x0044, actor_bzzap_tattle] +- [0x1C, 0x0045, actor_crazee_dayzee_tattle] +- [0x1C, 0x0046, actor_amazy_dayzee_tattle] +- [0x1C, 0x0047, actor_monty_mole_boss_tattle] +- [0x1C, 0x0048, actor_spike_tattle] +- [0x1C, 0x0049, actor_ruff_puff_tattle] +- [0x1C, 0x004A, actor_huff_n_puff_tattle] +- [0x1C, 0x004B, actor_tuff_puff_tattle] +- [0x1C, 0x004C, actor_jr_troopa4_tattle] +- [0x1C, 0x004D, actor_gulpit_tattle] +- [0x1C, 0x004E, actor_gulpit_rocks_tattle] +- [0x1C, 0x004F, actor_monstar_tattle] +- [0x1C, 0x0050, actor_frost_piranha_tattle] +- [0x1C, 0x0051, actor_white_clubba_tattle] +- [0x1C, 0x0052, actor_duplighost_tattle] +- [0x1C, 0x0053, actor_ghost_watt_tattle] +- [0x1C, 0x0054, actor_ghost_kooper_tattle] +- [0x1C, 0x0055, actor_ghost_goombario_tattle] +- [0x1C, 0x0056, actor_ghost_sushie_tattle] +- [0x1C, 0x0057, actor_ghost_lakilester_tattle] +- [0x1C, 0x0058, actor_ghost_parakarry_tattle] +- [0x1C, 0x0059, actor_ghost_bombette_tattle] +- [0x1C, 0x005A, actor_ghost_bow_tattle] +- [0x1C, 0x005B, actor_albino_dino_tattle] +- [0x1C, 0x005C, actor_swoopula_tattle] +- [0x1C, 0x005D, actor_crystal_king_tattle] +- [0x1C, 0x005E, actor_crystal_clone_tattle] +- [0x1C, 0x005F, actor_crystal_bit_tattle] +- [0x1C, 0x0060, actor_ember_tattle] +- [0x1C, 0x0061, actor_dry_bones_tattle] +- [0x1C, 0x0062, actor_bony_beetle_tattle] +- [0x1C, 0x0063, actor_magikoopa_tattle] +- [0x1C, 0x0064, actor_magiclone_tattle] +- [0x1C, 0x0065, actor_magikoopa_dup_tattle] +- [0x1C, 0x0066, actor_magiclone_dup_tattle] +- [0x1C, 0x0067, actor_koopatrol_tattle] +- [0x1C, 0x0068, actor_hammer_bros_tattle] +- [0x1C, 0x0069, actor_bombshell_bill_tattle] +- [0x1C, 0x006A, actor_bombshell_blaster_tattle] +- [0x1C, 0x006B, actor_jr_troopa5_tattle] +- [0x1C, 0x006C, actor_bowser_phase_1_tattle] +- [0x1C, 0x006D, actor_bowser_phase_2_tattle] +- [0x1C, 0x006E, actor_bowser_phase_3_tattle] +- [0x1C, 0x006F, actor_kent_c_koopa_tattle] +- [0x1C, 0x0070, actor_blooper_tattle] +- [0x1C, 0x0071, actor_electro_blooper_tattle] +- [0x1C, 0x0072, actor_super_blooper_tattle] +- [0x1C, 0x0073, actor_blooper_baby_tattle] +- [0x1C, 0x0074, actor_the_master_1_tattle] +- [0x1C, 0x0075, actor_the_master_2_tattle] +- [0x1C, 0x0076, actor_the_master_3_tattle] +- [0x1C, 0x0077, actor_chan_tattle] +- [0x1C, 0x0078, actor_lee_tattle] +- [0x1C, 0x0079, actor_gloomba_tattle] +- [0x1C, 0x007A, actor_paragloomba_tattle] +- [0x1C, 0x007B, actor_spiked_gloomba_tattle] +- [0x1C, 0x007C, actor_dark_koopa_tattle] +- [0x1C, 0x007D, actor_dark_paratroopa_tattle] +- [0x1C, 0x007E, actor_red_magikoopa_tattle] +- [0x1C, 0x007F, actor_flying_red_magikoopa_tattle] +- [0x1C, 0x0080, actor_green_magikoopa_tattle] +- [0x1C, 0x0081, actor_flying_green_magikoopa_tattle] +- [0x1C, 0x0082, actor_yellow_magikoopa_tattle] +- [0x1C, 0x0083, actor_flying_yellow_magikoopa_tattle] +- [0x1C, 0x0084, actor_gray_magikoopa_tattle] +- [0x1C, 0x0085, actor_flying_gray_magikoopa_tattle] +- [0x1C, 0x0086, actor_flying_white_magikoopa_tattle] +- [0x1C, 0x0087, actor_white_magikoopa_tattle] +- [0x1C, 0x0088, actor_magikoopa_boss_tattle] +- [0x1C, 0x0089, actor_magikoopa_boss_dup_tattle] +- [0x1C, 0x008A, actor_lee_watt_tattle] +- [0x1C, 0x008B, actor_lee_kooper_tattle] +- [0x1C, 0x008C, actor_lee_goombario_tattle] +- [0x1C, 0x008D, actor_lee_sushie_tattle] +- [0x1C, 0x008E, actor_lee_lakilester_tattle] +- [0x1C, 0x008F, actor_lee_parakarry_tattle] +- [0x1C, 0x0090, actor_lee_bombette_tattle] +- [0x1C, 0x0091, actor_lee_bow_tattle] +- [0x1C, 0x0092, actor_mario_tattle] +- [0x1C, 0x0093, actor_slot_machine_start_tattle] +- [0x1C, 0x0094, actor_slot_machine_stop_tattle] +- [0x1C, 0x0095, actor_whacka_tattle] + +- [0x1D, 0x0007, party_goombario] +- [0x1D, 0x0008, party_kooper] +- [0x1D, 0x0009, party_bombette] +- [0x1D, 0x000A, party_parakarry] +- [0x1D, 0x000B, party_goompa] +- [0x1D, 0x000C, party_watt] +- [0x1D, 0x000D, party_sushie] +- [0x1D, 0x000E, party_lakilester] +- [0x1D, 0x000F, party_bow] +- [0x1D, 0x0010, party_goombaria] +- [0x1D, 0x0011, party_twink] +- [0x1D, 0x0012, party_peach] +- [0x1D, 0x0013, party_mario] + +- [0x1D, 0x0071, merlee_increase_atk] +- [0x1D, 0x0072, merlee_increase_dmg] +- [0x1D, 0x0073, merlee_increase_star_points] +- [0x1D, 0x0074, merlee_increase_coins] +- [0x1D, 0x0075, merlee_end] +- [0x1D, 0x0076, charge_hammer] +- [0x1D, 0x0077, charge_hammer_more] +- [0x1D, 0x0078, charge_jump] +- [0x1D, 0x0079, charge_jump_more] +- [0x1D, 0x007A, charge_max] +- [0x1D, 0x007B, enemy_missed] +- [0x1D, 0x007C, partner_dazed] +- [0x1D, 0x007D, charge_goombario] +- [0x1D, 0x007E, charge_goombario_more] +- [0x1D, 0x007F, star_energy_increased] +- [0x1D, 0x0080, star_energy_filled] +- [0x1D, 0x0081, star_energy_max] +- [0x1D, 0x0082, atk_up_n] +- [0x1D, 0x0083, def_up_n] + +- [0x1D, 0x0086, enemy_transparent] +- [0x1D, 0x0087, enemy_electric_charge] + +- [0x1D, 0x0088, player_dazed] +- [0x1D, 0x0089, player_poisoned] +- [0x1D, 0x008A, player_frozen] +- [0x1D, 0x008B, player_slept] +- [0x1D, 0x008C, player_shrunk] +- [0x1D, 0x008D, player_paralyzed] +- [0x1D, 0x008E, player_electrified] +- [0x1D, 0x008F, player_transparent] +- [0x1D, 0x0090, enemy_dazed] +- [0x1D, 0x0091, enemy_poisoned] +- [0x1D, 0x0092, enemy_frozen] +- [0x1D, 0x0093, enemy_slept] +- [0x1D, 0x0094, enemy_shrunk] +- [0x1D, 0x0095, enemy_paralyzed] +- [0x1D, 0x0096, enemy_electrified] +- [0x1D, 0x0097, enemy_cannot_move] +- [0x1D, 0x0098, water_block_active] +- [0x1D, 0x0099, water_block_end] +- [0x1D, 0x009A, cloud_nine_active] +- [0x1D, 0x009B, cloud_nine_end] +- [0x1D, 0x009B, cloud_nine_end] +- [0x1D, 0x009C, atk_up_active] +- [0x1D, 0x009D, atk_up_end] +- [0x1D, 0x009E, enemy_atk_down] + +- [0x1D, 0x00AF, action_cmd_jump] +- [0x1D, 0x00B0, action_cmd_hammer] + +- [0x1D, 0x00C0, no_target_jump] +- [0x1D, 0x00C1, no_target_hammer] +- [0x1D, 0x00C2, no_battle_items] + +- [0x1D, 0x00C6, hammer_disabled] +- [0x1D, 0x00C7, jump_disabled] +- [0x1D, 0x00C8, items_disabled] +- [0x1D, 0x00C9, no_switch_used_turn] +- [0x1D, 0x00CA, no_switch_dazed] + +- [0x1D, 0x0168, kmr_12_sign_to_fortress] +- [0x1D, 0x0167, kmr_12_sign_trap] + +- [0x29, 0x0000, actor_goomba] +- [0x29, 0x0001, actor_spiked_goomba] +- [0x29, 0x0002, actor_paragoomba] +- [0x29, 0x0003, actor_red_goomba_boss] +- [0x29, 0x0004, actor_blue_goomba_boss] +- [0x29, 0x0005, actor_goomba_king] +- [0x29, 0x0006, actor_goomnut_tree] +- [0x29, 0x0007, actor_koopa_troopa] +- [0x29, 0x0008, actor_paratroopa] +- [0x29, 0x0009, actor_fuzzy] +- [0x29, 0x000A, actor_bob_omb] +- [0x29, 0x000B, actor_bullet_bill] +- [0x29, 0x000C, actor_bill_blaster] +- [0x29, 0x000D, actor_fake_bowser] +- [0x29, 0x000E, actor_red_ninjakoopa] +- [0x29, 0x000F, actor_blue_ninjakoopa] +- [0x29, 0x0010, actor_yellow_ninjakoopa] +- [0x29, 0x0011, actor_green_ninjakoopa] +- [0x29, 0x0012, actor_koopa_bros] +- [0x29, 0x0013, actor_jr_troopa] +- [0x29, 0x0014, actor_monty_mole] +- [0x29, 0x0015, actor_cleft] +- [0x29, 0x0016, actor_pokey] +- [0x29, 0x0017, actor_bandit] +- [0x29, 0x0018, actor_pokey_mummy] +- [0x29, 0x0019, actor_buzzy_beetle] +- [0x29, 0x001A, actor_swooper] +- [0x29, 0x001B, actor_buzzar] +- [0x29, 0x001C, actor_tutankoopa] +- [0x29, 0x001D, actor_chomp] +- [0x29, 0x001E, actor_stone_chomp] +- [0x29, 0x001F, actor_piranha_plant] +- [0x29, 0x0020, actor_forest_fuzzy] +- [0x29, 0x0021, actor_hyper_goomba] +- [0x29, 0x0022, actor_hyper_paragoomba] +- [0x29, 0x0023, actor_hyper_cleft] +- [0x29, 0x0024, actor_clubba] +- [0x29, 0x0025, actor_tubba_blubba] +- [0x29, 0x0026, actor_tubba_heart] +- [0x29, 0x0027, actor_shy_guy] +- [0x29, 0x0028, actor_groove_guy] +- [0x29, 0x0029, actor_spy_guy] +- [0x29, 0x002A, actor_pyro_guy] +- [0x29, 0x002B, actor_sky_guy] +- [0x29, 0x002C, actor_medi_guy] +- [0x29, 0x002D, actor_anti_guy] +- [0x29, 0x002E, actor_big_lantern_ghost] +- [0x29, 0x002F, actor_general_guy] +- [0x29, 0x0030, actor_shy_squad] +- [0x29, 0x0031, actor_shy_stack] +- [0x29, 0x0032, actor_stilt_guy] +- [0x29, 0x0033, actor_hurt_plant] +- [0x29, 0x0034, actor_m_bush] +- [0x29, 0x0035, actor_jungle_fuzzy] +- [0x29, 0x0036, actor_spear_guy] +- [0x29, 0x0037, actor_putrid_piranha] +- [0x29, 0x0038, actor_lava_bubble] +- [0x29, 0x0039, actor_spike_top] +- [0x29, 0x003A, actor_lava_piranha] +- [0x29, 0x003B, actor_lava_bud] +- [0x29, 0x003C, actor_petit_piranha] +- [0x29, 0x003D, actor_lakitu] +- [0x29, 0x003E, actor_spiny] +- [0x29, 0x003F, actor_bzzap] +- [0x29, 0x0040, actor_crazee_dayzee] +- [0x29, 0x0041, actor_amazy_dayzee] +- [0x29, 0x0042, actor_monty_mole_boss] +- [0x29, 0x0043, actor_spike] +- [0x29, 0x0044, actor_ruff_puff] +- [0x29, 0x0045, actor_huff_n_puff] +- [0x29, 0x0046, actor_tuff_puff] +- [0x29, 0x0047, actor_gulpit] +- [0x29, 0x0048, actor_gulpit_rocks] +- [0x29, 0x0049, actor_monstar] +- [0x29, 0x004A, actor_frost_piranha] +- [0x29, 0x004B, actor_white_clubba] +- [0x29, 0x004C, actor_duplighost] +- [0x29, 0x004D, actor_ghost_watt] +- [0x29, 0x004E, actor_ghost_kooper] +- [0x29, 0x004F, actor_ghost_goombario] +- [0x29, 0x0050, actor_ghost_sushie] +- [0x29, 0x0051, actor_ghost_lakilester] +- [0x29, 0x0052, actor_ghost_parakarry] +- [0x29, 0x0053, actor_ghost_bombette] +- [0x29, 0x0054, actor_ghost_bow] +- [0x29, 0x0055, actor_albino_dino] +- [0x29, 0x0056, actor_swoopula] +- [0x29, 0x0057, actor_crystal_king] +- [0x29, 0x0058, actor_crystal_bit] +- [0x29, 0x0059, actor_ember] +- [0x29, 0x005A, actor_dry_bones] +- [0x29, 0x005B, actor_bony_beetle] +- [0x29, 0x005C, actor_magikoopa] +- [0x29, 0x005D, actor_koopatrol] +- [0x29, 0x005E, actor_hammer_bros] +- [0x29, 0x005F, actor_bombshell_bill] +- [0x29, 0x0060, actor_bombshell_blaster] +- [0x29, 0x0061, actor_bowser] +- [0x29, 0x0062, actor_kammy_koopa] +- [0x29, 0x0063, actor_kent_c_koopa] +- [0x29, 0x0064, actor_blooper] +- [0x29, 0x0065, actor_electro_blooper] +- [0x29, 0x0066, actor_super_blooper] +- [0x29, 0x0067, actor_blooper_baby] +- [0x29, 0x0068, actor_the_master] +- [0x29, 0x0069, actor_chan] +- [0x29, 0x006A, actor_lee] +- [0x29, 0x006B, actor_gloomba] +- [0x29, 0x006C, actor_paragloomba] +- [0x29, 0x006D, actor_spiked_gloomba] +- [0x29, 0x006E, actor_dark_koopa] +- [0x29, 0x006F, actor_dark_paratroopa] +- [0x29, 0x0070, actor_red_magikoopa] +- [0x29, 0x0071, actor_green_magikoopa] +- [0x29, 0x0072, actor_yellow_magikoopa] +- [0x29, 0x0073, actor_gray_magikoopa] +- [0x29, 0x0074, actor_white_magikoopa] +- [0x29, 0x0075, actor_mario] +- [0x29, 0x0076, actor_slot_machine_start] +- [0x29, 0x0077, actor_slot_machine_stop] +- [0x29, 0x0078, actor_whacka] +- [0x29, 0x0079, actor_general_guy_dup] +- [0x29, 0x007A, actor_bulb] +- [0x29, 0x007B, actor_shy_squad_dup] +- [0x29, 0x007C, actor_fuzzipede] +- [0x29, 0x007D, actor_monty_hole] +- [0x29, 0x007E, actor_balloon] +- [0x29, 0x007F, actor_lantern] +- [0x29, 0x0080, actor_aqua_fuzzy] +- [0x29, 0x0081, actor_red_goomba] +- [0x29, 0x0082, actor_red_paragoomba] diff --git a/tools/splat_ext/npc.yaml b/tools/splat_ext/npc.yaml new file mode 100644 index 0000000000..b401e947bc --- /dev/null +++ b/tools/splat_ext/npc.yaml @@ -0,0 +1,236 @@ +# This file describes what to name the frame images, palettes, and animations of sprites when splitting. + +world_goombario: + frames: + - walk1 + - still + - walk2 + - pain + - headbonk + - still_copy1 + - still_copy2 + - jump + - talk1 + - talk2 + - jump_copy + - fall + - happy1 + - happy2 + - read_paper + palettes: + - normal + - green + - inactive + - yellow + - gray + animations: + - still + - idle + - walk + - run + - jump + - fall + - headbonk # centered at 0,0,0 rather than at base of sprite + - pain + - talk + - celebrate + - read_paper +world_kooper: + frames: + - walk1 + - walk2 + - walk3 + - idle1 + - idle2 + - idle3 + - idle4 + - shell1 + - shell2 + - shell3 + - shell4 + - shell5 + - shell6 + - shell7 + - shell8 + - pain1 + - pain2 + - shell_start1 + - shell_start2 + - shell_start3 + - talk + - talk_wave1 + - talk_wave2 + - happy1 + - happy2 + - happy3 + - happy4 + - jump + - fall + - read_paper + - talk_sad1 + - talk_sad2 + palettes: + - normal + - green + - inactive + - yellow + - gray + animations: + - still + - happy_still + - sad_still + - idle + - walk + - walk_fast + - jump + - fall + - shell_still1 + - shell_spin + - shell_start + - shell_end + - pain + - talk + - talk_wave + - anim_0f + - celebrate + - celebrate_loop + - shell_still2 + - read_paper +world_bombette: + frames: + - still + - walk1 + - walk2 + - walk3 + - walk4 + - idle1 + - idle2 + - idle3 + - idle4 + - jump + - fall + - key_fall + - still_lit + - walk_lit1 + - walk_lit2 + - walk_lit3 + - charge_lit + - pain1 + - pain2 + - frame_13 + - happy1 + - happy2 + - happy3 + - happy4 + - happy5 + - happy_jump + - happy_fall + - lit_fuse1 + - lit_fuse2 + - lit_fuse3 + - lit_fuse4 + - lit_fuse5 + - lit_fuse6 + - key1 + - key2 + - key3 + - key4 + - key5 + - key6 + - key7 + - key8 + palettes: + - normal + - fuse + - red + - green + - fuse2 + - black + - inactive + - purple + - black2 + - yellow + - fuse3 + - black3 + - gray + animations: + - still + - happy + - still_lit + - idle + - happy_idle + - walk + - walk_lit + - walk_fast + - walk_fast_lit + - jump + - fall + - happy_jump + - happy_fall + - pain + - idle_fast + - celebrate + - lit_charge + - anim_11 +goomba: + frames: + - still + - lean_left + - lean_right + - pain1 + - pain2 + - jump + - open_mouth + - open_mouth_wide + - sleep + - dizzy1 + - dizzy2 + - dizzy3 + - dizzy4 + - burn_pain1 + - burn_pain2 + - burn_dead + - tense + - fake_plant + - fake_mushroom + - electrocute + palettes: + - normal + - red # unused + - hyper + - blue # unused + - gloomba + - poisoned + - poisoned + - poisoned + - poisoned + - poisoned + - unk_purple_status + - unk_purple_status + - unk_purple_status + - unk_purple_status + - unk_purple_status + - electrified + - electrified + - electrified + - electrified + - electrified + - burnt + - fake_mushroom + - fake_plant + animations: + - still + - idle + - walk + - run + - headbonk # centered at 0,0,0 rather than at base of sprite + - pain + - dead + - dizzy + - asleep + - burn_pain + - burn_dead + - pre_headbonk # centered at 0,0,0 rather than at base of sprite + - fake_plant + - fake_mushroom + - electrocute diff --git a/ver/jp/asm/nonmatchings/main_10080/func_80034C80.s b/ver/jp/asm/nonmatchings/10080/func_80034C80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_80034C80.s rename to ver/jp/asm/nonmatchings/10080/func_80034C80.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_80034CD8.s b/ver/jp/asm/nonmatchings/10080/func_80034CD8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_80034CD8.s rename to ver/jp/asm/nonmatchings/10080/func_80034CD8.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_80034E48.s b/ver/jp/asm/nonmatchings/10080/func_80034E48.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_80034E48.s rename to ver/jp/asm/nonmatchings/10080/func_80034E48.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_8003516C.s b/ver/jp/asm/nonmatchings/10080/func_8003516C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_8003516C.s rename to ver/jp/asm/nonmatchings/10080/func_8003516C.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_80035244.s b/ver/jp/asm/nonmatchings/10080/func_80035244.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_80035244.s rename to ver/jp/asm/nonmatchings/10080/func_80035244.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_8003524C.s b/ver/jp/asm/nonmatchings/10080/func_8003524C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_8003524C.s rename to ver/jp/asm/nonmatchings/10080/func_8003524C.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_80035254.s b/ver/jp/asm/nonmatchings/10080/func_80035254.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_80035254.s rename to ver/jp/asm/nonmatchings/10080/func_80035254.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_800352E0.s b/ver/jp/asm/nonmatchings/10080/func_800352E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_800352E0.s rename to ver/jp/asm/nonmatchings/10080/func_800352E0.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_80035384.s b/ver/jp/asm/nonmatchings/10080/func_80035384.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_80035384.s rename to ver/jp/asm/nonmatchings/10080/func_80035384.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_800357C0.s b/ver/jp/asm/nonmatchings/10080/func_800357C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_800357C0.s rename to ver/jp/asm/nonmatchings/10080/func_800357C0.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_80035998.s b/ver/jp/asm/nonmatchings/10080/func_80035998.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_80035998.s rename to ver/jp/asm/nonmatchings/10080/func_80035998.s diff --git a/ver/jp/asm/nonmatchings/main_10080/func_800359A0.s b/ver/jp/asm/nonmatchings/10080/func_800359A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10080/func_800359A0.s rename to ver/jp/asm/nonmatchings/10080/func_800359A0.s diff --git a/ver/jp/asm/nonmatchings/main_1060/func_80026148.s b/ver/jp/asm/nonmatchings/1060/func_80026148.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1060/func_80026148.s rename to ver/jp/asm/nonmatchings/1060/func_80026148.s diff --git a/ver/jp/asm/nonmatchings/main_1060/func_80026710.s b/ver/jp/asm/nonmatchings/1060/func_80026710.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1060/func_80026710.s rename to ver/jp/asm/nonmatchings/1060/func_80026710.s diff --git a/ver/jp/asm/nonmatchings/main_1060/func_800269C0.s b/ver/jp/asm/nonmatchings/1060/func_800269C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1060/func_800269C0.s rename to ver/jp/asm/nonmatchings/1060/func_800269C0.s diff --git a/ver/jp/asm/nonmatchings/main_1060/func_80026AD4.s b/ver/jp/asm/nonmatchings/1060/func_80026AD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1060/func_80026AD4.s rename to ver/jp/asm/nonmatchings/1060/func_80026AD4.s diff --git a/ver/jp/asm/nonmatchings/main_1060/func_80026DA8.s b/ver/jp/asm/nonmatchings/1060/func_80026DA8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1060/func_80026DA8.s rename to ver/jp/asm/nonmatchings/1060/func_80026DA8.s diff --git a/ver/jp/asm/nonmatchings/main_1060/func_80027054.s b/ver/jp/asm/nonmatchings/1060/func_80027054.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1060/func_80027054.s rename to ver/jp/asm/nonmatchings/1060/func_80027054.s diff --git a/ver/jp/asm/nonmatchings/main_1060/func_8002715C.s b/ver/jp/asm/nonmatchings/1060/func_8002715C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1060/func_8002715C.s rename to ver/jp/asm/nonmatchings/1060/func_8002715C.s diff --git a/ver/jp/asm/nonmatchings/main_10DB0/func_800359B0.s b/ver/jp/asm/nonmatchings/10DB0/func_800359B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10DB0/func_800359B0.s rename to ver/jp/asm/nonmatchings/10DB0/func_800359B0.s diff --git a/ver/jp/asm/nonmatchings/main_10DB0/func_800359D4.s b/ver/jp/asm/nonmatchings/10DB0/func_800359D4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10DB0/func_800359D4.s rename to ver/jp/asm/nonmatchings/10DB0/func_800359D4.s diff --git a/ver/jp/asm/nonmatchings/main_10DB0/func_80035A20.s b/ver/jp/asm/nonmatchings/10DB0/func_80035A20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10DB0/func_80035A20.s rename to ver/jp/asm/nonmatchings/10DB0/func_80035A20.s diff --git a/ver/jp/asm/nonmatchings/main_10DB0/func_80035A4C.s b/ver/jp/asm/nonmatchings/10DB0/func_80035A4C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10DB0/func_80035A4C.s rename to ver/jp/asm/nonmatchings/10DB0/func_80035A4C.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035A70.s b/ver/jp/asm/nonmatchings/10E70/func_80035A70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035A70.s rename to ver/jp/asm/nonmatchings/10E70/func_80035A70.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035A80.s b/ver/jp/asm/nonmatchings/10E70/func_80035A80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035A80.s rename to ver/jp/asm/nonmatchings/10E70/func_80035A80.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035AA4.s b/ver/jp/asm/nonmatchings/10E70/func_80035AA4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035AA4.s rename to ver/jp/asm/nonmatchings/10E70/func_80035AA4.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035AD4.s b/ver/jp/asm/nonmatchings/10E70/func_80035AD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035AD4.s rename to ver/jp/asm/nonmatchings/10E70/func_80035AD4.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035B6C.s b/ver/jp/asm/nonmatchings/10E70/func_80035B6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035B6C.s rename to ver/jp/asm/nonmatchings/10E70/func_80035B6C.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035D7C.s b/ver/jp/asm/nonmatchings/10E70/func_80035D7C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035D7C.s rename to ver/jp/asm/nonmatchings/10E70/func_80035D7C.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035DB0.s b/ver/jp/asm/nonmatchings/10E70/func_80035DB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035DB0.s rename to ver/jp/asm/nonmatchings/10E70/func_80035DB0.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_80035DFC.s b/ver/jp/asm/nonmatchings/10E70/func_80035DFC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_80035DFC.s rename to ver/jp/asm/nonmatchings/10E70/func_80035DFC.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_8003607C.s b/ver/jp/asm/nonmatchings/10E70/func_8003607C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_8003607C.s rename to ver/jp/asm/nonmatchings/10E70/func_8003607C.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_800360B0.s b/ver/jp/asm/nonmatchings/10E70/func_800360B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_800360B0.s rename to ver/jp/asm/nonmatchings/10E70/func_800360B0.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_800360EC.s b/ver/jp/asm/nonmatchings/10E70/func_800360EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_800360EC.s rename to ver/jp/asm/nonmatchings/10E70/func_800360EC.s diff --git a/ver/jp/asm/nonmatchings/main_10E70/func_800362C0.s b/ver/jp/asm/nonmatchings/10E70/func_800362C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_10E70/func_800362C0.s rename to ver/jp/asm/nonmatchings/10E70/func_800362C0.s diff --git a/ver/jp/asm/nonmatchings/main_116D0/func_800362D0.s b/ver/jp/asm/nonmatchings/116D0/func_800362D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_116D0/func_800362D0.s rename to ver/jp/asm/nonmatchings/116D0/func_800362D0.s diff --git a/ver/jp/asm/nonmatchings/main_116D0/func_800364D4.s b/ver/jp/asm/nonmatchings/116D0/func_800364D4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_116D0/func_800364D4.s rename to ver/jp/asm/nonmatchings/116D0/func_800364D4.s diff --git a/ver/jp/asm/nonmatchings/main_116D0/func_80036A60.s b/ver/jp/asm/nonmatchings/116D0/func_80036A60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_116D0/func_80036A60.s rename to ver/jp/asm/nonmatchings/116D0/func_80036A60.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_80036A70.s b/ver/jp/asm/nonmatchings/11E70/func_80036A70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_80036A70.s rename to ver/jp/asm/nonmatchings/11E70/func_80036A70.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_80036D44.s b/ver/jp/asm/nonmatchings/11E70/func_80036D44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_80036D44.s rename to ver/jp/asm/nonmatchings/11E70/func_80036D44.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_80037234.s b/ver/jp/asm/nonmatchings/11E70/func_80037234.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_80037234.s rename to ver/jp/asm/nonmatchings/11E70/func_80037234.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_800372C8.s b/ver/jp/asm/nonmatchings/11E70/func_800372C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_800372C8.s rename to ver/jp/asm/nonmatchings/11E70/func_800372C8.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_800375F0.s b/ver/jp/asm/nonmatchings/11E70/func_800375F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_800375F0.s rename to ver/jp/asm/nonmatchings/11E70/func_800375F0.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_800375F8.s b/ver/jp/asm/nonmatchings/11E70/func_800375F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_800375F8.s rename to ver/jp/asm/nonmatchings/11E70/func_800375F8.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_80037624.s b/ver/jp/asm/nonmatchings/11E70/func_80037624.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_80037624.s rename to ver/jp/asm/nonmatchings/11E70/func_80037624.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_80037860.s b/ver/jp/asm/nonmatchings/11E70/func_80037860.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_80037860.s rename to ver/jp/asm/nonmatchings/11E70/func_80037860.s diff --git a/ver/jp/asm/nonmatchings/main_11E70/func_80037AAC.s b/ver/jp/asm/nonmatchings/11E70/func_80037AAC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_11E70/func_80037AAC.s rename to ver/jp/asm/nonmatchings/11E70/func_80037AAC.s diff --git a/ver/jp/asm/nonmatchings/main_13140/func_80037D40.s b/ver/jp/asm/nonmatchings/13140/func_80037D40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13140/func_80037D40.s rename to ver/jp/asm/nonmatchings/13140/func_80037D40.s diff --git a/ver/jp/asm/nonmatchings/main_13140/func_80037DB4.s b/ver/jp/asm/nonmatchings/13140/func_80037DB4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13140/func_80037DB4.s rename to ver/jp/asm/nonmatchings/13140/func_80037DB4.s diff --git a/ver/jp/asm/nonmatchings/main_13140/func_8003811C.s b/ver/jp/asm/nonmatchings/13140/func_8003811C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13140/func_8003811C.s rename to ver/jp/asm/nonmatchings/13140/func_8003811C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038130.s b/ver/jp/asm/nonmatchings/13530/func_80038130.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038130.s rename to ver/jp/asm/nonmatchings/13530/func_80038130.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038138.s b/ver/jp/asm/nonmatchings/13530/func_80038138.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038138.s rename to ver/jp/asm/nonmatchings/13530/func_80038138.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003817C.s b/ver/jp/asm/nonmatchings/13530/func_8003817C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003817C.s rename to ver/jp/asm/nonmatchings/13530/func_8003817C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_800381EC.s b/ver/jp/asm/nonmatchings/13530/func_800381EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_800381EC.s rename to ver/jp/asm/nonmatchings/13530/func_800381EC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003823C.s b/ver/jp/asm/nonmatchings/13530/func_8003823C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003823C.s rename to ver/jp/asm/nonmatchings/13530/func_8003823C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038258.s b/ver/jp/asm/nonmatchings/13530/func_80038258.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038258.s rename to ver/jp/asm/nonmatchings/13530/func_80038258.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038504.s b/ver/jp/asm/nonmatchings/13530/func_80038504.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038504.s rename to ver/jp/asm/nonmatchings/13530/func_80038504.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038524.s b/ver/jp/asm/nonmatchings/13530/func_80038524.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038524.s rename to ver/jp/asm/nonmatchings/13530/func_80038524.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038540.s b/ver/jp/asm/nonmatchings/13530/func_80038540.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038540.s rename to ver/jp/asm/nonmatchings/13530/func_80038540.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038560.s b/ver/jp/asm/nonmatchings/13530/func_80038560.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038560.s rename to ver/jp/asm/nonmatchings/13530/func_80038560.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003868C.s b/ver/jp/asm/nonmatchings/13530/func_8003868C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003868C.s rename to ver/jp/asm/nonmatchings/13530/func_8003868C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003879C.s b/ver/jp/asm/nonmatchings/13530/func_8003879C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003879C.s rename to ver/jp/asm/nonmatchings/13530/func_8003879C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_800387BC.s b/ver/jp/asm/nonmatchings/13530/func_800387BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_800387BC.s rename to ver/jp/asm/nonmatchings/13530/func_800387BC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038CCC.s b/ver/jp/asm/nonmatchings/13530/func_80038CCC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038CCC.s rename to ver/jp/asm/nonmatchings/13530/func_80038CCC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80038F98.s b/ver/jp/asm/nonmatchings/13530/func_80038F98.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80038F98.s rename to ver/jp/asm/nonmatchings/13530/func_80038F98.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80039348.s b/ver/jp/asm/nonmatchings/13530/func_80039348.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80039348.s rename to ver/jp/asm/nonmatchings/13530/func_80039348.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_800394A8.s b/ver/jp/asm/nonmatchings/13530/func_800394A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_800394A8.s rename to ver/jp/asm/nonmatchings/13530/func_800394A8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_800395F0.s b/ver/jp/asm/nonmatchings/13530/func_800395F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_800395F0.s rename to ver/jp/asm/nonmatchings/13530/func_800395F0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80039A64.s b/ver/jp/asm/nonmatchings/13530/func_80039A64.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80039A64.s rename to ver/jp/asm/nonmatchings/13530/func_80039A64.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_80039C90.s b/ver/jp/asm/nonmatchings/13530/func_80039C90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_80039C90.s rename to ver/jp/asm/nonmatchings/13530/func_80039C90.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A4B0.s b/ver/jp/asm/nonmatchings/13530/func_8003A4B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A4B0.s rename to ver/jp/asm/nonmatchings/13530/func_8003A4B0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A714.s b/ver/jp/asm/nonmatchings/13530/func_8003A714.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A714.s rename to ver/jp/asm/nonmatchings/13530/func_8003A714.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A7AC.s b/ver/jp/asm/nonmatchings/13530/func_8003A7AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A7AC.s rename to ver/jp/asm/nonmatchings/13530/func_8003A7AC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A808.s b/ver/jp/asm/nonmatchings/13530/func_8003A808.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A808.s rename to ver/jp/asm/nonmatchings/13530/func_8003A808.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A860.s b/ver/jp/asm/nonmatchings/13530/func_8003A860.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A860.s rename to ver/jp/asm/nonmatchings/13530/func_8003A860.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A8BC.s b/ver/jp/asm/nonmatchings/13530/func_8003A8BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A8BC.s rename to ver/jp/asm/nonmatchings/13530/func_8003A8BC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A91C.s b/ver/jp/asm/nonmatchings/13530/func_8003A91C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A91C.s rename to ver/jp/asm/nonmatchings/13530/func_8003A91C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003A9E4.s b/ver/jp/asm/nonmatchings/13530/func_8003A9E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003A9E4.s rename to ver/jp/asm/nonmatchings/13530/func_8003A9E4.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003AA6C.s b/ver/jp/asm/nonmatchings/13530/func_8003AA6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003AA6C.s rename to ver/jp/asm/nonmatchings/13530/func_8003AA6C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003AAB8.s b/ver/jp/asm/nonmatchings/13530/func_8003AAB8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003AAB8.s rename to ver/jp/asm/nonmatchings/13530/func_8003AAB8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003AAF8.s b/ver/jp/asm/nonmatchings/13530/func_8003AAF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003AAF8.s rename to ver/jp/asm/nonmatchings/13530/func_8003AAF8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003AE44.s b/ver/jp/asm/nonmatchings/13530/func_8003AE44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003AE44.s rename to ver/jp/asm/nonmatchings/13530/func_8003AE44.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003AE58.s b/ver/jp/asm/nonmatchings/13530/func_8003AE58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003AE58.s rename to ver/jp/asm/nonmatchings/13530/func_8003AE58.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003AE68.s b/ver/jp/asm/nonmatchings/13530/func_8003AE68.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003AE68.s rename to ver/jp/asm/nonmatchings/13530/func_8003AE68.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003AE70.s b/ver/jp/asm/nonmatchings/13530/func_8003AE70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003AE70.s rename to ver/jp/asm/nonmatchings/13530/func_8003AE70.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B000.s b/ver/jp/asm/nonmatchings/13530/func_8003B000.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B000.s rename to ver/jp/asm/nonmatchings/13530/func_8003B000.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B090.s b/ver/jp/asm/nonmatchings/13530/func_8003B090.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B090.s rename to ver/jp/asm/nonmatchings/13530/func_8003B090.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B0B8.s b/ver/jp/asm/nonmatchings/13530/func_8003B0B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B0B8.s rename to ver/jp/asm/nonmatchings/13530/func_8003B0B8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B0E0.s b/ver/jp/asm/nonmatchings/13530/func_8003B0E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B0E0.s rename to ver/jp/asm/nonmatchings/13530/func_8003B0E0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B10C.s b/ver/jp/asm/nonmatchings/13530/func_8003B10C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B10C.s rename to ver/jp/asm/nonmatchings/13530/func_8003B10C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B124.s b/ver/jp/asm/nonmatchings/13530/func_8003B124.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B124.s rename to ver/jp/asm/nonmatchings/13530/func_8003B124.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B13C.s b/ver/jp/asm/nonmatchings/13530/func_8003B13C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B13C.s rename to ver/jp/asm/nonmatchings/13530/func_8003B13C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B1C0.s b/ver/jp/asm/nonmatchings/13530/func_8003B1C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B1C0.s rename to ver/jp/asm/nonmatchings/13530/func_8003B1C0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B274.s b/ver/jp/asm/nonmatchings/13530/func_8003B274.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B274.s rename to ver/jp/asm/nonmatchings/13530/func_8003B274.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B62C.s b/ver/jp/asm/nonmatchings/13530/func_8003B62C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B62C.s rename to ver/jp/asm/nonmatchings/13530/func_8003B62C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003B720.s b/ver/jp/asm/nonmatchings/13530/func_8003B720.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003B720.s rename to ver/jp/asm/nonmatchings/13530/func_8003B720.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003BB98.s b/ver/jp/asm/nonmatchings/13530/func_8003BB98.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003BB98.s rename to ver/jp/asm/nonmatchings/13530/func_8003BB98.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C098.s b/ver/jp/asm/nonmatchings/13530/func_8003C098.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C098.s rename to ver/jp/asm/nonmatchings/13530/func_8003C098.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C0E8.s b/ver/jp/asm/nonmatchings/13530/func_8003C0E8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C0E8.s rename to ver/jp/asm/nonmatchings/13530/func_8003C0E8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C104.s b/ver/jp/asm/nonmatchings/13530/func_8003C104.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C104.s rename to ver/jp/asm/nonmatchings/13530/func_8003C104.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C1FC.s b/ver/jp/asm/nonmatchings/13530/func_8003C1FC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C1FC.s rename to ver/jp/asm/nonmatchings/13530/func_8003C1FC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C2DC.s b/ver/jp/asm/nonmatchings/13530/func_8003C2DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C2DC.s rename to ver/jp/asm/nonmatchings/13530/func_8003C2DC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C318.s b/ver/jp/asm/nonmatchings/13530/func_8003C318.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C318.s rename to ver/jp/asm/nonmatchings/13530/func_8003C318.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C320.s b/ver/jp/asm/nonmatchings/13530/func_8003C320.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C320.s rename to ver/jp/asm/nonmatchings/13530/func_8003C320.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C328.s b/ver/jp/asm/nonmatchings/13530/func_8003C328.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C328.s rename to ver/jp/asm/nonmatchings/13530/func_8003C328.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C44C.s b/ver/jp/asm/nonmatchings/13530/func_8003C44C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C44C.s rename to ver/jp/asm/nonmatchings/13530/func_8003C44C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C468.s b/ver/jp/asm/nonmatchings/13530/func_8003C468.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C468.s rename to ver/jp/asm/nonmatchings/13530/func_8003C468.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C56C.s b/ver/jp/asm/nonmatchings/13530/func_8003C56C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C56C.s rename to ver/jp/asm/nonmatchings/13530/func_8003C56C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C574.s b/ver/jp/asm/nonmatchings/13530/func_8003C574.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C574.s rename to ver/jp/asm/nonmatchings/13530/func_8003C574.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C644.s b/ver/jp/asm/nonmatchings/13530/func_8003C644.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C644.s rename to ver/jp/asm/nonmatchings/13530/func_8003C644.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C668.s b/ver/jp/asm/nonmatchings/13530/func_8003C668.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C668.s rename to ver/jp/asm/nonmatchings/13530/func_8003C668.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C7E0.s b/ver/jp/asm/nonmatchings/13530/func_8003C7E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C7E0.s rename to ver/jp/asm/nonmatchings/13530/func_8003C7E0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C804.s b/ver/jp/asm/nonmatchings/13530/func_8003C804.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C804.s rename to ver/jp/asm/nonmatchings/13530/func_8003C804.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C94C.s b/ver/jp/asm/nonmatchings/13530/func_8003C94C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C94C.s rename to ver/jp/asm/nonmatchings/13530/func_8003C94C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003C970.s b/ver/jp/asm/nonmatchings/13530/func_8003C970.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003C970.s rename to ver/jp/asm/nonmatchings/13530/func_8003C970.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003CC60.s b/ver/jp/asm/nonmatchings/13530/func_8003CC60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003CC60.s rename to ver/jp/asm/nonmatchings/13530/func_8003CC60.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003CC68.s b/ver/jp/asm/nonmatchings/13530/func_8003CC68.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003CC68.s rename to ver/jp/asm/nonmatchings/13530/func_8003CC68.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003CC74.s b/ver/jp/asm/nonmatchings/13530/func_8003CC74.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003CC74.s rename to ver/jp/asm/nonmatchings/13530/func_8003CC74.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003CD84.s b/ver/jp/asm/nonmatchings/13530/func_8003CD84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003CD84.s rename to ver/jp/asm/nonmatchings/13530/func_8003CD84.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003CE94.s b/ver/jp/asm/nonmatchings/13530/func_8003CE94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003CE94.s rename to ver/jp/asm/nonmatchings/13530/func_8003CE94.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003CFB8.s b/ver/jp/asm/nonmatchings/13530/func_8003CFB8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003CFB8.s rename to ver/jp/asm/nonmatchings/13530/func_8003CFB8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003D07C.s b/ver/jp/asm/nonmatchings/13530/func_8003D07C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003D07C.s rename to ver/jp/asm/nonmatchings/13530/func_8003D07C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003D2E4.s b/ver/jp/asm/nonmatchings/13530/func_8003D2E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003D2E4.s rename to ver/jp/asm/nonmatchings/13530/func_8003D2E4.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003D320.s b/ver/jp/asm/nonmatchings/13530/func_8003D320.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003D320.s rename to ver/jp/asm/nonmatchings/13530/func_8003D320.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003D448.s b/ver/jp/asm/nonmatchings/13530/func_8003D448.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003D448.s rename to ver/jp/asm/nonmatchings/13530/func_8003D448.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003D6F8.s b/ver/jp/asm/nonmatchings/13530/func_8003D6F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003D6F8.s rename to ver/jp/asm/nonmatchings/13530/func_8003D6F8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003D8F8.s b/ver/jp/asm/nonmatchings/13530/func_8003D8F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003D8F8.s rename to ver/jp/asm/nonmatchings/13530/func_8003D8F8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003DC60.s b/ver/jp/asm/nonmatchings/13530/func_8003DC60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003DC60.s rename to ver/jp/asm/nonmatchings/13530/func_8003DC60.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003DD94.s b/ver/jp/asm/nonmatchings/13530/func_8003DD94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003DD94.s rename to ver/jp/asm/nonmatchings/13530/func_8003DD94.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003DE90.s b/ver/jp/asm/nonmatchings/13530/func_8003DE90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003DE90.s rename to ver/jp/asm/nonmatchings/13530/func_8003DE90.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003DFA0.s b/ver/jp/asm/nonmatchings/13530/func_8003DFA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003DFA0.s rename to ver/jp/asm/nonmatchings/13530/func_8003DFA0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003DFF8.s b/ver/jp/asm/nonmatchings/13530/func_8003DFF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003DFF8.s rename to ver/jp/asm/nonmatchings/13530/func_8003DFF8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E0C0.s b/ver/jp/asm/nonmatchings/13530/func_8003E0C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E0C0.s rename to ver/jp/asm/nonmatchings/13530/func_8003E0C0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E1CC.s b/ver/jp/asm/nonmatchings/13530/func_8003E1CC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E1CC.s rename to ver/jp/asm/nonmatchings/13530/func_8003E1CC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E1D4.s b/ver/jp/asm/nonmatchings/13530/func_8003E1D4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E1D4.s rename to ver/jp/asm/nonmatchings/13530/func_8003E1D4.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E1E4.s b/ver/jp/asm/nonmatchings/13530/func_8003E1E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E1E4.s rename to ver/jp/asm/nonmatchings/13530/func_8003E1E4.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E270.s b/ver/jp/asm/nonmatchings/13530/func_8003E270.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E270.s rename to ver/jp/asm/nonmatchings/13530/func_8003E270.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E2FC.s b/ver/jp/asm/nonmatchings/13530/func_8003E2FC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E2FC.s rename to ver/jp/asm/nonmatchings/13530/func_8003E2FC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E330.s b/ver/jp/asm/nonmatchings/13530/func_8003E330.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E330.s rename to ver/jp/asm/nonmatchings/13530/func_8003E330.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E338.s b/ver/jp/asm/nonmatchings/13530/func_8003E338.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E338.s rename to ver/jp/asm/nonmatchings/13530/func_8003E338.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E3F0.s b/ver/jp/asm/nonmatchings/13530/func_8003E3F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E3F0.s rename to ver/jp/asm/nonmatchings/13530/func_8003E3F0.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E46C.s b/ver/jp/asm/nonmatchings/13530/func_8003E46C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E46C.s rename to ver/jp/asm/nonmatchings/13530/func_8003E46C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E60C.s b/ver/jp/asm/nonmatchings/13530/func_8003E60C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E60C.s rename to ver/jp/asm/nonmatchings/13530/func_8003E60C.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E674.s b/ver/jp/asm/nonmatchings/13530/func_8003E674.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E674.s rename to ver/jp/asm/nonmatchings/13530/func_8003E674.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E6DC.s b/ver/jp/asm/nonmatchings/13530/func_8003E6DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E6DC.s rename to ver/jp/asm/nonmatchings/13530/func_8003E6DC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E744.s b/ver/jp/asm/nonmatchings/13530/func_8003E744.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E744.s rename to ver/jp/asm/nonmatchings/13530/func_8003E744.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E810.s b/ver/jp/asm/nonmatchings/13530/func_8003E810.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E810.s rename to ver/jp/asm/nonmatchings/13530/func_8003E810.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E8DC.s b/ver/jp/asm/nonmatchings/13530/func_8003E8DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E8DC.s rename to ver/jp/asm/nonmatchings/13530/func_8003E8DC.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003E9A8.s b/ver/jp/asm/nonmatchings/13530/func_8003E9A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003E9A8.s rename to ver/jp/asm/nonmatchings/13530/func_8003E9A8.s diff --git a/ver/jp/asm/nonmatchings/main_13530/func_8003EA28.s b/ver/jp/asm/nonmatchings/13530/func_8003EA28.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_13530/func_8003EA28.s rename to ver/jp/asm/nonmatchings/13530/func_8003EA28.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80025F70.s b/ver/jp/asm/nonmatchings/1370/func_80025F70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_80025F70.s rename to ver/jp/asm/nonmatchings/1370/func_80025F70.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026148.s b/ver/jp/asm/nonmatchings/1370/func_80026148.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_80026148.s rename to ver/jp/asm/nonmatchings/1370/func_80026148.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026710.s b/ver/jp/asm/nonmatchings/1370/func_80026710.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_80026710.s rename to ver/jp/asm/nonmatchings/1370/func_80026710.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_800269C0.s b/ver/jp/asm/nonmatchings/1370/func_800269C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_800269C0.s rename to ver/jp/asm/nonmatchings/1370/func_800269C0.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026AD4.s b/ver/jp/asm/nonmatchings/1370/func_80026AD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_80026AD4.s rename to ver/jp/asm/nonmatchings/1370/func_80026AD4.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80026DA8.s b/ver/jp/asm/nonmatchings/1370/func_80026DA8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_80026DA8.s rename to ver/jp/asm/nonmatchings/1370/func_80026DA8.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_80027054.s b/ver/jp/asm/nonmatchings/1370/func_80027054.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_80027054.s rename to ver/jp/asm/nonmatchings/1370/func_80027054.s diff --git a/ver/jp/asm/nonmatchings/main_1370/func_8002715C.s b/ver/jp/asm/nonmatchings/1370/func_8002715C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1370/func_8002715C.s rename to ver/jp/asm/nonmatchings/1370/func_8002715C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003EAB0.s b/ver/jp/asm/nonmatchings/19EB0/func_8003EAB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003EAB0.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003EAB0.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003EB00.s b/ver/jp/asm/nonmatchings/19EB0/func_8003EB00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003EB00.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003EB00.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003EB58.s b/ver/jp/asm/nonmatchings/19EB0/func_8003EB58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003EB58.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003EB58.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003EB8C.s b/ver/jp/asm/nonmatchings/19EB0/func_8003EB8C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003EB8C.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003EB8C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003EBC0.s b/ver/jp/asm/nonmatchings/19EB0/func_8003EBC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003EBC0.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003EBC0.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003EC58.s b/ver/jp/asm/nonmatchings/19EB0/func_8003EC58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003EC58.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003EC58.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003ECD8.s b/ver/jp/asm/nonmatchings/19EB0/func_8003ECD8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003ECD8.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003ECD8.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003ED44.s b/ver/jp/asm/nonmatchings/19EB0/func_8003ED44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003ED44.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003ED44.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003ED84.s b/ver/jp/asm/nonmatchings/19EB0/func_8003ED84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003ED84.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003ED84.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F044.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F044.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F044.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F044.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F058.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F058.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F058.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F058.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F0B4.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F0B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F0B4.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F0B4.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F0D4.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F0D4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F0D4.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F0D4.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F18C.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F18C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F18C.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F18C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F240.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F240.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F240.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F240.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F3A8.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F3A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F3A8.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F3A8.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8003F48C.s b/ver/jp/asm/nonmatchings/19EB0/func_8003F48C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8003F48C.s rename to ver/jp/asm/nonmatchings/19EB0/func_8003F48C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8004101C.s b/ver/jp/asm/nonmatchings/19EB0/func_8004101C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8004101C.s rename to ver/jp/asm/nonmatchings/19EB0/func_8004101C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80041024.s b/ver/jp/asm/nonmatchings/19EB0/func_80041024.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80041024.s rename to ver/jp/asm/nonmatchings/19EB0/func_80041024.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80041624.s b/ver/jp/asm/nonmatchings/19EB0/func_80041624.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80041624.s rename to ver/jp/asm/nonmatchings/19EB0/func_80041624.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_8004191C.s b/ver/jp/asm/nonmatchings/19EB0/func_8004191C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_8004191C.s rename to ver/jp/asm/nonmatchings/19EB0/func_8004191C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80041BD0.s b/ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80041BD0.s rename to ver/jp/asm/nonmatchings/19EB0/func_80041BD0.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80042D0C.s b/ver/jp/asm/nonmatchings/19EB0/func_80042D0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80042D0C.s rename to ver/jp/asm/nonmatchings/19EB0/func_80042D0C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80042D5C.s b/ver/jp/asm/nonmatchings/19EB0/func_80042D5C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80042D5C.s rename to ver/jp/asm/nonmatchings/19EB0/func_80042D5C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80042E94.s b/ver/jp/asm/nonmatchings/19EB0/func_80042E94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80042E94.s rename to ver/jp/asm/nonmatchings/19EB0/func_80042E94.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80042E9C.s b/ver/jp/asm/nonmatchings/19EB0/func_80042E9C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80042E9C.s rename to ver/jp/asm/nonmatchings/19EB0/func_80042E9C.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80043370.s b/ver/jp/asm/nonmatchings/19EB0/func_80043370.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80043370.s rename to ver/jp/asm/nonmatchings/19EB0/func_80043370.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80043E00.s b/ver/jp/asm/nonmatchings/19EB0/func_80043E00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80043E00.s rename to ver/jp/asm/nonmatchings/19EB0/func_80043E00.s diff --git a/ver/jp/asm/nonmatchings/main_19EB0/func_80043E08.s b/ver/jp/asm/nonmatchings/19EB0/func_80043E08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_19EB0/func_80043E08.s rename to ver/jp/asm/nonmatchings/19EB0/func_80043E08.s diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80026710.s b/ver/jp/asm/nonmatchings/1B10/func_80026710.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1B10/func_80026710.s rename to ver/jp/asm/nonmatchings/1B10/func_80026710.s diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_800269C0.s b/ver/jp/asm/nonmatchings/1B10/func_800269C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1B10/func_800269C0.s rename to ver/jp/asm/nonmatchings/1B10/func_800269C0.s diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80026AD4.s b/ver/jp/asm/nonmatchings/1B10/func_80026AD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1B10/func_80026AD4.s rename to ver/jp/asm/nonmatchings/1B10/func_80026AD4.s diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80026DA8.s b/ver/jp/asm/nonmatchings/1B10/func_80026DA8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1B10/func_80026DA8.s rename to ver/jp/asm/nonmatchings/1B10/func_80026DA8.s diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_80027054.s b/ver/jp/asm/nonmatchings/1B10/func_80027054.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1B10/func_80027054.s rename to ver/jp/asm/nonmatchings/1B10/func_80027054.s diff --git a/ver/jp/asm/nonmatchings/main_1B10/func_8002715C.s b/ver/jp/asm/nonmatchings/1B10/func_8002715C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1B10/func_8002715C.s rename to ver/jp/asm/nonmatchings/1B10/func_8002715C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80043E40.s b/ver/jp/asm/nonmatchings/1F240/func_80043E40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80043E40.s rename to ver/jp/asm/nonmatchings/1F240/func_80043E40.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80043EB0.s b/ver/jp/asm/nonmatchings/1F240/func_80043EB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80043EB0.s rename to ver/jp/asm/nonmatchings/1F240/func_80043EB0.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80043EF8.s b/ver/jp/asm/nonmatchings/1F240/func_80043EF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80043EF8.s rename to ver/jp/asm/nonmatchings/1F240/func_80043EF8.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80043F24.s b/ver/jp/asm/nonmatchings/1F240/func_80043F24.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80043F24.s rename to ver/jp/asm/nonmatchings/1F240/func_80043F24.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80043F50.s b/ver/jp/asm/nonmatchings/1F240/func_80043F50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80043F50.s rename to ver/jp/asm/nonmatchings/1F240/func_80043F50.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80043F58.s b/ver/jp/asm/nonmatchings/1F240/func_80043F58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80043F58.s rename to ver/jp/asm/nonmatchings/1F240/func_80043F58.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044000.s b/ver/jp/asm/nonmatchings/1F240/func_80044000.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044000.s rename to ver/jp/asm/nonmatchings/1F240/func_80044000.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044138.s b/ver/jp/asm/nonmatchings/1F240/func_80044138.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044138.s rename to ver/jp/asm/nonmatchings/1F240/func_80044138.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_8004423C.s b/ver/jp/asm/nonmatchings/1F240/func_8004423C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_8004423C.s rename to ver/jp/asm/nonmatchings/1F240/func_8004423C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044268.s b/ver/jp/asm/nonmatchings/1F240/func_80044268.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044268.s rename to ver/jp/asm/nonmatchings/1F240/func_80044268.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044294.s b/ver/jp/asm/nonmatchings/1F240/func_80044294.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044294.s rename to ver/jp/asm/nonmatchings/1F240/func_80044294.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800442C0.s b/ver/jp/asm/nonmatchings/1F240/func_800442C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800442C0.s rename to ver/jp/asm/nonmatchings/1F240/func_800442C0.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800442EC.s b/ver/jp/asm/nonmatchings/1F240/func_800442EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800442EC.s rename to ver/jp/asm/nonmatchings/1F240/func_800442EC.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044374.s b/ver/jp/asm/nonmatchings/1F240/func_80044374.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044374.s rename to ver/jp/asm/nonmatchings/1F240/func_80044374.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044500.s b/ver/jp/asm/nonmatchings/1F240/func_80044500.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044500.s rename to ver/jp/asm/nonmatchings/1F240/func_80044500.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044520.s b/ver/jp/asm/nonmatchings/1F240/func_80044520.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044520.s rename to ver/jp/asm/nonmatchings/1F240/func_80044520.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_8004455C.s b/ver/jp/asm/nonmatchings/1F240/func_8004455C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_8004455C.s rename to ver/jp/asm/nonmatchings/1F240/func_8004455C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800446F8.s b/ver/jp/asm/nonmatchings/1F240/func_800446F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800446F8.s rename to ver/jp/asm/nonmatchings/1F240/func_800446F8.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044738.s b/ver/jp/asm/nonmatchings/1F240/func_80044738.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044738.s rename to ver/jp/asm/nonmatchings/1F240/func_80044738.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_8004486C.s b/ver/jp/asm/nonmatchings/1F240/func_8004486C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_8004486C.s rename to ver/jp/asm/nonmatchings/1F240/func_8004486C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800448EC.s b/ver/jp/asm/nonmatchings/1F240/func_800448EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800448EC.s rename to ver/jp/asm/nonmatchings/1F240/func_800448EC.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800449B0.s b/ver/jp/asm/nonmatchings/1F240/func_800449B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800449B0.s rename to ver/jp/asm/nonmatchings/1F240/func_800449B0.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044A64.s b/ver/jp/asm/nonmatchings/1F240/func_80044A64.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044A64.s rename to ver/jp/asm/nonmatchings/1F240/func_80044A64.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044B78.s b/ver/jp/asm/nonmatchings/1F240/func_80044B78.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044B78.s rename to ver/jp/asm/nonmatchings/1F240/func_80044B78.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044BF8.s b/ver/jp/asm/nonmatchings/1F240/func_80044BF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044BF8.s rename to ver/jp/asm/nonmatchings/1F240/func_80044BF8.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044CB0.s b/ver/jp/asm/nonmatchings/1F240/func_80044CB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044CB0.s rename to ver/jp/asm/nonmatchings/1F240/func_80044CB0.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044D64.s b/ver/jp/asm/nonmatchings/1F240/func_80044D64.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044D64.s rename to ver/jp/asm/nonmatchings/1F240/func_80044D64.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044E00.s b/ver/jp/asm/nonmatchings/1F240/func_80044E00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044E00.s rename to ver/jp/asm/nonmatchings/1F240/func_80044E00.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044E9C.s b/ver/jp/asm/nonmatchings/1F240/func_80044E9C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044E9C.s rename to ver/jp/asm/nonmatchings/1F240/func_80044E9C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044F1C.s b/ver/jp/asm/nonmatchings/1F240/func_80044F1C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044F1C.s rename to ver/jp/asm/nonmatchings/1F240/func_80044F1C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044F80.s b/ver/jp/asm/nonmatchings/1F240/func_80044F80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044F80.s rename to ver/jp/asm/nonmatchings/1F240/func_80044F80.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80044FE0.s b/ver/jp/asm/nonmatchings/1F240/func_80044FE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80044FE0.s rename to ver/jp/asm/nonmatchings/1F240/func_80044FE0.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_8004507C.s b/ver/jp/asm/nonmatchings/1F240/func_8004507C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_8004507C.s rename to ver/jp/asm/nonmatchings/1F240/func_8004507C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_8004511C.s b/ver/jp/asm/nonmatchings/1F240/func_8004511C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_8004511C.s rename to ver/jp/asm/nonmatchings/1F240/func_8004511C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800451CC.s b/ver/jp/asm/nonmatchings/1F240/func_800451CC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800451CC.s rename to ver/jp/asm/nonmatchings/1F240/func_800451CC.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800451E4.s b/ver/jp/asm/nonmatchings/1F240/func_800451E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800451E4.s rename to ver/jp/asm/nonmatchings/1F240/func_800451E4.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80045240.s b/ver/jp/asm/nonmatchings/1F240/func_80045240.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80045240.s rename to ver/jp/asm/nonmatchings/1F240/func_80045240.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800452D4.s b/ver/jp/asm/nonmatchings/1F240/func_800452D4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800452D4.s rename to ver/jp/asm/nonmatchings/1F240/func_800452D4.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80045300.s b/ver/jp/asm/nonmatchings/1F240/func_80045300.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80045300.s rename to ver/jp/asm/nonmatchings/1F240/func_80045300.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80045348.s b/ver/jp/asm/nonmatchings/1F240/func_80045348.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80045348.s rename to ver/jp/asm/nonmatchings/1F240/func_80045348.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800453EC.s b/ver/jp/asm/nonmatchings/1F240/func_800453EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800453EC.s rename to ver/jp/asm/nonmatchings/1F240/func_800453EC.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800453F4.s b/ver/jp/asm/nonmatchings/1F240/func_800453F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800453F4.s rename to ver/jp/asm/nonmatchings/1F240/func_800453F4.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80045458.s b/ver/jp/asm/nonmatchings/1F240/func_80045458.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80045458.s rename to ver/jp/asm/nonmatchings/1F240/func_80045458.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80045484.s b/ver/jp/asm/nonmatchings/1F240/func_80045484.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80045484.s rename to ver/jp/asm/nonmatchings/1F240/func_80045484.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800454B8.s b/ver/jp/asm/nonmatchings/1F240/func_800454B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800454B8.s rename to ver/jp/asm/nonmatchings/1F240/func_800454B8.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800454CC.s b/ver/jp/asm/nonmatchings/1F240/func_800454CC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800454CC.s rename to ver/jp/asm/nonmatchings/1F240/func_800454CC.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800454F8.s b/ver/jp/asm/nonmatchings/1F240/func_800454F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800454F8.s rename to ver/jp/asm/nonmatchings/1F240/func_800454F8.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_8004558C.s b/ver/jp/asm/nonmatchings/1F240/func_8004558C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_8004558C.s rename to ver/jp/asm/nonmatchings/1F240/func_8004558C.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_800455C0.s b/ver/jp/asm/nonmatchings/1F240/func_800455C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_800455C0.s rename to ver/jp/asm/nonmatchings/1F240/func_800455C0.s diff --git a/ver/jp/asm/nonmatchings/main_1F240/func_80045718.s b/ver/jp/asm/nonmatchings/1F240/func_80045718.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_1F240/func_80045718.s rename to ver/jp/asm/nonmatchings/1F240/func_80045718.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045780.s b/ver/jp/asm/nonmatchings/20B80/func_80045780.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045780.s rename to ver/jp/asm/nonmatchings/20B80/func_80045780.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800457D0.s b/ver/jp/asm/nonmatchings/20B80/func_800457D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800457D0.s rename to ver/jp/asm/nonmatchings/20B80/func_800457D0.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045828.s b/ver/jp/asm/nonmatchings/20B80/func_80045828.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045828.s rename to ver/jp/asm/nonmatchings/20B80/func_80045828.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045888.s b/ver/jp/asm/nonmatchings/20B80/func_80045888.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045888.s rename to ver/jp/asm/nonmatchings/20B80/func_80045888.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800458E8.s b/ver/jp/asm/nonmatchings/20B80/func_800458E8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800458E8.s rename to ver/jp/asm/nonmatchings/20B80/func_800458E8.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045948.s b/ver/jp/asm/nonmatchings/20B80/func_80045948.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045948.s rename to ver/jp/asm/nonmatchings/20B80/func_80045948.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045984.s b/ver/jp/asm/nonmatchings/20B80/func_80045984.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045984.s rename to ver/jp/asm/nonmatchings/20B80/func_80045984.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800459C0.s b/ver/jp/asm/nonmatchings/20B80/func_800459C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800459C0.s rename to ver/jp/asm/nonmatchings/20B80/func_800459C0.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045A3C.s b/ver/jp/asm/nonmatchings/20B80/func_80045A3C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045A3C.s rename to ver/jp/asm/nonmatchings/20B80/func_80045A3C.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045B0C.s b/ver/jp/asm/nonmatchings/20B80/func_80045B0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045B0C.s rename to ver/jp/asm/nonmatchings/20B80/func_80045B0C.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045B5C.s b/ver/jp/asm/nonmatchings/20B80/func_80045B5C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045B5C.s rename to ver/jp/asm/nonmatchings/20B80/func_80045B5C.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045C50.s b/ver/jp/asm/nonmatchings/20B80/func_80045C50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045C50.s rename to ver/jp/asm/nonmatchings/20B80/func_80045C50.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045C60.s b/ver/jp/asm/nonmatchings/20B80/func_80045C60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045C60.s rename to ver/jp/asm/nonmatchings/20B80/func_80045C60.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80045CDC.s b/ver/jp/asm/nonmatchings/20B80/func_80045CDC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80045CDC.s rename to ver/jp/asm/nonmatchings/20B80/func_80045CDC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_8004628C.s b/ver/jp/asm/nonmatchings/20B80/func_8004628C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_8004628C.s rename to ver/jp/asm/nonmatchings/20B80/func_8004628C.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800472B4.s b/ver/jp/asm/nonmatchings/20B80/func_800472B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800472B4.s rename to ver/jp/asm/nonmatchings/20B80/func_800472B4.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800473A0.s b/ver/jp/asm/nonmatchings/20B80/func_800473A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800473A0.s rename to ver/jp/asm/nonmatchings/20B80/func_800473A0.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047438.s b/ver/jp/asm/nonmatchings/20B80/func_80047438.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047438.s rename to ver/jp/asm/nonmatchings/20B80/func_80047438.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800474A0.s b/ver/jp/asm/nonmatchings/20B80/func_800474A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800474A0.s rename to ver/jp/asm/nonmatchings/20B80/func_800474A0.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800474CC.s b/ver/jp/asm/nonmatchings/20B80/func_800474CC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800474CC.s rename to ver/jp/asm/nonmatchings/20B80/func_800474CC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047544.s b/ver/jp/asm/nonmatchings/20B80/func_80047544.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047544.s rename to ver/jp/asm/nonmatchings/20B80/func_80047544.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800475A4.s b/ver/jp/asm/nonmatchings/20B80/func_800475A4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800475A4.s rename to ver/jp/asm/nonmatchings/20B80/func_800475A4.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800475D4.s b/ver/jp/asm/nonmatchings/20B80/func_800475D4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800475D4.s rename to ver/jp/asm/nonmatchings/20B80/func_800475D4.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_8004764C.s b/ver/jp/asm/nonmatchings/20B80/func_8004764C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_8004764C.s rename to ver/jp/asm/nonmatchings/20B80/func_8004764C.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800476AC.s b/ver/jp/asm/nonmatchings/20B80/func_800476AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800476AC.s rename to ver/jp/asm/nonmatchings/20B80/func_800476AC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800476DC.s b/ver/jp/asm/nonmatchings/20B80/func_800476DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800476DC.s rename to ver/jp/asm/nonmatchings/20B80/func_800476DC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047754.s b/ver/jp/asm/nonmatchings/20B80/func_80047754.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047754.s rename to ver/jp/asm/nonmatchings/20B80/func_80047754.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800477B4.s b/ver/jp/asm/nonmatchings/20B80/func_800477B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800477B4.s rename to ver/jp/asm/nonmatchings/20B80/func_800477B4.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800477E4.s b/ver/jp/asm/nonmatchings/20B80/func_800477E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800477E4.s rename to ver/jp/asm/nonmatchings/20B80/func_800477E4.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047830.s b/ver/jp/asm/nonmatchings/20B80/func_80047830.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047830.s rename to ver/jp/asm/nonmatchings/20B80/func_80047830.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047890.s b/ver/jp/asm/nonmatchings/20B80/func_80047890.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047890.s rename to ver/jp/asm/nonmatchings/20B80/func_80047890.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800478C0.s b/ver/jp/asm/nonmatchings/20B80/func_800478C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800478C0.s rename to ver/jp/asm/nonmatchings/20B80/func_800478C0.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047950.s b/ver/jp/asm/nonmatchings/20B80/func_80047950.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047950.s rename to ver/jp/asm/nonmatchings/20B80/func_80047950.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800479AC.s b/ver/jp/asm/nonmatchings/20B80/func_800479AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800479AC.s rename to ver/jp/asm/nonmatchings/20B80/func_800479AC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_800479DC.s b/ver/jp/asm/nonmatchings/20B80/func_800479DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_800479DC.s rename to ver/jp/asm/nonmatchings/20B80/func_800479DC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047A6C.s b/ver/jp/asm/nonmatchings/20B80/func_80047A6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047A6C.s rename to ver/jp/asm/nonmatchings/20B80/func_80047A6C.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047AC8.s b/ver/jp/asm/nonmatchings/20B80/func_80047AC8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047AC8.s rename to ver/jp/asm/nonmatchings/20B80/func_80047AC8.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047AF8.s b/ver/jp/asm/nonmatchings/20B80/func_80047AF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047AF8.s rename to ver/jp/asm/nonmatchings/20B80/func_80047AF8.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047B88.s b/ver/jp/asm/nonmatchings/20B80/func_80047B88.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047B88.s rename to ver/jp/asm/nonmatchings/20B80/func_80047B88.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047BD4.s b/ver/jp/asm/nonmatchings/20B80/func_80047BD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047BD4.s rename to ver/jp/asm/nonmatchings/20B80/func_80047BD4.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047C04.s b/ver/jp/asm/nonmatchings/20B80/func_80047C04.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047C04.s rename to ver/jp/asm/nonmatchings/20B80/func_80047C04.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047C94.s b/ver/jp/asm/nonmatchings/20B80/func_80047C94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047C94.s rename to ver/jp/asm/nonmatchings/20B80/func_80047C94.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047CE0.s b/ver/jp/asm/nonmatchings/20B80/func_80047CE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047CE0.s rename to ver/jp/asm/nonmatchings/20B80/func_80047CE0.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047D10.s b/ver/jp/asm/nonmatchings/20B80/func_80047D10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047D10.s rename to ver/jp/asm/nonmatchings/20B80/func_80047D10.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047DA0.s b/ver/jp/asm/nonmatchings/20B80/func_80047DA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047DA0.s rename to ver/jp/asm/nonmatchings/20B80/func_80047DA0.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047DEC.s b/ver/jp/asm/nonmatchings/20B80/func_80047DEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047DEC.s rename to ver/jp/asm/nonmatchings/20B80/func_80047DEC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047E1C.s b/ver/jp/asm/nonmatchings/20B80/func_80047E1C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047E1C.s rename to ver/jp/asm/nonmatchings/20B80/func_80047E1C.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047EAC.s b/ver/jp/asm/nonmatchings/20B80/func_80047EAC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047EAC.s rename to ver/jp/asm/nonmatchings/20B80/func_80047EAC.s diff --git a/ver/jp/asm/nonmatchings/main_20B80/func_80047EF8.s b/ver/jp/asm/nonmatchings/20B80/func_80047EF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_20B80/func_80047EF8.s rename to ver/jp/asm/nonmatchings/20B80/func_80047EF8.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80047F30.s b/ver/jp/asm/nonmatchings/23330/func_80047F30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80047F30.s rename to ver/jp/asm/nonmatchings/23330/func_80047F30.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80048A00.s b/ver/jp/asm/nonmatchings/23330/func_80048A00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80048A00.s rename to ver/jp/asm/nonmatchings/23330/func_80048A00.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80048AE4.s b/ver/jp/asm/nonmatchings/23330/func_80048AE4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80048AE4.s rename to ver/jp/asm/nonmatchings/23330/func_80048AE4.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80048BBC.s b/ver/jp/asm/nonmatchings/23330/func_80048BBC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80048BBC.s rename to ver/jp/asm/nonmatchings/23330/func_80048BBC.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80048C84.s b/ver/jp/asm/nonmatchings/23330/func_80048C84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80048C84.s rename to ver/jp/asm/nonmatchings/23330/func_80048C84.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80048D64.s b/ver/jp/asm/nonmatchings/23330/func_80048D64.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80048D64.s rename to ver/jp/asm/nonmatchings/23330/func_80048D64.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_8004909C.s b/ver/jp/asm/nonmatchings/23330/func_8004909C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_8004909C.s rename to ver/jp/asm/nonmatchings/23330/func_8004909C.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049170.s b/ver/jp/asm/nonmatchings/23330/func_80049170.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049170.s rename to ver/jp/asm/nonmatchings/23330/func_80049170.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049200.s b/ver/jp/asm/nonmatchings/23330/func_80049200.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049200.s rename to ver/jp/asm/nonmatchings/23330/func_80049200.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049250.s b/ver/jp/asm/nonmatchings/23330/func_80049250.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049250.s rename to ver/jp/asm/nonmatchings/23330/func_80049250.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049368.s b/ver/jp/asm/nonmatchings/23330/func_80049368.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049368.s rename to ver/jp/asm/nonmatchings/23330/func_80049368.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_800497F4.s b/ver/jp/asm/nonmatchings/23330/func_800497F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_800497F4.s rename to ver/jp/asm/nonmatchings/23330/func_800497F4.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_800498B4.s b/ver/jp/asm/nonmatchings/23330/func_800498B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_800498B4.s rename to ver/jp/asm/nonmatchings/23330/func_800498B4.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049AEC.s b/ver/jp/asm/nonmatchings/23330/func_80049AEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049AEC.s rename to ver/jp/asm/nonmatchings/23330/func_80049AEC.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049B7C.s b/ver/jp/asm/nonmatchings/23330/func_80049B7C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049B7C.s rename to ver/jp/asm/nonmatchings/23330/func_80049B7C.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049C2C.s b/ver/jp/asm/nonmatchings/23330/func_80049C2C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049C2C.s rename to ver/jp/asm/nonmatchings/23330/func_80049C2C.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_80049DD4.s b/ver/jp/asm/nonmatchings/23330/func_80049DD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_80049DD4.s rename to ver/jp/asm/nonmatchings/23330/func_80049DD4.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_8004A098.s b/ver/jp/asm/nonmatchings/23330/func_8004A098.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_8004A098.s rename to ver/jp/asm/nonmatchings/23330/func_8004A098.s diff --git a/ver/jp/asm/nonmatchings/main_23330/func_8004A12C.s b/ver/jp/asm/nonmatchings/23330/func_8004A12C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_23330/func_8004A12C.s rename to ver/jp/asm/nonmatchings/23330/func_8004A12C.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_80027170.s b/ver/jp/asm/nonmatchings/2570/func_80027170.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_80027170.s rename to ver/jp/asm/nonmatchings/2570/func_80027170.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_800271CC.s b/ver/jp/asm/nonmatchings/2570/func_800271CC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_800271CC.s rename to ver/jp/asm/nonmatchings/2570/func_800271CC.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_8002722C.s b/ver/jp/asm/nonmatchings/2570/func_8002722C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_8002722C.s rename to ver/jp/asm/nonmatchings/2570/func_8002722C.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_800275D0.s b/ver/jp/asm/nonmatchings/2570/func_800275D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_800275D0.s rename to ver/jp/asm/nonmatchings/2570/func_800275D0.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_80027744.s b/ver/jp/asm/nonmatchings/2570/func_80027744.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_80027744.s rename to ver/jp/asm/nonmatchings/2570/func_80027744.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_80027984.s b/ver/jp/asm/nonmatchings/2570/func_80027984.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_80027984.s rename to ver/jp/asm/nonmatchings/2570/func_80027984.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_80027B7C.s b/ver/jp/asm/nonmatchings/2570/func_80027B7C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_80027B7C.s rename to ver/jp/asm/nonmatchings/2570/func_80027B7C.s diff --git a/ver/jp/asm/nonmatchings/main_2570/func_80027DE0.s b/ver/jp/asm/nonmatchings/2570/func_80027DE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2570/func_80027DE0.s rename to ver/jp/asm/nonmatchings/2570/func_80027DE0.s diff --git a/ver/jp/asm/nonmatchings/main_257A0/func_8004A3A0.s b/ver/jp/asm/nonmatchings/257A0/func_8004A3A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_257A0/func_8004A3A0.s rename to ver/jp/asm/nonmatchings/257A0/func_8004A3A0.s diff --git a/ver/jp/asm/nonmatchings/main_257A0/func_8004A3EC.s b/ver/jp/asm/nonmatchings/257A0/func_8004A3EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_257A0/func_8004A3EC.s rename to ver/jp/asm/nonmatchings/257A0/func_8004A3EC.s diff --git a/ver/jp/asm/nonmatchings/main_257A0/func_8004A434.s b/ver/jp/asm/nonmatchings/257A0/func_8004A434.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_257A0/func_8004A434.s rename to ver/jp/asm/nonmatchings/257A0/func_8004A434.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004A7B0.s b/ver/jp/asm/nonmatchings/25BB0/func_8004A7B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004A7B0.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004A7B0.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004AA80.s b/ver/jp/asm/nonmatchings/25BB0/func_8004AA80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004AA80.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004AA80.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004AAB8.s b/ver/jp/asm/nonmatchings/25BB0/func_8004AAB8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004AAB8.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004AAB8.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004AED4.s b/ver/jp/asm/nonmatchings/25BB0/func_8004AED4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004AED4.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004AED4.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004AF18.s b/ver/jp/asm/nonmatchings/25BB0/func_8004AF18.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004AF18.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004AF18.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004AFD8.s b/ver/jp/asm/nonmatchings/25BB0/func_8004AFD8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004AFD8.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004AFD8.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004B09C.s b/ver/jp/asm/nonmatchings/25BB0/func_8004B09C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004B09C.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004B09C.s diff --git a/ver/jp/asm/nonmatchings/main_25BB0/func_8004B0BC.s b/ver/jp/asm/nonmatchings/25BB0/func_8004B0BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_25BB0/func_8004B0BC.s rename to ver/jp/asm/nonmatchings/25BB0/func_8004B0BC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B0F0.s b/ver/jp/asm/nonmatchings/264F0/func_8004B0F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B0F0.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B0F0.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B2DC.s b/ver/jp/asm/nonmatchings/264F0/func_8004B2DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B2DC.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B2DC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B348.s b/ver/jp/asm/nonmatchings/264F0/func_8004B348.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B348.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B348.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B388.s b/ver/jp/asm/nonmatchings/264F0/func_8004B388.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B388.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B388.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B3F8.s b/ver/jp/asm/nonmatchings/264F0/func_8004B3F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B3F8.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B3F8.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B694.s b/ver/jp/asm/nonmatchings/264F0/func_8004B694.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B694.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B694.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B704.s b/ver/jp/asm/nonmatchings/264F0/func_8004B704.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B704.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B704.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004B724.s b/ver/jp/asm/nonmatchings/264F0/func_8004B724.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004B724.s rename to ver/jp/asm/nonmatchings/264F0/func_8004B724.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004BD94.s b/ver/jp/asm/nonmatchings/264F0/func_8004BD94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004BD94.s rename to ver/jp/asm/nonmatchings/264F0/func_8004BD94.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004BF18.s b/ver/jp/asm/nonmatchings/264F0/func_8004BF18.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004BF18.s rename to ver/jp/asm/nonmatchings/264F0/func_8004BF18.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004BF54.s b/ver/jp/asm/nonmatchings/264F0/func_8004BF54.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004BF54.s rename to ver/jp/asm/nonmatchings/264F0/func_8004BF54.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004BFB0.s b/ver/jp/asm/nonmatchings/264F0/func_8004BFB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004BFB0.s rename to ver/jp/asm/nonmatchings/264F0/func_8004BFB0.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004C008.s b/ver/jp/asm/nonmatchings/264F0/func_8004C008.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004C008.s rename to ver/jp/asm/nonmatchings/264F0/func_8004C008.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004C084.s b/ver/jp/asm/nonmatchings/264F0/func_8004C084.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004C084.s rename to ver/jp/asm/nonmatchings/264F0/func_8004C084.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004C0F4.s b/ver/jp/asm/nonmatchings/264F0/func_8004C0F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004C0F4.s rename to ver/jp/asm/nonmatchings/264F0/func_8004C0F4.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004C228.s b/ver/jp/asm/nonmatchings/264F0/func_8004C228.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004C228.s rename to ver/jp/asm/nonmatchings/264F0/func_8004C228.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004C4F4.s b/ver/jp/asm/nonmatchings/264F0/func_8004C4F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004C4F4.s rename to ver/jp/asm/nonmatchings/264F0/func_8004C4F4.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004C534.s b/ver/jp/asm/nonmatchings/264F0/func_8004C534.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004C534.s rename to ver/jp/asm/nonmatchings/264F0/func_8004C534.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CA44.s b/ver/jp/asm/nonmatchings/264F0/func_8004CA44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CA44.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CA44.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CAA8.s b/ver/jp/asm/nonmatchings/264F0/func_8004CAA8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CAA8.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CAA8.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CB20.s b/ver/jp/asm/nonmatchings/264F0/func_8004CB20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CB20.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CB20.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CB54.s b/ver/jp/asm/nonmatchings/264F0/func_8004CB54.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CB54.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CB54.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CB74.s b/ver/jp/asm/nonmatchings/264F0/func_8004CB74.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CB74.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CB74.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CBBC.s b/ver/jp/asm/nonmatchings/264F0/func_8004CBBC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CBBC.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CBBC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CBEC.s b/ver/jp/asm/nonmatchings/264F0/func_8004CBEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CBEC.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CBEC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CCBC.s b/ver/jp/asm/nonmatchings/264F0/func_8004CCBC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CCBC.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CCBC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CCE8.s b/ver/jp/asm/nonmatchings/264F0/func_8004CCE8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CCE8.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CCE8.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CD00.s b/ver/jp/asm/nonmatchings/264F0/func_8004CD00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CD00.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CD00.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CD2C.s b/ver/jp/asm/nonmatchings/264F0/func_8004CD2C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CD2C.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CD2C.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CDC4.s b/ver/jp/asm/nonmatchings/264F0/func_8004CDC4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CDC4.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CDC4.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CDE0.s b/ver/jp/asm/nonmatchings/264F0/func_8004CDE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CDE0.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CDE0.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CE0C.s b/ver/jp/asm/nonmatchings/264F0/func_8004CE0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CE0C.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CE0C.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CE30.s b/ver/jp/asm/nonmatchings/264F0/func_8004CE30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CE30.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CE30.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CE64.s b/ver/jp/asm/nonmatchings/264F0/func_8004CE64.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CE64.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CE64.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CEEC.s b/ver/jp/asm/nonmatchings/264F0/func_8004CEEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CEEC.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CEEC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CF60.s b/ver/jp/asm/nonmatchings/264F0/func_8004CF60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CF60.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CF60.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CF94.s b/ver/jp/asm/nonmatchings/264F0/func_8004CF94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CF94.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CF94.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CFC0.s b/ver/jp/asm/nonmatchings/264F0/func_8004CFC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CFC0.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CFC0.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CFCC.s b/ver/jp/asm/nonmatchings/264F0/func_8004CFCC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CFCC.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CFCC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CFD4.s b/ver/jp/asm/nonmatchings/264F0/func_8004CFD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CFD4.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CFD4.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004CFEC.s b/ver/jp/asm/nonmatchings/264F0/func_8004CFEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004CFEC.s rename to ver/jp/asm/nonmatchings/264F0/func_8004CFEC.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004D004.s b/ver/jp/asm/nonmatchings/264F0/func_8004D004.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004D004.s rename to ver/jp/asm/nonmatchings/264F0/func_8004D004.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004D01C.s b/ver/jp/asm/nonmatchings/264F0/func_8004D01C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004D01C.s rename to ver/jp/asm/nonmatchings/264F0/func_8004D01C.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004D050.s b/ver/jp/asm/nonmatchings/264F0/func_8004D050.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004D050.s rename to ver/jp/asm/nonmatchings/264F0/func_8004D050.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004D0A8.s b/ver/jp/asm/nonmatchings/264F0/func_8004D0A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004D0A8.s rename to ver/jp/asm/nonmatchings/264F0/func_8004D0A8.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004D0D8.s b/ver/jp/asm/nonmatchings/264F0/func_8004D0D8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004D0D8.s rename to ver/jp/asm/nonmatchings/264F0/func_8004D0D8.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004D134.s b/ver/jp/asm/nonmatchings/264F0/func_8004D134.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004D134.s rename to ver/jp/asm/nonmatchings/264F0/func_8004D134.s diff --git a/ver/jp/asm/nonmatchings/main_264F0/func_8004D16C.s b/ver/jp/asm/nonmatchings/264F0/func_8004D16C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_264F0/func_8004D16C.s rename to ver/jp/asm/nonmatchings/264F0/func_8004D16C.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D1C0.s b/ver/jp/asm/nonmatchings/285C0/func_8004D1C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D1C0.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D1C0.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D444.s b/ver/jp/asm/nonmatchings/285C0/func_8004D444.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D444.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D444.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D490.s b/ver/jp/asm/nonmatchings/285C0/func_8004D490.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D490.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D490.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D6BC.s b/ver/jp/asm/nonmatchings/285C0/func_8004D6BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D6BC.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D6BC.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D724.s b/ver/jp/asm/nonmatchings/285C0/func_8004D724.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D724.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D724.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D758.s b/ver/jp/asm/nonmatchings/285C0/func_8004D758.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D758.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D758.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D790.s b/ver/jp/asm/nonmatchings/285C0/func_8004D790.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D790.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D790.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D7D8.s b/ver/jp/asm/nonmatchings/285C0/func_8004D7D8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D7D8.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D7D8.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D7FC.s b/ver/jp/asm/nonmatchings/285C0/func_8004D7FC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D7FC.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D7FC.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D930.s b/ver/jp/asm/nonmatchings/285C0/func_8004D930.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D930.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D930.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004D968.s b/ver/jp/asm/nonmatchings/285C0/func_8004D968.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004D968.s rename to ver/jp/asm/nonmatchings/285C0/func_8004D968.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004DADC.s b/ver/jp/asm/nonmatchings/285C0/func_8004DADC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004DADC.s rename to ver/jp/asm/nonmatchings/285C0/func_8004DADC.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004DC84.s b/ver/jp/asm/nonmatchings/285C0/func_8004DC84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004DC84.s rename to ver/jp/asm/nonmatchings/285C0/func_8004DC84.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004DDA4.s b/ver/jp/asm/nonmatchings/285C0/func_8004DDA4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004DDA4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004DDA4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004DE08.s b/ver/jp/asm/nonmatchings/285C0/func_8004DE08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004DE08.s rename to ver/jp/asm/nonmatchings/285C0/func_8004DE08.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004DFF4.s b/ver/jp/asm/nonmatchings/285C0/func_8004DFF4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004DFF4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004DFF4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E054.s b/ver/jp/asm/nonmatchings/285C0/func_8004E054.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E054.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E054.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E0F4.s b/ver/jp/asm/nonmatchings/285C0/func_8004E0F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E0F4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E0F4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E168.s b/ver/jp/asm/nonmatchings/285C0/func_8004E168.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E168.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E168.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E288.s b/ver/jp/asm/nonmatchings/285C0/func_8004E288.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E288.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E288.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E4F4.s b/ver/jp/asm/nonmatchings/285C0/func_8004E4F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E4F4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E4F4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E530.s b/ver/jp/asm/nonmatchings/285C0/func_8004E530.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E530.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E530.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E5B4.s b/ver/jp/asm/nonmatchings/285C0/func_8004E5B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E5B4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E5B4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E6E4.s b/ver/jp/asm/nonmatchings/285C0/func_8004E6E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E6E4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E6E4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E784.s b/ver/jp/asm/nonmatchings/285C0/func_8004E784.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E784.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E784.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E8B4.s b/ver/jp/asm/nonmatchings/285C0/func_8004E8B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E8B4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E8B4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004E918.s b/ver/jp/asm/nonmatchings/285C0/func_8004E918.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004E918.s rename to ver/jp/asm/nonmatchings/285C0/func_8004E918.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004F86C.s b/ver/jp/asm/nonmatchings/285C0/func_8004F86C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004F86C.s rename to ver/jp/asm/nonmatchings/285C0/func_8004F86C.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004F8B8.s b/ver/jp/asm/nonmatchings/285C0/func_8004F8B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004F8B8.s rename to ver/jp/asm/nonmatchings/285C0/func_8004F8B8.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004F964.s b/ver/jp/asm/nonmatchings/285C0/func_8004F964.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004F964.s rename to ver/jp/asm/nonmatchings/285C0/func_8004F964.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004F994.s b/ver/jp/asm/nonmatchings/285C0/func_8004F994.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004F994.s rename to ver/jp/asm/nonmatchings/285C0/func_8004F994.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004F9B4.s b/ver/jp/asm/nonmatchings/285C0/func_8004F9B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004F9B4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004F9B4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004F9E8.s b/ver/jp/asm/nonmatchings/285C0/func_8004F9E8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004F9E8.s rename to ver/jp/asm/nonmatchings/285C0/func_8004F9E8.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FA44.s b/ver/jp/asm/nonmatchings/285C0/func_8004FA44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FA44.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FA44.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FAC0.s b/ver/jp/asm/nonmatchings/285C0/func_8004FAC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FAC0.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FAC0.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FB1C.s b/ver/jp/asm/nonmatchings/285C0/func_8004FB1C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FB1C.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FB1C.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FB60.s b/ver/jp/asm/nonmatchings/285C0/func_8004FB60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FB60.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FB60.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FB80.s b/ver/jp/asm/nonmatchings/285C0/func_8004FB80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FB80.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FB80.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FBEC.s b/ver/jp/asm/nonmatchings/285C0/func_8004FBEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FBEC.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FBEC.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FC08.s b/ver/jp/asm/nonmatchings/285C0/func_8004FC08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FC08.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FC08.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FC20.s b/ver/jp/asm/nonmatchings/285C0/func_8004FC20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FC20.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FC20.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FC38.s b/ver/jp/asm/nonmatchings/285C0/func_8004FC38.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FC38.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FC38.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FC58.s b/ver/jp/asm/nonmatchings/285C0/func_8004FC58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FC58.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FC58.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FC64.s b/ver/jp/asm/nonmatchings/285C0/func_8004FC64.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FC64.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FC64.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FC78.s b/ver/jp/asm/nonmatchings/285C0/func_8004FC78.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FC78.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FC78.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FC94.s b/ver/jp/asm/nonmatchings/285C0/func_8004FC94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FC94.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FC94.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FCA0.s b/ver/jp/asm/nonmatchings/285C0/func_8004FCA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FCA0.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FCA0.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FCAC.s b/ver/jp/asm/nonmatchings/285C0/func_8004FCAC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FCAC.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FCAC.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FCB4.s b/ver/jp/asm/nonmatchings/285C0/func_8004FCB4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FCB4.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FCB4.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FCD0.s b/ver/jp/asm/nonmatchings/285C0/func_8004FCD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FCD0.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FCD0.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FDD8.s b/ver/jp/asm/nonmatchings/285C0/func_8004FDD8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FDD8.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FDD8.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FE0C.s b/ver/jp/asm/nonmatchings/285C0/func_8004FE0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FE0C.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FE0C.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FE34.s b/ver/jp/asm/nonmatchings/285C0/func_8004FE34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FE34.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FE34.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FE58.s b/ver/jp/asm/nonmatchings/285C0/func_8004FE58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FE58.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FE58.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8004FFA0.s b/ver/jp/asm/nonmatchings/285C0/func_8004FFA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8004FFA0.s rename to ver/jp/asm/nonmatchings/285C0/func_8004FFA0.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050210.s b/ver/jp/asm/nonmatchings/285C0/func_80050210.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050210.s rename to ver/jp/asm/nonmatchings/285C0/func_80050210.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050218.s b/ver/jp/asm/nonmatchings/285C0/func_80050218.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050218.s rename to ver/jp/asm/nonmatchings/285C0/func_80050218.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050294.s b/ver/jp/asm/nonmatchings/285C0/func_80050294.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050294.s rename to ver/jp/asm/nonmatchings/285C0/func_80050294.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050304.s b/ver/jp/asm/nonmatchings/285C0/func_80050304.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050304.s rename to ver/jp/asm/nonmatchings/285C0/func_80050304.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8005033C.s b/ver/jp/asm/nonmatchings/285C0/func_8005033C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8005033C.s rename to ver/jp/asm/nonmatchings/285C0/func_8005033C.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050378.s b/ver/jp/asm/nonmatchings/285C0/func_80050378.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050378.s rename to ver/jp/asm/nonmatchings/285C0/func_80050378.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050420.s b/ver/jp/asm/nonmatchings/285C0/func_80050420.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050420.s rename to ver/jp/asm/nonmatchings/285C0/func_80050420.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_800504C8.s b/ver/jp/asm/nonmatchings/285C0/func_800504C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_800504C8.s rename to ver/jp/asm/nonmatchings/285C0/func_800504C8.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_800504EC.s b/ver/jp/asm/nonmatchings/285C0/func_800504EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_800504EC.s rename to ver/jp/asm/nonmatchings/285C0/func_800504EC.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_8005052C.s b/ver/jp/asm/nonmatchings/285C0/func_8005052C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_8005052C.s rename to ver/jp/asm/nonmatchings/285C0/func_8005052C.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050538.s b/ver/jp/asm/nonmatchings/285C0/func_80050538.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050538.s rename to ver/jp/asm/nonmatchings/285C0/func_80050538.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_800505B0.s b/ver/jp/asm/nonmatchings/285C0/func_800505B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_800505B0.s rename to ver/jp/asm/nonmatchings/285C0/func_800505B0.s diff --git a/ver/jp/asm/nonmatchings/main_285C0/func_80050620.s b/ver/jp/asm/nonmatchings/285C0/func_80050620.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_285C0/func_80050620.s rename to ver/jp/asm/nonmatchings/285C0/func_80050620.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050840.s b/ver/jp/asm/nonmatchings/2BC40/func_80050840.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050840.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050840.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_800508E0.s b/ver/jp/asm/nonmatchings/2BC40/func_800508E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_800508E0.s rename to ver/jp/asm/nonmatchings/2BC40/func_800508E0.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050904.s b/ver/jp/asm/nonmatchings/2BC40/func_80050904.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050904.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050904.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050914.s b/ver/jp/asm/nonmatchings/2BC40/func_80050914.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050914.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050914.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050950.s b/ver/jp/asm/nonmatchings/2BC40/func_80050950.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050950.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050950.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050A00.s b/ver/jp/asm/nonmatchings/2BC40/func_80050A00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050A00.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050A00.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050AC8.s b/ver/jp/asm/nonmatchings/2BC40/func_80050AC8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050AC8.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050AC8.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050B34.s b/ver/jp/asm/nonmatchings/2BC40/func_80050B34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050B34.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050B34.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050BA0.s b/ver/jp/asm/nonmatchings/2BC40/func_80050BA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050BA0.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050BA0.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050C14.s b/ver/jp/asm/nonmatchings/2BC40/func_80050C14.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050C14.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050C14.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050C80.s b/ver/jp/asm/nonmatchings/2BC40/func_80050C80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050C80.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050C80.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050D00.s b/ver/jp/asm/nonmatchings/2BC40/func_80050D00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050D00.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050D00.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050D54.s b/ver/jp/asm/nonmatchings/2BC40/func_80050D54.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050D54.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050D54.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050E6C.s b/ver/jp/asm/nonmatchings/2BC40/func_80050E6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050E6C.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050E6C.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80050FE4.s b/ver/jp/asm/nonmatchings/2BC40/func_80050FE4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80050FE4.s rename to ver/jp/asm/nonmatchings/2BC40/func_80050FE4.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_800510E4.s b/ver/jp/asm/nonmatchings/2BC40/func_800510E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_800510E4.s rename to ver/jp/asm/nonmatchings/2BC40/func_800510E4.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80051E80.s b/ver/jp/asm/nonmatchings/2BC40/func_80051E80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80051E80.s rename to ver/jp/asm/nonmatchings/2BC40/func_80051E80.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80051E98.s b/ver/jp/asm/nonmatchings/2BC40/func_80051E98.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80051E98.s rename to ver/jp/asm/nonmatchings/2BC40/func_80051E98.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80051F58.s b/ver/jp/asm/nonmatchings/2BC40/func_80051F58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80051F58.s rename to ver/jp/asm/nonmatchings/2BC40/func_80051F58.s diff --git a/ver/jp/asm/nonmatchings/main_2BC40/func_80051FDC.s b/ver/jp/asm/nonmatchings/2BC40/func_80051FDC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2BC40/func_80051FDC.s rename to ver/jp/asm/nonmatchings/2BC40/func_80051FDC.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_80052250.s b/ver/jp/asm/nonmatchings/2D650/func_80052250.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_80052250.s rename to ver/jp/asm/nonmatchings/2D650/func_80052250.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_800522C4.s b/ver/jp/asm/nonmatchings/2D650/func_800522C4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_800522C4.s rename to ver/jp/asm/nonmatchings/2D650/func_800522C4.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_80052310.s b/ver/jp/asm/nonmatchings/2D650/func_80052310.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_80052310.s rename to ver/jp/asm/nonmatchings/2D650/func_80052310.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_800527F4.s b/ver/jp/asm/nonmatchings/2D650/func_800527F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_800527F4.s rename to ver/jp/asm/nonmatchings/2D650/func_800527F4.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_80052870.s b/ver/jp/asm/nonmatchings/2D650/func_80052870.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_80052870.s rename to ver/jp/asm/nonmatchings/2D650/func_80052870.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_800528A8.s b/ver/jp/asm/nonmatchings/2D650/func_800528A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_800528A8.s rename to ver/jp/asm/nonmatchings/2D650/func_800528A8.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_800529AC.s b/ver/jp/asm/nonmatchings/2D650/func_800529AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_800529AC.s rename to ver/jp/asm/nonmatchings/2D650/func_800529AC.s diff --git a/ver/jp/asm/nonmatchings/main_2D650/func_80052AC8.s b/ver/jp/asm/nonmatchings/2D650/func_80052AC8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2D650/func_80052AC8.s rename to ver/jp/asm/nonmatchings/2D650/func_80052AC8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80052AE0.s b/ver/jp/asm/nonmatchings/2DEE0/func_80052AE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80052AE0.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80052AE0.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80052B0C.s b/ver/jp/asm/nonmatchings/2DEE0/func_80052B0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80052B0C.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80052B0C.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80052FA4.s b/ver/jp/asm/nonmatchings/2DEE0/func_80052FA4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80052FA4.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80052FA4.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053020.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053020.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053020.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053020.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053058.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053058.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053058.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053058.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053080.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053080.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053080.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053080.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053270.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053270.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053270.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053270.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053304.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053304.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053304.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053304.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053538.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053538.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053538.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053538.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053574.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053574.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053574.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053574.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800535A8.s b/ver/jp/asm/nonmatchings/2DEE0/func_800535A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800535A8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800535A8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053624.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053624.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053624.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053624.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800536C8.s b/ver/jp/asm/nonmatchings/2DEE0/func_800536C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800536C8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800536C8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800536D8.s b/ver/jp/asm/nonmatchings/2DEE0/func_800536D8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800536D8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800536D8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053748.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053748.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053748.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053748.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053778.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053778.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053778.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053778.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_8005379C.s b/ver/jp/asm/nonmatchings/2DEE0/func_8005379C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_8005379C.s rename to ver/jp/asm/nonmatchings/2DEE0/func_8005379C.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800537B4.s b/ver/jp/asm/nonmatchings/2DEE0/func_800537B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800537B4.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800537B4.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053858.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053858.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053858.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053858.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053898.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053898.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053898.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053898.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053908.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053908.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053908.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053908.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053964.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053964.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053964.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053964.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800539A8.s b/ver/jp/asm/nonmatchings/2DEE0/func_800539A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800539A8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800539A8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053B08.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053B08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053B08.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053B08.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053C14.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053C14.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053C14.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053C14.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053C30.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053C30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053C30.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053C30.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053EF8.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053EF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053EF8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053EF8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80053F6C.s b/ver/jp/asm/nonmatchings/2DEE0/func_80053F6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80053F6C.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80053F6C.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_8005412C.s b/ver/jp/asm/nonmatchings/2DEE0/func_8005412C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_8005412C.s rename to ver/jp/asm/nonmatchings/2DEE0/func_8005412C.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800541A8.s b/ver/jp/asm/nonmatchings/2DEE0/func_800541A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800541A8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800541A8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054264.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054264.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054264.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054264.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_8005430C.s b/ver/jp/asm/nonmatchings/2DEE0/func_8005430C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_8005430C.s rename to ver/jp/asm/nonmatchings/2DEE0/func_8005430C.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800543F4.s b/ver/jp/asm/nonmatchings/2DEE0/func_800543F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800543F4.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800543F4.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054478.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054478.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054478.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054478.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800546A8.s b/ver/jp/asm/nonmatchings/2DEE0/func_800546A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800546A8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800546A8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054750.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054750.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054750.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054750.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_800548FC.s b/ver/jp/asm/nonmatchings/2DEE0/func_800548FC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_800548FC.s rename to ver/jp/asm/nonmatchings/2DEE0/func_800548FC.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054934.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054934.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054934.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054934.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054990.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054990.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054990.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054990.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054A24.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054A24.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054A24.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054A24.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054A58.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054A58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054A58.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054A58.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054AB0.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054AB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054AB0.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054AB0.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054B40.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054B40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054B40.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054B40.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054BF8.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054BF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054BF8.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054BF8.s diff --git a/ver/jp/asm/nonmatchings/main_2DEE0/func_80054C24.s b/ver/jp/asm/nonmatchings/2DEE0/func_80054C24.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_2DEE0/func_80054C24.s rename to ver/jp/asm/nonmatchings/2DEE0/func_80054C24.s diff --git a/ver/jp/asm/nonmatchings/main_30070/func_80054C70.s b/ver/jp/asm/nonmatchings/30070/func_80054C70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30070/func_80054C70.s rename to ver/jp/asm/nonmatchings/30070/func_80054C70.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054D00.s b/ver/jp/asm/nonmatchings/30100/func_80054D00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054D00.s rename to ver/jp/asm/nonmatchings/30100/func_80054D00.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054D18.s b/ver/jp/asm/nonmatchings/30100/func_80054D18.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054D18.s rename to ver/jp/asm/nonmatchings/30100/func_80054D18.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054DC0.s b/ver/jp/asm/nonmatchings/30100/func_80054DC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054DC0.s rename to ver/jp/asm/nonmatchings/30100/func_80054DC0.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054DEC.s b/ver/jp/asm/nonmatchings/30100/func_80054DEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054DEC.s rename to ver/jp/asm/nonmatchings/30100/func_80054DEC.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054E90.s b/ver/jp/asm/nonmatchings/30100/func_80054E90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054E90.s rename to ver/jp/asm/nonmatchings/30100/func_80054E90.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054EF0.s b/ver/jp/asm/nonmatchings/30100/func_80054EF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054EF0.s rename to ver/jp/asm/nonmatchings/30100/func_80054EF0.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054F80.s b/ver/jp/asm/nonmatchings/30100/func_80054F80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054F80.s rename to ver/jp/asm/nonmatchings/30100/func_80054F80.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80054FE0.s b/ver/jp/asm/nonmatchings/30100/func_80054FE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80054FE0.s rename to ver/jp/asm/nonmatchings/30100/func_80054FE0.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055070.s b/ver/jp/asm/nonmatchings/30100/func_80055070.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055070.s rename to ver/jp/asm/nonmatchings/30100/func_80055070.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800550A4.s b/ver/jp/asm/nonmatchings/30100/func_800550A4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800550A4.s rename to ver/jp/asm/nonmatchings/30100/func_800550A4.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800550B8.s b/ver/jp/asm/nonmatchings/30100/func_800550B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800550B8.s rename to ver/jp/asm/nonmatchings/30100/func_800550B8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800550F8.s b/ver/jp/asm/nonmatchings/30100/func_800550F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800550F8.s rename to ver/jp/asm/nonmatchings/30100/func_800550F8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055114.s b/ver/jp/asm/nonmatchings/30100/func_80055114.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055114.s rename to ver/jp/asm/nonmatchings/30100/func_80055114.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055154.s b/ver/jp/asm/nonmatchings/30100/func_80055154.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055154.s rename to ver/jp/asm/nonmatchings/30100/func_80055154.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055198.s b/ver/jp/asm/nonmatchings/30100/func_80055198.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055198.s rename to ver/jp/asm/nonmatchings/30100/func_80055198.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800551EC.s b/ver/jp/asm/nonmatchings/30100/func_800551EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800551EC.s rename to ver/jp/asm/nonmatchings/30100/func_800551EC.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055240.s b/ver/jp/asm/nonmatchings/30100/func_80055240.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055240.s rename to ver/jp/asm/nonmatchings/30100/func_80055240.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055294.s b/ver/jp/asm/nonmatchings/30100/func_80055294.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055294.s rename to ver/jp/asm/nonmatchings/30100/func_80055294.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800552C8.s b/ver/jp/asm/nonmatchings/30100/func_800552C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800552C8.s rename to ver/jp/asm/nonmatchings/30100/func_800552C8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_8005531C.s b/ver/jp/asm/nonmatchings/30100/func_8005531C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_8005531C.s rename to ver/jp/asm/nonmatchings/30100/func_8005531C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055380.s b/ver/jp/asm/nonmatchings/30100/func_80055380.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055380.s rename to ver/jp/asm/nonmatchings/30100/func_80055380.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800553C8.s b/ver/jp/asm/nonmatchings/30100/func_800553C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800553C8.s rename to ver/jp/asm/nonmatchings/30100/func_800553C8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055410.s b/ver/jp/asm/nonmatchings/30100/func_80055410.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055410.s rename to ver/jp/asm/nonmatchings/30100/func_80055410.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_8005547C.s b/ver/jp/asm/nonmatchings/30100/func_8005547C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_8005547C.s rename to ver/jp/asm/nonmatchings/30100/func_8005547C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800554F8.s b/ver/jp/asm/nonmatchings/30100/func_800554F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800554F8.s rename to ver/jp/asm/nonmatchings/30100/func_800554F8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055584.s b/ver/jp/asm/nonmatchings/30100/func_80055584.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055584.s rename to ver/jp/asm/nonmatchings/30100/func_80055584.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800555CC.s b/ver/jp/asm/nonmatchings/30100/func_800555CC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800555CC.s rename to ver/jp/asm/nonmatchings/30100/func_800555CC.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055620.s b/ver/jp/asm/nonmatchings/30100/func_80055620.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055620.s rename to ver/jp/asm/nonmatchings/30100/func_80055620.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055674.s b/ver/jp/asm/nonmatchings/30100/func_80055674.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055674.s rename to ver/jp/asm/nonmatchings/30100/func_80055674.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055690.s b/ver/jp/asm/nonmatchings/30100/func_80055690.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055690.s rename to ver/jp/asm/nonmatchings/30100/func_80055690.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800556AC.s b/ver/jp/asm/nonmatchings/30100/func_800556AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800556AC.s rename to ver/jp/asm/nonmatchings/30100/func_800556AC.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800556C8.s b/ver/jp/asm/nonmatchings/30100/func_800556C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800556C8.s rename to ver/jp/asm/nonmatchings/30100/func_800556C8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_8005571C.s b/ver/jp/asm/nonmatchings/30100/func_8005571C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_8005571C.s rename to ver/jp/asm/nonmatchings/30100/func_8005571C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_8005576C.s b/ver/jp/asm/nonmatchings/30100/func_8005576C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_8005576C.s rename to ver/jp/asm/nonmatchings/30100/func_8005576C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800557A0.s b/ver/jp/asm/nonmatchings/30100/func_800557A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800557A0.s rename to ver/jp/asm/nonmatchings/30100/func_800557A0.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800557D8.s b/ver/jp/asm/nonmatchings/30100/func_800557D8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800557D8.s rename to ver/jp/asm/nonmatchings/30100/func_800557D8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055830.s b/ver/jp/asm/nonmatchings/30100/func_80055830.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055830.s rename to ver/jp/asm/nonmatchings/30100/func_80055830.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055868.s b/ver/jp/asm/nonmatchings/30100/func_80055868.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055868.s rename to ver/jp/asm/nonmatchings/30100/func_80055868.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800558A0.s b/ver/jp/asm/nonmatchings/30100/func_800558A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800558A0.s rename to ver/jp/asm/nonmatchings/30100/func_800558A0.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800558DC.s b/ver/jp/asm/nonmatchings/30100/func_800558DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800558DC.s rename to ver/jp/asm/nonmatchings/30100/func_800558DC.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055914.s b/ver/jp/asm/nonmatchings/30100/func_80055914.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055914.s rename to ver/jp/asm/nonmatchings/30100/func_80055914.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055944.s b/ver/jp/asm/nonmatchings/30100/func_80055944.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055944.s rename to ver/jp/asm/nonmatchings/30100/func_80055944.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055974.s b/ver/jp/asm/nonmatchings/30100/func_80055974.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055974.s rename to ver/jp/asm/nonmatchings/30100/func_80055974.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055998.s b/ver/jp/asm/nonmatchings/30100/func_80055998.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055998.s rename to ver/jp/asm/nonmatchings/30100/func_80055998.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_800559E8.s b/ver/jp/asm/nonmatchings/30100/func_800559E8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_800559E8.s rename to ver/jp/asm/nonmatchings/30100/func_800559E8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055A3C.s b/ver/jp/asm/nonmatchings/30100/func_80055A3C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055A3C.s rename to ver/jp/asm/nonmatchings/30100/func_80055A3C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055A8C.s b/ver/jp/asm/nonmatchings/30100/func_80055A8C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055A8C.s rename to ver/jp/asm/nonmatchings/30100/func_80055A8C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055AF8.s b/ver/jp/asm/nonmatchings/30100/func_80055AF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055AF8.s rename to ver/jp/asm/nonmatchings/30100/func_80055AF8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055B64.s b/ver/jp/asm/nonmatchings/30100/func_80055B64.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055B64.s rename to ver/jp/asm/nonmatchings/30100/func_80055B64.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055C08.s b/ver/jp/asm/nonmatchings/30100/func_80055C08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055C08.s rename to ver/jp/asm/nonmatchings/30100/func_80055C08.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055C84.s b/ver/jp/asm/nonmatchings/30100/func_80055C84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055C84.s rename to ver/jp/asm/nonmatchings/30100/func_80055C84.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055CA0.s b/ver/jp/asm/nonmatchings/30100/func_80055CA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055CA0.s rename to ver/jp/asm/nonmatchings/30100/func_80055CA0.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055CBC.s b/ver/jp/asm/nonmatchings/30100/func_80055CBC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055CBC.s rename to ver/jp/asm/nonmatchings/30100/func_80055CBC.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055CD8.s b/ver/jp/asm/nonmatchings/30100/func_80055CD8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055CD8.s rename to ver/jp/asm/nonmatchings/30100/func_80055CD8.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055CF4.s b/ver/jp/asm/nonmatchings/30100/func_80055CF4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055CF4.s rename to ver/jp/asm/nonmatchings/30100/func_80055CF4.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055D18.s b/ver/jp/asm/nonmatchings/30100/func_80055D18.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055D18.s rename to ver/jp/asm/nonmatchings/30100/func_80055D18.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055D3C.s b/ver/jp/asm/nonmatchings/30100/func_80055D3C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055D3C.s rename to ver/jp/asm/nonmatchings/30100/func_80055D3C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055D58.s b/ver/jp/asm/nonmatchings/30100/func_80055D58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055D58.s rename to ver/jp/asm/nonmatchings/30100/func_80055D58.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055D6C.s b/ver/jp/asm/nonmatchings/30100/func_80055D6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055D6C.s rename to ver/jp/asm/nonmatchings/30100/func_80055D6C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055DBC.s b/ver/jp/asm/nonmatchings/30100/func_80055DBC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055DBC.s rename to ver/jp/asm/nonmatchings/30100/func_80055DBC.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055DF4.s b/ver/jp/asm/nonmatchings/30100/func_80055DF4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055DF4.s rename to ver/jp/asm/nonmatchings/30100/func_80055DF4.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055E0C.s b/ver/jp/asm/nonmatchings/30100/func_80055E0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055E0C.s rename to ver/jp/asm/nonmatchings/30100/func_80055E0C.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055E30.s b/ver/jp/asm/nonmatchings/30100/func_80055E30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055E30.s rename to ver/jp/asm/nonmatchings/30100/func_80055E30.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055E54.s b/ver/jp/asm/nonmatchings/30100/func_80055E54.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055E54.s rename to ver/jp/asm/nonmatchings/30100/func_80055E54.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055E74.s b/ver/jp/asm/nonmatchings/30100/func_80055E74.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055E74.s rename to ver/jp/asm/nonmatchings/30100/func_80055E74.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055E94.s b/ver/jp/asm/nonmatchings/30100/func_80055E94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055E94.s rename to ver/jp/asm/nonmatchings/30100/func_80055E94.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055EB4.s b/ver/jp/asm/nonmatchings/30100/func_80055EB4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055EB4.s rename to ver/jp/asm/nonmatchings/30100/func_80055EB4.s diff --git a/ver/jp/asm/nonmatchings/main_30100/func_80055ED8.s b/ver/jp/asm/nonmatchings/30100/func_80055ED8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_30100/func_80055ED8.s rename to ver/jp/asm/nonmatchings/30100/func_80055ED8.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80055F00.s b/ver/jp/asm/nonmatchings/31300/func_80055F00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80055F00.s rename to ver/jp/asm/nonmatchings/31300/func_80055F00.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056254.s b/ver/jp/asm/nonmatchings/31300/func_80056254.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056254.s rename to ver/jp/asm/nonmatchings/31300/func_80056254.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056270.s b/ver/jp/asm/nonmatchings/31300/func_80056270.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056270.s rename to ver/jp/asm/nonmatchings/31300/func_80056270.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_800569E4.s b/ver/jp/asm/nonmatchings/31300/func_800569E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_800569E4.s rename to ver/jp/asm/nonmatchings/31300/func_800569E4.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_800569F4.s b/ver/jp/asm/nonmatchings/31300/func_800569F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_800569F4.s rename to ver/jp/asm/nonmatchings/31300/func_800569F4.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056A00.s b/ver/jp/asm/nonmatchings/31300/func_80056A00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056A00.s rename to ver/jp/asm/nonmatchings/31300/func_80056A00.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056A0C.s b/ver/jp/asm/nonmatchings/31300/func_80056A0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056A0C.s rename to ver/jp/asm/nonmatchings/31300/func_80056A0C.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056A28.s b/ver/jp/asm/nonmatchings/31300/func_80056A28.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056A28.s rename to ver/jp/asm/nonmatchings/31300/func_80056A28.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056A54.s b/ver/jp/asm/nonmatchings/31300/func_80056A54.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056A54.s rename to ver/jp/asm/nonmatchings/31300/func_80056A54.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056A7C.s b/ver/jp/asm/nonmatchings/31300/func_80056A7C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056A7C.s rename to ver/jp/asm/nonmatchings/31300/func_80056A7C.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056AE4.s b/ver/jp/asm/nonmatchings/31300/func_80056AE4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056AE4.s rename to ver/jp/asm/nonmatchings/31300/func_80056AE4.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056B70.s b/ver/jp/asm/nonmatchings/31300/func_80056B70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056B70.s rename to ver/jp/asm/nonmatchings/31300/func_80056B70.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056B98.s b/ver/jp/asm/nonmatchings/31300/func_80056B98.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056B98.s rename to ver/jp/asm/nonmatchings/31300/func_80056B98.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056C28.s b/ver/jp/asm/nonmatchings/31300/func_80056C28.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056C28.s rename to ver/jp/asm/nonmatchings/31300/func_80056C28.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056C54.s b/ver/jp/asm/nonmatchings/31300/func_80056C54.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056C54.s rename to ver/jp/asm/nonmatchings/31300/func_80056C54.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056ED4.s b/ver/jp/asm/nonmatchings/31300/func_80056ED4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056ED4.s rename to ver/jp/asm/nonmatchings/31300/func_80056ED4.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80056FF4.s b/ver/jp/asm/nonmatchings/31300/func_80056FF4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80056FF4.s rename to ver/jp/asm/nonmatchings/31300/func_80056FF4.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_8005701C.s b/ver/jp/asm/nonmatchings/31300/func_8005701C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_8005701C.s rename to ver/jp/asm/nonmatchings/31300/func_8005701C.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_800571F8.s b/ver/jp/asm/nonmatchings/31300/func_800571F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_800571F8.s rename to ver/jp/asm/nonmatchings/31300/func_800571F8.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_8005739C.s b/ver/jp/asm/nonmatchings/31300/func_8005739C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_8005739C.s rename to ver/jp/asm/nonmatchings/31300/func_8005739C.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057524.s b/ver/jp/asm/nonmatchings/31300/func_80057524.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057524.s rename to ver/jp/asm/nonmatchings/31300/func_80057524.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057688.s b/ver/jp/asm/nonmatchings/31300/func_80057688.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057688.s rename to ver/jp/asm/nonmatchings/31300/func_80057688.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057814.s b/ver/jp/asm/nonmatchings/31300/func_80057814.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057814.s rename to ver/jp/asm/nonmatchings/31300/func_80057814.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_8005783C.s b/ver/jp/asm/nonmatchings/31300/func_8005783C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_8005783C.s rename to ver/jp/asm/nonmatchings/31300/func_8005783C.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057864.s b/ver/jp/asm/nonmatchings/31300/func_80057864.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057864.s rename to ver/jp/asm/nonmatchings/31300/func_80057864.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_8005788C.s b/ver/jp/asm/nonmatchings/31300/func_8005788C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_8005788C.s rename to ver/jp/asm/nonmatchings/31300/func_8005788C.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_800578B4.s b/ver/jp/asm/nonmatchings/31300/func_800578B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_800578B4.s rename to ver/jp/asm/nonmatchings/31300/func_800578B4.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_800578DC.s b/ver/jp/asm/nonmatchings/31300/func_800578DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_800578DC.s rename to ver/jp/asm/nonmatchings/31300/func_800578DC.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057904.s b/ver/jp/asm/nonmatchings/31300/func_80057904.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057904.s rename to ver/jp/asm/nonmatchings/31300/func_80057904.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_800579BC.s b/ver/jp/asm/nonmatchings/31300/func_800579BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_800579BC.s rename to ver/jp/asm/nonmatchings/31300/func_800579BC.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057A78.s b/ver/jp/asm/nonmatchings/31300/func_80057A78.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057A78.s rename to ver/jp/asm/nonmatchings/31300/func_80057A78.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057AB8.s b/ver/jp/asm/nonmatchings/31300/func_80057AB8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057AB8.s rename to ver/jp/asm/nonmatchings/31300/func_80057AB8.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057B0C.s b/ver/jp/asm/nonmatchings/31300/func_80057B0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057B0C.s rename to ver/jp/asm/nonmatchings/31300/func_80057B0C.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057B60.s b/ver/jp/asm/nonmatchings/31300/func_80057B60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057B60.s rename to ver/jp/asm/nonmatchings/31300/func_80057B60.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057B80.s b/ver/jp/asm/nonmatchings/31300/func_80057B80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057B80.s rename to ver/jp/asm/nonmatchings/31300/func_80057B80.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057BD0.s b/ver/jp/asm/nonmatchings/31300/func_80057BD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057BD0.s rename to ver/jp/asm/nonmatchings/31300/func_80057BD0.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057C40.s b/ver/jp/asm/nonmatchings/31300/func_80057C40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057C40.s rename to ver/jp/asm/nonmatchings/31300/func_80057C40.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057C88.s b/ver/jp/asm/nonmatchings/31300/func_80057C88.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057C88.s rename to ver/jp/asm/nonmatchings/31300/func_80057C88.s diff --git a/ver/jp/asm/nonmatchings/main_31300/func_80057CB4.s b/ver/jp/asm/nonmatchings/31300/func_80057CB4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_31300/func_80057CB4.s rename to ver/jp/asm/nonmatchings/31300/func_80057CB4.s diff --git a/ver/jp/asm/nonmatchings/main_33100/func_80057D00.s b/ver/jp/asm/nonmatchings/33100/func_80057D00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33100/func_80057D00.s rename to ver/jp/asm/nonmatchings/33100/func_80057D00.s diff --git a/ver/jp/asm/nonmatchings/main_33100/func_800587D0.s b/ver/jp/asm/nonmatchings/33100/func_800587D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33100/func_800587D0.s rename to ver/jp/asm/nonmatchings/33100/func_800587D0.s diff --git a/ver/jp/asm/nonmatchings/main_33100/func_8005891C.s b/ver/jp/asm/nonmatchings/33100/func_8005891C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33100/func_8005891C.s rename to ver/jp/asm/nonmatchings/33100/func_8005891C.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80058A80.s b/ver/jp/asm/nonmatchings/33E80/func_80058A80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80058A80.s rename to ver/jp/asm/nonmatchings/33E80/func_80058A80.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80058B34.s b/ver/jp/asm/nonmatchings/33E80/func_80058B34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80058B34.s rename to ver/jp/asm/nonmatchings/33E80/func_80058B34.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80058C38.s b/ver/jp/asm/nonmatchings/33E80/func_80058C38.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80058C38.s rename to ver/jp/asm/nonmatchings/33E80/func_80058C38.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80058CB8.s b/ver/jp/asm/nonmatchings/33E80/func_80058CB8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80058CB8.s rename to ver/jp/asm/nonmatchings/33E80/func_80058CB8.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80058CFC.s b/ver/jp/asm/nonmatchings/33E80/func_80058CFC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80058CFC.s rename to ver/jp/asm/nonmatchings/33E80/func_80058CFC.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80058FC0.s b/ver/jp/asm/nonmatchings/33E80/func_80058FC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80058FC0.s rename to ver/jp/asm/nonmatchings/33E80/func_80058FC0.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059550.s b/ver/jp/asm/nonmatchings/33E80/func_80059550.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059550.s rename to ver/jp/asm/nonmatchings/33E80/func_80059550.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059768.s b/ver/jp/asm/nonmatchings/33E80/func_80059768.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059768.s rename to ver/jp/asm/nonmatchings/33E80/func_80059768.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059884.s b/ver/jp/asm/nonmatchings/33E80/func_80059884.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059884.s rename to ver/jp/asm/nonmatchings/33E80/func_80059884.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059930.s b/ver/jp/asm/nonmatchings/33E80/func_80059930.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059930.s rename to ver/jp/asm/nonmatchings/33E80/func_80059930.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059938.s b/ver/jp/asm/nonmatchings/33E80/func_80059938.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059938.s rename to ver/jp/asm/nonmatchings/33E80/func_80059938.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_8005994C.s b/ver/jp/asm/nonmatchings/33E80/func_8005994C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_8005994C.s rename to ver/jp/asm/nonmatchings/33E80/func_8005994C.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_800599F8.s b/ver/jp/asm/nonmatchings/33E80/func_800599F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_800599F8.s rename to ver/jp/asm/nonmatchings/33E80/func_800599F8.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059A00.s b/ver/jp/asm/nonmatchings/33E80/func_80059A00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059A00.s rename to ver/jp/asm/nonmatchings/33E80/func_80059A00.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059BA4.s b/ver/jp/asm/nonmatchings/33E80/func_80059BA4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059BA4.s rename to ver/jp/asm/nonmatchings/33E80/func_80059BA4.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059C44.s b/ver/jp/asm/nonmatchings/33E80/func_80059C44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059C44.s rename to ver/jp/asm/nonmatchings/33E80/func_80059C44.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_80059F6C.s b/ver/jp/asm/nonmatchings/33E80/func_80059F6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_80059F6C.s rename to ver/jp/asm/nonmatchings/33E80/func_80059F6C.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_8005A100.s b/ver/jp/asm/nonmatchings/33E80/func_8005A100.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_8005A100.s rename to ver/jp/asm/nonmatchings/33E80/func_8005A100.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_8005A190.s b/ver/jp/asm/nonmatchings/33E80/func_8005A190.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_8005A190.s rename to ver/jp/asm/nonmatchings/33E80/func_8005A190.s diff --git a/ver/jp/asm/nonmatchings/main_33E80/func_8005A214.s b/ver/jp/asm/nonmatchings/33E80/func_8005A214.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_33E80/func_8005A214.s rename to ver/jp/asm/nonmatchings/33E80/func_8005A214.s diff --git a/ver/jp/asm/nonmatchings/main_35770/func_8005A370.s b/ver/jp/asm/nonmatchings/35770/func_8005A370.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35770/func_8005A370.s rename to ver/jp/asm/nonmatchings/35770/func_8005A370.s diff --git a/ver/jp/asm/nonmatchings/main_35770/func_8005A3A4.s b/ver/jp/asm/nonmatchings/35770/func_8005A3A4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35770/func_8005A3A4.s rename to ver/jp/asm/nonmatchings/35770/func_8005A3A4.s diff --git a/ver/jp/asm/nonmatchings/main_35770/func_8005A890.s b/ver/jp/asm/nonmatchings/35770/func_8005A890.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35770/func_8005A890.s rename to ver/jp/asm/nonmatchings/35770/func_8005A890.s diff --git a/ver/jp/asm/nonmatchings/main_35770/func_8005A8A0.s b/ver/jp/asm/nonmatchings/35770/func_8005A8A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35770/func_8005A8A0.s rename to ver/jp/asm/nonmatchings/35770/func_8005A8A0.s diff --git a/ver/jp/asm/nonmatchings/main_35770/func_8005A8B0.s b/ver/jp/asm/nonmatchings/35770/func_8005A8B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35770/func_8005A8B0.s rename to ver/jp/asm/nonmatchings/35770/func_8005A8B0.s diff --git a/ver/jp/asm/nonmatchings/main_35770/func_8005A9A0.s b/ver/jp/asm/nonmatchings/35770/func_8005A9A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35770/func_8005A9A0.s rename to ver/jp/asm/nonmatchings/35770/func_8005A9A0.s diff --git a/ver/jp/asm/nonmatchings/main_35770/func_8005AA88.s b/ver/jp/asm/nonmatchings/35770/func_8005AA88.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35770/func_8005AA88.s rename to ver/jp/asm/nonmatchings/35770/func_8005AA88.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AB50.s b/ver/jp/asm/nonmatchings/35F50/func_8005AB50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AB50.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AB50.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AC34.s b/ver/jp/asm/nonmatchings/35F50/func_8005AC34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AC34.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AC34.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AC3C.s b/ver/jp/asm/nonmatchings/35F50/func_8005AC3C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AC3C.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AC3C.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AC44.s b/ver/jp/asm/nonmatchings/35F50/func_8005AC44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AC44.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AC44.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AC70.s b/ver/jp/asm/nonmatchings/35F50/func_8005AC70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AC70.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AC70.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AD08.s b/ver/jp/asm/nonmatchings/35F50/func_8005AD08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AD08.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AD08.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AE50.s b/ver/jp/asm/nonmatchings/35F50/func_8005AE50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AE50.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AE50.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005AEEC.s b/ver/jp/asm/nonmatchings/35F50/func_8005AEEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005AEEC.s rename to ver/jp/asm/nonmatchings/35F50/func_8005AEEC.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005B430.s b/ver/jp/asm/nonmatchings/35F50/func_8005B430.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005B430.s rename to ver/jp/asm/nonmatchings/35F50/func_8005B430.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005B650.s b/ver/jp/asm/nonmatchings/35F50/func_8005B650.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005B650.s rename to ver/jp/asm/nonmatchings/35F50/func_8005B650.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005B6A4.s b/ver/jp/asm/nonmatchings/35F50/func_8005B6A4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005B6A4.s rename to ver/jp/asm/nonmatchings/35F50/func_8005B6A4.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005B6D4.s b/ver/jp/asm/nonmatchings/35F50/func_8005B6D4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005B6D4.s rename to ver/jp/asm/nonmatchings/35F50/func_8005B6D4.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005BA58.s b/ver/jp/asm/nonmatchings/35F50/func_8005BA58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005BA58.s rename to ver/jp/asm/nonmatchings/35F50/func_8005BA58.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005BA88.s b/ver/jp/asm/nonmatchings/35F50/func_8005BA88.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005BA88.s rename to ver/jp/asm/nonmatchings/35F50/func_8005BA88.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005BAC0.s b/ver/jp/asm/nonmatchings/35F50/func_8005BAC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005BAC0.s rename to ver/jp/asm/nonmatchings/35F50/func_8005BAC0.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005BB34.s b/ver/jp/asm/nonmatchings/35F50/func_8005BB34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005BB34.s rename to ver/jp/asm/nonmatchings/35F50/func_8005BB34.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005C14C.s b/ver/jp/asm/nonmatchings/35F50/func_8005C14C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005C14C.s rename to ver/jp/asm/nonmatchings/35F50/func_8005C14C.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005C454.s b/ver/jp/asm/nonmatchings/35F50/func_8005C454.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005C454.s rename to ver/jp/asm/nonmatchings/35F50/func_8005C454.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005C980.s b/ver/jp/asm/nonmatchings/35F50/func_8005C980.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005C980.s rename to ver/jp/asm/nonmatchings/35F50/func_8005C980.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005CDD4.s b/ver/jp/asm/nonmatchings/35F50/func_8005CDD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005CDD4.s rename to ver/jp/asm/nonmatchings/35F50/func_8005CDD4.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005CF8C.s b/ver/jp/asm/nonmatchings/35F50/func_8005CF8C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005CF8C.s rename to ver/jp/asm/nonmatchings/35F50/func_8005CF8C.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005D0F8.s b/ver/jp/asm/nonmatchings/35F50/func_8005D0F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005D0F8.s rename to ver/jp/asm/nonmatchings/35F50/func_8005D0F8.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005D7B0.s b/ver/jp/asm/nonmatchings/35F50/func_8005D7B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005D7B0.s rename to ver/jp/asm/nonmatchings/35F50/func_8005D7B0.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005DA04.s b/ver/jp/asm/nonmatchings/35F50/func_8005DA04.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005DA04.s rename to ver/jp/asm/nonmatchings/35F50/func_8005DA04.s diff --git a/ver/jp/asm/nonmatchings/main_35F50/func_8005DAA0.s b/ver/jp/asm/nonmatchings/35F50/func_8005DAA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_35F50/func_8005DAA0.s rename to ver/jp/asm/nonmatchings/35F50/func_8005DAA0.s diff --git a/ver/jp/asm/nonmatchings/main_38EC0/func_8005DAC0.s b/ver/jp/asm/nonmatchings/38EC0/func_8005DAC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_38EC0/func_8005DAC0.s rename to ver/jp/asm/nonmatchings/38EC0/func_8005DAC0.s diff --git a/ver/jp/asm/nonmatchings/main_38EC0/func_8005DB7C.s b/ver/jp/asm/nonmatchings/38EC0/func_8005DB7C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_38EC0/func_8005DB7C.s rename to ver/jp/asm/nonmatchings/38EC0/func_8005DB7C.s diff --git a/ver/jp/asm/nonmatchings/main_38EC0/func_8005DC84.s b/ver/jp/asm/nonmatchings/38EC0/func_8005DC84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_38EC0/func_8005DC84.s rename to ver/jp/asm/nonmatchings/38EC0/func_8005DC84.s diff --git a/ver/jp/asm/nonmatchings/main_38EC0/func_8005DDDC.s b/ver/jp/asm/nonmatchings/38EC0/func_8005DDDC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_38EC0/func_8005DDDC.s rename to ver/jp/asm/nonmatchings/38EC0/func_8005DDDC.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005E560.s b/ver/jp/asm/nonmatchings/39960/func_8005E560.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005E560.s rename to ver/jp/asm/nonmatchings/39960/func_8005E560.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005E5BC.s b/ver/jp/asm/nonmatchings/39960/func_8005E5BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005E5BC.s rename to ver/jp/asm/nonmatchings/39960/func_8005E5BC.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005E660.s b/ver/jp/asm/nonmatchings/39960/func_8005E660.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005E660.s rename to ver/jp/asm/nonmatchings/39960/func_8005E660.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005E890.s b/ver/jp/asm/nonmatchings/39960/func_8005E890.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005E890.s rename to ver/jp/asm/nonmatchings/39960/func_8005E890.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EAE0.s b/ver/jp/asm/nonmatchings/39960/func_8005EAE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EAE0.s rename to ver/jp/asm/nonmatchings/39960/func_8005EAE0.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EB6C.s b/ver/jp/asm/nonmatchings/39960/func_8005EB6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EB6C.s rename to ver/jp/asm/nonmatchings/39960/func_8005EB6C.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EBE8.s b/ver/jp/asm/nonmatchings/39960/func_8005EBE8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EBE8.s rename to ver/jp/asm/nonmatchings/39960/func_8005EBE8.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EC28.s b/ver/jp/asm/nonmatchings/39960/func_8005EC28.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EC28.s rename to ver/jp/asm/nonmatchings/39960/func_8005EC28.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EC34.s b/ver/jp/asm/nonmatchings/39960/func_8005EC34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EC34.s rename to ver/jp/asm/nonmatchings/39960/func_8005EC34.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EC40.s b/ver/jp/asm/nonmatchings/39960/func_8005EC40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EC40.s rename to ver/jp/asm/nonmatchings/39960/func_8005EC40.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EC4C.s b/ver/jp/asm/nonmatchings/39960/func_8005EC4C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EC4C.s rename to ver/jp/asm/nonmatchings/39960/func_8005EC4C.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EC58.s b/ver/jp/asm/nonmatchings/39960/func_8005EC58.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EC58.s rename to ver/jp/asm/nonmatchings/39960/func_8005EC58.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005ED70.s b/ver/jp/asm/nonmatchings/39960/func_8005ED70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005ED70.s rename to ver/jp/asm/nonmatchings/39960/func_8005ED70.s diff --git a/ver/jp/asm/nonmatchings/main_39960/func_8005EDD0.s b/ver/jp/asm/nonmatchings/39960/func_8005EDD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_39960/func_8005EDD0.s rename to ver/jp/asm/nonmatchings/39960/func_8005EDD0.s diff --git a/ver/jp/asm/nonmatchings/main_3A300/func_8005EF00.s b/ver/jp/asm/nonmatchings/3A300/func_8005EF00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A300/func_8005EF00.s rename to ver/jp/asm/nonmatchings/3A300/func_8005EF00.s diff --git a/ver/jp/asm/nonmatchings/main_3A340/func_8005EF40.s b/ver/jp/asm/nonmatchings/3A340/func_8005EF40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A340/func_8005EF40.s rename to ver/jp/asm/nonmatchings/3A340/func_8005EF40.s diff --git a/ver/jp/asm/nonmatchings/main_3A380/func_8005EF80.s b/ver/jp/asm/nonmatchings/3A380/func_8005EF80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A380/func_8005EF80.s rename to ver/jp/asm/nonmatchings/3A380/func_8005EF80.s diff --git a/ver/jp/asm/nonmatchings/main_3A3A0/func_8005EFA0.s b/ver/jp/asm/nonmatchings/3A3A0/func_8005EFA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A3A0/func_8005EFA0.s rename to ver/jp/asm/nonmatchings/3A3A0/func_8005EFA0.s diff --git a/ver/jp/asm/nonmatchings/main_3A4B0/func_8005F0B0.s b/ver/jp/asm/nonmatchings/3A4B0/func_8005F0B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A4B0/func_8005F0B0.s rename to ver/jp/asm/nonmatchings/3A4B0/func_8005F0B0.s diff --git a/ver/jp/asm/nonmatchings/main_3A4E0/func_8005F0E0.s b/ver/jp/asm/nonmatchings/3A4E0/func_8005F0E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A4E0/func_8005F0E0.s rename to ver/jp/asm/nonmatchings/3A4E0/func_8005F0E0.s diff --git a/ver/jp/asm/nonmatchings/main_3A500/func_8005F100.s b/ver/jp/asm/nonmatchings/3A500/func_8005F100.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A500/func_8005F100.s rename to ver/jp/asm/nonmatchings/3A500/func_8005F100.s diff --git a/ver/jp/asm/nonmatchings/main_3A500/func_8005F140.s b/ver/jp/asm/nonmatchings/3A500/func_8005F140.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A500/func_8005F140.s rename to ver/jp/asm/nonmatchings/3A500/func_8005F140.s diff --git a/ver/jp/asm/nonmatchings/main_3A610/func_8005F210.s b/ver/jp/asm/nonmatchings/3A610/func_8005F210.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A610/func_8005F210.s rename to ver/jp/asm/nonmatchings/3A610/func_8005F210.s diff --git a/ver/jp/asm/nonmatchings/main_3A610/func_8005F2C0.s b/ver/jp/asm/nonmatchings/3A610/func_8005F2C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A610/func_8005F2C0.s rename to ver/jp/asm/nonmatchings/3A610/func_8005F2C0.s diff --git a/ver/jp/asm/nonmatchings/main_3A700/func_8005F300.s b/ver/jp/asm/nonmatchings/3A700/func_8005F300.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A700/func_8005F300.s rename to ver/jp/asm/nonmatchings/3A700/func_8005F300.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F360.s b/ver/jp/asm/nonmatchings/3A760/func_8005F360.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F360.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F360.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F384.s b/ver/jp/asm/nonmatchings/3A760/func_8005F384.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F384.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F384.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F3A8.s b/ver/jp/asm/nonmatchings/3A760/func_8005F3A8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F3A8.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F3A8.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F3F8.s b/ver/jp/asm/nonmatchings/3A760/func_8005F3F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F3F8.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F3F8.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F420.s b/ver/jp/asm/nonmatchings/3A760/func_8005F420.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F420.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F420.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F460.s b/ver/jp/asm/nonmatchings/3A760/func_8005F460.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F460.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F460.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F514.s b/ver/jp/asm/nonmatchings/3A760/func_8005F514.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F514.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F514.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F554.s b/ver/jp/asm/nonmatchings/3A760/func_8005F554.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F554.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F554.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F580.s b/ver/jp/asm/nonmatchings/3A760/func_8005F580.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F580.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F580.s diff --git a/ver/jp/asm/nonmatchings/main_3A760/func_8005F5AC.s b/ver/jp/asm/nonmatchings/3A760/func_8005F5AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A760/func_8005F5AC.s rename to ver/jp/asm/nonmatchings/3A760/func_8005F5AC.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005F5D0.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005F5D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005F5D0.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005F5D0.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005F7C0.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005F7C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005F7C0.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005F7C0.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005F93C.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005F93C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005F93C.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005F93C.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005F99C.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005F99C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005F99C.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005F99C.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005F9C0.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005F9C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005F9C0.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005F9C0.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005FA08.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005FA08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005FA08.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005FA08.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005FA94.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005FA94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005FA94.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005FA94.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005FABC.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005FABC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005FABC.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005FABC.s diff --git a/ver/jp/asm/nonmatchings/main_3A9D0/func_8005FB04.s b/ver/jp/asm/nonmatchings/3A9D0/func_8005FB04.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3A9D0/func_8005FB04.s rename to ver/jp/asm/nonmatchings/3A9D0/func_8005FB04.s diff --git a/ver/jp/asm/nonmatchings/main_3AF40/func_8005FB40.s b/ver/jp/asm/nonmatchings/3AF40/func_8005FB40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3AF40/func_8005FB40.s rename to ver/jp/asm/nonmatchings/3AF40/func_8005FB40.s diff --git a/ver/jp/asm/nonmatchings/main_3AFA0/func_8005FBA0.s b/ver/jp/asm/nonmatchings/3AFA0/func_8005FBA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3AFA0/func_8005FBA0.s rename to ver/jp/asm/nonmatchings/3AFA0/func_8005FBA0.s diff --git a/ver/jp/asm/nonmatchings/main_3B040/func_8005FC40.s b/ver/jp/asm/nonmatchings/3B040/func_8005FC40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B040/func_8005FC40.s rename to ver/jp/asm/nonmatchings/3B040/func_8005FC40.s diff --git a/ver/jp/asm/nonmatchings/main_3B2A0/func_8005FEA0.s b/ver/jp/asm/nonmatchings/3B2A0/func_8005FEA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B2A0/func_8005FEA0.s rename to ver/jp/asm/nonmatchings/3B2A0/func_8005FEA0.s diff --git a/ver/jp/asm/nonmatchings/main_3B2A0/func_8005FEF8.s b/ver/jp/asm/nonmatchings/3B2A0/func_8005FEF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B2A0/func_8005FEF8.s rename to ver/jp/asm/nonmatchings/3B2A0/func_8005FEF8.s diff --git a/ver/jp/asm/nonmatchings/main_3B2A0/func_8005FFC0.s b/ver/jp/asm/nonmatchings/3B2A0/func_8005FFC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B2A0/func_8005FFC0.s rename to ver/jp/asm/nonmatchings/3B2A0/func_8005FFC0.s diff --git a/ver/jp/asm/nonmatchings/main_3B400/func_80060000.s b/ver/jp/asm/nonmatchings/3B400/func_80060000.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B400/func_80060000.s rename to ver/jp/asm/nonmatchings/3B400/func_80060000.s diff --git a/ver/jp/asm/nonmatchings/main_3B420/func_80060020.s b/ver/jp/asm/nonmatchings/3B420/func_80060020.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B420/func_80060020.s rename to ver/jp/asm/nonmatchings/3B420/func_80060020.s diff --git a/ver/jp/asm/nonmatchings/main_3B4A0/func_800600A0.s b/ver/jp/asm/nonmatchings/3B4A0/func_800600A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B4A0/func_800600A0.s rename to ver/jp/asm/nonmatchings/3B4A0/func_800600A0.s diff --git a/ver/jp/asm/nonmatchings/main_3B4A0/func_80060230.s b/ver/jp/asm/nonmatchings/3B4A0/func_80060230.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B4A0/func_80060230.s rename to ver/jp/asm/nonmatchings/3B4A0/func_80060230.s diff --git a/ver/jp/asm/nonmatchings/main_3B4A0/func_800602C8.s b/ver/jp/asm/nonmatchings/3B4A0/func_800602C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B4A0/func_800602C8.s rename to ver/jp/asm/nonmatchings/3B4A0/func_800602C8.s diff --git a/ver/jp/asm/nonmatchings/main_3B4A0/func_8006032C.s b/ver/jp/asm/nonmatchings/3B4A0/func_8006032C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B4A0/func_8006032C.s rename to ver/jp/asm/nonmatchings/3B4A0/func_8006032C.s diff --git a/ver/jp/asm/nonmatchings/main_3B4A0/func_80060390.s b/ver/jp/asm/nonmatchings/3B4A0/func_80060390.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B4A0/func_80060390.s rename to ver/jp/asm/nonmatchings/3B4A0/func_80060390.s diff --git a/ver/jp/asm/nonmatchings/main_3B7C0/func_800603C0.s b/ver/jp/asm/nonmatchings/3B7C0/func_800603C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B7C0/func_800603C0.s rename to ver/jp/asm/nonmatchings/3B7C0/func_800603C0.s diff --git a/ver/jp/asm/nonmatchings/main_3B7C0/func_80060460.s b/ver/jp/asm/nonmatchings/3B7C0/func_80060460.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B7C0/func_80060460.s rename to ver/jp/asm/nonmatchings/3B7C0/func_80060460.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_800604E0.s b/ver/jp/asm/nonmatchings/3B8E0/func_800604E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_800604E0.s rename to ver/jp/asm/nonmatchings/3B8E0/func_800604E0.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_800605B8.s b/ver/jp/asm/nonmatchings/3B8E0/func_800605B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_800605B8.s rename to ver/jp/asm/nonmatchings/3B8E0/func_800605B8.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_800605DC.s b/ver/jp/asm/nonmatchings/3B8E0/func_800605DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_800605DC.s rename to ver/jp/asm/nonmatchings/3B8E0/func_800605DC.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_80060604.s b/ver/jp/asm/nonmatchings/3B8E0/func_80060604.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_80060604.s rename to ver/jp/asm/nonmatchings/3B8E0/func_80060604.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_8006062C.s b/ver/jp/asm/nonmatchings/3B8E0/func_8006062C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_8006062C.s rename to ver/jp/asm/nonmatchings/3B8E0/func_8006062C.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_80060708.s b/ver/jp/asm/nonmatchings/3B8E0/func_80060708.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_80060708.s rename to ver/jp/asm/nonmatchings/3B8E0/func_80060708.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_80060784.s b/ver/jp/asm/nonmatchings/3B8E0/func_80060784.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_80060784.s rename to ver/jp/asm/nonmatchings/3B8E0/func_80060784.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_80060840.s b/ver/jp/asm/nonmatchings/3B8E0/func_80060840.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_80060840.s rename to ver/jp/asm/nonmatchings/3B8E0/func_80060840.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_80060890.s b/ver/jp/asm/nonmatchings/3B8E0/func_80060890.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_80060890.s rename to ver/jp/asm/nonmatchings/3B8E0/func_80060890.s diff --git a/ver/jp/asm/nonmatchings/main_3B8E0/func_800608C0.s b/ver/jp/asm/nonmatchings/3B8E0/func_800608C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3B8E0/func_800608C0.s rename to ver/jp/asm/nonmatchings/3B8E0/func_800608C0.s diff --git a/ver/jp/asm/nonmatchings/main_3BC0/func_800287C0.s b/ver/jp/asm/nonmatchings/3BC0/func_800287C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3BC0/func_800287C0.s rename to ver/jp/asm/nonmatchings/3BC0/func_800287C0.s diff --git a/ver/jp/asm/nonmatchings/main_3BC0/func_80028808.s b/ver/jp/asm/nonmatchings/3BC0/func_80028808.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3BC0/func_80028808.s rename to ver/jp/asm/nonmatchings/3BC0/func_80028808.s diff --git a/ver/jp/asm/nonmatchings/main_3BC0/func_80028844.s b/ver/jp/asm/nonmatchings/3BC0/func_80028844.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3BC0/func_80028844.s rename to ver/jp/asm/nonmatchings/3BC0/func_80028844.s diff --git a/ver/jp/asm/nonmatchings/main_3BCF0/func_800608F0.s b/ver/jp/asm/nonmatchings/3BCF0/func_800608F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3BCF0/func_800608F0.s rename to ver/jp/asm/nonmatchings/3BCF0/func_800608F0.s diff --git a/ver/jp/asm/nonmatchings/main_3BCF0/func_80060910.s b/ver/jp/asm/nonmatchings/3BCF0/func_80060910.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3BCF0/func_80060910.s rename to ver/jp/asm/nonmatchings/3BCF0/func_80060910.s diff --git a/ver/jp/asm/nonmatchings/main_3BCF0/func_800609B0.s b/ver/jp/asm/nonmatchings/3BCF0/func_800609B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3BCF0/func_800609B0.s rename to ver/jp/asm/nonmatchings/3BCF0/func_800609B0.s diff --git a/ver/jp/asm/nonmatchings/main_3BCF0/func_80060B40.s b/ver/jp/asm/nonmatchings/3BCF0/func_80060B40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3BCF0/func_80060B40.s rename to ver/jp/asm/nonmatchings/3BCF0/func_80060B40.s diff --git a/ver/jp/asm/nonmatchings/main_3C1F0/func_80060DF0.s b/ver/jp/asm/nonmatchings/3C1F0/func_80060DF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C1F0/func_80060DF0.s rename to ver/jp/asm/nonmatchings/3C1F0/func_80060DF0.s diff --git a/ver/jp/asm/nonmatchings/main_3C290/func_80060E90.s b/ver/jp/asm/nonmatchings/3C290/func_80060E90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C290/func_80060E90.s rename to ver/jp/asm/nonmatchings/3C290/func_80060E90.s diff --git a/ver/jp/asm/nonmatchings/main_3C2E0/func_80060EE0.s b/ver/jp/asm/nonmatchings/3C2E0/func_80060EE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C2E0/func_80060EE0.s rename to ver/jp/asm/nonmatchings/3C2E0/func_80060EE0.s diff --git a/ver/jp/asm/nonmatchings/main_3C460/func_80061060.s b/ver/jp/asm/nonmatchings/3C460/func_80061060.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C460/func_80061060.s rename to ver/jp/asm/nonmatchings/3C460/func_80061060.s diff --git a/ver/jp/asm/nonmatchings/main_3C820/func_80061420.s b/ver/jp/asm/nonmatchings/3C820/func_80061420.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C820/func_80061420.s rename to ver/jp/asm/nonmatchings/3C820/func_80061420.s diff --git a/ver/jp/asm/nonmatchings/main_3C820/func_80061474.s b/ver/jp/asm/nonmatchings/3C820/func_80061474.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C820/func_80061474.s rename to ver/jp/asm/nonmatchings/3C820/func_80061474.s diff --git a/ver/jp/asm/nonmatchings/main_3C820/func_800614E0.s b/ver/jp/asm/nonmatchings/3C820/func_800614E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C820/func_800614E0.s rename to ver/jp/asm/nonmatchings/3C820/func_800614E0.s diff --git a/ver/jp/asm/nonmatchings/main_3C910/func_80061510.s b/ver/jp/asm/nonmatchings/3C910/func_80061510.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C910/func_80061510.s rename to ver/jp/asm/nonmatchings/3C910/func_80061510.s diff --git a/ver/jp/asm/nonmatchings/main_3C910/func_80061520.s b/ver/jp/asm/nonmatchings/3C910/func_80061520.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C910/func_80061520.s rename to ver/jp/asm/nonmatchings/3C910/func_80061520.s diff --git a/ver/jp/asm/nonmatchings/main_3C910/func_80061530.s b/ver/jp/asm/nonmatchings/3C910/func_80061530.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3C910/func_80061530.s rename to ver/jp/asm/nonmatchings/3C910/func_80061530.s diff --git a/ver/jp/asm/nonmatchings/main_3CA50/func_80061650.s b/ver/jp/asm/nonmatchings/3CA50/func_80061650.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CA50/func_80061650.s rename to ver/jp/asm/nonmatchings/3CA50/func_80061650.s diff --git a/ver/jp/asm/nonmatchings/main_3CAF0/func_800616F0.s b/ver/jp/asm/nonmatchings/3CAF0/func_800616F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CAF0/func_800616F0.s rename to ver/jp/asm/nonmatchings/3CAF0/func_800616F0.s diff --git a/ver/jp/asm/nonmatchings/main_3CAF0/func_800617A0.s b/ver/jp/asm/nonmatchings/3CAF0/func_800617A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CAF0/func_800617A0.s rename to ver/jp/asm/nonmatchings/3CAF0/func_800617A0.s diff --git a/ver/jp/asm/nonmatchings/main_3CC20/func_80061820.s b/ver/jp/asm/nonmatchings/3CC20/func_80061820.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CC20/func_80061820.s rename to ver/jp/asm/nonmatchings/3CC20/func_80061820.s diff --git a/ver/jp/asm/nonmatchings/main_3CCA0/func_800618A0.s b/ver/jp/asm/nonmatchings/3CCA0/func_800618A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CCA0/func_800618A0.s rename to ver/jp/asm/nonmatchings/3CCA0/func_800618A0.s diff --git a/ver/jp/asm/nonmatchings/main_3CCD0/func_800618D0.s b/ver/jp/asm/nonmatchings/3CCD0/func_800618D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CCD0/func_800618D0.s rename to ver/jp/asm/nonmatchings/3CCD0/func_800618D0.s diff --git a/ver/jp/asm/nonmatchings/main_3CCD0/func_80061950.s b/ver/jp/asm/nonmatchings/3CCD0/func_80061950.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CCD0/func_80061950.s rename to ver/jp/asm/nonmatchings/3CCD0/func_80061950.s diff --git a/ver/jp/asm/nonmatchings/main_3CCD0/func_80061970.s b/ver/jp/asm/nonmatchings/3CCD0/func_80061970.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CCD0/func_80061970.s rename to ver/jp/asm/nonmatchings/3CCD0/func_80061970.s diff --git a/ver/jp/asm/nonmatchings/main_3CCD0/func_800619F8.s b/ver/jp/asm/nonmatchings/3CCD0/func_800619F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CCD0/func_800619F8.s rename to ver/jp/asm/nonmatchings/3CCD0/func_800619F8.s diff --git a/ver/jp/asm/nonmatchings/main_3CCD0/func_80061A94.s b/ver/jp/asm/nonmatchings/3CCD0/func_80061A94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CCD0/func_80061A94.s rename to ver/jp/asm/nonmatchings/3CCD0/func_80061A94.s diff --git a/ver/jp/asm/nonmatchings/main_3CF50/func_80061B50.s b/ver/jp/asm/nonmatchings/3CF50/func_80061B50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CF50/func_80061B50.s rename to ver/jp/asm/nonmatchings/3CF50/func_80061B50.s diff --git a/ver/jp/asm/nonmatchings/main_3CF50/func_80061CEC.s b/ver/jp/asm/nonmatchings/3CF50/func_80061CEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CF50/func_80061CEC.s rename to ver/jp/asm/nonmatchings/3CF50/func_80061CEC.s diff --git a/ver/jp/asm/nonmatchings/main_3CF50/func_80061DA0.s b/ver/jp/asm/nonmatchings/3CF50/func_80061DA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3CF50/func_80061DA0.s rename to ver/jp/asm/nonmatchings/3CF50/func_80061DA0.s diff --git a/ver/jp/asm/nonmatchings/main_3D260/func_80061E60.s b/ver/jp/asm/nonmatchings/3D260/func_80061E60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3D260/func_80061E60.s rename to ver/jp/asm/nonmatchings/3D260/func_80061E60.s diff --git a/ver/jp/asm/nonmatchings/main_3D2C0/func_80061EC0.s b/ver/jp/asm/nonmatchings/3D2C0/func_80061EC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3D2C0/func_80061EC0.s rename to ver/jp/asm/nonmatchings/3D2C0/func_80061EC0.s diff --git a/ver/jp/asm/nonmatchings/main_3D2D0/func_80061ED0.s b/ver/jp/asm/nonmatchings/3D2D0/func_80061ED0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3D2D0/func_80061ED0.s rename to ver/jp/asm/nonmatchings/3D2D0/func_80061ED0.s diff --git a/ver/jp/asm/nonmatchings/main_3D300/func_80061F00.s b/ver/jp/asm/nonmatchings/3D300/func_80061F00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3D300/func_80061F00.s rename to ver/jp/asm/nonmatchings/3D300/func_80061F00.s diff --git a/ver/jp/asm/nonmatchings/main_3D300/func_80062030.s b/ver/jp/asm/nonmatchings/3D300/func_80062030.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3D300/func_80062030.s rename to ver/jp/asm/nonmatchings/3D300/func_80062030.s diff --git a/ver/jp/asm/nonmatchings/main_3D580/func_80062180.s b/ver/jp/asm/nonmatchings/3D580/func_80062180.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3D580/func_80062180.s rename to ver/jp/asm/nonmatchings/3D580/func_80062180.s diff --git a/ver/jp/asm/nonmatchings/main_3D580/func_80062500.s b/ver/jp/asm/nonmatchings/3D580/func_80062500.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3D580/func_80062500.s rename to ver/jp/asm/nonmatchings/3D580/func_80062500.s diff --git a/ver/jp/asm/nonmatchings/main_3DC90/func_80062890.s b/ver/jp/asm/nonmatchings/3DC90/func_80062890.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3DC90/func_80062890.s rename to ver/jp/asm/nonmatchings/3DC90/func_80062890.s diff --git a/ver/jp/asm/nonmatchings/main_3DC90/func_80063214.s b/ver/jp/asm/nonmatchings/3DC90/func_80063214.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3DC90/func_80063214.s rename to ver/jp/asm/nonmatchings/3DC90/func_80063214.s diff --git a/ver/jp/asm/nonmatchings/main_3E6F0/func_800632F0.s b/ver/jp/asm/nonmatchings/3E6F0/func_800632F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3E6F0/func_800632F0.s rename to ver/jp/asm/nonmatchings/3E6F0/func_800632F0.s diff --git a/ver/jp/asm/nonmatchings/main_3E6F0/func_80063868.s b/ver/jp/asm/nonmatchings/3E6F0/func_80063868.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3E6F0/func_80063868.s rename to ver/jp/asm/nonmatchings/3E6F0/func_80063868.s diff --git a/ver/jp/asm/nonmatchings/main_3ECE0/func_800638E0.s b/ver/jp/asm/nonmatchings/3ECE0/func_800638E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3ECE0/func_800638E0.s rename to ver/jp/asm/nonmatchings/3ECE0/func_800638E0.s diff --git a/ver/jp/asm/nonmatchings/main_3ECE0/func_80063A10.s b/ver/jp/asm/nonmatchings/3ECE0/func_80063A10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3ECE0/func_80063A10.s rename to ver/jp/asm/nonmatchings/3ECE0/func_80063A10.s diff --git a/ver/jp/asm/nonmatchings/main_3EF60/func_80063B60.s b/ver/jp/asm/nonmatchings/3EF60/func_80063B60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3EF60/func_80063B60.s rename to ver/jp/asm/nonmatchings/3EF60/func_80063B60.s diff --git a/ver/jp/asm/nonmatchings/main_3EF60/func_80063D10.s b/ver/jp/asm/nonmatchings/3EF60/func_80063D10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3EF60/func_80063D10.s rename to ver/jp/asm/nonmatchings/3EF60/func_80063D10.s diff --git a/ver/jp/asm/nonmatchings/main_3F2E0/func_80063EE0.s b/ver/jp/asm/nonmatchings/3F2E0/func_80063EE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3F2E0/func_80063EE0.s rename to ver/jp/asm/nonmatchings/3F2E0/func_80063EE0.s diff --git a/ver/jp/asm/nonmatchings/main_3F2E0/func_800640B8.s b/ver/jp/asm/nonmatchings/3F2E0/func_800640B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3F2E0/func_800640B8.s rename to ver/jp/asm/nonmatchings/3F2E0/func_800640B8.s diff --git a/ver/jp/asm/nonmatchings/main_3F6A0/func_800642A0.s b/ver/jp/asm/nonmatchings/3F6A0/func_800642A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3F6A0/func_800642A0.s rename to ver/jp/asm/nonmatchings/3F6A0/func_800642A0.s diff --git a/ver/jp/asm/nonmatchings/main_3F6A0/func_80064428.s b/ver/jp/asm/nonmatchings/3F6A0/func_80064428.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3F6A0/func_80064428.s rename to ver/jp/asm/nonmatchings/3F6A0/func_80064428.s diff --git a/ver/jp/asm/nonmatchings/main_3F9C0/func_800645C0.s b/ver/jp/asm/nonmatchings/3F9C0/func_800645C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3F9C0/func_800645C0.s rename to ver/jp/asm/nonmatchings/3F9C0/func_800645C0.s diff --git a/ver/jp/asm/nonmatchings/main_3FA20/func_80064620.s b/ver/jp/asm/nonmatchings/3FA20/func_80064620.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FA20/func_80064620.s rename to ver/jp/asm/nonmatchings/3FA20/func_80064620.s diff --git a/ver/jp/asm/nonmatchings/main_3FA20/func_80064940.s b/ver/jp/asm/nonmatchings/3FA20/func_80064940.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FA20/func_80064940.s rename to ver/jp/asm/nonmatchings/3FA20/func_80064940.s diff --git a/ver/jp/asm/nonmatchings/main_3FA20/func_800649E0.s b/ver/jp/asm/nonmatchings/3FA20/func_800649E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FA20/func_800649E0.s rename to ver/jp/asm/nonmatchings/3FA20/func_800649E0.s diff --git a/ver/jp/asm/nonmatchings/main_3FA20/func_80064A20.s b/ver/jp/asm/nonmatchings/3FA20/func_80064A20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FA20/func_80064A20.s rename to ver/jp/asm/nonmatchings/3FA20/func_80064A20.s diff --git a/ver/jp/asm/nonmatchings/main_3FA20/func_80064A44.s b/ver/jp/asm/nonmatchings/3FA20/func_80064A44.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FA20/func_80064A44.s rename to ver/jp/asm/nonmatchings/3FA20/func_80064A44.s diff --git a/ver/jp/asm/nonmatchings/main_3FE70/_Printf.s b/ver/jp/asm/nonmatchings/3FE70/_Printf.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FE70/_Printf.s rename to ver/jp/asm/nonmatchings/3FE70/_Printf.s diff --git a/ver/jp/asm/nonmatchings/main_3FE70/func_80064FF0.s b/ver/jp/asm/nonmatchings/3FE70/func_80064FF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FE70/func_80064FF0.s rename to ver/jp/asm/nonmatchings/3FE70/func_80064FF0.s diff --git a/ver/jp/asm/nonmatchings/main_3FE70/func_800654C0.s b/ver/jp/asm/nonmatchings/3FE70/func_800654C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FE70/func_800654C0.s rename to ver/jp/asm/nonmatchings/3FE70/func_800654C0.s diff --git a/ver/jp/asm/nonmatchings/main_3FE70/func_80065518.s b/ver/jp/asm/nonmatchings/3FE70/func_80065518.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_3FE70/func_80065518.s rename to ver/jp/asm/nonmatchings/3FE70/func_80065518.s diff --git a/ver/jp/asm/nonmatchings/main_40950/func_80065550.s b/ver/jp/asm/nonmatchings/40950/func_80065550.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40950/func_80065550.s rename to ver/jp/asm/nonmatchings/40950/func_80065550.s diff --git a/ver/jp/asm/nonmatchings/main_40980/func_80065580.s b/ver/jp/asm/nonmatchings/40980/func_80065580.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40980/func_80065580.s rename to ver/jp/asm/nonmatchings/40980/func_80065580.s diff --git a/ver/jp/asm/nonmatchings/main_40AC0/func_800656C0.s b/ver/jp/asm/nonmatchings/40AC0/func_800656C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40AC0/func_800656C0.s rename to ver/jp/asm/nonmatchings/40AC0/func_800656C0.s diff --git a/ver/jp/asm/nonmatchings/main_40BF0/func_800657F0.s b/ver/jp/asm/nonmatchings/40BF0/func_800657F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40BF0/func_800657F0.s rename to ver/jp/asm/nonmatchings/40BF0/func_800657F0.s diff --git a/ver/jp/asm/nonmatchings/main_40BF0/func_80065920.s b/ver/jp/asm/nonmatchings/40BF0/func_80065920.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40BF0/func_80065920.s rename to ver/jp/asm/nonmatchings/40BF0/func_80065920.s diff --git a/ver/jp/asm/nonmatchings/main_40DD0/func_800659D0.s b/ver/jp/asm/nonmatchings/40DD0/func_800659D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40DD0/func_800659D0.s rename to ver/jp/asm/nonmatchings/40DD0/func_800659D0.s diff --git a/ver/jp/asm/nonmatchings/main_40DE0/func_800659E0.s b/ver/jp/asm/nonmatchings/40DE0/func_800659E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40DE0/func_800659E0.s rename to ver/jp/asm/nonmatchings/40DE0/func_800659E0.s diff --git a/ver/jp/asm/nonmatchings/main_40DE0/func_80065BEC.s b/ver/jp/asm/nonmatchings/40DE0/func_80065BEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_40DE0/func_80065BEC.s rename to ver/jp/asm/nonmatchings/40DE0/func_80065BEC.s diff --git a/ver/jp/asm/nonmatchings/main_41020/func_80065C20.s b/ver/jp/asm/nonmatchings/41020/func_80065C20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41020/func_80065C20.s rename to ver/jp/asm/nonmatchings/41020/func_80065C20.s diff --git a/ver/jp/asm/nonmatchings/main_41040/func_80065C40.s b/ver/jp/asm/nonmatchings/41040/func_80065C40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41040/func_80065C40.s rename to ver/jp/asm/nonmatchings/41040/func_80065C40.s diff --git a/ver/jp/asm/nonmatchings/main_41090/func_80065C90.s b/ver/jp/asm/nonmatchings/41090/func_80065C90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41090/func_80065C90.s rename to ver/jp/asm/nonmatchings/41090/func_80065C90.s diff --git a/ver/jp/asm/nonmatchings/main_41140/func_80065D40.s b/ver/jp/asm/nonmatchings/41140/func_80065D40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41140/func_80065D40.s rename to ver/jp/asm/nonmatchings/41140/func_80065D40.s diff --git a/ver/jp/asm/nonmatchings/main_41140/func_80065D94.s b/ver/jp/asm/nonmatchings/41140/func_80065D94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41140/func_80065D94.s rename to ver/jp/asm/nonmatchings/41140/func_80065D94.s diff --git a/ver/jp/asm/nonmatchings/main_41140/func_80065E00.s b/ver/jp/asm/nonmatchings/41140/func_80065E00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41140/func_80065E00.s rename to ver/jp/asm/nonmatchings/41140/func_80065E00.s diff --git a/ver/jp/asm/nonmatchings/main_41230/func_80065E30.s b/ver/jp/asm/nonmatchings/41230/func_80065E30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41230/func_80065E30.s rename to ver/jp/asm/nonmatchings/41230/func_80065E30.s diff --git a/ver/jp/asm/nonmatchings/main_41230/func_80065F00.s b/ver/jp/asm/nonmatchings/41230/func_80065F00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41230/func_80065F00.s rename to ver/jp/asm/nonmatchings/41230/func_80065F00.s diff --git a/ver/jp/asm/nonmatchings/main_41320/func_80065F20.s b/ver/jp/asm/nonmatchings/41320/func_80065F20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41320/func_80065F20.s rename to ver/jp/asm/nonmatchings/41320/func_80065F20.s diff --git a/ver/jp/asm/nonmatchings/main_413F0/func_80065FF0.s b/ver/jp/asm/nonmatchings/413F0/func_80065FF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_413F0/func_80065FF0.s rename to ver/jp/asm/nonmatchings/413F0/func_80065FF0.s diff --git a/ver/jp/asm/nonmatchings/main_41510/func_80066110.s b/ver/jp/asm/nonmatchings/41510/func_80066110.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41510/func_80066110.s rename to ver/jp/asm/nonmatchings/41510/func_80066110.s diff --git a/ver/jp/asm/nonmatchings/main_415D0/func_800661D0.s b/ver/jp/asm/nonmatchings/415D0/func_800661D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_415D0/func_800661D0.s rename to ver/jp/asm/nonmatchings/415D0/func_800661D0.s diff --git a/ver/jp/asm/nonmatchings/main_41610/func_80066210.s b/ver/jp/asm/nonmatchings/41610/func_80066210.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41610/func_80066210.s rename to ver/jp/asm/nonmatchings/41610/func_80066210.s diff --git a/ver/jp/asm/nonmatchings/main_41660/func_80066260.s b/ver/jp/asm/nonmatchings/41660/func_80066260.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41660/func_80066260.s rename to ver/jp/asm/nonmatchings/41660/func_80066260.s diff --git a/ver/jp/asm/nonmatchings/main_41670/func_80066270.s b/ver/jp/asm/nonmatchings/41670/func_80066270.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41670/func_80066270.s rename to ver/jp/asm/nonmatchings/41670/func_80066270.s diff --git a/ver/jp/asm/nonmatchings/main_41700/func_80066300.s b/ver/jp/asm/nonmatchings/41700/func_80066300.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41700/func_80066300.s rename to ver/jp/asm/nonmatchings/41700/func_80066300.s diff --git a/ver/jp/asm/nonmatchings/main_41720/func_80066320.s b/ver/jp/asm/nonmatchings/41720/func_80066320.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41720/func_80066320.s rename to ver/jp/asm/nonmatchings/41720/func_80066320.s diff --git a/ver/jp/asm/nonmatchings/main_41850/func_80066450.s b/ver/jp/asm/nonmatchings/41850/func_80066450.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41850/func_80066450.s rename to ver/jp/asm/nonmatchings/41850/func_80066450.s diff --git a/ver/jp/asm/nonmatchings/main_41850/func_800664A4.s b/ver/jp/asm/nonmatchings/41850/func_800664A4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41850/func_800664A4.s rename to ver/jp/asm/nonmatchings/41850/func_800664A4.s diff --git a/ver/jp/asm/nonmatchings/main_41850/func_800665E0.s b/ver/jp/asm/nonmatchings/41850/func_800665E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41850/func_800665E0.s rename to ver/jp/asm/nonmatchings/41850/func_800665E0.s diff --git a/ver/jp/asm/nonmatchings/main_41850/func_80066660.s b/ver/jp/asm/nonmatchings/41850/func_80066660.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41850/func_80066660.s rename to ver/jp/asm/nonmatchings/41850/func_80066660.s diff --git a/ver/jp/asm/nonmatchings/main_41B70/func_80066770.s b/ver/jp/asm/nonmatchings/41B70/func_80066770.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41B70/func_80066770.s rename to ver/jp/asm/nonmatchings/41B70/func_80066770.s diff --git a/ver/jp/asm/nonmatchings/main_41C30/func_80066830.s b/ver/jp/asm/nonmatchings/41C30/func_80066830.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41C30/func_80066830.s rename to ver/jp/asm/nonmatchings/41C30/func_80066830.s diff --git a/ver/jp/asm/nonmatchings/main_41CF0/func_800668F0.s b/ver/jp/asm/nonmatchings/41CF0/func_800668F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41CF0/func_800668F0.s rename to ver/jp/asm/nonmatchings/41CF0/func_800668F0.s diff --git a/ver/jp/asm/nonmatchings/main_41D30/func_80066930.s b/ver/jp/asm/nonmatchings/41D30/func_80066930.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41D30/func_80066930.s rename to ver/jp/asm/nonmatchings/41D30/func_80066930.s diff --git a/ver/jp/asm/nonmatchings/main_41D80/func_80066980.s b/ver/jp/asm/nonmatchings/41D80/func_80066980.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41D80/func_80066980.s rename to ver/jp/asm/nonmatchings/41D80/func_80066980.s diff --git a/ver/jp/asm/nonmatchings/main_41DC0/func_800669C0.s b/ver/jp/asm/nonmatchings/41DC0/func_800669C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41DC0/func_800669C0.s rename to ver/jp/asm/nonmatchings/41DC0/func_800669C0.s diff --git a/ver/jp/asm/nonmatchings/main_41E00/func_80066A00.s b/ver/jp/asm/nonmatchings/41E00/func_80066A00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41E00/func_80066A00.s rename to ver/jp/asm/nonmatchings/41E00/func_80066A00.s diff --git a/ver/jp/asm/nonmatchings/main_41E40/func_80066A40.s b/ver/jp/asm/nonmatchings/41E40/func_80066A40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41E40/func_80066A40.s rename to ver/jp/asm/nonmatchings/41E40/func_80066A40.s diff --git a/ver/jp/asm/nonmatchings/main_41E40/func_80066BE0.s b/ver/jp/asm/nonmatchings/41E40/func_80066BE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_41E40/func_80066BE0.s rename to ver/jp/asm/nonmatchings/41E40/func_80066BE0.s diff --git a/ver/jp/asm/nonmatchings/main_42180/func_80066D80.s b/ver/jp/asm/nonmatchings/42180/func_80066D80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42180/func_80066D80.s rename to ver/jp/asm/nonmatchings/42180/func_80066D80.s diff --git a/ver/jp/asm/nonmatchings/main_421E0/func_80066DE0.s b/ver/jp/asm/nonmatchings/421E0/func_80066DE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_421E0/func_80066DE0.s rename to ver/jp/asm/nonmatchings/421E0/func_80066DE0.s diff --git a/ver/jp/asm/nonmatchings/main_42230/func_80066E30.s b/ver/jp/asm/nonmatchings/42230/func_80066E30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42230/func_80066E30.s rename to ver/jp/asm/nonmatchings/42230/func_80066E30.s diff --git a/ver/jp/asm/nonmatchings/main_423A0/func_80066FA0.s b/ver/jp/asm/nonmatchings/423A0/func_80066FA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_423A0/func_80066FA0.s rename to ver/jp/asm/nonmatchings/423A0/func_80066FA0.s diff --git a/ver/jp/asm/nonmatchings/main_423F0/func_80066FF0.s b/ver/jp/asm/nonmatchings/423F0/func_80066FF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_423F0/func_80066FF0.s rename to ver/jp/asm/nonmatchings/423F0/func_80066FF0.s diff --git a/ver/jp/asm/nonmatchings/main_42440/func_80067040.s b/ver/jp/asm/nonmatchings/42440/func_80067040.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42440/func_80067040.s rename to ver/jp/asm/nonmatchings/42440/func_80067040.s diff --git a/ver/jp/asm/nonmatchings/main_42750/func_80067350.s b/ver/jp/asm/nonmatchings/42750/func_80067350.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42750/func_80067350.s rename to ver/jp/asm/nonmatchings/42750/func_80067350.s diff --git a/ver/jp/asm/nonmatchings/main_427B0/func_800673B0.s b/ver/jp/asm/nonmatchings/427B0/func_800673B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_427B0/func_800673B0.s rename to ver/jp/asm/nonmatchings/427B0/func_800673B0.s diff --git a/ver/jp/asm/nonmatchings/main_42820/func_80067420.s b/ver/jp/asm/nonmatchings/42820/func_80067420.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42820/func_80067420.s rename to ver/jp/asm/nonmatchings/42820/func_80067420.s diff --git a/ver/jp/asm/nonmatchings/main_42880/func_80067480.s b/ver/jp/asm/nonmatchings/42880/func_80067480.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42880/func_80067480.s rename to ver/jp/asm/nonmatchings/42880/func_80067480.s diff --git a/ver/jp/asm/nonmatchings/main_428E0/func_800674E0.s b/ver/jp/asm/nonmatchings/428E0/func_800674E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_428E0/func_800674E0.s rename to ver/jp/asm/nonmatchings/428E0/func_800674E0.s diff --git a/ver/jp/asm/nonmatchings/main_42960/func_80067560.s b/ver/jp/asm/nonmatchings/42960/func_80067560.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42960/func_80067560.s rename to ver/jp/asm/nonmatchings/42960/func_80067560.s diff --git a/ver/jp/asm/nonmatchings/main_429E0/func_800675E0.s b/ver/jp/asm/nonmatchings/429E0/func_800675E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_429E0/func_800675E0.s rename to ver/jp/asm/nonmatchings/429E0/func_800675E0.s diff --git a/ver/jp/asm/nonmatchings/main_42AE0/func_800676E0.s b/ver/jp/asm/nonmatchings/42AE0/func_800676E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42AE0/func_800676E0.s rename to ver/jp/asm/nonmatchings/42AE0/func_800676E0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80028EB0.s b/ver/jp/asm/nonmatchings/42B0/func_80028EB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80028EB0.s rename to ver/jp/asm/nonmatchings/42B0/func_80028EB0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80028ED8.s b/ver/jp/asm/nonmatchings/42B0/func_80028ED8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80028ED8.s rename to ver/jp/asm/nonmatchings/42B0/func_80028ED8.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80028F4C.s b/ver/jp/asm/nonmatchings/42B0/func_80028F4C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80028F4C.s rename to ver/jp/asm/nonmatchings/42B0/func_80028F4C.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80028FA0.s b/ver/jp/asm/nonmatchings/42B0/func_80028FA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80028FA0.s rename to ver/jp/asm/nonmatchings/42B0/func_80028FA0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80028FB0.s b/ver/jp/asm/nonmatchings/42B0/func_80028FB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80028FB0.s rename to ver/jp/asm/nonmatchings/42B0/func_80028FB0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80028FF0.s b/ver/jp/asm/nonmatchings/42B0/func_80028FF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80028FF0.s rename to ver/jp/asm/nonmatchings/42B0/func_80028FF0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002902C.s b/ver/jp/asm/nonmatchings/42B0/func_8002902C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002902C.s rename to ver/jp/asm/nonmatchings/42B0/func_8002902C.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029124.s b/ver/jp/asm/nonmatchings/42B0/func_80029124.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029124.s rename to ver/jp/asm/nonmatchings/42B0/func_80029124.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800291DC.s b/ver/jp/asm/nonmatchings/42B0/func_800291DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800291DC.s rename to ver/jp/asm/nonmatchings/42B0/func_800291DC.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029284.s b/ver/jp/asm/nonmatchings/42B0/func_80029284.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029284.s rename to ver/jp/asm/nonmatchings/42B0/func_80029284.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029394.s b/ver/jp/asm/nonmatchings/42B0/func_80029394.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029394.s rename to ver/jp/asm/nonmatchings/42B0/func_80029394.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029470.s b/ver/jp/asm/nonmatchings/42B0/func_80029470.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029470.s rename to ver/jp/asm/nonmatchings/42B0/func_80029470.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029484.s b/ver/jp/asm/nonmatchings/42B0/func_80029484.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029484.s rename to ver/jp/asm/nonmatchings/42B0/func_80029484.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800295C0.s b/ver/jp/asm/nonmatchings/42B0/func_800295C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800295C0.s rename to ver/jp/asm/nonmatchings/42B0/func_800295C0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800295E0.s b/ver/jp/asm/nonmatchings/42B0/func_800295E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800295E0.s rename to ver/jp/asm/nonmatchings/42B0/func_800295E0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800296E0.s b/ver/jp/asm/nonmatchings/42B0/func_800296E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800296E0.s rename to ver/jp/asm/nonmatchings/42B0/func_800296E0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800296FC.s b/ver/jp/asm/nonmatchings/42B0/func_800296FC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800296FC.s rename to ver/jp/asm/nonmatchings/42B0/func_800296FC.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029794.s b/ver/jp/asm/nonmatchings/42B0/func_80029794.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029794.s rename to ver/jp/asm/nonmatchings/42B0/func_80029794.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029820.s b/ver/jp/asm/nonmatchings/42B0/func_80029820.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029820.s rename to ver/jp/asm/nonmatchings/42B0/func_80029820.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800298C0.s b/ver/jp/asm/nonmatchings/42B0/func_800298C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800298C0.s rename to ver/jp/asm/nonmatchings/42B0/func_800298C0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800298F4.s b/ver/jp/asm/nonmatchings/42B0/func_800298F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800298F4.s rename to ver/jp/asm/nonmatchings/42B0/func_800298F4.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029954.s b/ver/jp/asm/nonmatchings/42B0/func_80029954.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029954.s rename to ver/jp/asm/nonmatchings/42B0/func_80029954.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_800299BC.s b/ver/jp/asm/nonmatchings/42B0/func_800299BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_800299BC.s rename to ver/jp/asm/nonmatchings/42B0/func_800299BC.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029A3C.s b/ver/jp/asm/nonmatchings/42B0/func_80029A3C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029A3C.s rename to ver/jp/asm/nonmatchings/42B0/func_80029A3C.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029A84.s b/ver/jp/asm/nonmatchings/42B0/func_80029A84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029A84.s rename to ver/jp/asm/nonmatchings/42B0/func_80029A84.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029AE4.s b/ver/jp/asm/nonmatchings/42B0/func_80029AE4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029AE4.s rename to ver/jp/asm/nonmatchings/42B0/func_80029AE4.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029BE8.s b/ver/jp/asm/nonmatchings/42B0/func_80029BE8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029BE8.s rename to ver/jp/asm/nonmatchings/42B0/func_80029BE8.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029C40.s b/ver/jp/asm/nonmatchings/42B0/func_80029C40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029C40.s rename to ver/jp/asm/nonmatchings/42B0/func_80029C40.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029DE0.s b/ver/jp/asm/nonmatchings/42B0/func_80029DE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029DE0.s rename to ver/jp/asm/nonmatchings/42B0/func_80029DE0.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029E10.s b/ver/jp/asm/nonmatchings/42B0/func_80029E10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029E10.s rename to ver/jp/asm/nonmatchings/42B0/func_80029E10.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029E94.s b/ver/jp/asm/nonmatchings/42B0/func_80029E94.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029E94.s rename to ver/jp/asm/nonmatchings/42B0/func_80029E94.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029EEC.s b/ver/jp/asm/nonmatchings/42B0/func_80029EEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029EEC.s rename to ver/jp/asm/nonmatchings/42B0/func_80029EEC.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029F5C.s b/ver/jp/asm/nonmatchings/42B0/func_80029F5C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029F5C.s rename to ver/jp/asm/nonmatchings/42B0/func_80029F5C.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_80029FF4.s b/ver/jp/asm/nonmatchings/42B0/func_80029FF4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_80029FF4.s rename to ver/jp/asm/nonmatchings/42B0/func_80029FF4.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A074.s b/ver/jp/asm/nonmatchings/42B0/func_8002A074.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A074.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A074.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A12C.s b/ver/jp/asm/nonmatchings/42B0/func_8002A12C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A12C.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A12C.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A190.s b/ver/jp/asm/nonmatchings/42B0/func_8002A190.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A190.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A190.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A1F4.s b/ver/jp/asm/nonmatchings/42B0/func_8002A1F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A1F4.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A1F4.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A2AC.s b/ver/jp/asm/nonmatchings/42B0/func_8002A2AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A2AC.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A2AC.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A310.s b/ver/jp/asm/nonmatchings/42B0/func_8002A310.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A310.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A310.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A374.s b/ver/jp/asm/nonmatchings/42B0/func_8002A374.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A374.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A374.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002A8C4.s b/ver/jp/asm/nonmatchings/42B0/func_8002A8C4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002A8C4.s rename to ver/jp/asm/nonmatchings/42B0/func_8002A8C4.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002AA84.s b/ver/jp/asm/nonmatchings/42B0/func_8002AA84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002AA84.s rename to ver/jp/asm/nonmatchings/42B0/func_8002AA84.s diff --git a/ver/jp/asm/nonmatchings/main_42B0/func_8002AB1C.s b/ver/jp/asm/nonmatchings/42B0/func_8002AB1C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42B0/func_8002AB1C.s rename to ver/jp/asm/nonmatchings/42B0/func_8002AB1C.s diff --git a/ver/jp/asm/nonmatchings/main_42BA0/func_800677A0.s b/ver/jp/asm/nonmatchings/42BA0/func_800677A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42BA0/func_800677A0.s rename to ver/jp/asm/nonmatchings/42BA0/func_800677A0.s diff --git a/ver/jp/asm/nonmatchings/main_42C00/func_80067800.s b/ver/jp/asm/nonmatchings/42C00/func_80067800.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42C00/func_80067800.s rename to ver/jp/asm/nonmatchings/42C00/func_80067800.s diff --git a/ver/jp/asm/nonmatchings/main_42CE0/func_800678E0.s b/ver/jp/asm/nonmatchings/42CE0/func_800678E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42CE0/func_800678E0.s rename to ver/jp/asm/nonmatchings/42CE0/func_800678E0.s diff --git a/ver/jp/asm/nonmatchings/main_42D40/func_80067940.s b/ver/jp/asm/nonmatchings/42D40/func_80067940.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42D40/func_80067940.s rename to ver/jp/asm/nonmatchings/42D40/func_80067940.s diff --git a/ver/jp/asm/nonmatchings/main_42DC0/func_800679C0.s b/ver/jp/asm/nonmatchings/42DC0/func_800679C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42DC0/func_800679C0.s rename to ver/jp/asm/nonmatchings/42DC0/func_800679C0.s diff --git a/ver/jp/asm/nonmatchings/main_42E50/func_80067A50.s b/ver/jp/asm/nonmatchings/42E50/func_80067A50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42E50/func_80067A50.s rename to ver/jp/asm/nonmatchings/42E50/func_80067A50.s diff --git a/ver/jp/asm/nonmatchings/main_42F00/func_80067B00.s b/ver/jp/asm/nonmatchings/42F00/func_80067B00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42F00/func_80067B00.s rename to ver/jp/asm/nonmatchings/42F00/func_80067B00.s diff --git a/ver/jp/asm/nonmatchings/main_42F00/func_80067C60.s b/ver/jp/asm/nonmatchings/42F00/func_80067C60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_42F00/func_80067C60.s rename to ver/jp/asm/nonmatchings/42F00/func_80067C60.s diff --git a/ver/jp/asm/nonmatchings/main_431E0/func_80067DE0.s b/ver/jp/asm/nonmatchings/431E0/func_80067DE0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_431E0/func_80067DE0.s rename to ver/jp/asm/nonmatchings/431E0/func_80067DE0.s diff --git a/ver/jp/asm/nonmatchings/main_431E0/func_80067F24.s b/ver/jp/asm/nonmatchings/431E0/func_80067F24.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_431E0/func_80067F24.s rename to ver/jp/asm/nonmatchings/431E0/func_80067F24.s diff --git a/ver/jp/asm/nonmatchings/main_43570/func_80068170.s b/ver/jp/asm/nonmatchings/43570/func_80068170.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_43570/func_80068170.s rename to ver/jp/asm/nonmatchings/43570/func_80068170.s diff --git a/ver/jp/asm/nonmatchings/main_43570/func_8006847C.s b/ver/jp/asm/nonmatchings/43570/func_8006847C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_43570/func_8006847C.s rename to ver/jp/asm/nonmatchings/43570/func_8006847C.s diff --git a/ver/jp/asm/nonmatchings/main_439A0/func_800685A0.s b/ver/jp/asm/nonmatchings/439A0/func_800685A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_439A0/func_800685A0.s rename to ver/jp/asm/nonmatchings/439A0/func_800685A0.s diff --git a/ver/jp/asm/nonmatchings/main_439A0/func_8006874C.s b/ver/jp/asm/nonmatchings/439A0/func_8006874C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_439A0/func_8006874C.s rename to ver/jp/asm/nonmatchings/439A0/func_8006874C.s diff --git a/ver/jp/asm/nonmatchings/main_43BC0/func_800687C0.s b/ver/jp/asm/nonmatchings/43BC0/func_800687C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_43BC0/func_800687C0.s rename to ver/jp/asm/nonmatchings/43BC0/func_800687C0.s diff --git a/ver/jp/asm/nonmatchings/main_43BC0/func_80068C00.s b/ver/jp/asm/nonmatchings/43BC0/func_80068C00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_43BC0/func_80068C00.s rename to ver/jp/asm/nonmatchings/43BC0/func_80068C00.s diff --git a/ver/jp/asm/nonmatchings/main_441A0/func_80068DA0.s b/ver/jp/asm/nonmatchings/441A0/func_80068DA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_441A0/func_80068DA0.s rename to ver/jp/asm/nonmatchings/441A0/func_80068DA0.s diff --git a/ver/jp/asm/nonmatchings/main_44360/func_80068F60.s b/ver/jp/asm/nonmatchings/44360/func_80068F60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44360/func_80068F60.s rename to ver/jp/asm/nonmatchings/44360/func_80068F60.s diff --git a/ver/jp/asm/nonmatchings/main_44470/func_80069070.s b/ver/jp/asm/nonmatchings/44470/func_80069070.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44470/func_80069070.s rename to ver/jp/asm/nonmatchings/44470/func_80069070.s diff --git a/ver/jp/asm/nonmatchings/main_44470/func_80069170.s b/ver/jp/asm/nonmatchings/44470/func_80069170.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44470/func_80069170.s rename to ver/jp/asm/nonmatchings/44470/func_80069170.s diff --git a/ver/jp/asm/nonmatchings/main_44470/func_80069368.s b/ver/jp/asm/nonmatchings/44470/func_80069368.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44470/func_80069368.s rename to ver/jp/asm/nonmatchings/44470/func_80069368.s diff --git a/ver/jp/asm/nonmatchings/main_44840/func_80069440.s b/ver/jp/asm/nonmatchings/44840/func_80069440.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44840/func_80069440.s rename to ver/jp/asm/nonmatchings/44840/func_80069440.s diff --git a/ver/jp/asm/nonmatchings/main_448A0/func_800694A0.s b/ver/jp/asm/nonmatchings/448A0/func_800694A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_448A0/func_800694A0.s rename to ver/jp/asm/nonmatchings/448A0/func_800694A0.s diff --git a/ver/jp/asm/nonmatchings/main_448A0/func_80069590.s b/ver/jp/asm/nonmatchings/448A0/func_80069590.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_448A0/func_80069590.s rename to ver/jp/asm/nonmatchings/448A0/func_80069590.s diff --git a/ver/jp/asm/nonmatchings/main_448A0/func_80069624.s b/ver/jp/asm/nonmatchings/448A0/func_80069624.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_448A0/func_80069624.s rename to ver/jp/asm/nonmatchings/448A0/func_80069624.s diff --git a/ver/jp/asm/nonmatchings/main_44AB0/func_800696B0.s b/ver/jp/asm/nonmatchings/44AB0/func_800696B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44AB0/func_800696B0.s rename to ver/jp/asm/nonmatchings/44AB0/func_800696B0.s diff --git a/ver/jp/asm/nonmatchings/main_44B20/func_80069720.s b/ver/jp/asm/nonmatchings/44B20/func_80069720.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44B20/func_80069720.s rename to ver/jp/asm/nonmatchings/44B20/func_80069720.s diff --git a/ver/jp/asm/nonmatchings/main_44B20/func_80069754.s b/ver/jp/asm/nonmatchings/44B20/func_80069754.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44B20/func_80069754.s rename to ver/jp/asm/nonmatchings/44B20/func_80069754.s diff --git a/ver/jp/asm/nonmatchings/main_44B20/func_80069798.s b/ver/jp/asm/nonmatchings/44B20/func_80069798.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44B20/func_80069798.s rename to ver/jp/asm/nonmatchings/44B20/func_80069798.s diff --git a/ver/jp/asm/nonmatchings/main_44B20/func_80069A84.s b/ver/jp/asm/nonmatchings/44B20/func_80069A84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44B20/func_80069A84.s rename to ver/jp/asm/nonmatchings/44B20/func_80069A84.s diff --git a/ver/jp/asm/nonmatchings/main_44B20/func_80069BE8.s b/ver/jp/asm/nonmatchings/44B20/func_80069BE8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44B20/func_80069BE8.s rename to ver/jp/asm/nonmatchings/44B20/func_80069BE8.s diff --git a/ver/jp/asm/nonmatchings/main_44B20/func_80069DB4.s b/ver/jp/asm/nonmatchings/44B20/func_80069DB4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44B20/func_80069DB4.s rename to ver/jp/asm/nonmatchings/44B20/func_80069DB4.s diff --git a/ver/jp/asm/nonmatchings/main_44B20/func_80069E6C.s b/ver/jp/asm/nonmatchings/44B20/func_80069E6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_44B20/func_80069E6C.s rename to ver/jp/asm/nonmatchings/44B20/func_80069E6C.s diff --git a/ver/jp/asm/nonmatchings/main_455B0/func_8006A1B0.s b/ver/jp/asm/nonmatchings/455B0/func_8006A1B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_455B0/func_8006A1B0.s rename to ver/jp/asm/nonmatchings/455B0/func_8006A1B0.s diff --git a/ver/jp/asm/nonmatchings/main_457A0/func_8006A3A0.s b/ver/jp/asm/nonmatchings/457A0/func_8006A3A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_457A0/func_8006A3A0.s rename to ver/jp/asm/nonmatchings/457A0/func_8006A3A0.s diff --git a/ver/jp/asm/nonmatchings/main_45A10/func_8006A610.s b/ver/jp/asm/nonmatchings/45A10/func_8006A610.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45A10/func_8006A610.s rename to ver/jp/asm/nonmatchings/45A10/func_8006A610.s diff --git a/ver/jp/asm/nonmatchings/main_45A30/func_8006A630.s b/ver/jp/asm/nonmatchings/45A30/func_8006A630.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45A30/func_8006A630.s rename to ver/jp/asm/nonmatchings/45A30/func_8006A630.s diff --git a/ver/jp/asm/nonmatchings/main_45A30/func_8006A6E8.s b/ver/jp/asm/nonmatchings/45A30/func_8006A6E8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45A30/func_8006A6E8.s rename to ver/jp/asm/nonmatchings/45A30/func_8006A6E8.s diff --git a/ver/jp/asm/nonmatchings/main_45A30/func_8006A9C0.s b/ver/jp/asm/nonmatchings/45A30/func_8006A9C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45A30/func_8006A9C0.s rename to ver/jp/asm/nonmatchings/45A30/func_8006A9C0.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006A9D0.s b/ver/jp/asm/nonmatchings/45DD0/func_8006A9D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006A9D0.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006A9D0.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006A9E0.s b/ver/jp/asm/nonmatchings/45DD0/func_8006A9E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006A9E0.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006A9E0.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006AF5C.s b/ver/jp/asm/nonmatchings/45DD0/func_8006AF5C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006AF5C.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006AF5C.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006B04C.s b/ver/jp/asm/nonmatchings/45DD0/func_8006B04C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006B04C.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006B04C.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006B154.s b/ver/jp/asm/nonmatchings/45DD0/func_8006B154.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006B154.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006B154.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006B19C.s b/ver/jp/asm/nonmatchings/45DD0/func_8006B19C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006B19C.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006B19C.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006B1B4.s b/ver/jp/asm/nonmatchings/45DD0/func_8006B1B4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006B1B4.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006B1B4.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006B340.s b/ver/jp/asm/nonmatchings/45DD0/func_8006B340.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006B340.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006B340.s diff --git a/ver/jp/asm/nonmatchings/main_45DD0/func_8006B3B0.s b/ver/jp/asm/nonmatchings/45DD0/func_8006B3B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_45DD0/func_8006B3B0.s rename to ver/jp/asm/nonmatchings/45DD0/func_8006B3B0.s diff --git a/ver/jp/asm/nonmatchings/main_467D0/func_8006B3D0.s b/ver/jp/asm/nonmatchings/467D0/func_8006B3D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_467D0/func_8006B3D0.s rename to ver/jp/asm/nonmatchings/467D0/func_8006B3D0.s diff --git a/ver/jp/asm/nonmatchings/main_467D0/func_8006B410.s b/ver/jp/asm/nonmatchings/467D0/func_8006B410.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_467D0/func_8006B410.s rename to ver/jp/asm/nonmatchings/467D0/func_8006B410.s diff --git a/ver/jp/asm/nonmatchings/main_46860/func_8006B460.s b/ver/jp/asm/nonmatchings/46860/func_8006B460.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46860/func_8006B460.s rename to ver/jp/asm/nonmatchings/46860/func_8006B460.s diff --git a/ver/jp/asm/nonmatchings/main_46860/func_8006B530.s b/ver/jp/asm/nonmatchings/46860/func_8006B530.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46860/func_8006B530.s rename to ver/jp/asm/nonmatchings/46860/func_8006B530.s diff --git a/ver/jp/asm/nonmatchings/main_46860/func_8006B550.s b/ver/jp/asm/nonmatchings/46860/func_8006B550.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46860/func_8006B550.s rename to ver/jp/asm/nonmatchings/46860/func_8006B550.s diff --git a/ver/jp/asm/nonmatchings/main_46AC0/func_8006B6C0.s b/ver/jp/asm/nonmatchings/46AC0/func_8006B6C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46AC0/func_8006B6C0.s rename to ver/jp/asm/nonmatchings/46AC0/func_8006B6C0.s diff --git a/ver/jp/asm/nonmatchings/main_46C30/func_8006B830.s b/ver/jp/asm/nonmatchings/46C30/func_8006B830.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46C30/func_8006B830.s rename to ver/jp/asm/nonmatchings/46C30/func_8006B830.s diff --git a/ver/jp/asm/nonmatchings/main_46C50/func_8006B850.s b/ver/jp/asm/nonmatchings/46C50/func_8006B850.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46C50/func_8006B850.s rename to ver/jp/asm/nonmatchings/46C50/func_8006B850.s diff --git a/ver/jp/asm/nonmatchings/main_46C50/func_8006B960.s b/ver/jp/asm/nonmatchings/46C50/func_8006B960.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46C50/func_8006B960.s rename to ver/jp/asm/nonmatchings/46C50/func_8006B960.s diff --git a/ver/jp/asm/nonmatchings/main_46C50/func_8006BBB0.s b/ver/jp/asm/nonmatchings/46C50/func_8006BBB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46C50/func_8006BBB0.s rename to ver/jp/asm/nonmatchings/46C50/func_8006BBB0.s diff --git a/ver/jp/asm/nonmatchings/main_46C50/func_8006BFFC.s b/ver/jp/asm/nonmatchings/46C50/func_8006BFFC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46C50/func_8006BFFC.s rename to ver/jp/asm/nonmatchings/46C50/func_8006BFFC.s diff --git a/ver/jp/asm/nonmatchings/main_46C50/func_8006C094.s b/ver/jp/asm/nonmatchings/46C50/func_8006C094.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_46C50/func_8006C094.s rename to ver/jp/asm/nonmatchings/46C50/func_8006C094.s diff --git a/ver/jp/asm/nonmatchings/main_47A40/func_8006C640.s b/ver/jp/asm/nonmatchings/47A40/func_8006C640.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47A40/func_8006C640.s rename to ver/jp/asm/nonmatchings/47A40/func_8006C640.s diff --git a/ver/jp/asm/nonmatchings/main_47A50/func_8006C650.s b/ver/jp/asm/nonmatchings/47A50/func_8006C650.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47A50/func_8006C650.s rename to ver/jp/asm/nonmatchings/47A50/func_8006C650.s diff --git a/ver/jp/asm/nonmatchings/main_47A60/func_8006C660.s b/ver/jp/asm/nonmatchings/47A60/func_8006C660.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47A60/func_8006C660.s rename to ver/jp/asm/nonmatchings/47A60/func_8006C660.s diff --git a/ver/jp/asm/nonmatchings/main_47A70/func_8006C670.s b/ver/jp/asm/nonmatchings/47A70/func_8006C670.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47A70/func_8006C670.s rename to ver/jp/asm/nonmatchings/47A70/func_8006C670.s diff --git a/ver/jp/asm/nonmatchings/main_47A70/func_8006C680.s b/ver/jp/asm/nonmatchings/47A70/func_8006C680.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47A70/func_8006C680.s rename to ver/jp/asm/nonmatchings/47A70/func_8006C680.s diff --git a/ver/jp/asm/nonmatchings/main_47A70/func_8006C690.s b/ver/jp/asm/nonmatchings/47A70/func_8006C690.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47A70/func_8006C690.s rename to ver/jp/asm/nonmatchings/47A70/func_8006C690.s diff --git a/ver/jp/asm/nonmatchings/main_47A70/func_8006C6A0.s b/ver/jp/asm/nonmatchings/47A70/func_8006C6A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47A70/func_8006C6A0.s rename to ver/jp/asm/nonmatchings/47A70/func_8006C6A0.s diff --git a/ver/jp/asm/nonmatchings/main_47AC0/func_8006C6C0.s b/ver/jp/asm/nonmatchings/47AC0/func_8006C6C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47AC0/func_8006C6C0.s rename to ver/jp/asm/nonmatchings/47AC0/func_8006C6C0.s diff --git a/ver/jp/asm/nonmatchings/main_47AC0/func_8006C6D0.s b/ver/jp/asm/nonmatchings/47AC0/func_8006C6D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47AC0/func_8006C6D0.s rename to ver/jp/asm/nonmatchings/47AC0/func_8006C6D0.s diff --git a/ver/jp/asm/nonmatchings/main_47AC0/func_8006C6E0.s b/ver/jp/asm/nonmatchings/47AC0/func_8006C6E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47AC0/func_8006C6E0.s rename to ver/jp/asm/nonmatchings/47AC0/func_8006C6E0.s diff --git a/ver/jp/asm/nonmatchings/main_47AC0/func_8006C710.s b/ver/jp/asm/nonmatchings/47AC0/func_8006C710.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47AC0/func_8006C710.s rename to ver/jp/asm/nonmatchings/47AC0/func_8006C710.s diff --git a/ver/jp/asm/nonmatchings/main_47BA0/func_8006C7A0.s b/ver/jp/asm/nonmatchings/47BA0/func_8006C7A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47BA0/func_8006C7A0.s rename to ver/jp/asm/nonmatchings/47BA0/func_8006C7A0.s diff --git a/ver/jp/asm/nonmatchings/main_47BF0/func_8006C7F0.s b/ver/jp/asm/nonmatchings/47BF0/func_8006C7F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47BF0/func_8006C7F0.s rename to ver/jp/asm/nonmatchings/47BF0/func_8006C7F0.s diff --git a/ver/jp/asm/nonmatchings/main_47C40/func_8006C840.s b/ver/jp/asm/nonmatchings/47C40/func_8006C840.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47C40/func_8006C840.s rename to ver/jp/asm/nonmatchings/47C40/func_8006C840.s diff --git a/ver/jp/asm/nonmatchings/main_47C40/func_8006C8AC.s b/ver/jp/asm/nonmatchings/47C40/func_8006C8AC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47C40/func_8006C8AC.s rename to ver/jp/asm/nonmatchings/47C40/func_8006C8AC.s diff --git a/ver/jp/asm/nonmatchings/main_47D30/func_8006C930.s b/ver/jp/asm/nonmatchings/47D30/func_8006C930.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47D30/func_8006C930.s rename to ver/jp/asm/nonmatchings/47D30/func_8006C930.s diff --git a/ver/jp/asm/nonmatchings/main_47E10/func_8006CA10.s b/ver/jp/asm/nonmatchings/47E10/func_8006CA10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47E10/func_8006CA10.s rename to ver/jp/asm/nonmatchings/47E10/func_8006CA10.s diff --git a/ver/jp/asm/nonmatchings/main_47E70/func_8006CA70.s b/ver/jp/asm/nonmatchings/47E70/func_8006CA70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47E70/func_8006CA70.s rename to ver/jp/asm/nonmatchings/47E70/func_8006CA70.s diff --git a/ver/jp/asm/nonmatchings/main_47F80/func_8006CB80.s b/ver/jp/asm/nonmatchings/47F80/func_8006CB80.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47F80/func_8006CB80.s rename to ver/jp/asm/nonmatchings/47F80/func_8006CB80.s diff --git a/ver/jp/asm/nonmatchings/main_47FA0/func_8006CBA0.s b/ver/jp/asm/nonmatchings/47FA0/func_8006CBA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_47FA0/func_8006CBA0.s rename to ver/jp/asm/nonmatchings/47FA0/func_8006CBA0.s diff --git a/ver/jp/asm/nonmatchings/main_48000/func_8006CC00.s b/ver/jp/asm/nonmatchings/48000/func_8006CC00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48000/func_8006CC00.s rename to ver/jp/asm/nonmatchings/48000/func_8006CC00.s diff --git a/ver/jp/asm/nonmatchings/main_48000/func_8006D060.s b/ver/jp/asm/nonmatchings/48000/func_8006D060.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48000/func_8006D060.s rename to ver/jp/asm/nonmatchings/48000/func_8006D060.s diff --git a/ver/jp/asm/nonmatchings/main_48000/func_8006D1B8.s b/ver/jp/asm/nonmatchings/48000/func_8006D1B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48000/func_8006D1B8.s rename to ver/jp/asm/nonmatchings/48000/func_8006D1B8.s diff --git a/ver/jp/asm/nonmatchings/main_48000/func_8006D320.s b/ver/jp/asm/nonmatchings/48000/func_8006D320.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48000/func_8006D320.s rename to ver/jp/asm/nonmatchings/48000/func_8006D320.s diff --git a/ver/jp/asm/nonmatchings/main_48000/func_8006D49C.s b/ver/jp/asm/nonmatchings/48000/func_8006D49C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48000/func_8006D49C.s rename to ver/jp/asm/nonmatchings/48000/func_8006D49C.s diff --git a/ver/jp/asm/nonmatchings/main_48000/func_8006D540.s b/ver/jp/asm/nonmatchings/48000/func_8006D540.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48000/func_8006D540.s rename to ver/jp/asm/nonmatchings/48000/func_8006D540.s diff --git a/ver/jp/asm/nonmatchings/main_48A00/func_8006D600.s b/ver/jp/asm/nonmatchings/48A00/func_8006D600.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48A00/func_8006D600.s rename to ver/jp/asm/nonmatchings/48A00/func_8006D600.s diff --git a/ver/jp/asm/nonmatchings/main_48A00/func_8006D684.s b/ver/jp/asm/nonmatchings/48A00/func_8006D684.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48A00/func_8006D684.s rename to ver/jp/asm/nonmatchings/48A00/func_8006D684.s diff --git a/ver/jp/asm/nonmatchings/main_48BC0/func_8006D7C0.s b/ver/jp/asm/nonmatchings/48BC0/func_8006D7C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48BC0/func_8006D7C0.s rename to ver/jp/asm/nonmatchings/48BC0/func_8006D7C0.s diff --git a/ver/jp/asm/nonmatchings/main_48BE0/func_8006D7E0.s b/ver/jp/asm/nonmatchings/48BE0/func_8006D7E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_48BE0/func_8006D7E0.s rename to ver/jp/asm/nonmatchings/48BE0/func_8006D7E0.s diff --git a/ver/jp/asm/nonmatchings/main_491A0/func_8006DDA0.s b/ver/jp/asm/nonmatchings/491A0/func_8006DDA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_491A0/func_8006DDA0.s rename to ver/jp/asm/nonmatchings/491A0/func_8006DDA0.s diff --git a/ver/jp/asm/nonmatchings/main_491A0/func_8006E2F0.s b/ver/jp/asm/nonmatchings/491A0/func_8006E2F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_491A0/func_8006E2F0.s rename to ver/jp/asm/nonmatchings/491A0/func_8006E2F0.s diff --git a/ver/jp/asm/nonmatchings/main_49C50/func_8006E850.s b/ver/jp/asm/nonmatchings/49C50/func_8006E850.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_49C50/func_8006E850.s rename to ver/jp/asm/nonmatchings/49C50/func_8006E850.s diff --git a/ver/jp/asm/nonmatchings/main_4A120/func_8006ED20.s b/ver/jp/asm/nonmatchings/4A120/func_8006ED20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A120/func_8006ED20.s rename to ver/jp/asm/nonmatchings/4A120/func_8006ED20.s diff --git a/ver/jp/asm/nonmatchings/main_4A120/func_8006ED50.s b/ver/jp/asm/nonmatchings/4A120/func_8006ED50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A120/func_8006ED50.s rename to ver/jp/asm/nonmatchings/4A120/func_8006ED50.s diff --git a/ver/jp/asm/nonmatchings/main_4A190/func_8006ED90.s b/ver/jp/asm/nonmatchings/4A190/func_8006ED90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A190/func_8006ED90.s rename to ver/jp/asm/nonmatchings/4A190/func_8006ED90.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006EDD0.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006EDD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006EDD0.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006EDD0.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006EEF8.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006EEF8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006EEF8.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006EEF8.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF00.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006EF00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF00.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006EF00.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF08.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006EF08.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF08.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006EF08.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF38.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006EF38.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF38.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006EF38.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF40.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006EF40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF40.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006EF40.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF48.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006EF48.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006EF48.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006EF48.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F098.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F098.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F098.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F098.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F164.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F164.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F164.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F164.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F27C.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F27C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F27C.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F27C.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F2E8.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F2E8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F2E8.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F2E8.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F404.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F404.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F404.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F404.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F530.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F530.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F530.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F530.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F5FC.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F5FC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F5FC.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F5FC.s diff --git a/ver/jp/asm/nonmatchings/main_4A1D0/func_8006F73C.s b/ver/jp/asm/nonmatchings/4A1D0/func_8006F73C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4A1D0/func_8006F73C.s rename to ver/jp/asm/nonmatchings/4A1D0/func_8006F73C.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006F870.s b/ver/jp/asm/nonmatchings/4AC70/func_8006F870.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006F870.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006F870.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006F8D0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006F8D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006F8D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006F8D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006F930.s b/ver/jp/asm/nonmatchings/4AC70/func_8006F930.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006F930.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006F930.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006F990.s b/ver/jp/asm/nonmatchings/4AC70/func_8006F990.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006F990.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006F990.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006F9F0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006F9F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006F9F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006F9F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FA50.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FA50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FA50.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FA50.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FAB0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FAB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FAB0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FAB0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FB10.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FB10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FB10.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FB10.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FB70.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FB70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FB70.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FB70.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FBD0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FBD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FBD0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FBD0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FC30.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FC30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FC30.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FC30.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FC90.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FC90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FC90.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FC90.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FCF0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FCF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FCF0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FCF0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FD50.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FD50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FD50.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FD50.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FDB0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FDB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FDB0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FDB0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FE10.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FE10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FE10.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FE10.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FE70.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FE70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FE70.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FE70.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FED0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FED0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FED0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FED0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FF30.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FF30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FF30.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FF30.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FF90.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FF90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FF90.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FF90.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_8006FFF0.s b/ver/jp/asm/nonmatchings/4AC70/func_8006FFF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_8006FFF0.s rename to ver/jp/asm/nonmatchings/4AC70/func_8006FFF0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070050.s b/ver/jp/asm/nonmatchings/4AC70/func_80070050.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070050.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070050.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800700B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800700B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800700B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800700B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070110.s b/ver/jp/asm/nonmatchings/4AC70/func_80070110.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070110.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070110.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070170.s b/ver/jp/asm/nonmatchings/4AC70/func_80070170.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070170.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070170.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800701D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800701D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800701D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800701D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070230.s b/ver/jp/asm/nonmatchings/4AC70/func_80070230.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070230.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070230.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070290.s b/ver/jp/asm/nonmatchings/4AC70/func_80070290.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070290.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070290.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800702F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800702F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800702F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800702F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070350.s b/ver/jp/asm/nonmatchings/4AC70/func_80070350.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070350.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070350.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800703B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800703B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800703B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800703B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070410.s b/ver/jp/asm/nonmatchings/4AC70/func_80070410.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070410.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070410.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070470.s b/ver/jp/asm/nonmatchings/4AC70/func_80070470.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070470.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070470.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800704D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800704D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800704D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800704D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070530.s b/ver/jp/asm/nonmatchings/4AC70/func_80070530.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070530.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070530.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070590.s b/ver/jp/asm/nonmatchings/4AC70/func_80070590.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070590.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070590.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800705F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800705F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800705F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800705F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070650.s b/ver/jp/asm/nonmatchings/4AC70/func_80070650.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070650.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070650.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800706B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800706B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800706B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800706B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070710.s b/ver/jp/asm/nonmatchings/4AC70/func_80070710.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070710.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070710.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070770.s b/ver/jp/asm/nonmatchings/4AC70/func_80070770.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070770.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070770.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800707D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800707D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800707D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800707D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070830.s b/ver/jp/asm/nonmatchings/4AC70/func_80070830.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070830.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070830.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070890.s b/ver/jp/asm/nonmatchings/4AC70/func_80070890.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070890.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070890.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800708F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800708F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800708F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800708F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070950.s b/ver/jp/asm/nonmatchings/4AC70/func_80070950.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070950.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070950.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800709B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800709B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800709B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800709B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070A10.s b/ver/jp/asm/nonmatchings/4AC70/func_80070A10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070A10.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070A10.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070A70.s b/ver/jp/asm/nonmatchings/4AC70/func_80070A70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070A70.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070A70.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070AD0.s b/ver/jp/asm/nonmatchings/4AC70/func_80070AD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070AD0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070AD0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070B30.s b/ver/jp/asm/nonmatchings/4AC70/func_80070B30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070B30.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070B30.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070B90.s b/ver/jp/asm/nonmatchings/4AC70/func_80070B90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070B90.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070B90.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070BF0.s b/ver/jp/asm/nonmatchings/4AC70/func_80070BF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070BF0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070BF0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070C50.s b/ver/jp/asm/nonmatchings/4AC70/func_80070C50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070C50.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070C50.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070CB0.s b/ver/jp/asm/nonmatchings/4AC70/func_80070CB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070CB0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070CB0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070D10.s b/ver/jp/asm/nonmatchings/4AC70/func_80070D10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070D10.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070D10.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070D70.s b/ver/jp/asm/nonmatchings/4AC70/func_80070D70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070D70.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070D70.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070DD0.s b/ver/jp/asm/nonmatchings/4AC70/func_80070DD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070DD0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070DD0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070E30.s b/ver/jp/asm/nonmatchings/4AC70/func_80070E30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070E30.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070E30.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070E90.s b/ver/jp/asm/nonmatchings/4AC70/func_80070E90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070E90.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070E90.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070EF0.s b/ver/jp/asm/nonmatchings/4AC70/func_80070EF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070EF0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070EF0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070F50.s b/ver/jp/asm/nonmatchings/4AC70/func_80070F50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070F50.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070F50.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80070FB0.s b/ver/jp/asm/nonmatchings/4AC70/func_80070FB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80070FB0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80070FB0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071010.s b/ver/jp/asm/nonmatchings/4AC70/func_80071010.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071010.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071010.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071070.s b/ver/jp/asm/nonmatchings/4AC70/func_80071070.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071070.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071070.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800710D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800710D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800710D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800710D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071130.s b/ver/jp/asm/nonmatchings/4AC70/func_80071130.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071130.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071130.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071190.s b/ver/jp/asm/nonmatchings/4AC70/func_80071190.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071190.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071190.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800711F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800711F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800711F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800711F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071250.s b/ver/jp/asm/nonmatchings/4AC70/func_80071250.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071250.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071250.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800712B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800712B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800712B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800712B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071310.s b/ver/jp/asm/nonmatchings/4AC70/func_80071310.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071310.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071310.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071370.s b/ver/jp/asm/nonmatchings/4AC70/func_80071370.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071370.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071370.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800713D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800713D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800713D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800713D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071430.s b/ver/jp/asm/nonmatchings/4AC70/func_80071430.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071430.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071430.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071490.s b/ver/jp/asm/nonmatchings/4AC70/func_80071490.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071490.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071490.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800714F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800714F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800714F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800714F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071550.s b/ver/jp/asm/nonmatchings/4AC70/func_80071550.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071550.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071550.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800715B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800715B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800715B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800715B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071610.s b/ver/jp/asm/nonmatchings/4AC70/func_80071610.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071610.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071610.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071670.s b/ver/jp/asm/nonmatchings/4AC70/func_80071670.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071670.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071670.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800716D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800716D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800716D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800716D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071730.s b/ver/jp/asm/nonmatchings/4AC70/func_80071730.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071730.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071730.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071790.s b/ver/jp/asm/nonmatchings/4AC70/func_80071790.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071790.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071790.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800717F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800717F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800717F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800717F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071850.s b/ver/jp/asm/nonmatchings/4AC70/func_80071850.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071850.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071850.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800718B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800718B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800718B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800718B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071910.s b/ver/jp/asm/nonmatchings/4AC70/func_80071910.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071910.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071910.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071970.s b/ver/jp/asm/nonmatchings/4AC70/func_80071970.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071970.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071970.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800719D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800719D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800719D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800719D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071A30.s b/ver/jp/asm/nonmatchings/4AC70/func_80071A30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071A30.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071A30.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071A90.s b/ver/jp/asm/nonmatchings/4AC70/func_80071A90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071A90.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071A90.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071AF0.s b/ver/jp/asm/nonmatchings/4AC70/func_80071AF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071AF0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071AF0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071B50.s b/ver/jp/asm/nonmatchings/4AC70/func_80071B50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071B50.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071B50.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071BB0.s b/ver/jp/asm/nonmatchings/4AC70/func_80071BB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071BB0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071BB0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071C10.s b/ver/jp/asm/nonmatchings/4AC70/func_80071C10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071C10.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071C10.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071C70.s b/ver/jp/asm/nonmatchings/4AC70/func_80071C70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071C70.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071C70.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071CD0.s b/ver/jp/asm/nonmatchings/4AC70/func_80071CD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071CD0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071CD0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071D30.s b/ver/jp/asm/nonmatchings/4AC70/func_80071D30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071D30.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071D30.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071D90.s b/ver/jp/asm/nonmatchings/4AC70/func_80071D90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071D90.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071D90.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071DF0.s b/ver/jp/asm/nonmatchings/4AC70/func_80071DF0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071DF0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071DF0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071E50.s b/ver/jp/asm/nonmatchings/4AC70/func_80071E50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071E50.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071E50.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071EB0.s b/ver/jp/asm/nonmatchings/4AC70/func_80071EB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071EB0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071EB0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071F10.s b/ver/jp/asm/nonmatchings/4AC70/func_80071F10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071F10.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071F10.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071F70.s b/ver/jp/asm/nonmatchings/4AC70/func_80071F70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071F70.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071F70.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80071FD0.s b/ver/jp/asm/nonmatchings/4AC70/func_80071FD0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80071FD0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80071FD0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072030.s b/ver/jp/asm/nonmatchings/4AC70/func_80072030.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072030.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072030.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072090.s b/ver/jp/asm/nonmatchings/4AC70/func_80072090.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072090.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072090.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800720F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800720F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800720F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800720F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072150.s b/ver/jp/asm/nonmatchings/4AC70/func_80072150.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072150.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072150.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800721B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800721B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800721B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800721B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072210.s b/ver/jp/asm/nonmatchings/4AC70/func_80072210.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072210.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072210.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072270.s b/ver/jp/asm/nonmatchings/4AC70/func_80072270.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072270.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072270.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800722D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800722D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800722D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800722D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072330.s b/ver/jp/asm/nonmatchings/4AC70/func_80072330.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072330.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072330.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072390.s b/ver/jp/asm/nonmatchings/4AC70/func_80072390.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072390.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072390.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800723F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800723F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800723F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800723F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072450.s b/ver/jp/asm/nonmatchings/4AC70/func_80072450.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072450.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072450.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800724B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800724B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800724B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800724B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072510.s b/ver/jp/asm/nonmatchings/4AC70/func_80072510.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072510.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072510.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072570.s b/ver/jp/asm/nonmatchings/4AC70/func_80072570.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072570.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072570.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800725D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800725D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800725D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800725D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072630.s b/ver/jp/asm/nonmatchings/4AC70/func_80072630.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072630.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072630.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072690.s b/ver/jp/asm/nonmatchings/4AC70/func_80072690.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072690.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072690.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800726F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800726F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800726F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800726F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072750.s b/ver/jp/asm/nonmatchings/4AC70/func_80072750.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072750.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072750.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800727B0.s b/ver/jp/asm/nonmatchings/4AC70/func_800727B0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800727B0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800727B0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072810.s b/ver/jp/asm/nonmatchings/4AC70/func_80072810.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072810.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072810.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072870.s b/ver/jp/asm/nonmatchings/4AC70/func_80072870.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072870.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072870.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800728D0.s b/ver/jp/asm/nonmatchings/4AC70/func_800728D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800728D0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800728D0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072930.s b/ver/jp/asm/nonmatchings/4AC70/func_80072930.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072930.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072930.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072990.s b/ver/jp/asm/nonmatchings/4AC70/func_80072990.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072990.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072990.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_800729F0.s b/ver/jp/asm/nonmatchings/4AC70/func_800729F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_800729F0.s rename to ver/jp/asm/nonmatchings/4AC70/func_800729F0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072A50.s b/ver/jp/asm/nonmatchings/4AC70/func_80072A50.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072A50.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072A50.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072AB0.s b/ver/jp/asm/nonmatchings/4AC70/func_80072AB0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072AB0.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072AB0.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072B10.s b/ver/jp/asm/nonmatchings/4AC70/func_80072B10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072B10.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072B10.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072B90.s b/ver/jp/asm/nonmatchings/4AC70/func_80072B90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072B90.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072B90.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072BAC.s b/ver/jp/asm/nonmatchings/4AC70/func_80072BAC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072BAC.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072BAC.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072BBC.s b/ver/jp/asm/nonmatchings/4AC70/func_80072BBC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072BBC.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072BBC.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072C70.s b/ver/jp/asm/nonmatchings/4AC70/func_80072C70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072C70.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072C70.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072CAC.s b/ver/jp/asm/nonmatchings/4AC70/func_80072CAC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072CAC.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072CAC.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072CBC.s b/ver/jp/asm/nonmatchings/4AC70/func_80072CBC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072CBC.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072CBC.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072CCC.s b/ver/jp/asm/nonmatchings/4AC70/func_80072CCC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072CCC.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072CCC.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072CD4.s b/ver/jp/asm/nonmatchings/4AC70/func_80072CD4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072CD4.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072CD4.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072D0C.s b/ver/jp/asm/nonmatchings/4AC70/func_80072D0C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072D0C.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072D0C.s diff --git a/ver/jp/asm/nonmatchings/main_4AC70/func_80072DF4.s b/ver/jp/asm/nonmatchings/4AC70/func_80072DF4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_4AC70/func_80072DF4.s rename to ver/jp/asm/nonmatchings/4AC70/func_80072DF4.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002ABC0.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ABC0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002ABC0.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002ABC0.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002ABE8.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ABE8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002ABE8.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002ABE8.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002AC10.s b/ver/jp/asm/nonmatchings/5FC0/func_8002AC10.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002AC10.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002AC10.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002AC38.s b/ver/jp/asm/nonmatchings/5FC0/func_8002AC38.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002AC38.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002AC38.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002AC60.s b/ver/jp/asm/nonmatchings/5FC0/func_8002AC60.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002AC60.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002AC60.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002AC9C.s b/ver/jp/asm/nonmatchings/5FC0/func_8002AC9C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002AC9C.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002AC9C.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002ACA4.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ACA4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002ACA4.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002ACA4.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002ACEC.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ACEC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002ACEC.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002ACEC.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002AD34.s b/ver/jp/asm/nonmatchings/5FC0/func_8002AD34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002AD34.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002AD34.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002AD70.s b/ver/jp/asm/nonmatchings/5FC0/func_8002AD70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002AD70.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002AD70.s diff --git a/ver/jp/asm/nonmatchings/main_5FC0/func_8002ADB4.s b/ver/jp/asm/nonmatchings/5FC0/func_8002ADB4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_5FC0/func_8002ADB4.s rename to ver/jp/asm/nonmatchings/5FC0/func_8002ADB4.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002AE00.s b/ver/jp/asm/nonmatchings/6200/func_8002AE00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002AE00.s rename to ver/jp/asm/nonmatchings/6200/func_8002AE00.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002AF00.s b/ver/jp/asm/nonmatchings/6200/func_8002AF00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002AF00.s rename to ver/jp/asm/nonmatchings/6200/func_8002AF00.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002AF30.s b/ver/jp/asm/nonmatchings/6200/func_8002AF30.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002AF30.s rename to ver/jp/asm/nonmatchings/6200/func_8002AF30.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002AF98.s b/ver/jp/asm/nonmatchings/6200/func_8002AF98.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002AF98.s rename to ver/jp/asm/nonmatchings/6200/func_8002AF98.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B00C.s b/ver/jp/asm/nonmatchings/6200/func_8002B00C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B00C.s rename to ver/jp/asm/nonmatchings/6200/func_8002B00C.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B090.s b/ver/jp/asm/nonmatchings/6200/func_8002B090.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B090.s rename to ver/jp/asm/nonmatchings/6200/func_8002B090.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B0B8.s b/ver/jp/asm/nonmatchings/6200/func_8002B0B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B0B8.s rename to ver/jp/asm/nonmatchings/6200/func_8002B0B8.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B114.s b/ver/jp/asm/nonmatchings/6200/func_8002B114.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B114.s rename to ver/jp/asm/nonmatchings/6200/func_8002B114.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B290.s b/ver/jp/asm/nonmatchings/6200/func_8002B290.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B290.s rename to ver/jp/asm/nonmatchings/6200/func_8002B290.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B334.s b/ver/jp/asm/nonmatchings/6200/func_8002B334.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B334.s rename to ver/jp/asm/nonmatchings/6200/func_8002B334.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B3EC.s b/ver/jp/asm/nonmatchings/6200/func_8002B3EC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B3EC.s rename to ver/jp/asm/nonmatchings/6200/func_8002B3EC.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B450.s b/ver/jp/asm/nonmatchings/6200/func_8002B450.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B450.s rename to ver/jp/asm/nonmatchings/6200/func_8002B450.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B5C8.s b/ver/jp/asm/nonmatchings/6200/func_8002B5C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B5C8.s rename to ver/jp/asm/nonmatchings/6200/func_8002B5C8.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B5F0.s b/ver/jp/asm/nonmatchings/6200/func_8002B5F0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B5F0.s rename to ver/jp/asm/nonmatchings/6200/func_8002B5F0.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B80C.s b/ver/jp/asm/nonmatchings/6200/func_8002B80C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B80C.s rename to ver/jp/asm/nonmatchings/6200/func_8002B80C.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B828.s b/ver/jp/asm/nonmatchings/6200/func_8002B828.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B828.s rename to ver/jp/asm/nonmatchings/6200/func_8002B828.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B908.s b/ver/jp/asm/nonmatchings/6200/func_8002B908.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B908.s rename to ver/jp/asm/nonmatchings/6200/func_8002B908.s diff --git a/ver/jp/asm/nonmatchings/main_6200/func_8002B9DC.s b/ver/jp/asm/nonmatchings/6200/func_8002B9DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6200/func_8002B9DC.s rename to ver/jp/asm/nonmatchings/6200/func_8002B9DC.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BA00.s b/ver/jp/asm/nonmatchings/6E00/func_8002BA00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BA00.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BA00.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BA38.s b/ver/jp/asm/nonmatchings/6E00/func_8002BA38.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BA38.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BA38.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BA40.s b/ver/jp/asm/nonmatchings/6E00/func_8002BA40.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BA40.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BA40.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BE9C.s b/ver/jp/asm/nonmatchings/6E00/func_8002BE9C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BE9C.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BE9C.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BEAC.s b/ver/jp/asm/nonmatchings/6E00/func_8002BEAC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BEAC.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BEAC.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BEC4.s b/ver/jp/asm/nonmatchings/6E00/func_8002BEC4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BEC4.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BEC4.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BED4.s b/ver/jp/asm/nonmatchings/6E00/func_8002BED4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BED4.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BED4.s diff --git a/ver/jp/asm/nonmatchings/main_6E00/func_8002BEE4.s b/ver/jp/asm/nonmatchings/6E00/func_8002BEE4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_6E00/func_8002BEE4.s rename to ver/jp/asm/nonmatchings/6E00/func_8002BEE4.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002BF00.s b/ver/jp/asm/nonmatchings/7300/func_8002BF00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002BF00.s rename to ver/jp/asm/nonmatchings/7300/func_8002BF00.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002BF70.s b/ver/jp/asm/nonmatchings/7300/func_8002BF70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002BF70.s rename to ver/jp/asm/nonmatchings/7300/func_8002BF70.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C014.s b/ver/jp/asm/nonmatchings/7300/func_8002C014.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C014.s rename to ver/jp/asm/nonmatchings/7300/func_8002C014.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C194.s b/ver/jp/asm/nonmatchings/7300/func_8002C194.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C194.s rename to ver/jp/asm/nonmatchings/7300/func_8002C194.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C1C8.s b/ver/jp/asm/nonmatchings/7300/func_8002C1C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C1C8.s rename to ver/jp/asm/nonmatchings/7300/func_8002C1C8.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C278.s b/ver/jp/asm/nonmatchings/7300/func_8002C278.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C278.s rename to ver/jp/asm/nonmatchings/7300/func_8002C278.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C2E4.s b/ver/jp/asm/nonmatchings/7300/func_8002C2E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C2E4.s rename to ver/jp/asm/nonmatchings/7300/func_8002C2E4.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C370.s b/ver/jp/asm/nonmatchings/7300/func_8002C370.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C370.s rename to ver/jp/asm/nonmatchings/7300/func_8002C370.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C770.s b/ver/jp/asm/nonmatchings/7300/func_8002C770.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C770.s rename to ver/jp/asm/nonmatchings/7300/func_8002C770.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C7DC.s b/ver/jp/asm/nonmatchings/7300/func_8002C7DC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C7DC.s rename to ver/jp/asm/nonmatchings/7300/func_8002C7DC.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C850.s b/ver/jp/asm/nonmatchings/7300/func_8002C850.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C850.s rename to ver/jp/asm/nonmatchings/7300/func_8002C850.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C870.s b/ver/jp/asm/nonmatchings/7300/func_8002C870.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C870.s rename to ver/jp/asm/nonmatchings/7300/func_8002C870.s diff --git a/ver/jp/asm/nonmatchings/main_7300/func_8002C90C.s b/ver/jp/asm/nonmatchings/7300/func_8002C90C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7300/func_8002C90C.s rename to ver/jp/asm/nonmatchings/7300/func_8002C90C.s diff --git a/ver/jp/asm/nonmatchings/main_7E00/func_8002CA00.s b/ver/jp/asm/nonmatchings/7E00/func_8002CA00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_7E00/func_8002CA00.s rename to ver/jp/asm/nonmatchings/7E00/func_8002CA00.s diff --git a/ver/jp/asm/nonmatchings/main_80A0/func_8002CCA0.s b/ver/jp/asm/nonmatchings/80A0/func_8002CCA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_80A0/func_8002CCA0.s rename to ver/jp/asm/nonmatchings/80A0/func_8002CCA0.s diff --git a/ver/jp/asm/nonmatchings/main_80A0/func_8002CF24.s b/ver/jp/asm/nonmatchings/80A0/func_8002CF24.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_80A0/func_8002CF24.s rename to ver/jp/asm/nonmatchings/80A0/func_8002CF24.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002D090.s b/ver/jp/asm/nonmatchings/8490/func_8002D090.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002D090.s rename to ver/jp/asm/nonmatchings/8490/func_8002D090.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002D3CC.s b/ver/jp/asm/nonmatchings/8490/func_8002D3CC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002D3CC.s rename to ver/jp/asm/nonmatchings/8490/func_8002D3CC.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002DB84.s b/ver/jp/asm/nonmatchings/8490/func_8002DB84.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002DB84.s rename to ver/jp/asm/nonmatchings/8490/func_8002DB84.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002DCC8.s b/ver/jp/asm/nonmatchings/8490/func_8002DCC8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002DCC8.s rename to ver/jp/asm/nonmatchings/8490/func_8002DCC8.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002DDFC.s b/ver/jp/asm/nonmatchings/8490/func_8002DDFC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002DDFC.s rename to ver/jp/asm/nonmatchings/8490/func_8002DDFC.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002DFA4.s b/ver/jp/asm/nonmatchings/8490/func_8002DFA4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002DFA4.s rename to ver/jp/asm/nonmatchings/8490/func_8002DFA4.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002E178.s b/ver/jp/asm/nonmatchings/8490/func_8002E178.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002E178.s rename to ver/jp/asm/nonmatchings/8490/func_8002E178.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002E1C8.s b/ver/jp/asm/nonmatchings/8490/func_8002E1C8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002E1C8.s rename to ver/jp/asm/nonmatchings/8490/func_8002E1C8.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002E3E4.s b/ver/jp/asm/nonmatchings/8490/func_8002E3E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002E3E4.s rename to ver/jp/asm/nonmatchings/8490/func_8002E3E4.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002E45C.s b/ver/jp/asm/nonmatchings/8490/func_8002E45C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002E45C.s rename to ver/jp/asm/nonmatchings/8490/func_8002E45C.s diff --git a/ver/jp/asm/nonmatchings/main_8490/func_8002E4BC.s b/ver/jp/asm/nonmatchings/8490/func_8002E4BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_8490/func_8002E4BC.s rename to ver/jp/asm/nonmatchings/8490/func_8002E4BC.s diff --git a/ver/jp/asm/nonmatchings/main_99A0/func_8002E5A0.s b/ver/jp/asm/nonmatchings/99A0/func_8002E5A0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_99A0/func_8002E5A0.s rename to ver/jp/asm/nonmatchings/99A0/func_8002E5A0.s diff --git a/ver/jp/asm/nonmatchings/main_99A0/func_8002E988.s b/ver/jp/asm/nonmatchings/99A0/func_8002E988.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_99A0/func_8002E988.s rename to ver/jp/asm/nonmatchings/99A0/func_8002E988.s diff --git a/ver/jp/asm/nonmatchings/main_99A0/func_8002EF20.s b/ver/jp/asm/nonmatchings/99A0/func_8002EF20.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_99A0/func_8002EF20.s rename to ver/jp/asm/nonmatchings/99A0/func_8002EF20.s diff --git a/ver/jp/asm/nonmatchings/main_99A0/func_8002F4E0.s b/ver/jp/asm/nonmatchings/99A0/func_8002F4E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_99A0/func_8002F4E0.s rename to ver/jp/asm/nonmatchings/99A0/func_8002F4E0.s diff --git a/ver/jp/asm/nonmatchings/main_AA20/func_8002F620.s b/ver/jp/asm/nonmatchings/AA20/func_8002F620.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AA20/func_8002F620.s rename to ver/jp/asm/nonmatchings/AA20/func_8002F620.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_8002F970.s b/ver/jp/asm/nonmatchings/AD70/func_8002F970.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_8002F970.s rename to ver/jp/asm/nonmatchings/AD70/func_8002F970.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_8002FC90.s b/ver/jp/asm/nonmatchings/AD70/func_8002FC90.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_8002FC90.s rename to ver/jp/asm/nonmatchings/AD70/func_8002FC90.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_8002FEA0.s b/ver/jp/asm/nonmatchings/AD70/func_8002FEA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_8002FEA0.s rename to ver/jp/asm/nonmatchings/AD70/func_8002FEA0.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_8002FFDC.s b/ver/jp/asm/nonmatchings/AD70/func_8002FFDC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_8002FFDC.s rename to ver/jp/asm/nonmatchings/AD70/func_8002FFDC.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_800300E0.s b/ver/jp/asm/nonmatchings/AD70/func_800300E0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_800300E0.s rename to ver/jp/asm/nonmatchings/AD70/func_800300E0.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_800300E8.s b/ver/jp/asm/nonmatchings/AD70/func_800300E8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_800300E8.s rename to ver/jp/asm/nonmatchings/AD70/func_800300E8.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_8003018C.s b/ver/jp/asm/nonmatchings/AD70/func_8003018C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_8003018C.s rename to ver/jp/asm/nonmatchings/AD70/func_8003018C.s diff --git a/ver/jp/asm/nonmatchings/main_AD70/func_80031124.s b/ver/jp/asm/nonmatchings/AD70/func_80031124.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_AD70/func_80031124.s rename to ver/jp/asm/nonmatchings/AD70/func_80031124.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80031EA0.s b/ver/jp/asm/nonmatchings/D2A0/func_80031EA0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80031EA0.s rename to ver/jp/asm/nonmatchings/D2A0/func_80031EA0.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80031F6C.s b/ver/jp/asm/nonmatchings/D2A0/func_80031F6C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80031F6C.s rename to ver/jp/asm/nonmatchings/D2A0/func_80031F6C.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80032274.s b/ver/jp/asm/nonmatchings/D2A0/func_80032274.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80032274.s rename to ver/jp/asm/nonmatchings/D2A0/func_80032274.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80032534.s b/ver/jp/asm/nonmatchings/D2A0/func_80032534.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80032534.s rename to ver/jp/asm/nonmatchings/D2A0/func_80032534.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80032600.s b/ver/jp/asm/nonmatchings/D2A0/func_80032600.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80032600.s rename to ver/jp/asm/nonmatchings/D2A0/func_80032600.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_800328F4.s b/ver/jp/asm/nonmatchings/D2A0/func_800328F4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_800328F4.s rename to ver/jp/asm/nonmatchings/D2A0/func_800328F4.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80033024.s b/ver/jp/asm/nonmatchings/D2A0/func_80033024.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80033024.s rename to ver/jp/asm/nonmatchings/D2A0/func_80033024.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80033178.s b/ver/jp/asm/nonmatchings/D2A0/func_80033178.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80033178.s rename to ver/jp/asm/nonmatchings/D2A0/func_80033178.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_80033180.s b/ver/jp/asm/nonmatchings/D2A0/func_80033180.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_80033180.s rename to ver/jp/asm/nonmatchings/D2A0/func_80033180.s diff --git a/ver/jp/asm/nonmatchings/main_D2A0/func_800331B8.s b/ver/jp/asm/nonmatchings/D2A0/func_800331B8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_D2A0/func_800331B8.s rename to ver/jp/asm/nonmatchings/D2A0/func_800331B8.s diff --git a/ver/jp/asm/nonmatchings/main_E5D0/func_800331D0.s b/ver/jp/asm/nonmatchings/E5D0/func_800331D0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E5D0/func_800331D0.s rename to ver/jp/asm/nonmatchings/E5D0/func_800331D0.s diff --git a/ver/jp/asm/nonmatchings/main_E5D0/func_800331F8.s b/ver/jp/asm/nonmatchings/E5D0/func_800331F8.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E5D0/func_800331F8.s rename to ver/jp/asm/nonmatchings/E5D0/func_800331F8.s diff --git a/ver/jp/asm/nonmatchings/main_E5D0/func_80033418.s b/ver/jp/asm/nonmatchings/E5D0/func_80033418.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E5D0/func_80033418.s rename to ver/jp/asm/nonmatchings/E5D0/func_80033418.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033460.s b/ver/jp/asm/nonmatchings/E860/func_80033460.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033460.s rename to ver/jp/asm/nonmatchings/E860/func_80033460.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033470.s b/ver/jp/asm/nonmatchings/E860/func_80033470.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033470.s rename to ver/jp/asm/nonmatchings/E860/func_80033470.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033488.s b/ver/jp/asm/nonmatchings/E860/func_80033488.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033488.s rename to ver/jp/asm/nonmatchings/E860/func_80033488.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_800334C0.s b/ver/jp/asm/nonmatchings/E860/func_800334C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_800334C0.s rename to ver/jp/asm/nonmatchings/E860/func_800334C0.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033504.s b/ver/jp/asm/nonmatchings/E860/func_80033504.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033504.s rename to ver/jp/asm/nonmatchings/E860/func_80033504.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033560.s b/ver/jp/asm/nonmatchings/E860/func_80033560.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033560.s rename to ver/jp/asm/nonmatchings/E860/func_80033560.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033574.s b/ver/jp/asm/nonmatchings/E860/func_80033574.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033574.s rename to ver/jp/asm/nonmatchings/E860/func_80033574.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_800337E4.s b/ver/jp/asm/nonmatchings/E860/func_800337E4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_800337E4.s rename to ver/jp/asm/nonmatchings/E860/func_800337E4.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033818.s b/ver/jp/asm/nonmatchings/E860/func_80033818.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033818.s rename to ver/jp/asm/nonmatchings/E860/func_80033818.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033850.s b/ver/jp/asm/nonmatchings/E860/func_80033850.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033850.s rename to ver/jp/asm/nonmatchings/E860/func_80033850.s diff --git a/ver/jp/asm/nonmatchings/main_E860/func_80033AF4.s b/ver/jp/asm/nonmatchings/E860/func_80033AF4.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_E860/func_80033AF4.s rename to ver/jp/asm/nonmatchings/E860/func_80033AF4.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_80033B00.s b/ver/jp/asm/nonmatchings/EF00/func_80033B00.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_80033B00.s rename to ver/jp/asm/nonmatchings/EF00/func_80033B00.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_80033D34.s b/ver/jp/asm/nonmatchings/EF00/func_80033D34.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_80033D34.s rename to ver/jp/asm/nonmatchings/EF00/func_80033D34.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_80034038.s b/ver/jp/asm/nonmatchings/EF00/func_80034038.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_80034038.s rename to ver/jp/asm/nonmatchings/EF00/func_80034038.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_80034054.s b/ver/jp/asm/nonmatchings/EF00/func_80034054.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_80034054.s rename to ver/jp/asm/nonmatchings/EF00/func_80034054.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_800345C0.s b/ver/jp/asm/nonmatchings/EF00/func_800345C0.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_800345C0.s rename to ver/jp/asm/nonmatchings/EF00/func_800345C0.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_800345FC.s b/ver/jp/asm/nonmatchings/EF00/func_800345FC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_800345FC.s rename to ver/jp/asm/nonmatchings/EF00/func_800345FC.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_80034874.s b/ver/jp/asm/nonmatchings/EF00/func_80034874.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_80034874.s rename to ver/jp/asm/nonmatchings/EF00/func_80034874.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_8003487C.s b/ver/jp/asm/nonmatchings/EF00/func_8003487C.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_8003487C.s rename to ver/jp/asm/nonmatchings/EF00/func_8003487C.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_800348BC.s b/ver/jp/asm/nonmatchings/EF00/func_800348BC.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_800348BC.s rename to ver/jp/asm/nonmatchings/EF00/func_800348BC.s diff --git a/ver/jp/asm/nonmatchings/main_EF00/func_80034C70.s b/ver/jp/asm/nonmatchings/EF00/func_80034C70.s similarity index 100% rename from ver/jp/asm/nonmatchings/main_EF00/func_80034C70.s rename to ver/jp/asm/nonmatchings/EF00/func_80034C70.s diff --git a/ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD70.s b/ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD70.s similarity index 100% rename from ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD70.s rename to ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD70.s diff --git a/ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD90.s b/ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD90.s similarity index 100% rename from ver/jp/asm/nonmatchings/os/nusys/code_3B150/func_8005FD90.s rename to ver/jp/asm/nonmatchings/os/nusys/3B150/func_8005FD90.s diff --git a/ver/jp/asm/nonmatchings/os/nusys/code_3B150/nuContRmbForceStop.s b/ver/jp/asm/nonmatchings/os/nusys/3B150/nuContRmbForceStop.s similarity index 100% rename from ver/jp/asm/nonmatchings/os/nusys/code_3B150/nuContRmbForceStop.s rename to ver/jp/asm/nonmatchings/os/nusys/3B150/nuContRmbForceStop.s diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml index 2791b26741..3594832a61 100644 --- a/ver/jp/splat.yaml +++ b/ver/jp/splat.yaml @@ -4,15 +4,23 @@ options: find_file_boundaries: True compiler: GCC mnemonic_ljust: 10 - ld_o_replace_extension: False - ld_addrs_header: build/include/ld_addrs.h - extensions: ../../tools/splat_ext - symbol_addrs_path: symbol_addrs.txt platform: n64 - out_dir: . - target_path: baserom.z64 - src_path: ../../src/jp - assets_dir: assets + + base_path: ../.. + target_path: ver/jp/baserom.z64 + extensions_path: tools/splat_ext + symbol_addrs_path: ver/jp/symbol_addrs.txt + ld_script_path: ver/jp/papermario.ld + linker_symbol_header_path: ver/jp/build/include/ld_addrs.h + src_path: src/jp + asm_path: ver/jp/asm + asset_path: assets/jp + build_path: ver/jp/build + cache_path: ver/jp/.splat_cache + undefined_funcs_auto_path: ver/jp/undefined_funcs_auto.txt + undefined_syms_auto_path: ver/jp/undefined_syms_auto.txt +asset_stack: + - jp segments: - name: header type: header @@ -23,7 +31,7 @@ segments: start: 0x1000 vram: 0x80025C00 subalign: 8 - subsections: + subsegments: - [0x1000, hasm, entry_point] - [0x1060, c] # 1060 (identical) - [0x1370, c] # 1370 @@ -86,7 +94,7 @@ segments: - [0x3AF40, c] - [0x3AFA0, c] - [0x3B040, c] - - [0x3B150, c, os/nusys/code_3B150] # 3b4a0 + - [0x3B150, c, os/nusys/3B150] # 3b4a0 - [0x3B2A0, c] - [0x3B400, c] - [0x3B420, c] diff --git a/ver/us/asm/data/code_1000_len_60.data.s b/ver/us/asm/data/1000_len_60.data.s similarity index 100% rename from ver/us/asm/data/code_1000_len_60.data.s rename to ver/us/asm/data/1000_len_60.data.s diff --git a/ver/us/asm/data/code_10A9F0.data.s b/ver/us/asm/data/10A9F0.data.s similarity index 100% rename from ver/us/asm/data/code_10A9F0.data.s rename to ver/us/asm/data/10A9F0.data.s diff --git a/ver/us/asm/data/code_10AAF0.data.s b/ver/us/asm/data/10AAF0.data.s similarity index 100% rename from ver/us/asm/data/code_10AAF0.data.s rename to ver/us/asm/data/10AAF0.data.s diff --git a/ver/us/asm/data/code_10B610.data.s b/ver/us/asm/data/10B610.data.s similarity index 100% rename from ver/us/asm/data/code_10B610.data.s rename to ver/us/asm/data/10B610.data.s diff --git a/ver/us/asm/data/10CC10.data.s b/ver/us/asm/data/10CC10.data.s new file mode 100644 index 0000000000..5c889f772e --- /dev/null +++ b/ver/us/asm/data/10CC10.data.s @@ -0,0 +1,90 @@ +.include "macro.inc" + +.section .data + +glabel D_802EB3D0 +.word 0x0B08080A, 0x09090904, 0x08080909, 0x0509050A, 0x09070909, 0x09090909, 0x09090505, 0x08090809, 0x0A090909, 0x09090909, 0x09070909, 0x09090909, 0x09090909, 0x09090909, 0x09090907, 0x09060709, 0x06090808, 0x09080808, 0x07040708, 0x04090807, 0x09080808, 0x08080809, 0x08080807, 0x03070A07, 0x09090909, 0x09090909, 0x09070707, 0x08090909, 0x09090909, 0x09090909, 0x09090908, 0x08080808, 0x06060607, 0x09070707, 0x08080808, 0x08060907, 0x0B0B0B0B, 0x0C0C0B0B, 0x0D0D0E0E, 0x0C0D0D0D, 0x0D100909, 0x05050000, D_802EE8D0, D_802EB3D0, 0x0A000000, D_802EE8D0, D_802EB3D0, 0x0AFE0000, D_802EE8D0, D_802EB3D0, 0x0A000000, D_802EE8D0, D_802EB3D0, 0x0A000000, 0x00000000, 0x00000000, 0x00000000, D_802EE8D0, D_802EB3D0, 0x09FE0000, D_802EE8D0, D_802EB3D0, 0x09000000, D_802EE8D0, D_802EB3D0, 0x09000000, D_802EE8D0, D_802EB3D0, 0x09000000, 0x00000000, 0x00000000, 0x00000000, 0x10100E10, 0x00800000, 0x802EB478, 0x10100E10, 0x00800000, 0x802EB4B4, 0x08080809, 0x08080808, 0x05080908, 0x0A080809, 0x08090808, 0x08080A09, 0x09080403, 0x04090909, 0x09090909, 0x0909090A, 0x0A000000, 0x09090808, 0x07070807, 0x03070707, 0x08070808, 0x08070708, 0x07070808, 0x08070403, 0x04080808, 0x08080808, 0x08080808, 0x08000000, D_802ED970, 0x802EB508, 0x0E000000, 0x00000000, 0x00000000, 0x00000000, D_802F39D0, 0x802EB534, 0x0A000000, 0x00000000, 0x00000000, 0x00000000, 0x0C0F0E10, 0x00600000, 0x802EB560, 0x0C0C0A0A, 0x00480000, 0x802EB578 + +glabel D_802EB5A8 +.word 0x802EB4F0, 0x802EB4FC, 0x802EB4FC, 0x802EB590, 0x802EB59C, 0x00000000 + +glabel D_802EB5C0 +.word 0x0000D178, 0x0000ED78, 0x00010978, 0x00012578, 0x00014178, 0x00015D78, 0x00017978, 0x00019578, 0x0001B178, 0x0001CD78, 0x0001E978, 0x00020578 + +glabel D_802EB5F0 +.word 0x0000EB78, 0x00010778, 0x00012378, 0x00013F78, 0x00015B78, 0x00017778, 0x00019378, 0x0001AF78, 0x0001CB78, 0x0001E778, 0x00020378, 0x00021F78 + +glabel D_802EB620 +.word 0x00000011, 0x00000012, 0x00000000, 0x00000017, 0x00000018, 0xFFFFFFCE, 0x0000001B, 0x0000001B, 0x00000000 + +glabel D_802EB644 +.short 0x0000, 0xFFFC, 0xFFFC, 0xFFFC, 0xFFFC, 0x0000, 0xFFFC, 0xFFFC, 0xFFFC, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFC, 0xFFFC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 + +glabel D_802EB670 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01111111, 0x00000000, 0x00000000, 0x00000111, 0x12233334, 0x00000000, 0x00000000, 0x00111233, 0x44444444, 0x00000000, 0x00000000, 0x11234444, 0x44444444, 0x00000000, 0x00000011, 0x23444444, 0x44444444, 0x00000000, 0x00000123, 0x44444444, 0x44444444, 0x00000000, 0x00011344, 0x44444444, 0x44444444, 0x00000000, 0x00123444, 0x44444444, 0x44444444, 0x00000000, 0x01244444, 0x44444444, 0x44444444, 0x00000000, 0x12444444, 0x44444444, 0x44444444, 0x00000001, 0x24444444, 0x44444444, 0x44444444, 0x00000012, 0x44444444, 0x44444444, 0x44444444, 0x00000013, 0x44444444, 0x44444444, 0x44444444, 0x00000134, 0x44444444, 0x44444444, 0x44444444, 0x00001244, 0x44444444, 0x44444444, 0x44444444, 0x00001344, 0x44444444, 0x44444444, 0x44444444, 0x00012444, 0x44444444, 0x44444444, 0x44444444, 0x00013444, 0x44444444, 0x44444444, 0x44444444, 0x00124444, 0x44444444, 0x44444444, 0x44444444, 0x00134444, 0x44444444, 0x44444444, 0x44444444, 0x01244444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x13444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x12444444, 0x44444444, 0x44444444, 0x44444444, 0x01444444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01344444, 0x44444444, 0x44444444, 0x44444444, 0x01244444, 0x44444444, 0x44444444, 0x44444444, 0x00134444, 0x44444444, 0x44444444, 0x44444444, 0x00124444, 0x44444444, 0x44444444, 0x44444444, 0x00013444, 0x44444444, 0x44444444, 0x44444444, 0x00012444, 0x44444444, 0x44444444, 0x44444444, 0x00001344, 0x44444444, 0x44444444, 0x44444444, 0x00001244, 0x44444444, 0x44444444, 0x44444444, 0x00000134, 0x44444444, 0x44444444, 0x44444444, 0x00000014, 0x44444444, 0x44444444, 0x44444444, 0x00000099, 0x44444444, 0x44444444, 0x44444444, 0x00000009, 0x34444444, 0x44444444, 0x44444444, 0x00000000, 0x88444444, 0x44444444, 0x44444444, 0x00000000, 0x08544444, 0x44444444, 0x44444444, 0x00000000, 0x00AA4444, 0x44444444, 0x44444444, 0x00000000, 0x000A7544, 0x44444444, 0x44444444, 0x00000000, 0x00000765, 0x44444444, 0x44444444, 0x00000000, 0x00000077, 0x65444444, 0x44444444, 0x00000000, 0x00000000, 0x77654444, 0x44444444, 0x00000000, 0x00000000, 0x00777655, 0x44444444, 0x00000000, 0x00000000, 0x00000777, 0x76655554, 0x00000000, 0x00000000, 0x00000000, 0x07777777, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_802EBA70 +.ascii "\0\0\0\0\0\0\0\0\0\0\0\0DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDwwww\0\0\0\0\0\0\0\0\0\0\0\0" + +glabel D_802EBB70 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111110, 0x00000000, 0x00000000, 0x00000000, 0x43333221, 0x11100000, 0x00000000, 0x00000000, 0x44444444, 0x33211100, 0x00000000, 0x00000000, 0x44444444, 0x44443211, 0x00000000, 0x00000000, 0x44444444, 0x44444432, 0x11000000, 0x00000000, 0x44444444, 0x44444444, 0x32100000, 0x00000000, 0x44444444, 0x44444444, 0x44319000, 0x00000000, 0x44444444, 0x44444444, 0x44449900, 0x00000000, 0x44444444, 0x44444444, 0x44444380, 0x00000000, 0x44444444, 0x44444444, 0x44444488, 0x00000000, 0x44444444, 0x44444444, 0x44444445, D_A0000000, 0x44444444, 0x44444444, 0x44444444, 0xAA000000, 0x44444444, 0x44444444, 0x44444444, 0x47000000, 0x44444444, 0x44444444, 0x44444444, 0x45700000, 0x44444444, 0x44444444, 0x44444444, 0x44670000, 0x44444444, 0x44444444, 0x44444444, 0x44570000, 0x44444444, 0x44444444, 0x44444444, 0x44467000, 0x44444444, 0x44444444, 0x44444444, 0x44457000, 0x44444444, 0x44444444, 0x44444444, 0x44446700, 0x44444444, 0x44444444, 0x44444444, 0x44445700, 0x44444444, 0x44444444, 0x44444444, 0x44444670, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444470, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444457, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444467, 0x44444444, 0x44444444, 0x44444444, 0x44444470, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444570, 0x44444444, 0x44444444, 0x44444444, 0x44444670, 0x44444444, 0x44444444, 0x44444444, 0x44445700, 0x44444444, 0x44444444, 0x44444444, 0x44446700, 0x44444444, 0x44444444, 0x44444444, 0x44457000, 0x44444444, 0x44444444, 0x44444444, 0x44467000, 0x44444444, 0x44444444, 0x44444444, 0x44570000, 0x44444444, 0x44444444, 0x44444444, 0x44670000, 0x44444444, 0x44444444, 0x44444444, 0x45700000, 0x44444444, 0x44444444, 0x44444444, 0x57000000, 0x44444444, 0x44444444, 0x44444444, 0x67000000, 0x44444444, 0x44444444, 0x44444446, 0x70000000, 0x44444444, 0x44444444, 0x44444467, 0x00000000, 0x44444444, 0x44444444, 0x44444670, 0x00000000, 0x44444444, 0x44444444, 0x44456700, 0x00000000, 0x44444444, 0x44444444, 0x44577000, 0x00000000, 0x44444444, 0x44444444, 0x56700000, 0x00000000, 0x44444444, 0x44444456, 0x77000000, 0x00000000, 0x44444444, 0x44445677, 0x00000000, 0x00000000, 0x44444444, 0x55677700, 0x00000000, 0x00000000, 0x45555667, 0x77700000, 0x00000000, 0x00000000, 0x77777770, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_802EBF70 +.word 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78444444, 0x44444870, 0x78888888, 0x88888870, 0x77777777, 0x77777770, 0x00000000, 0x00000000, 0x00000001, 0x00000112, 0x00011344, 0x00123444, 0x00134444, 0x01344444, 0x01444444, 0x12444444, 0x11111111, 0x33344444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x11111111, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x11111111, 0x44444333, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x10000000, 0x21100000, 0x44398000, 0x44449A00, 0x44444A00, 0x44444570, 0x44444470, 0x44444467, 0x13444444, 0x13444444, 0x13444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x44444457, 0x44444457, 0x44444457, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x14444444, 0x13444444, 0x13444444, 0x13444444, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444447, 0x44444457, 0x44444457, 0x44444457, 0x12444444, 0x01444444, 0x01344444, 0x00944444, 0x00894444, 0x000AA544, 0x00000776, 0x00000007, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x55544444, 0x77777777, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x77777777, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444555, 0x77777777, 0x44444467, 0x44444470, 0x44444570, 0x44445700, 0x44456700, 0x44577000, 0x67700000, 0x70000000, 0x00000008, 0x00000812, 0x00001245, 0x000145BB, 0x00146B00, 0x0825B000, 0x014B0000, 0x825B0000, 0x11111111, 0x33444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111111, 0x44444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x11111111, 0x44444444, 0xBBBBBBBB, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x21800000, 0x54210000, 0xBB541000, 0x00B64100, 0x000B5280, 0x0000B410, 0x0000B528, 0x13B00000, 0x13B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x00000B31, 0x00000B31, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x14B00000, 0x13B00000, 0x13B00000, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B41, 0x00000B31, 0x00000B31, 0x825B0000, 0x014B0000, 0x0825B000, 0x00146B00, 0x000145BB, 0x00001245, 0x00000812, 0x00000008, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x33444444, 0x11111111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x44444444, 0x11111111, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xBBBBBBBB, 0x44444433, 0x11111111, 0x0000B528, 0x0000B410, 0x000B5280, 0x00B64100, 0xBB541000, 0x54210000, 0x21800000, D_80000000 + +glabel D_802EC3F0 +.word 0x739EFFFF, 0xF7BBE739 + +glabel D_802EC3F8 +.short 0xDEF5, 0xC62F, 0x9CE5, 0x7BDD, 0xBDEF, 0xDEF7, 0x9CE5, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE73B, 0xDEF9, 0xD6B7, 0xCE75, 0xB5AF, 0x8C65, 0x6B5D, 0xAD6D, 0xCE75, 0x8C65, 0x631B, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF6F5, 0xF671, 0xF5AB, 0xCCE5, 0xAC61, 0x839B, 0xC5AD, 0xE6B5, 0xA4A3, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xD6BD, 0xC63F, 0xB5BF, 0x9CF5, 0x8C6B, 0x73A1, 0xB5B1, 0xD6B9, 0x94A9, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF7B3, 0xF7A9, 0xF75F, 0xCE1D, 0xA51D, 0x7BDB, 0xC62B, 0xE733, 0xA523, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE739, 0xF69F, 0x8B4F, 0xABCF, 0xB455, 0xD559, 0xABD1, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xE739, 0xF69F, 0xBC51, 0xA83F, 0xB455, 0xD559, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xE739, 0xF69F, 0x830D, 0xA83F, 0xB413, 0xD559, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x7A03, 0x4101, 0x0001, 0x739E, 0xFFFF, 0xF7BB, 0xE739, 0xDEF5, 0xC62F, 0x9CE5, 0x7BDD, 0xBDEF, 0xDEF7, 0x9CE5, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0x420F, 0x841D, 0xB5AB, 0xD6B3, 0xB5AB, 0x7BDD, 0x420F, 0x420F, 0x420F, 0x420F, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF739, 0xEEF7, 0xE673, 0xC56B, 0xAC61, 0x839B, 0xC5AD, 0xE6B5, 0xA4A3, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xE73D, 0xD6BB, 0xCE79, 0xAD71, 0x8C6B, 0x73A1, 0xB5B1, 0xD6B9, 0x94A9, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xFFFF, 0xF7B7, 0xEF73, 0xE72D, 0xC627, 0xA51F, 0x7BDB, 0xC62B, 0xE733, 0xA523, 0x739D, 0x0001, 0x0001, 0x0001, 0x0001, 0x739E, 0xE739, 0xE61D, 0x938F, 0xBC15, 0xC44F, 0xD557, 0xABD1, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001, 0x739E, 0xE739, 0xE61D, 0xAC53, 0xAC13, 0xC44F, 0xD557, 0xA38D, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001, 0x739E, 0xE739, 0xE61D, 0x9B4B, 0xA83F, 0xC44F, 0xCD17, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0xA83F, 0x8289, 0x4101, 0x0001 + +glabel D_802EC5F0 +.word 0x00006666, 0x66666666, 0x00666666, 0x66666666, 0x06666666, 0x66666666, 0x06666FEE, 0xEEEEEEEE, 0x6666EEEE, 0xBBBBBBBB, 0x666FEEBB, 0xBBAAAAAA, 0x666EEBBA, 0xAAAAAAAA, 0x666EEBAA, 0xCCCCCCCC, 0x666EBBAC, 0x23333333, 0x666EBAAC, 0x99CCC923, 0x666EBAAC, 0x2C11DC23, 0x666EBAAC, 0x9C12DD23, 0x666EBAAC, 0x2CDDDC32, 0x666EBAAC, 0x23CDC332, 0x666EBAAC, 0x22333332, 0x666EBBAC, 0x22333323 + +glabel D_802EC670 +.word 0x66666666, 0x66660000, 0x66666666, 0x66666600, 0x66666666, 0x66666770, 0xEEEEEEEE, 0xEEF67770, 0xBBBBBBBB, 0xEEEE7777, 0xBAAAAABB, 0xBBEEF777, 0xAAAAAAAA, 0xABBEE777, 0xCCCCCCCC, 0xCBBEE777, 0x33332992, 0xDABBE777, 0x3239CC39, 0xDABBE777, 0x22922DC2, 0xDAABE777, 0x32C22DD9, 0xDAABE777, 0x23CDDDC9, 0xDAABE777, 0x233CDC33, 0xDAABE777, 0x23333333, 0xDAABE777, 0x32333333, 0xDAABE777 + +glabel D_802EC6F0 +.word 0x666EBAAC, 0x39993332, 0x666EBAAC, 0x33939322, 0x666EBAAC, 0x39393322, 0x666EBAAC, 0x39CCC322, 0x666EBAAC, 0x9C11DC22, 0x666EBAAC, 0x3D22DD22, 0x666EBAAC, 0x3CDDDC22, 0x666EBBBC, 0x33CDC322, 0x666EEBBC, 0xDDDDDDDD, 0x666EEBBB, 0xAAAAAAAA, 0x666FEEBB, 0xBBAAAAAA, 0x6666EEEE, 0xBBBBBBBB, 0x06667FEE, 0xEEEEEEEE, 0x06677777, 0x77777777, 0x00777777, 0x77777777, 0x00007777, 0x77777777 + +glabel D_802EC770 +.word 0x22323322, 0xDAABE777, 0x2222232C, 0xDAABE777, 0x22CCCCCD, 0xAABBE777, 0x22CCDDDA, 0xAABBE777, 0x39CCDDBA, 0xAABBE777, 0x3CCDDEAA, 0xABBBE777, 0xCDDDEAAA, 0xAABBE777, 0xDDEAAAAA, 0xABBBE777, 0xBAAAAAAA, 0xABBBE777, 0xAAAABABB, 0xBBBBF777, 0xAAAAABBB, 0xBBBE7777, 0xBBBBBBBB, 0xBBEF7777, 0xEEEEEEEE, 0xEEF77770, 0x77777777, 0x77777770, 0x77777777, 0x77777700, 0x77777777, 0x77770000 + +glabel D_802EC7F0 +.word 0x22323322, 0xDAABF777, 0x22222322, 0xDAABF777, 0x229CCC92, 0xDABBF777, 0x22C11DC2, 0xDABBE777, 0x22C12DD2, 0xDABBE777, 0x22CDDDC2, 0xDBBBE777, 0x223CDC32, 0xDABBE777, 0x22222222, 0xDBBBE777, 0xBDDDDDDD, 0xDBBBE777, 0xAAAABABB, 0xBBBBF777, 0xAAAAABBB, 0xBBBE7777, 0xBBBBBBBB, 0xBBEF7777, 0xEEEEEEEE, 0xEEF77770, 0x77777777, 0x77777770, 0x77777777, 0x77777700, 0x77777777, 0x77770000 + +glabel D_802EC870 +.word 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0x66666666, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xAAAAAAAB, 0xBAAABBBB, 0xBBBAAAAA, 0xAABBBBBA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0xCCCCCCCC, 0x33339999, 0x99999993, 0x33399999, 0x99999333, 0x22332333, 0x33333333, 0x33333333, 0x33333332, 0x22222333, 0x33333333, 0x33222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222 + +glabel D_802EC970 +.word 0x666EBBAC, 0x22332323, 0x666EBBAC, 0x23323233, 0x666EBAAC, 0x23392322, 0x666EBAAC, 0x23323223, 0x666EBAAC, 0x23332222, 0x666EBAAC, 0x23323223, 0x666EBAAC, 0x39332222, 0x666EBAAC, 0x99323223, 0x666EBAAC, 0x99332329, 0x666EBAAC, 0x99323223, 0x666EBAAC, 0x99932322, 0x666EBAAC, 0x99933323, 0x666EBAAC, 0x99993232, 0x666EBBAC, 0x99933222, 0x666EBBBC, 0x99933322, 0x666EBBBC, 0x99933222, 0x666EBBBC, 0x99932322, 0x666EBBAC, 0x99932222, 0x666EBAAC, 0x99332222, 0x666EBAAC, 0x99333222, 0x666EBAAC, 0x99332222, 0x666EBAAC, 0x99333222, 0x666EBAAC, 0x99332223, 0x666EBAAC, 0x93332222, 0x666EBAAC, 0x93322322, 0x666EBAAC, 0x93332222, 0x666EBBAC, 0x93332322, 0x666EBBAC, 0x93333233, 0x666EBBAC, 0x93332323, 0x666EBBAC, 0x93333233, 0x666EBAAC, 0x93332323, 0x666EBAAC, 0x93333233, 0x666EBAAC, 0x99222322, 0x666EBAAC, 0x99933233, 0x666EBAAC, 0x99332322, 0x666EAAAC, 0x93333232, 0x666EAAAC, 0x93333332, 0x666EAAAC, 0x93333332, 0x666EBAAC, 0x33333332, 0x666EBAAC, 0x33333332 + +glabel D_802ECAB0 +.word 0x23333399, 0xDAABE777, 0x23333999, 0xDAABE777, 0x23339993, 0xDAABE777, 0x23339993, 0xDAABE777, 0x23339333, 0xDAABE777, 0x22332333, 0xDAABE777, 0x22332339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22223399, 0xDAABE777, 0x22222399, 0xDAABE777, 0x32222399, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x22332339, 0xDAABE777, 0x32333339, 0xDAABE777, 0x23333339, 0xDAABE777, 0x23333339, 0xDAABE777, 0x22333333, 0xDAABE777, 0x32232339, 0xDAABE777, 0x22333339, 0xDAABE777, 0x22233339, 0xDAABE777, 0x23232399, 0xDAABE777, 0x22323999, 0xDAABE777, 0x22222399, 0xDABBE777, 0x22223399, 0xDABBE777, 0x23222399, 0xDAABE777, 0x32323339, 0xDAABE777, 0x22222339, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23222333, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23222333, 0xDAABE777, 0x32323333, 0xDAABE777, 0x23232333, 0xDABBE777, 0x32323333, 0xDABBE777, 0x23232933, 0xDABBE777, 0x32323333, 0xDAABE777, 0x23232322, 0xDAABE777 + +glabel D_802ECBF0 +.word 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x32222222, 0x22222222, 0x22222222, 0x22222222, 0x32232222, 0x22222222, 0x22222222, 0x33339932, 0x33333333, 0x33333333, 0x22222222, 0x33333332, 0x93399999, 0x33333333, 0x22332322, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xDDDDDDDD, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAAAAAA, 0xAAAABBBB, 0xBAAABBBB, 0xBBAAAAAA, 0xABBAAAAA, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xBBBBBBBB, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0xEEEEEEEE, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777, 0x77777777 + +glabel D_802ECCF0 +.word 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222, 0x22222222 + +glabel D_802ECD10 +.word 0x7BDEBDAD, 0xCE2BC5E9, 0xF801F801, 0x51834143, 0xF801B565, 0xB459A3D3, 0x8C1B7353, 0x82CB6205 + +glabel D_802ECD30 +.word 0x7BDEBDAD, 0xCE2BC5E9, 0xF801F801, 0x218F210B, 0xF801B5E5, 0x2BDD2BDD, 0x5C1D2B59, 0x02D70211 + +glabel D_802ECD50 +.ascii "3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333DDD333333333333333333333333333343D3C3333333333333333334C3333333DC34D333333333333333333DD3333334DDDDDC33333333333333333C43333333DDDDD333333333333333333CD33333344333CC33333333333333333CC33333343DDD3C33333333333333333D4DC333344CD4CC333333334DD33333344DC333334CD4C3333333334343333334D4C333334DDDC3333333334343333334C3C333333DDD333333334CD343333334D4C333333333333333334DC34C333333DD3333333333333333334DC4DC333333343333333333333333333DC4DD333333343333333333333333333334D33333334D3333333333333333333333333333334D33333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333C3333333333333333333333333333333D3333333333333333333333333333333DD333333333333333333333333333333C43333333333333333333333333333DD333333333333333333333333333333DD3333333333333333333333333333334D333333333333333C3333333333333333333333333333434D34333333333333333333333333334CDDCD333333333333333333333333334DDDDD333333333333333333333333334D4D4D333333333333333333333333334D4D4D333333333333333333333333334DDDDD333333333333333333333333333DDDDC3333333333333333333333333334DDD333333333333333333333333333D33C34C33333333333333333333333334DCCDD333333333333333333333333333DDDDC33333333333C3333333333333333333333333333334D3333333333333333333333333333334D333333333333333333333333333333DDC3333333DDD33333333333333333DDDDDDC33333D34333333333333333334DCCDD333333C34333333333333333333DCCDC333333C34C333333333333333334DDD3333333C33D3333333D3333333334DDD3333333C3DD3333333DC33333333DDDDC33334DC3DD3333333C433333333DC3DC33334DC3333333333C3C3333334C333D33333D33333333334C4C3333333333333333333333333334D3433333333333333333333333333334D3433333333333333333333333333333D4D3333333333333333333333333333334D3333333333333333333333333333334C3333333333333333333333333333333333333333333333333333333333333333333" + +glabel D_802ED550 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x05000000, 0x00000000, 0x00000000, 0x55500000, 0x00000000, 0x00000005, 0x52550000, 0x00000000, 0x00000055, 0x21255000, 0x00000000, 0x00000552, 0x11125500, 0x00000000, 0x00005521, 0x11112550, 0x00000000, 0x00005555, 0x11155550, 0x00000000, 0x00000055, 0x11155005, 0x55500000, 0x00000055, 0x11155055, 0x55550000, 0x00000055, 0x11155055, 0x11550000, 0x00000055, 0x11155555, 0x11550000, 0x00000055, 0x31135553, 0x12550000, 0x00000055, 0x42112221, 0x14550000, 0x00000005, 0x54311113, 0x45500000, 0x00000005, 0x55555555, 0x55000000, 0x00000000, 0x05555555, 0x50000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_802ED670 +.word 0x294AE729, 0xC623AD61, 0x84194209, 0x00010001, 0x00010001, 0x00010001, 0x00010001, 0x00010001 + +glabel D_802ED690 +.word 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C79BCB, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9BCBDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0xC553DE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C79BCB, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7C553, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9BCBB44B, 0xC553C553, 0xDE55DE9B, 0xDE9BDE9B, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0xB44BDDCF, 0xDDCFDE55, 0xDE55DE55, 0xDE55DE55, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xD549D549, 0xDDCFDDCF, 0xDDCFDE55, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x9B87CC87, 0xD549D549, 0xD549D549, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xCC87CC87, 0xCC87CC87, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7A3C7, 0xBC45BC45, 0xBC05BC05, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7B44B, 0xBC45BC45, 0xBC05BC05, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C7BC05, 0xBC05B3C5, 0xB3C5B3C5, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B07B3C5, 0xB3C5B3C5, 0x9B878B07, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B07B3C5, 0xA3C78B07, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x8B079B87, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7, 0x82C782C7 + +glabel D_802ED8D0 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0x0000004F, 0x00000000, 0x000000CF, 0x00000000, 0x000003FF, 0x00000000, 0x00000BFF, 0x00000000, 0x69BDEFFF, 0x00000000, 0xAFFFFFFF, 0x00000000, 0x08FFFFFF, 0x00000000, 0x006FFFFF, 0x00000000, 0x0009FFFF, 0x00000000, 0x0009FFFF, 0x00000000, 0x000EFFFF, 0x00000000, 0x000FFFFF, 0x00000000, 0x002FFFC6, 0x00000000, 0x004FE500, 0x00000000, 0x00280000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_16A3E0.data.s b/ver/us/asm/data/16A3E0.data.s similarity index 100% rename from ver/us/asm/data/code_16A3E0.data.s rename to ver/us/asm/data/16A3E0.data.s diff --git a/ver/us/asm/data/code_1AF2D0.data.s b/ver/us/asm/data/1AF2D0.data.s similarity index 100% rename from ver/us/asm/data/code_1AF2D0.data.s rename to ver/us/asm/data/1AF2D0.data.s diff --git a/ver/us/asm/data/code_26840_len_20d0.data.s b/ver/us/asm/data/26840_len_20d0.data.s similarity index 100% rename from ver/us/asm/data/code_26840_len_20d0.data.s rename to ver/us/asm/data/26840_len_20d0.data.s diff --git a/ver/us/asm/data/code_52D80.data.s b/ver/us/asm/data/52D80.data.s similarity index 100% rename from ver/us/asm/data/code_52D80.data.s rename to ver/us/asm/data/52D80.data.s diff --git a/ver/us/asm/data/code_542E0.data.s b/ver/us/asm/data/542E0.data.s similarity index 100% rename from ver/us/asm/data/code_542E0.data.s rename to ver/us/asm/data/542E0.data.s diff --git a/ver/us/asm/data/code_6240_len_c00.data.s b/ver/us/asm/data/6240_len_c00.data.s similarity index 100% rename from ver/us/asm/data/code_6240_len_c00.data.s rename to ver/us/asm/data/6240_len_c00.data.s diff --git a/ver/us/asm/data/code_6EAC0.data.s b/ver/us/asm/data/6EAC0.data.s similarity index 100% rename from ver/us/asm/data/code_6EAC0.data.s rename to ver/us/asm/data/6EAC0.data.s diff --git a/ver/us/asm/data/code_6FA70.data.s b/ver/us/asm/data/6FA70.data.s similarity index 100% rename from ver/us/asm/data/code_6FA70.data.s rename to ver/us/asm/data/6FA70.data.s diff --git a/ver/us/asm/data/code_71430.data.s b/ver/us/asm/data/71430.data.s similarity index 100% rename from ver/us/asm/data/code_71430.data.s rename to ver/us/asm/data/71430.data.s diff --git a/ver/us/asm/data/code_917F8.data.s b/ver/us/asm/data/917F8.data.s similarity index 100% rename from ver/us/asm/data/code_917F8.data.s rename to ver/us/asm/data/917F8.data.s diff --git a/ver/us/asm/data/code_93FF0.data.s b/ver/us/asm/data/93FF0.data.s similarity index 100% rename from ver/us/asm/data/code_93FF0.data.s rename to ver/us/asm/data/93FF0.data.s diff --git a/ver/us/asm/data/code_9DA58.data.s b/ver/us/asm/data/9DA58.data.s similarity index 100% rename from ver/us/asm/data/code_9DA58.data.s rename to ver/us/asm/data/9DA58.data.s diff --git a/ver/us/asm/data/code_9DE60.data.s b/ver/us/asm/data/9DE60.data.s similarity index 100% rename from ver/us/asm/data/code_9DE60.data.s rename to ver/us/asm/data/9DE60.data.s diff --git a/ver/us/asm/data/code_E20B30.data.s b/ver/us/asm/data/E20B30.data.s similarity index 100% rename from ver/us/asm/data/code_E20B30.data.s rename to ver/us/asm/data/E20B30.data.s diff --git a/ver/us/asm/data/code_E215C0.data.s b/ver/us/asm/data/E215C0.data.s similarity index 100% rename from ver/us/asm/data/code_E215C0.data.s rename to ver/us/asm/data/E215C0.data.s diff --git a/ver/us/asm/data/code_E21EB0.data.s b/ver/us/asm/data/E21EB0.data.s similarity index 100% rename from ver/us/asm/data/code_E21EB0.data.s rename to ver/us/asm/data/E21EB0.data.s diff --git a/ver/us/asm/data/code_E22B30.data.s b/ver/us/asm/data/E22B30.data.s similarity index 100% rename from ver/us/asm/data/code_E22B30.data.s rename to ver/us/asm/data/E22B30.data.s diff --git a/ver/us/asm/data/code_E23690.data.s b/ver/us/asm/data/E23690.data.s similarity index 100% rename from ver/us/asm/data/code_E23690.data.s rename to ver/us/asm/data/E23690.data.s diff --git a/ver/us/asm/data/code_E23FF0.data.s b/ver/us/asm/data/E23FF0.data.s similarity index 100% rename from ver/us/asm/data/code_E23FF0.data.s rename to ver/us/asm/data/E23FF0.data.s diff --git a/ver/us/asm/data/code_E248D0.data.s b/ver/us/asm/data/E248D0.data.s similarity index 100% rename from ver/us/asm/data/code_E248D0.data.s rename to ver/us/asm/data/E248D0.data.s diff --git a/ver/us/asm/data/code_E25C80.data.s b/ver/us/asm/data/E25C80.data.s similarity index 100% rename from ver/us/asm/data/code_E25C80.data.s rename to ver/us/asm/data/E25C80.data.s diff --git a/ver/us/asm/data/code_E2A690.data.s b/ver/us/asm/data/E2A690.data.s similarity index 100% rename from ver/us/asm/data/code_E2A690.data.s rename to ver/us/asm/data/E2A690.data.s diff --git a/ver/us/asm/data/code_E2B420.data.s b/ver/us/asm/data/E2B420.data.s similarity index 100% rename from ver/us/asm/data/code_E2B420.data.s rename to ver/us/asm/data/E2B420.data.s diff --git a/ver/us/asm/data/code_EA3A80.data.s b/ver/us/asm/data/EA3A80.data.s similarity index 70% rename from ver/us/asm/data/code_EA3A80.data.s rename to ver/us/asm/data/EA3A80.data.s index ae60acec2e..b3783cb4b5 100644 --- a/ver/us/asm/data/code_EA3A80.data.s +++ b/ver/us/asm/data/EA3A80.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80243180_EA3A80 -.word 0xC4278000, 0x00000000, 0x43200000, 0x42B40000, 0x441B0000, 0x00000000, 0x41F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802435B4, D_80243180_EA3A80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019010E, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EA0900_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EA0900_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802431E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802431E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246470, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246478, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802434B4, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243510, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000B, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x802458F0, 0x00000046, 0x00000001, 0x8024380C, 0x00000024, 0x00000002, 0xFE363C80, 0x8024356C, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000044, 0x00000001, 0x80245DC8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000044, 0x00000001, 0x8024327C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000044, 0x00000001, 0x80243398, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010000, 0x00000024, 0x00000002, 0xF84060A4, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A5, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A7, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A8, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060AA, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A4, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFF3D, 0x00000032, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024372C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A5, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFF0B, 0x0000003C, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024374C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A6, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFED9, 0x00000046, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024376C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A7, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFEA7, 0x00000050, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024378C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A8, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFE75, 0x0000005A, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802437AC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFE43, 0x00000064, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802437CC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFE11, 0x0000006E, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802437EC, 0x00000013, 0x00000000, 0x00000043, 0x00000008, bMarioDefenseTable, 0x00000000, 0x0000001D, 0x00000002, 0xFFFFFF89, 0xFFFFFFFD, 0x00000005, 0x00000000, 0x00000043, 0x00000005, 0x8028364C, 0x00000000, 0x0000001C, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, 0x800499B0, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000009, 0x00000009, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, 0x8004930C, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, 0x8004930C, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241AE0_EA23E0, 0x80243B68, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80243B98, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, 0x8004930C, 0x00000004, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_802406CC_EA0FCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800486A0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, 0x800497E4, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800990BC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80243C98, 0x00000000, 0x00000000, 0x80243AAC, 0x00000000, 0x00000000, 0x00110000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243DD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243E70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000008, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000006, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80242568_EA2E68, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, func_802425B0_EA2EB0, 0x00000043, 0x00000002, 0x80049630, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, func_80242608_EA2F08, 0x00000043, 0x00000002, 0x80049630, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243DD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243E00, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243FB0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243EA0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80243F40, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00190000 +.word 0xC4278000, 0x00000000, 0x43200000, 0x42B40000, 0x441B0000, 0x00000000, 0x41F00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802435B4, D_80243180_EA3A80, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0019010E, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA0900_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA0900_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802431E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802431E0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246470, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246478, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802434B4, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80243510, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000B, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x802458F0, 0x00000046, 0x00000001, 0x8024380C, 0x00000024, 0x00000002, 0xFE363C80, 0x8024356C, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000044, 0x00000001, 0x80245DC8, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002A, 0x00000044, 0x00000001, 0x8024327C, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002B, 0x00000044, 0x00000001, 0x80243398, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x01010000, 0x00000024, 0x00000002, 0xF84060A4, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A5, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A7, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A8, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060A9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060AA, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A4, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFF3D, 0x00000032, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024372C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A5, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFF0B, 0x0000003C, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024374C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A6, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFED9, 0x00000046, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024376C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A7, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFEA7, 0x00000050, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x8024378C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A8, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFE75, 0x0000005A, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802437AC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060A9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFE43, 0x00000064, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802437CC, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF84060AA, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F86DC, 0xFFFFFE11, 0x0000006E, 0x0000001B, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802437EC, 0x00000013, 0x00000000, 0x00000043, 0x00000008, bMarioDefenseTable, 0x00000000, 0x0000001D, 0x00000002, 0xFFFFFF89, 0xFFFFFFFD, 0x00000005, 0x00000000, 0x00000043, 0x00000005, 0x8028364C, 0x00000000, 0x0000001C, 0x00000001, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, 0x800499B0, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x43160000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000008, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000009, 0x00000009, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x0000000C, 0x00000043, 0x00000003, 0x8004930C, 0x0000000B, 0x00000007, 0x00000043, 0x00000003, 0x8004930C, 0x0000000C, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x0000000D, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x0000000E, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x0000000F, 0x00000043, 0x00000002, func_80241AE0_EA23E0, 0x80243B68, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00320024, 0x00000000, 0x00000000, 0x80243B98, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000, 0x00000043, 0x00000003, 0x802DC7C8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x0000000E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x0000001C, 0x00000043, 0x00000003, 0x8004930C, 0x00000004, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x0000000F, 0x000020DE, 0x00000043, 0x00000001, func_802406CC_EA0FCC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800486A0, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x0000001D, 0x00000001, 0x00000002, 0x0000001D, 0x00000001, 0x00000004, 0x0000001D, 0x00000001, 0x00000006, 0x00000043, 0x00000003, 0x800497E4, 0x00000007, 0xFE363C80, 0x00000046, 0x00000001, 0x800990BC, 0x00000020, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0014001C, 0x00000000, 0x00000000, 0x80243C98, 0x00000000, 0x00000000, 0x80243AAC, 0x00000000, 0x00000000, 0x00110000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40900000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243DD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x0000003C, 0x0000003C, 0x42B40000, 0x42200000, 0x00000001, 0x40E00000, 0x00000000, 0x00000000, 0x42C80000, 0x42200000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x0000000A, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000004, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000003, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243E70, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x00000014, 0x00000005, 0x42F00000, 0x00000000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x43160000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000008, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000006, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000006, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243F10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80242568_EA2E68, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x0033000F, 0x00000043, 0x00000001, func_802425B0_EA2EB0, 0x00000043, 0x00000002, 0x80049630, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000200, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00330000, 0x00000043, 0x00000001, func_80242608_EA2F08, 0x00000043, 0x00000002, 0x80049630, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000002, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000005, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000002, 0x00000043, 0x00000002, func_802420FC_EA29FC, 0x80243DD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243E00, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243FB0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x000A0000, 0x00000000, 0x00140016, 0x00000000, 0x00000000, 0x80243EA0, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00110000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x80243F40, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00190000 glabel D_80244154_EA4A54 .word 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 diff --git a/ver/us/asm/data/code_EA7390.data.s b/ver/us/asm/data/EA7390.data.s similarity index 100% rename from ver/us/asm/data/code_EA7390.data.s rename to ver/us/asm/data/EA7390.data.s diff --git a/ver/us/asm/data/code_EAA810.data.s b/ver/us/asm/data/EAA810.data.s similarity index 72% rename from ver/us/asm/data/code_EAA810.data.s rename to ver/us/asm/data/EAA810.data.s index 4580d79365..020e05a438 100644 --- a/ver/us/asm/data/code_EAA810.data.s +++ b/ver/us/asm/data/EAA810.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80241D30_EAA810 -.word 0xC3D98000, 0x437A0000, 0xC3AF0000, 0x42B40000, 0xC3F50000, 0x41C80000, 0xC1F00000, 0x42B40000, 0x43DC0000, 0x41C80000, 0xC2480000, 0x43870000, 0x43DC0000, 0x41C80000, 0xC2480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242C48, D_80241D30_EAA810, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190111, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EA8AE0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EA8AE0_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D9578, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, 0x802D94E8, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_80240358_EA8E38, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802404B8_EA8F98, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x80000067, 0x00000043, 0x00000001, func_8024030C_EA8DEC, 0x00000043, 0x00000002, 0x802E3908, 0x80000067, 0x00000043, 0x00000006, 0x802E382C, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, 0x802E382C, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_80240908_EA93E8, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240A14_EA94F4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000003, 0x00000043, 0x00000003, 0x802E0324, 0x00000138, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802D78CC, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x8024835C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x8024835C, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80248364, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024263C, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242698, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802426F4, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0x00000032, 0x00000002, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6480, 0x00000026, 0x0000000E, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000190, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000028, 0x0000000C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x000000B4, 0x00000000, 0x00000028, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000D, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80247DDC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80247DB8, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802482C0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000046, 0x00000001, 0x80244C78, 0x00000044, 0x00000001, 0x80242750, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242750, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000019, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x802427B4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000044, 0x00000001, 0x80241F2C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000044, 0x00000001, 0x80242048, 0x00000044, 0x00000001, 0x80241DB0, 0x00000044, 0x00000001, 0x80242AD0, 0x00000044, 0x00000001, 0x80248068, 0x00000044, 0x00000001, 0x80242164, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x80243040, 0x00000000, 0x10460000, 0x42CC0000, 0x42C60000, 0xC1200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x2B020000, 0x43090000, 0x42BC0000, 0xC1200000, 0x80243040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0xEAD80000, 0x42FE0000, 0x42600000, 0xC1200000, 0x8024306C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0xF1C80000, 0x42D40000, 0x41B80000, 0xC1200000, 0x80243098, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x15550000, 0x42F40000, 0xC1500000, 0xC1200000, 0x802430C4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x52350000, 0x42F00000, 0x42D80000, 0xC1300000, 0x802430F0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x0AEC0000, 0x430C0000, 0x42920000, 0xC1300000, 0x8024311C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0xE0170000, 0x42E00000, 0x42280000, 0xC1300000, 0x80243148, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x038E0000, 0x42DC0000, 0x40400000, 0xC1300000, 0x80243174, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802431A0, 0x00000000, 0x00000000, 0x00000000, 0x802431CC, 0x802431A0, 0x80243174, 0x80243148, 0x8024311C, 0x802430F0, 0x802430C4, 0x80243098, 0x8024306C, 0x80243040, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x32DC0000, 0x42780000, 0x42540000, 0xC1A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x330B0000, 0x42C20000, 0x424C0000, 0xC1A00000, 0x80243228, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0xD8720000, 0x42960000, 0x41980000, 0xC1A00000, 0x80243254, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x007A0000, 0x428A0000, 0xC1980000, 0xC1A00000, 0x80243280, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x60570000, 0x42980000, 0x42780000, 0xC1A80000, 0x802432AC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x05BE0000, 0x42C00000, 0x41E00000, 0xC1A80000, 0x802432D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0xEB250000, 0x42860000, 0x00000000, 0xC1A80000, 0x80243304, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243330, 0x00000000, 0x00000000, 0x00000000, 0x8024335C, 0x80243330, 0x80243304, 0x802432D8, 0x802432AC, 0x80243280, 0x80243254, 0x80243228, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0x75710000, 0x43040000, 0xC0A00000, 0xC0A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0xC7070000, 0x42C40000, 0x40800000, 0xC0A00000, 0x802433B0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0x59000000, 0x43010000, 0xC1D00000, 0xC0C00000, 0x802433DC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0x91CB0000, 0x42F00000, 0x41400000, 0xC0C00000, 0x80243408, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0xE3BC0000, 0x42AE0000, 0xC1500000, 0xC0C00000, 0x80243434, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243460, 0x00000000, 0x00000000, 0x00000000, 0x8024348C, 0x80243460, 0x80243434, 0x80243408, 0x802433DC, 0x802433B0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x11000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x21100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, 0x22100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000112, 0x22110000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000122, 0x22210000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001122, 0x22211000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001222, 0x22221000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x33333333, 0x33311222, 0x22221133, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33312222, 0x22222133, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33112222, 0x22222113, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x31122222, 0x22222113, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33122222, 0x22222133, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33112222, 0x22221133, 0x33333333, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00012222, 0x22221000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00011222, 0x22211000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001222, 0x22210000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001122, 0x22110000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000122, 0x22100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000112, 0x21100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x11000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x014041C1, 0xE7390241, 0x044F0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3D98000, 0x437A0000, 0xC3AF0000, 0x42B40000, 0xC3F50000, 0x41C80000, 0xC1F00000, 0x42B40000, 0x43DC0000, 0x41C80000, 0xC2480000, 0x43870000, 0x43DC0000, 0x41C80000, 0xC2480000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242C48, D_80241D30_EAA810, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190111, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000001F4, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000001B, 0x00000001, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000023, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EA8AE0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EA8AE0_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000016, 0x00000001, 0x00000022, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000023, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x0000001C, 0x00000000, 0x00000002, 0x00000000, 0x00000023, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7C43, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000043, 0x00000003, 0x802D9578, 0x00000000, 0xFE363C81, 0x00000028, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x0000000B, 0x00000002, 0x00002710, 0x00002710, 0x00000043, 0x00000004, 0x802D94E8, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xFE363C82, 0x00002710, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x0000000B, func_80240358_EA8E38, 0x00000004, 0x000000B4, 0x00000130, 0x0000000F, 0xFFFFFFCA, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000037, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_802404B8_EA8F98, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802E37A0, 0x80000067, 0x00000043, 0x00000001, func_8024030C_EA8DEC, 0x00000043, 0x00000002, 0x802E3908, 0x80000067, 0x00000043, 0x00000006, 0x802E382C, 0x000000B2, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x000000B4, 0x00000008, 0x00000001, 0x00000073, 0x00000043, 0x00000006, 0x802E382C, 0x00000137, 0x00000000, 0x000000B9, 0x0000006E, 0xFFFFFFE2, 0x00000057, 0x00000000, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xFE363C81, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x000000B9, 0x00000019, 0xFFFFFFE2, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, func_80240908_EA93E8, 0x00000004, 0x000000B9, 0x00000037, 0xFFFFFFE2, 0x00000019, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240A14_EA94F4, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, func_802408C8_EA93A8, 0x00000003, 0x00000043, 0x00000003, 0x802E0324, 0x00000138, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000004, 0x802D78CC, 0x80248354, 0x00000004, 0x0000000E, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x8024835C, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x8024835C, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000002, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80248364, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024263C, 0x00080000, 0x00000006, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242698, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802426F4, 0x00080000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0x00000032, 0x00000002, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6480, 0x00000026, 0x0000000E, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000190, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE0C, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E90, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000008, 0x00000001, 0x00000006, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00008000, 0x00000008, 0x00000001, 0x00000004, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000028, 0x0000000C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x000000B4, 0x00000000, 0x00000028, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7E1A, 0x00000043, 0x00000005, 0x802D6208, 0x00000032, 0x00000001, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000D, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80247DDC, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80247DB8, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802482C0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000046, 0x00000001, 0x80244C78, 0x00000044, 0x00000001, 0x80242750, 0x00000057, 0x00000000, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80242750, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002E, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000040, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000002E, 0x7FFFFE00, 0x00000019, 0x00000001, 0x00000023, 0x00000043, 0x00000003, 0x802D7044, 0x0000002B, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000030, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000029, 0x7FFFFE00, 0x00000023, 0x00000000, 0x00000044, 0x00000001, 0x802427B4, 0x00000024, 0x00000002, 0xFE363C80, 0x00000022, 0x00000044, 0x00000001, 0x80241F2C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000023, 0x00000044, 0x00000001, 0x80242048, 0x00000044, 0x00000001, 0x80241DB0, 0x00000044, 0x00000001, 0x80242AD0, 0x00000044, 0x00000001, 0x80248068, 0x00000044, 0x00000001, 0x80242164, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x80243040, 0x00000000, 0x10460000, 0x42CC0000, 0x42C60000, 0xC1200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x2B020000, 0x43090000, 0x42BC0000, 0xC1200000, 0x80243040, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0xEAD80000, 0x42FE0000, 0x42600000, 0xC1200000, 0x8024306C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0xF1C80000, 0x42D40000, 0x41B80000, 0xC1200000, 0x80243098, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x15550000, 0x42F40000, 0xC1500000, 0xC1200000, 0x802430C4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x52350000, 0x42F00000, 0x42D80000, 0xC1300000, 0x802430F0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x0AEC0000, 0x430C0000, 0x42920000, 0xC1300000, 0x8024311C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0xE0170000, 0x42E00000, 0x42280000, 0xC1300000, 0x80243148, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243040, 0x00000000, 0x038E0000, 0x42DC0000, 0x40400000, 0xC1300000, 0x80243174, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802431A0, 0x00000000, 0x00000000, 0x00000000, 0x802431CC, 0x802431A0, 0x80243174, 0x80243148, 0x8024311C, 0x802430F0, 0x802430C4, 0x80243098, 0x8024306C, 0x80243040, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x32DC0000, 0x42780000, 0x42540000, 0xC1A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x330B0000, 0x42C20000, 0x424C0000, 0xC1A00000, 0x80243228, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0xD8720000, 0x42960000, 0x41980000, 0xC1A00000, 0x80243254, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x007A0000, 0x428A0000, 0xC1980000, 0xC1A00000, 0x80243280, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x60570000, 0x42980000, 0x42780000, 0xC1A80000, 0x802432AC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0x05BE0000, 0x42C00000, 0x41E00000, 0xC1A80000, 0x802432D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243228, 0x00000000, 0xEB250000, 0x42860000, 0x00000000, 0xC1A80000, 0x80243304, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243330, 0x00000000, 0x00000000, 0x00000000, 0x8024335C, 0x80243330, 0x80243304, 0x802432D8, 0x802432AC, 0x80243280, 0x80243254, 0x80243228, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0x75710000, 0x43040000, 0xC0A00000, 0xC0A00000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0xC7070000, 0x42C40000, 0x40800000, 0xC0A00000, 0x802433B0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0x59000000, 0x43010000, 0xC1D00000, 0xC0C00000, 0x802433DC, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0x91CB0000, 0x42F00000, 0x41400000, 0xC0C00000, 0x80243408, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802433B0, 0x00000000, 0xE3BC0000, 0x42AE0000, 0xC1500000, 0xC0C00000, 0x80243434, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80243460, 0x00000000, 0x00000000, 0x00000000, 0x8024348C, 0x80243460, 0x80243434, 0x80243408, 0x802433DC, 0x802433B0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x11000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x21100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000012, 0x22100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000112, 0x22110000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000122, 0x22210000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001122, 0x22211000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001222, 0x22221000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x33333333, 0x33311222, 0x22221133, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33312222, 0x22222133, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33112222, 0x22222113, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x44444444, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x31122222, 0x22222113, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33122222, 0x22222133, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33333333, 0x33112222, 0x22221133, 0x33333333, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00012222, 0x22221000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00011222, 0x22211000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001222, 0x22210000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001122, 0x22110000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000122, 0x22100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000112, 0x21100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x11000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x014041C1, 0xE7390241, 0x044F0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 glabel D_80243AD8_EAC5B8 .word 0xE7000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE3000A01, 0x00000000, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xE200001C, 0x00551238, 0xFC30FE61, 0xFFFFF3F9, 0xFA000000, 0xFFA0A000, 0xE3001001, 0x00008000, 0xFD100000, 0x802438D8, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xFD48001F, 0x802434D8, 0xF5480800, 0x07094060, 0xE6000000, 0x00000000, 0xF4000000, 0x0707E07C, 0xE7000000, 0x00000000, 0xF5400800, 0x00094060, 0xF2000000, 0x000FC07C, 0xD9000000, 0x00000000, 0xD9FFFFFF, 0x00000005, 0xDF000000, 0x00000000 diff --git a/ver/us/asm/data/code_EB1920.data.s b/ver/us/asm/data/EB1920.data.s similarity index 79% rename from ver/us/asm/data/code_EB1920.data.s rename to ver/us/asm/data/EB1920.data.s index b0fdb3751a..6285a5875d 100644 --- a/ver/us/asm/data/code_EB1920.data.s +++ b/ver/us/asm/data/EB1920.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80240AC0_EB1920 -.word 0xC3360000, 0x00000000, 0x42100000, 0x42B40000, 0x43240000, 0x43160000, 0x41A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241548, D_80240AC0_EB1920, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190112, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EB0E60_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EB0E60_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802442C0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802442C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240C6C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240CC8, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFD44, 0x00000024, 0x00000002, 0xFE363C82, 0x000002BC, 0x00000024, 0x00000002, 0xFE363C83, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80240BD0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000017, 0xC1F00000, 0x42FA0000, 0xC1700000, 0x00000013, 0x41F00000, 0x43160000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000003, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFD050F8A, 0x0000006E, 0x0000002D, 0x00000002, 0xFD050F8B, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFD050F8C, 0xF24A7A8B, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A7D80, 0x00000008, 0x00000001, 0x00000009, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802D6400, 0x00000026, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000017, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, 0x802D6708, 0x00000026, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D75C0, 0x0000001C, 0x00000026, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF971888B, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000026, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80240E88, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000026, 0x00000002, 0xFD050F8A, 0x00000023, 0x00000026, 0x00000002, 0xFD050F8B, 0xF24A7F4D, 0x00000026, 0x00000002, 0xFD050F8C, 0xF24A75B4, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFD050F8A, 0x0000006E, 0x00000026, 0x00000002, 0xFD050F8B, 0xF24A7E80, 0x00000026, 0x00000002, 0xFD050F8C, 0xF24A7680, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240EB8, 0x00000044, 0x00000001, 0x80240F90, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000104, 0x0000001E, 0x0000000C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F8A, 0x00000026, 0x00000002, 0xFE363C84, 0xFD050F8A, 0x0000002F, 0x00000002, 0xFE363C83, 0xFD050F8C, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0x00000001, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000104, 0x00000000, 0x0000003C, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F8A, 0x00000026, 0x00000002, 0xFE363C84, 0xFD050F8A, 0x0000002F, 0x00000002, 0xFE363C83, 0xFD050F8C, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0x00000001, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x432F0000, 0x43160000, 0x41700000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000E, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80244294, 0x00000024, 0x00000002, 0xFE363C80, 0x80240D24, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242250, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000000, 0x00000047, 0x00000005, 0x8024149C, 0x00100000, 0x8024148C, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240B20, 0x00000044, 0x00000001, 0x8024106C, 0x00000044, 0x00000001, 0x80240D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 +.word 0xC3360000, 0x00000000, 0x42100000, 0x42B40000, 0x43240000, 0x43160000, 0x41A00000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241548, D_80240AC0_EB1920, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190112, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000029, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000007, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000004, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB0E60_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB0E60_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802442C0, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802442C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240C6C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240CC8, 0x00080000, 0x00000002, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFD44, 0x00000024, 0x00000002, 0xFE363C82, 0x000002BC, 0x00000024, 0x00000002, 0xFE363C83, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80240BD0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000017, 0xC1F00000, 0x42FA0000, 0xC1700000, 0x00000013, 0x41F00000, 0x43160000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000003, 0x00000001, 0x00000001, 0x0000000C, 0x00000002, 0xFD050F8A, 0x0000006E, 0x0000002D, 0x00000002, 0xFD050F8B, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFD050F8C, 0xF24A7A8B, 0x00000005, 0x00000001, 0x00000005, 0x0000002C, 0x00000002, 0xFD050F8A, 0xF24A7D80, 0x00000008, 0x00000001, 0x00000009, 0x00000006, 0x00000000, 0x00000012, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802D6400, 0x00000026, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000017, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, 0x802D6708, 0x00000026, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D75C0, 0x0000001C, 0x00000026, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF971888B, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000026, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000001C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80240E88, 0x00000057, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000026, 0x00000002, 0xFD050F8A, 0x00000023, 0x00000026, 0x00000002, 0xFD050F8B, 0xF24A7F4D, 0x00000026, 0x00000002, 0xFD050F8C, 0xF24A75B4, 0x00000012, 0x00000000, 0x00000026, 0x00000002, 0xFD050F8A, 0x0000006E, 0x00000026, 0x00000002, 0xFD050F8B, 0xF24A7E80, 0x00000026, 0x00000002, 0xFD050F8C, 0xF24A7680, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240EB8, 0x00000044, 0x00000001, 0x80240F90, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000104, 0x0000001E, 0x0000000C, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F8A, 0x00000026, 0x00000002, 0xFE363C84, 0xFD050F8A, 0x0000002F, 0x00000002, 0xFE363C83, 0xFD050F8C, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0x00000001, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000104, 0x00000000, 0x0000003C, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000002D, 0x00000002, 0xFE363C80, 0xFD050F8B, 0x00000026, 0x00000002, 0xFE363C83, 0xFD050F8A, 0x00000026, 0x00000002, 0xFE363C84, 0xFD050F8A, 0x0000002F, 0x00000002, 0xFE363C83, 0xFD050F8C, 0x0000002E, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0x00000001, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000026, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000001C, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x432F0000, 0x43160000, 0x41700000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000042, 0x00000000, 0x00000002, 0x00000002, 0x00000001, 0x0000000A, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000E, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80244294, 0x00000024, 0x00000002, 0xFE363C80, 0x80240D24, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x80242250, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x802D7044, 0x00000016, 0x00000000, 0x00000047, 0x00000005, 0x8024149C, 0x00100000, 0x8024148C, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240B20, 0x00000044, 0x00000001, 0x8024106C, 0x00000044, 0x00000001, 0x80240D6C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 glabel D_80241780_EB25E0 .word 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -12,4 +12,4 @@ glabel D_802417E4_EB2644 .word 0x00000000 glabel D_802417E8_EB2648 -.word 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_80240484_EB12E4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, 0x802417EC, 0x00000010, 0x00000000, 0x802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_8024086C_EB16CC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_8024086C_EB16CC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x80241980, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, 0x80241A00, 0x00000010, 0x00000000, 0x802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802409F8_EB1858, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, 0x80241D24, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, 0x80241784, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240A3C_EB189C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000054, 0x00000000, 0x00000043, 0x0000000B, func_8024077C_EB15DC, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, 0x8024208C, 0x00000046, 0x00000001, 0x80241D94, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, 0x80241784, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000064, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000015, 0x00000001, 0xFE363C80, 0x0000015E, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000064, 0xFE363C80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000015, 0x00000001, 0xFE363C80, 0x0000015E, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000A, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000044, 0x00000001, 0x80242148, 0x00000012, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000002, 0xF24A7C80, 0x0000000B, 0x00000002, 0xF971888B, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80242148, 0x00000043, 0x00000005, 0x802E1C00, 0x00000014, 0x000000FA, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000003, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x000000FA, 0x0000001E, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0xFFFFFFB5, 0x000000C3, 0x00000023, 0x00000002, 0xFFFFFFC4, 0x000000AF, 0x00000019, 0x00000001, 0xFFFFFFA1, 0x000000A5, 0x0000000F, 0x00000001, 0xFFFFFF92, 0x00000078, 0x00000023, 0xFFFFFFFF, 0x00000001, 0xFFFFFFE7, 0x000000C3, 0x00000014, 0x00000002, 0xFFFFFFB5, 0x000000C3, 0x00000023, 0x00000001, 0xFFFFFFC4, 0x000000AF, 0x00000019, 0x00000002, 0xFFFFFF88, 0x0000008C, 0x0000000F, 0xFFFFFFFF, 0x0000004D, 0x00000001, 0x000000EF, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000030, 0x00000001, 0x80242434, 0x00000012, 0x00000000, 0x00000030, 0x00000001, 0x80242478, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xFE363C81, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60004, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000031, 0x00000001, 0xFE363C82, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802E1D00, 0x00000002, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x00000005, 0x00000001, 0xFE363C84, 0x00000043, 0x00000003, 0x802DBF70, 0x00000000, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C85, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C82, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x802424BC, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8D, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F8D, 0x00000016, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000064, 0x00000028, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFE7, 0x0000007D, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000014, 0x00000096, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x0010010A, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000014, 0x00000016, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFDD, 0x0000007D, 0xFFFFFFEC, 0x0000000C, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A7E80, 0x00000003, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0xFFFFFFF1, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFEC, 0x00000000, 0x0000000A, 0x00000002, 0xF971888A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000005, 0x0010010B, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8080, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000005, 0x0010010C, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60002, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x0010010D, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000001E, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000064, 0x00000028, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFF1, 0x0000004B, 0x00000050, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000023, 0x00000032, 0x00000078, 0x0000000A, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000001, func_80240A68_EB18C8, 0x00000044, 0x00000001, 0x802426A4, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x0010010F, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000024, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B6000D, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x000000E8, 0x00000000, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000024, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000064, 0x00000019, 0x00000064, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000064, 0x00000019, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60007, 0x00B60007, 0x00000000, 0x00100110, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000028, 0x00000016, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000064, 0x00000028, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFE7, 0x0000007D, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000014, 0x00000096, 0x00000005, 0x00000008, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000032, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x0000004B, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x80048DA0, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00100108, 0x00000046, 0x00000001, 0x80242094, 0x00000046, 0x00000001, 0x802420E4, 0x00000043, 0x00000003, 0x80048DA0, 0xFFFFFFFF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x00100113, 0x00000046, 0x00000001, 0x80242094, 0x00000046, 0x00000001, 0x802420E4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x802427B4, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x802432D4, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0xC2F00000, 0x428C0000, 0x42340000, 0xC2960000, 0x42A00000, 0x42B40000, 0xC1200000, 0x42E60000, 0x42B40000, 0x41200000, 0x43340000, 0x428C0000, 0x42480000, 0x43520000, 0x41F00000, 0x42C80000, 0x43200000, 0x00000000, 0x43110000, 0x43430000, 0xC1200000, 0x42C80000, 0x433E0000, 0xC2B40000, 0x42A00000, 0x43340000, 0xC2700000, 0x42E60000, 0x432F0000, 0xC2200000, 0x43250000, 0x432A0000, 0xC1200000, 0x43660000, 0x432A0000, 0xC1A00000, 0x43870000, 0x432F0000, 0xC1F00000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFFFFFF88, 0x00000046, 0x0000002D, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000003C, 0x80243420, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240A8C_EB18EC, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000013, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE644, 0xF24A8280, 0x00000043, 0x00000004, 0x802DE754, 0x0000003C, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000000F, 0x00000003, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000019, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x00000016, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000001F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000005, 0x0010010E, 0x00000003, 0x00000001, 0x0000001E, 0x0000000A, 0x00000002, 0xFD050F8D, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000023, 0x00000016, 0x00000001, 0x00000028, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100111, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000002D, 0x00000016, 0x00000001, 0x00000032, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x00000091, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160007, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x000000AA, 0x000000AA, 0x00000032, 0x00000014, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000003, 0x802DBFE4, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000091, 0x000000AA, 0xFFFFFFF6, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFF, 0x00000091, 0x000000A0, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100112, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000003, 0x00000001, 0x0000005A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60007, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0x00000131, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000091, 0x000000C3, 0xFFFFFFF6, 0x00000005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160005, 0x00160008, 0x00000000, 0x00100115, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000001E, 0x80243468, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000005B, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000005B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100114, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x802434BC, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80243E08, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x802416D0, 0xC2820000, 0x00000000, 0x433E0000, 0x00510509, 0x802433B8, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000, 0x00000001, 0x802416FC, 0x42C80000, 0x43200000, 0x00000000, 0x00400001, 0x80243E38, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x001A000B, 0x00000001, 0x80243EB4, 0x00000000, 0x00000001, 0x802440A4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6B7A6E5F, 0x31390000, 0x6B7A6E5F, 0x32320000 +.word 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_80240484_EB12E4, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060005, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, 0x802417EC, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_8024086C_EB16CC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E4720, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C81, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, func_8024086C_EB16CC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000042, 0x00000002, 0xFE363C80, 0x00050000, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C80, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x80241980, 0xFE363C8A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040002, 0x00000043, 0x00000004, 0x802E1D58, 0xFE363C89, 0xFFFFFFFC, 0xFE363C8B, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C89, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x0000000E, 0x00000002, 0xFE363C8B, 0x000000B4, 0x00000027, 0x00000002, 0xFE363C86, 0x00000014, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFEC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C87, 0x0000000A, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000014, 0x00000049, 0x00000001, 0xFE363C8A, 0x00000043, 0x00000002, 0x802E461C, 0xFE363C80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DBF70, 0xFFFFFFFC, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C8A, 0x000000B4, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFC, 0xFE363C8A, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFC, 0x00040001, 0x00000043, 0x00000004, 0x802DC3E0, 0xFFFFFFFC, 0xFE363C89, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000005, 0x00000023, 0x00000000, 0x00000043, 0x00000002, func_802406A8_EB1508, 0xFE363C8A, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, func_802406E0_EB1540, 0xFE363C80, 0x0000004E, 0x00000006, 0x80241A00, 0x00000010, 0x00000000, D_802442D0, 0x00000000, 0x00000001, 0x00000043, 0x00000002, func_80240654_EB14B4, 0xFE363C80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0xFFFFFFBA, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802409F8_EB1858, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000003, 0x802E4064, 0xFE363C85, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000004, 0x0000000B, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFE363C82, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFE363C82, 0xFE363C8D, 0xFE363C80, 0xFE363C8E, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFC, 0xFE363C8D, 0xFE363C80, 0xFE363C8F, 0x0000000A, 0x00000043, 0x00000007, 0x802DD864, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000000, 0xFE363C82, 0xFE363C87, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000046, 0x00000001, 0x80241D24, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C88, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000001, 0x0000001C, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00040006, 0x00040001, 0x00000005, 0xFE363C89, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000000, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x0000000B, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, 0x80241784, 0x00000043, 0x00000002, 0x802E3F18, 0xFE363C86, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240A3C_EB189C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000054, 0x00000000, 0x00000043, 0x0000000B, func_8024077C_EB15DC, 0x00000000, 0x00B60008, 0x00B60001, 0x00000054, 0x00000000, 0x001000E4, 0x001000E5, 0x001000E6, 0x001000E7, 0x8024208C, 0x00000046, 0x00000001, 0x80241D94, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000002, 0x00000024, 0x00000002, 0xFE363C80, 0x0000015C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000003, 0x00000046, 0x00000001, 0x80241784, 0x00000043, 0x00000002, 0x802E4940, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000064, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000015, 0x00000001, 0xFE363C80, 0x0000015E, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000064, 0xFE363C80, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000015, 0x00000001, 0xFE363C80, 0x0000015E, 0x00000000, 0x0000003C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000A, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000044, 0x00000001, 0x80242148, 0x00000012, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000002, 0xF24A7C80, 0x0000000B, 0x00000002, 0xF971888B, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80242148, 0x00000043, 0x00000005, 0x802E1C00, 0x00000014, 0x000000FA, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000003, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x000000FA, 0x0000001E, 0x0000003C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0xFFFFFFB5, 0x000000C3, 0x00000023, 0x00000002, 0xFFFFFFC4, 0x000000AF, 0x00000019, 0x00000001, 0xFFFFFFA1, 0x000000A5, 0x0000000F, 0x00000001, 0xFFFFFF92, 0x00000078, 0x00000023, 0xFFFFFFFF, 0x00000001, 0xFFFFFFE7, 0x000000C3, 0x00000014, 0x00000002, 0xFFFFFFB5, 0x000000C3, 0x00000023, 0x00000001, 0xFFFFFFC4, 0x000000AF, 0x00000019, 0x00000002, 0xFFFFFF88, 0x0000008C, 0x0000000F, 0xFFFFFFFF, 0x0000004D, 0x00000001, 0x000000EF, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C81, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000030, 0x00000001, 0x80242434, 0x00000012, 0x00000000, 0x00000030, 0x00000001, 0x80242478, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xFE363C81, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60004, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C82, 0xFE363C83, 0x00000000, 0x00000031, 0x00000001, 0xFE363C82, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60001, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802E1D00, 0x00000002, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C84, 0x00000001, 0x00000005, 0x00000001, 0xFE363C84, 0x00000043, 0x00000003, 0x802DBF70, 0x00000000, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C85, 0x000000B4, 0x0000000D, 0x00000002, 0xFE363C85, 0x00000168, 0x00000028, 0x00000002, 0xFE363C85, 0x00000168, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0xFE363C85, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C82, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C83, 0x0000001E, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002A, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0xFE363C83, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000045, 0x00000002, 0x802424BC, 0xFE363C89, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8D, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000049, 0x00000001, 0xFE363C89, 0x00000008, 0x00000001, 0x0000000A, 0x00000003, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F8D, 0x00000016, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000064, 0x00000028, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFE7, 0x0000007D, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000014, 0x00000096, 0x00000005, 0x0000000A, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x00000028, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x0010010A, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000014, 0x00000016, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFE2, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24E6280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000004, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x00000014, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A7E80, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFDD, 0x0000007D, 0xFFFFFFEC, 0x0000000C, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A7E80, 0x00000003, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0xFFFFFFF1, 0xFFFFFFEC, 0x00000000, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0xFFFFFFD8, 0xFFFFFFEC, 0x00000000, 0x0000000A, 0x00000002, 0xF971888A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000019, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000005, 0x0010010B, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8080, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000008, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000005, 0x0010010C, 0x00000024, 0x00000002, 0xF971888B, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000008, 0x00000001, 0x00000014, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001002B, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60002, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x0010010D, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000001E, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000064, 0x00000028, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFF1, 0x0000004B, 0x00000050, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000023, 0x00000032, 0x00000078, 0x0000000A, 0x00000016, 0x00000001, 0x00000023, 0x00000043, 0x00000001, func_80240A68_EB18C8, 0x00000044, 0x00000001, 0x802426A4, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x0010010F, 0x000000A0, 0x00000028, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000024, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B6000D, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A7DB4, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x000000E8, 0x00000000, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000003C, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000024, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000064, 0x00000019, 0x00000064, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000064, 0x00000019, 0x00000064, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60007, 0x00B60007, 0x00000000, 0x00100110, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000028, 0x00000016, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60004, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFFFFFFE2, 0x00000064, 0x00000028, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFFFFFFE7, 0x0000007D, 0xFFFFFFEC, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000014, 0x00000096, 0x00000005, 0x00000008, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000032, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x0000004B, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000064, 0x00000043, 0x00000003, 0x80048DA0, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60008, 0x00B60001, 0x00000000, 0x00100108, 0x00000046, 0x00000001, 0x80242094, 0x00000046, 0x00000001, 0x802420E4, 0x00000043, 0x00000003, 0x80048DA0, 0xFFFFFFFF, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60009, 0x00B60002, 0x00000000, 0x00100113, 0x00000046, 0x00000001, 0x80242094, 0x00000046, 0x00000001, 0x802420E4, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x802427B4, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x802432D4, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0xC2F00000, 0x428C0000, 0x42340000, 0xC2960000, 0x42A00000, 0x42B40000, 0xC1200000, 0x42E60000, 0x42B40000, 0x41200000, 0x43340000, 0x428C0000, 0x42480000, 0x43520000, 0x41F00000, 0x42C80000, 0x43200000, 0x00000000, 0x43110000, 0x43430000, 0xC1200000, 0x42C80000, 0x433E0000, 0xC2B40000, 0x42A00000, 0x43340000, 0xC2700000, 0x42E60000, 0x432F0000, 0xC2200000, 0x43250000, 0x432A0000, 0xC1200000, 0x43660000, 0x432A0000, 0xC1A00000, 0x43870000, 0x432F0000, 0xC1F00000, 0x0000000A, 0x00000002, 0xF9718889, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFFFFFF88, 0x00000046, 0x0000002D, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xF9718889, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000003C, 0x80243420, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240A8C_EB18EC, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000013, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE644, 0xF24A8280, 0x00000043, 0x00000004, 0x802DE754, 0x0000003C, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971888B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000000F, 0x00000003, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFD050F8D, 0x00000016, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000019, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xF971888A, 0x00000001, 0x00000016, 0x00000001, 0x0000001E, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24FF280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000001F, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000005, 0x0010010E, 0x00000003, 0x00000001, 0x0000001E, 0x0000000A, 0x00000002, 0xFD050F8D, 0x0000001E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000023, 0x00000016, 0x00000001, 0x00000028, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100111, 0x00000024, 0x00000002, 0xFD050F8D, 0x0000002D, 0x00000016, 0x00000001, 0x00000032, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB57C, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DB78C, 0xFFFFFFFF, 0x00000091, 0xFFFFFFF6, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0xFFFFFFE2, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160007, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x000000AA, 0x000000AA, 0x00000032, 0x00000014, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0xFFFFFFC4, 0x00000000, 0x00000043, 0x00000003, 0x802DBFE4, 0xFFFFFFFF, 0x0000010E, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000091, 0x000000AA, 0xFFFFFFF6, 0x0000000F, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802DBC40, 0xFFFFFFFF, 0x00000091, 0x000000A0, 0xFFFFFFF6, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100112, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x0000000B, 0x00000002, 0xFD050F8D, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000003, 0x00000001, 0x0000005A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000025, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000001A, 0x7FFFFE00, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60007, 0x00000043, 0x00000003, 0x802DB57C, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0x00000131, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A7C80, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0x00000091, 0x000000C3, 0xFFFFFFF6, 0x00000005, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160005, 0x00160008, 0x00000000, 0x00100115, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000001E, 0x80243468, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000005B, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000005B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00160009, 0x00160008, 0x00000000, 0x00100114, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x802434BC, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80243E08, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x802416D0, 0xC2820000, 0x00000000, 0x433E0000, 0x00510509, 0x802433B8, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000, 0x00000001, 0x802416FC, 0x42C80000, 0x43200000, 0x00000000, 0x00400001, 0x80243E38, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x001A000B, 0x00000001, 0x80243EB4, 0x00000000, 0x00000001, 0x802440A4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6B7A6E5F, 0x31390000, 0x6B7A6E5F, 0x32320000 diff --git a/ver/us/asm/data/EB54C0.data.s b/ver/us/asm/data/EB54C0.data.s new file mode 100644 index 0000000000..b8cf2b3409 --- /dev/null +++ b/ver/us/asm/data/EB54C0.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel D_80240390_EB54C0 +.word 0xC3C30000, 0x00000000, 0x43520000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240D60, D_80240390_EB54C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190113, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB5130_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB5130_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80240450, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80240450, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802420F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240724, 0x00000080, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000006, 0x00000001, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFBB4, 0x00000027, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFE0C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFE0C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802D6400, 0x00000029, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000017, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, 0x802D6480, 0x0000002B, 0x00000002, 0x00000043, 0x00000003, 0x802D6480, 0x00000029, 0x00000002, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000000, 0x00000043, 0x00000003, 0x802D75C0, 0x00000013, 0x00000029, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802D7634, 0x00000013, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024030C_EB543C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, 0x80240958, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6708, 0x0000002B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A8080, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000011D, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A85B4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0x00000000, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000007, 0x43480000, 0x43160000, 0x43340000, 0x00000009, 0x43480000, 0x43160000, 0x43340000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000F, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x802420C0, 0x00000046, 0x00000001, 0x80240EE0, 0x00000024, 0x00000002, 0xFE363C80, 0x80240790, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802403E0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80240D30, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x802407BC, 0x00000044, 0x00000001, 0x802408A8, 0x00000044, 0x00000001, 0x80240A34, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, 0x802404EC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, 0x80240608, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, 0x8011A58C, 0x802F92E0, 0x000001E0, 0x000000EB, 0x000000AF, 0x00000000, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80240FD0, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240340_EB5470, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DF4B4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0008001A, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x0000000A, 0x00000002, 0xF971888E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A6A80, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0xF251FA80, 0xF24F28E7, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DE644, 0xF24A8680, 0x00000043, 0x00000004, 0x802DE754, 0x000000FA, 0x000000D2, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DDEEC, 0x00100116, 0x000001B8, 0x000000F0, 0x000000A5, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80241010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x43960000, 0x43320000, 0x42F00000, 0x43A00000, 0x432A0000, 0x43250000, 0x43AA0000, 0x43220000, 0x43480000, 0x43C08000, 0x431B0000, 0x43700000, 0x43D98000, 0x43200000, 0x437F0000, 0x43E10000, 0x43250000, 0x43610000, 0x43DC0000, 0x432C0000, 0x43430000, 0x43DE8000, 0x43340000, 0x42F00000, 0x43CA8000, 0x433E0000, 0x42A00000, 0x43B40000, 0x43430000, 0x428C0000, 0x43AA0000, 0x43480000, 0x42B40000, 0x439D8000, 0x433E0000, 0x42DC0000, 0x43938000, 0x43340000, 0x43340000, 0x43870000, 0x432F0000, 0x43660000, 0x437F0000, 0x432A0000, 0x43520000, 0x437F0000, 0x432B0000, 0x432F0000, 0x43820000, 0x432D0000, 0x43200000, 0x43870000, 0x432F0000, 0x43160000, 0x43910000, 0x43320000, 0x430E0000, 0x43980000, 0x43360000, 0x43070000, 0x43A50000, 0x43390000, 0x43110000, 0x43AF0000, 0x433E0000, 0x431B0000, 0x43B80000, 0x436B0000, 0x432A0000, 0x43B80000, 0x43938000, 0x432A0000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000190, 0x00000096, 0x000000C8, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000190, 0x00000096, 0x000000C8, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF2509280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888E, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x0000012C, 0x00000096, 0x000000AA, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000170, 0x00000136, 0x000000AA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xF971888F, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFB, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF971888D, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000044, 0x00000001, 0x80241460, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000023, 0x80241340, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000001, 0x00000043, 0x00000003, 0x802DB3C8, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, 0x802DB310, 0x00000000, 0x00000000, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60007, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000002, 0x802DE674, 0x00000000, 0x00000043, 0x00000005, 0x802DEF08, 0x000000F5, 0x000000AB, 0x000000B0, 0x00000008, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0x000000F5, 0x000000BF, 0x000000AB, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000028, 0x80241394, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_802E2B74, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000046, 0x00000001, 0x80241648, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000001, func_8024036C_EB549C, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000046, 0x802413F4, 0x00000009, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000043, 0x00000001, func_802E2B74, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000046, 0x00000001, 0x80241648, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E1C00, 0x0000012C, 0x000001F4, 0x00000014, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C85, 0xFE363C82, 0xFE363C86, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000046, 0x00000001, 0x80241648, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802D78AC, 0x802420F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x0000012C, 0x000000B4, 0x00000050, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x8024173C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240F20, 0x43DE8000, 0x43160000, 0x432F0000, 0x00110509, 0x8024131C, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000, 0x00000001, 0x80240F4C, 0x438E8000, 0x43200000, 0x42A00000, 0x00110509, 0x80241C3C, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x001A000B, 0x00000001, 0x80241CE0, 0x00000000, 0x00000001, 0x80241ED0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6B7A6E5F, 0x32300000, 0x6B7A6E5F, 0x32330000 diff --git a/ver/us/asm/data/EB7850.data.s b/ver/us/asm/data/EB7850.data.s new file mode 100644 index 0000000000..dda7972ba5 --- /dev/null +++ b/ver/us/asm/data/EB7850.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel D_80240620_EB7850 +.word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240C34, D_80240620_EB7850, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EB7230_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EB7230_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802406B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802406B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0x80240984, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFD050F8A, 0xFE363C81, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x802409B4, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFF97, 0x00000024, 0x00000002, 0xFE363C85, 0x00000028, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000028, 0x0000000C, 0x00000002, 0xFD050F8A, 0x00000A8C, 0x00000027, 0x00000002, 0xFD050F8A, 0x00000014, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000028, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A0010, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80241BE0, 0x00000044, 0x00000001, 0x80240670, 0x00000044, 0x00000001, 0x80240A20, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, 0x8024074C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000044, 0x00000001, 0x80240868, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60009, 0x00B60007, 0x00000005, 0x00100117, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DB3C8, 0xFFFFFFFF, 0x0000000A, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80240DD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000AB4, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x42480000, 0x4525A000, 0xC1A00000, 0x43160000, 0x45322000, 0xC2340000, 0x436B0000, 0x45386000, 0xC2700000, 0x43A78000, 0x453B8000, 0xC2960000, 0xC1A00000, 0x4525A000, 0xC1A00000, 0xC2F00000, 0x45322000, 0xC2200000, 0xC35C0000, 0x453B8000, 0xC2200000, 0x41200000, 0x4525A000, 0xC1A00000, 0x41A00000, 0x452F0000, 0xC2700000, 0x41F00000, 0x45340000, 0xC2C80000, 0x42200000, 0x45368000, 0xC3160000, 0x42480000, 0x4537C000, 0xC35C0000, 0xC20C0000, 0x4525A000, 0xC1A00000, 0xC2820000, 0x452DC000, 0xC1F00000, 0xC2BE0000, 0x45322000, 0xC2200000, 0xC2FA0000, 0x45340000, 0xC2480000, 0xC31B0000, 0x45354000, 0xC2700000, 0xC3390000, 0x45363000, 0xC28C0000, 0x00000082, 0xFFFFFF6A, 0x00000082, 0xFFFFFF6A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, 0x80241018, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AD, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AE, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, 0x80241028, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, 0x80240F40, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000A, 0x80240F70, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, 0x80240F94, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x00000014, 0x80240FD0, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, func_80240478_EB76A8, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802E5160, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, func_80240504_EB7734, 0x00000044, 0x00000001, 0x80240E98, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x802410F4, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, D_80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240520_EB7750, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, func_802403D8_EB7608, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, func_80240310_EB7540, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80241418, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240D20, 0x00000000, 0xC47A0000, 0x00000000, 0x00110709, 0x80240E0C, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000, 0x00000001, 0x80240D4C, 0x00000000, 0xC47A0000, 0x00000000, 0x19100004, 0x802417AC, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80241800, 0x00000000, 0x00000001, 0x802419F0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_EBA260.data.s b/ver/us/asm/data/EBA260.data.s similarity index 100% rename from ver/us/asm/data/code_EBA260.data.s rename to ver/us/asm/data/EBA260.data.s diff --git a/ver/us/asm/data/code_EC2850.data.s b/ver/us/asm/data/EC2850.data.s similarity index 99% rename from ver/us/asm/data/code_EC2850.data.s rename to ver/us/asm/data/EC2850.data.s index d84304a1e2..8ef35e5a42 100644 --- a/ver/us/asm/data/code_EC2850.data.s +++ b/ver/us/asm/data/EC2850.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80240650_EC2850 -.word 0xC3A28000, 0x00000000, 0x00000000, 0x42B40000, 0x43A28000, 0x00000000, 0x00000000, 0x43870000, 0xC3A28000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240C4C, D_80240650_EC2850, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190115, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001A, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000049, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000001, 0x00000043, 0x00000003, 0x802E3648, 0x00000089, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000001, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80244F70, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80244F78, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240B4C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240BA8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244464, 0x00000046, 0x00000001, 0x80244F20, 0x00000046, 0x00000001, 0x80241F14, 0x00000044, 0x00000001, 0x80244E94, 0x00000044, 0x00000001, 0x80244F10, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802408A0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802408A0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, 0x8024101C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80240C04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802406C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, code_EC2200_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 +.word 0xC3A28000, 0x00000000, 0x00000000, 0x42B40000, 0x43A28000, 0x00000000, 0x00000000, 0x43870000, 0xC3A28000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240C4C, D_80240650_EC2850, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190115, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x0000001A, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000049, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000001, 0x00000043, 0x00000003, 0x802E3648, 0x00000089, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000001, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80244F70, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80244F78, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240B4C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240BA8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244464, 0x00000046, 0x00000001, 0x80244F20, 0x00000046, 0x00000001, 0x80241F14, 0x00000044, 0x00000001, 0x80244E94, 0x00000044, 0x00000001, 0x80244F10, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF6F, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEB1, 0x00000024, 0x00000002, 0xFE363C82, 0x000000B6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF4C, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802408A0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C8, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF56, 0x00000024, 0x00000002, 0xFE363C82, 0x00000136, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802408A0, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000044, 0x00000001, 0x8024101C, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80240C04, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802406C0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EC2200_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 glabel D_80240F28_EC3128 .word 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x000000D2, 0xFFFFFF60, 0x00000000, 0x0000011D, 0xFFFFFFDD, 0x00000000, 0x00000131, 0xFFFFFF42, 0x00000000, 0x00000050, 0xFFFFFF7E, 0x00000000, 0x00000000, 0xFFFFFFBA, 0x00000000, 0xFFFFFFC4, 0x0000004B, 0x00000000, 0xFFFFFFF1, 0x00000023, 0x00000000, 0xFFFFFF9C, 0x00000082, 0x00000000, 0x00000000, 0x00000073, 0x00000000, 0x000000B4, 0x00000055, 0x00000000, 0x00000122, 0x00000091, 0x00000000, 0x0000008C, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000000, 0x0000005A, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5480, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xFFFFFFE5, 0x00000000, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0x00000000, 0xFFFFFFCE, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C70002, 0x00C70001, 0x00000000, 0x001100C8, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C70003, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802D78AC, 0x80244F80, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_80240158_EC2358, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF84060D6, 0x00000001, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x00000009, 0x802D98E0, 0x00000000, 0xFE363C84, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000012C, 0xF24ACA80, 0xF24A5480, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x802407E0, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C84, 0xF24A8880, 0x00000046, 0x00000001, 0x8024124C, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110050, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C70006, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110051, 0x00000043, 0x00000003, 0x802DB654, 0x00000002, 0x002F0112, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000002, 0x0000010E, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, 0x802DD70C, 0x00000002, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000002, 0x002F0116, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DD70C, 0x00000002, 0x00000263, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0x00000002, 0x00000002, 0xFFFFFFD3, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110052, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000003, 0x0000005A, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802DB654, 0x00000003, 0x002F0100, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000004, 0x802DD70C, 0x00000003, 0x00000321, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DB654, 0x00000003, 0x002F0110, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110053, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000004, 0x0000010E, 0x00000043, 0x00000005, 0x802DC654, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0x00000004, 0x002F0114, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110054, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000005, 0x0000010E, 0x00000043, 0x00000005, 0x802DC654, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000000C8, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0106, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0107, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0108, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0116, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110055, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFFFFFF17, 0x00000000, 0xFFFFFF27, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802DB654, 0x00000001, 0x0048000D, 0x00000043, 0x00000004, 0x802DD70C, 0x00000001, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0x00000001, 0x00000000, 0x0000002D, 0x0000001E, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110056, 0x00000024, 0x00000002, 0xFE363C84, 0xF24BE280, 0x00000046, 0x00000001, 0x8024124C, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110057, 0x00000043, 0x00000004, 0x80049738, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x80049738, 0x00000002, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x80049738, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x80049738, 0x00000004, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x80049738, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80048B18, 0x00000001, 0x802411BC, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8F, 0x0000003C, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF8406103, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00110058, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C70006, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xF24A8880, 0x00000046, 0x00000001, 0x8024124C, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70008, 0x00C70003, 0x00000000, 0x00110059, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C70004, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C70001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000058, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, 0x80240F2C, 0x00000043, 0x00000002, 0x802E3F18, 0x00000058, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005A, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C70007, 0x00C70006, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002D, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005B, 0x00000018, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005C, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E81, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005D, 0x00000024, 0x00000002, 0xF70F2E81, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C70002, 0x00C70001, 0x00000000, 0x0011005E, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A9A80, 0x00000046, 0x00000001, 0x80240834, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x802412DC, 0x0000000A, 0x00000002, 0xF8406103, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C70006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C70001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x802411D8, 0x00000043, 0x00000003, 0x802DC7C8, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x0000001C, 0x00000000, 0x0000000A, 0x00000002, 0xF84060D6, 0x00000000, 0x00000043, 0x00000004, 0x80049738, 0x00000001, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x802411BC, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8E, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8F, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000002, 0x00000024, 0x00000002, 0xF84060D7, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000024, 0x00000002, 0xF84060D8, 0x00000001, 0x00000016, 0x00000001, 0x00000004, 0x00000024, 0x00000002, 0xF84060D9, 0x00000001, 0x00000016, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xF84060DA, 0x00000001, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060D7, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060D8, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060D9, 0x00000027, 0x00000002, 0xFE363C80, 0xF84060DA, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C70006, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C70001, 0x00000024, 0x00000002, 0xF8406103, 0x00000001, 0x00000046, 0x00000001, 0x802406C0, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x002F0101, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x002F0101, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000002C, 0x0000005A, 0x00000001, D_80244F98_EC7198, 0x00000043, 0x00000002, 0x800486A0, 0xFE363C80, 0x0000005B, 0x00000001, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x002F0105, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0x00000000, 0x0000000A, 0x00000002, 0xF9718897, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802E1FB4, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF9718897, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000002, 0x00008048, 0x00000001, 0x00000043, 0x00000003, 0x802DC228, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF9718897, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000002, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0x00000002, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000002, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000002, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060D7, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718897, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D7, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, 0x80240F8C, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000002, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF9718897, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0x00000002, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DD70C, 0x00000002, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000002, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x0000001E, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000003C, 0x00000024, 0x00000002, 0xFD050F8A, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8B, 0x00000000, 0x0000000A, 0x00000002, 0xF9718898, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802E1FB4, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF9718898, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000003, 0x00008048, 0x00000001, 0x00000043, 0x00000003, 0x802DC228, 0x00000003, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF9718898, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8B, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000003, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0x00000003, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000003, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000003, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060D8, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718898, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D8, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, 0x80240FB0, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000003, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF9718898, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0x00000003, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DD70C, 0x00000003, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000003, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000023, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000037, 0x00000024, 0x00000002, 0xFD050F8B, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8B, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8B, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8C, 0x00000000, 0x0000000A, 0x00000002, 0xF9718899, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802E1FB4, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF9718899, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000004, 0x00008048, 0x00000001, 0x00000043, 0x00000003, 0x802DC228, 0x00000004, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF9718899, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8C, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000004, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0x00000004, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000004, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000004, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060D9, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718899, 0x00000001, 0x0000000A, 0x00000002, 0xF84060D9, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, 0x80240FD4, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000004, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF9718899, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0x00000004, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DD70C, 0x00000004, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000004, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000028, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000032, 0x00000024, 0x00000002, 0xFD050F8C, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8C, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8C, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8D, 0x00000000, 0x0000000A, 0x00000002, 0xF971889A, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000001, 0x00000012, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000005, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802E1FB4, 0xFE363C80, 0xFE363C82, 0xFD050F8F, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C89, 0x0000000A, 0x00000002, 0xFE363C89, 0x00000009, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8E, 0x00000001, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C83, 0x00000001, 0x0000000A, 0x00000002, 0xF971889A, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000005, 0x00008048, 0x00000001, 0x00000043, 0x00000003, 0x802DC228, 0x00000005, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xF971889A, 0x00000001, 0x0000000B, 0x00000002, 0xFD050F8D, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002C, 0x00000024, 0x00000002, 0xFE363C81, 0x00000004, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000005, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0x00000005, 0x00000000, 0x00000000, 0xFE363C81, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C81, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000005, 0x00000322, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0111, 0x00000008, 0x00000001, 0x00000014, 0x0000000A, 0x00000002, 0xF84060DA, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000005, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF971889A, 0x00000001, 0x0000000A, 0x00000002, 0xF84060DA, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000002, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, 0x80240FF8, 0x00000005, 0x00000001, 0xFE363C80, 0x00000033, 0x00000003, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000005, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000005, 0x00008048, 0x00000001, 0x00000024, 0x00000002, 0xF971889A, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0x00000005, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DD70C, 0x00000005, 0x00000321, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0110, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x800495D4, 0x17100000, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x0000002D, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x0000002D, 0x00000024, 0x00000002, 0xFD050F8D, 0xFE363C80, 0x00000012, 0x00000000, 0x0000000D, 0x00000002, 0xFD050F8D, 0x00000000, 0x00000028, 0x00000002, 0xFD050F8D, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x800491F0, 0xFFFFFFFF, 0x80242158, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80241F84, 0x00000043, 0x00000003, 0x802DC7C8, 0x00000002, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x802421D4, 0x00000043, 0x00000003, 0x802DB654, 0x00000002, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060D7, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x802421D4, 0x00000043, 0x00000003, 0x802DB654, 0x00000002, 0x002F0110, 0x00000043, 0x00000004, 0x80049738, 0x00000002, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x800491F0, 0xFFFFFFFF, 0x80242158, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80241F84, 0x00000043, 0x00000003, 0x802DC7C8, 0x00000003, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80242650, 0x00000043, 0x00000003, 0x802DB654, 0x00000003, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060D8, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80242650, 0x00000043, 0x00000003, 0x802DB654, 0x00000003, 0x002F0110, 0x00000043, 0x00000004, 0x80049738, 0x00000003, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x800491F0, 0xFFFFFFFF, 0x80242158, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80241F84, 0x00000043, 0x00000003, 0x802DC7C8, 0x00000004, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80242ACC, 0x00000043, 0x00000003, 0x802DB654, 0x00000004, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060D9, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80242ACC, 0x00000043, 0x00000003, 0x802DB654, 0x00000004, 0x002F0110, 0x00000043, 0x00000004, 0x80049738, 0x00000004, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x800491F0, 0xFFFFFFFF, 0x80242158, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80241F84, 0x00000043, 0x00000003, 0x802DC7C8, 0x00000005, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002C, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80242F48, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0110, 0x00000016, 0x00000001, 0x0000002C, 0x0000000A, 0x00000002, 0xF84060DA, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80242F48, 0x00000043, 0x00000003, 0x802DB654, 0x00000005, 0x002F0110, 0x00000043, 0x00000004, 0x80049738, 0x00000005, 0x00000001, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000005, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240EFC, 0xC1F00000, 0x00000000, 0x42C80000, 0x00000D01, 0x80241DC4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00C70001, 0x00000000, 0x00000000, 0x00000000, 0x001A00DD, 0x00000001, 0x80240ED0, 0xC3690000, 0x00000000, 0xC3590000, 0x00000D01, 0x80241E30, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80240ED0, 0xC2C80000, 0x00000000, 0x43520000, 0x00000F01, 0x802433C4, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80240ED0, 0xC3020000, 0x00000000, 0x00000000, 0x00000F01, 0x80243504, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x80240ED0, 0x42960000, 0x00000000, 0x41A00000, 0x00000F01, 0x80243644, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000005, 0x80240ED0, 0x428E0000, 0x00000000, 0x43480000, 0x00000F01, 0x80243784, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002F0101, 0x002F0102, 0x002F0103, 0x002F0103, 0x002F0101, 0x002F0101, 0x002F0105, 0x002F0105, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x002F0100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802438C4, 0x00000000, 0x00000001, 0x80243AB4, 0x1A0F0002, 0x00000001, 0x80243CA4, 0x1B020002, 0x00000001, 0x80243E94, 0x1B010002, 0x00000001, 0x80244084, 0x1B030002, 0x00000001, 0x80244274, 0x1B040002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240480_EC2680, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240480_EC2680, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240480_EC2680, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240480_EC2680, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240480_EC2680, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240480_EC2680, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x00000017, 0x00000001, 0x00000016, 0x00000002, 0x0000009F, 0xFFFFFF00, 0x00000066, 0xFFFFFF57, 0x0000000C, 0x00000000, 0xF971889B, 0x0000009F, 0xFFFFFF64, 0x00000066, 0xFFFFFF57, 0x0000000C, 0x00000000, 0xF971889C, 0x80244E24, 0x80244E2C, 0x80244E34, 0x00000000, 0x00000000, 0xC3500000, 0x00000000, 0xC3360000, 0x00000000, 0x00000024, 0x00000002, 0xF971889B, 0x00000000, 0x00000024, 0x00000002, 0xF971889C, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80244E70, 0x00000047, 0x00000005, 0x80244820, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80244820, 0x00100000, 0x80244E84, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, 0x8011A58C, 0x802F8FB4, 0xFFFFFF51, 0x00000000, 0x00000096, 0x00000000, 0x00000008, D_80000000, 0x00000043, 0x00000002, 0x8011A968, 0xF84060FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_EC78F0.data.s b/ver/us/asm/data/EC78F0.data.s similarity index 50% rename from ver/us/asm/data/code_EC78F0.data.s rename to ver/us/asm/data/EC78F0.data.s index 3c54b5fb65..c2eaca0fe6 100644 --- a/ver/us/asm/data/code_EC78F0.data.s +++ b/ver/us/asm/data/EC78F0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80240740_EC78F0 -.word 0x43BB8000, 0x00000000, 0x00000000, 0x43870000, 0x43A28000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CA0, D_80240740_EC78F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190116, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x80000021, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3648, 0x00000089, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EC71B0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EC71B0_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80242B30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240C18, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80242B0C, 0x00000046, 0x00000001, 0x802428C4, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408D0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408D0, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x80241C14, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80240C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, 0x802424F4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802407A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EC74BC, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x43BB8000, 0x00000000, 0x00000000, 0x43870000, 0x43A28000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240CA0, D_80240740_EC78F0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190116, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x80000021, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3648, 0x00000089, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EC71B0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EC71B0_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80242B30, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240C18, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80242B0C, 0x00000046, 0x00000001, 0x802428C4, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000006, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x00000129, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017F, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFBF, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000125, 0x00000024, 0x00000002, 0xFE363C81, 0x00000047, 0x00000024, 0x00000002, 0xFE363C82, 0x0000017A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000071, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000015, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C82, 0x00000093, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF0E, 0x00000024, 0x00000002, 0xFE363C84, 0x00000014, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF42, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFAF, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF96, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE84, 0x00000024, 0x00000002, 0xFE363C81, 0x00000055, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA1, 0x00000024, 0x00000002, 0xFE363C83, 0x00000096, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x8024096C, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000064, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408D0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFB50, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408D0, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x80241C14, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80240C74, 0x00000044, 0x00000001, 0x80285C70, 0x00000044, 0x00000001, 0x802424F4, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802407A0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EC74BC, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240344_EC74F4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240450_EC7600, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_80241BB0_EC8D60 .word 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x0000001E, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA680, 0xF24A4E80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x001100C5, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802D78AC, 0x80242B38, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000001, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF9718886, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x00110068, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AC280, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7C80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000045, 0x00000002, 0x80241D6C, 0xFD050F80, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80006, 0x00C80006, 0x00000000, 0x00110069, 0x00000049, 0x00000001, 0xFD050F80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AC280, 0xF24A5C80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C80, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF06, 0x00000043, 0x00000007, 0x802E4310, 0x0000001E, 0xFFFFFF1F, 0x00000064, 0xFFFFFFE7, 0x0000000D, 0xF84060DE, 0x00000012, 0x00000000, 0x00000043, 0x00000007, 0x802E4310, 0x0000001E, 0xFFFFFEF7, 0x00000064, 0x00000036, 0x0000000D, 0xF84060DE, 0x00000024, 0x00000002, 0xF84060F4, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x000007BC, 0x00000043, 0x00000002, 0x802E3934, 0x000003BC, 0x00000024, 0x00000002, 0xF9718886, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x0011006A, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x8024086C, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000001, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x0000000A, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110070, 0x00000024, 0x00000002, 0xF9718885, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110071, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000002E, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24FF280, 0xF24AC280, 0xF24A5C80, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110065, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C80005, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C80000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000059, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, 0x80241BB4, 0x00000043, 0x00000002, 0x802E3F18, 0x00000059, 0x00000024, 0x00000002, 0xF5DE0180, 0x0000002E, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110066, 0x0000000A, 0x00000002, 0xF84060E3, 0x00000001, 0x00000046, 0x00000001, 0x80241DBC, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000018, 0x00000001, 0x0000002F, 0x0000000A, 0x00000002, 0xF84060E3, 0x00000001, 0x0000000A, 0x00000002, 0xF9718886, 0x00000000, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A8A80, 0x00000000, 0xF24FF280, 0xF24AC280, 0xF24A5C80, 0x00000046, 0x00000001, 0x80241DBC, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110072, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110072, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000035, 0x0000000A, 0x00000002, 0xF84060DE, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110072, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000030, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110073, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110074, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110075, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110076, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C80002, 0x00C80001, 0x00000000, 0x00110077, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x80240890, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000002F, 0x0000000A, 0x00000002, 0xF84060DE, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F4, 0x00000000, 0x00000043, 0x00000007, 0x802E4310, 0x0000001E, 0xFFFFFF1F, 0x00000000, 0xFFFFFFE7, 0x00000011, 0xF84060DE, 0x00000012, 0x00000000, 0x00000043, 0x00000007, 0x802E4310, 0x0000001E, 0xFFFFFEF7, 0x00000000, 0x00000036, 0x00000011, 0xF84060DE, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF9718885, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80242044, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xF70F2E83, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x0011006E, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, 0x802DE754, 0x0000019A, 0xFE363C83, 0x0000000A, 0x00000027, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80002, 0x00C80001, 0x00000000, 0x0011006F, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x0000000C, 0x00000002, 0xF5DE0180, 0x0000002F, 0x00000043, 0x00000003, 0x802DC228, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80004, 0x00C80001, 0x00000000, 0x00110067, 0x0000000A, 0x00000002, 0xF5DE0180, 0x0000002E, 0x0000000A, 0x00000002, 0xF84060E3, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF06, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000015E, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000046, 0x00000001, 0x80241DBC, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF84060DE, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80004, 0x00C80001, 0x00000000, 0x00110067, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E82, 0x00000001, 0x00000014, 0x00000001, 0xF70F2E82, 0x00000018, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80003, 0x00C80001, 0x00000000, 0x0011006B, 0x00000018, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80003, 0x00C80001, 0x00000000, 0x0011006C, 0x0000001B, 0x00000001, 0x00000005, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C80003, 0x00C80001, 0x00000000, 0x0011006D, 0x00000024, 0x00000002, 0xF70F2E83, 0x00000001, 0x00000043, 0x00000003, 0x802D78AC, 0x80242B40, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000013, 0x00000014, 0x00000015, 0x00000001, 0x00000012, 0x80242888, 0x80242898, 0x00000000, 0x00000000, 0x802425F8, 0xC39A8000, 0x00000000, 0x41F80000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802428A0, 0x00000047, 0x00000005, 0x802415AC, 0x00001000, 0x00000004, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802415AC, 0x00100000, 0x802428B4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80241220, 0xC3820000, 0x00000000, 0x00000000, 0x00000D01, 0x80242428, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00C80001, 0x00000000, 0x00000000, 0x00000000, 0x001A00DE, 0x00000001, 0x8024291C, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x666C6F5F, 0x32350000, 0x666C6F5F, 0x31300000, 0x666C6F5F, 0x32350000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_ECBC10.data.s b/ver/us/asm/data/ECBC10.data.s similarity index 76% rename from ver/us/asm/data/code_ECBC10.data.s rename to ver/us/asm/data/ECBC10.data.s index 7af28d8d30..cfcad26b2d 100644 --- a/ver/us/asm/data/code_ECBC10.data.s +++ b/ver/us/asm/data/ECBC10.data.s @@ -15,7 +15,7 @@ glabel D_80241FF8_ECBCF8 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_80242038_ECBD38 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, func_80240544_ECA244, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, func_80240B38_ECA838, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, func_80240B38_ECA838, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_EC9D3C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405A8_ECA2A8, 0x00000043, 0x00000001, code_EC9D00_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, code_EC9D00_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, code_EC9D00_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_ECA300, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_ECAA08, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, func_80240000_EC9D00, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240480_ECA180, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_EC9E20, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_EC9ECC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_ECA11C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242044, 0x00000043, 0x00000003, func_80240068_EC9D68, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000001, func_80240448_ECA148, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FA, 0x00000043, 0x00000002, 0x8011A804, 0x802421A8, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246150, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246158, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024295C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802429B8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244EF4, 0x00000046, 0x00000001, 0x80242628, 0x00000044, 0x00000001, 0x80245F8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80242A5C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802426B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802426B0, 0x00000044, 0x00000001, 0x80245944, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80242A14, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80241F70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, code_ECAA40_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x3FC00000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41F00000, 0x00000003, 0x4019999A, 0x0000000F, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001, 0x00000043, 0x00000002, func_8024150C_ECB20C, 0x80242EE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x80242F10, 0x8007D3C0, 0x80242F30, 0x8007D4EC, 0x00000000, 0x00000000, 0x00640000, 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x3F800000, 0x000001F4, 0x0000000A, 0x42480000, 0x41F00000, 0x00000003, 0x40600000, 0x00000028, 0x00000003, 0x42C80000, 0x41F00000, 0x00000001, 0x00000043, 0x00000002, 0x8004E89C, 0x8024303C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x8024306C, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, func_80240544_ECA244, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, func_80240B38_ECA838, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, func_80240B38_ECA838, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024003C_EC9D3C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_802405A8_ECA2A8, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EC9D00_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_80240600_ECA300, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FA, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240D08_ECAA08, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, func_80240000_EC9D00, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240480_ECA180, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240120_EC9E20, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802401CC_EC9ECC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_8024041C_ECA11C, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80242044, 0x00000043, 0x00000003, func_80240068_EC9D68, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FA, 0x00000001, 0x00000043, 0x00000002, func_80240510_ECA210, 0xFE363C89, 0x00000043, 0x00000001, func_80240448_ECA148, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_8024001C_EC9D1C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0xFFFFFCF4, 0x00000078, 0xFFFFFF92, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FA, 0x00000043, 0x00000002, 0x8011A804, 0x802421A8, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x000001FE, 0x00000000, 0xFFFFFFA6, 0x00000011, 0xF84060E5, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246150, 0x00000006, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80246158, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024295C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802429B8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000009, 0xC4070000, 0x00000000, 0x42480000, 0x0000000A, 0x42700000, 0x00000000, 0x42480000, 0x0000000F, 0x42700000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244EF4, 0x00000046, 0x00000001, 0x80242628, 0x00000044, 0x00000001, 0x80245F8C, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80242A5C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000015, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x00000154, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802426B0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001C2, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0x0000024E, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC4, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802426B0, 0x00000044, 0x00000001, 0x80245944, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80242A14, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80241F70, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECAA40_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x3FC00000, 0x0000001E, 0x0000001E, 0x42C80000, 0x41F00000, 0x00000003, 0x4019999A, 0x0000000F, 0x00000001, 0x430C0000, 0x41F00000, 0x00000001, 0x00000043, 0x00000002, func_8024150C_ECB20C, 0x80242EE0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000001E, 0x00000028, 0x00000002, 0xFE363C82, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x80242F10, 0x8007D3C0, 0x80242F30, 0x8007D4EC, 0x00000000, 0x00000000, 0x00640000, 0x00000000, 0x00380028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x3F800000, 0x000001F4, 0x0000000A, 0x42480000, 0x41F00000, 0x00000003, 0x40600000, 0x00000028, 0x00000003, 0x42C80000, 0x41F00000, 0x00000001, 0x00000043, 0x00000002, 0x8004E89C, 0x8024303C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x8024306C, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 glabel D_802430B8_ECCDB8 .word 0x00000000 diff --git a/ver/us/asm/data/ED1840.data.s b/ver/us/asm/data/ED1840.data.s new file mode 100644 index 0000000000..5e89002ecc --- /dev/null +++ b/ver/us/asm/data/ED1840.data.s @@ -0,0 +1,9 @@ +.include "macro.inc" + +.section .data + +glabel D_80241850_ED1840 +.word 0xC4020000, 0x00000000, 0x00000000, 0x42B40000, 0x44020000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241CCC, D_80241850_ED1840, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190118, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802441C0, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802441C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241BCC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241C28, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x8024417C, 0x00000044, 0x00000001, 0x8024260C, 0x00000044, 0x00000001, 0x802434D8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, 0x80241920, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80241C84, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x802418B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ECFFF0_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_ED0030, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0x00000045, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000024, 0x00000002, 0xFE363C84, 0x00000046, 0x00000024, 0x00000002, 0xFE363C85, 0x00000047, 0x00000024, 0x00000002, 0xFE363C86, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000053, 0x00000024, 0x00000002, 0xFE363C83, 0x00000053, 0x00000024, 0x00000002, 0xFE363C84, 0x00000054, 0x00000024, 0x00000002, 0xFE363C85, 0x00000055, 0x00000024, 0x00000002, 0xFE363C86, 0x00000056, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000059, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000061, 0x00000024, 0x00000002, 0xFE363C84, 0x00000062, 0x00000024, 0x00000002, 0xFE363C85, 0x00000063, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000067, 0x00000024, 0x00000002, 0xFE363C83, 0x00000067, 0x00000024, 0x00000002, 0xFE363C84, 0x00000068, 0x00000024, 0x00000002, 0xFE363C85, 0x00000069, 0x00000024, 0x00000002, 0xFE363C86, 0x0000006A, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000043, 0x00000007, 0x802E4310, 0x00000141, 0xFFFFFF06, 0x00000064, 0x00000000, 0x0000000D, 0xF84060E6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, 0x80243214, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E84, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000044, 0x00000001, 0x80243214, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x0000000F, 0x00000010, 0x00000001, 0x0000000E, 0x80243430, 0x8024343C, 0x00000000, 0x00000000, 0x80243294, 0xC3480000, 0x00000000, 0x3F800000, 0x00000000, 0x00000002, 0x00000013, 0x00000014, 0x00000001, 0x00000012, 0x80243468, 0x80243474, 0x00000000, 0x00000000, 0x8024333C, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x00000002, 0x00000017, 0x00000018, 0x00000001, 0x00000016, 0x802434A0, 0x802434AC, 0x00000000, 0x00000000, 0x80243384, 0x43480000, 0x00000000, 0x3F800000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80243444, 0x00000047, 0x00000005, 0x80242C10, 0x00001000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242C10, 0x00100000, 0x80243458, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024347C, 0x00000047, 0x00000005, 0x80242C10, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242C10, 0x00100000, 0x80243490, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802434B4, 0x00000047, 0x00000005, 0x80242C10, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242C10, 0x00100000, 0x802434C8, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x000001F4, 0x0000000A, 0x42480000, 0x41F00000, 0x00000003, 0x40600000, 0x00000028, 0x00000003, 0x42C80000, 0x41F00000, 0x00000001, 0x00000043, 0x00000002, 0x8004E89C, 0x802435E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x80243610, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 + +glabel D_8024365C_ED364C +.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_8024162C_ED161C, 0x80243674, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x802436A4, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C80, 0x00000032, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048B18, 0xFFFFFFFF, 0x802436A4, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000002, 0x00000043, 0x00000003, 0x80048B18, 0xFFFFFFFF, 0x8024376C, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x8024376C, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x802438F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80243630, 0xC3AF0000, 0x00000000, 0x42200000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFEA2, 0x00000000, 0x00000028, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEA2, 0x00000000, 0x00000028, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243630, 0x43820000, 0x00000000, 0x42960000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000104, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000104, 0x00000000, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243714, 0xC2480000, 0x425C0000, 0x42B40000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFFCE, 0x00000037, 0x0000005A, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x0000005A, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80243740, 0x00000000, 0xC47A0000, 0x00000000, 0x00002D04, 0x80243984, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFFCE, 0x00000037, 0x0000005A, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x0000005A, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802439BC, 0x1A100005, 0x00000001, 0x80243BAC, 0x1A150005, 0x00000001, 0x80243D9C, 0x1A170002, 0x00000001, 0x80243F8C, 0x1A170002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x666C6F5F, 0x30300000, 0x666C6F5F, 0x30330000 diff --git a/ver/us/asm/data/code_ED5780.data.s b/ver/us/asm/data/ED5780.data.s similarity index 99% rename from ver/us/asm/data/code_ED5780.data.s rename to ver/us/asm/data/ED5780.data.s index 81dc30cf3f..9c3cd83ae8 100644 --- a/ver/us/asm/data/code_ED5780.data.s +++ b/ver/us/asm/data/ED5780.data.s @@ -3,7 +3,7 @@ .section .data glabel D_80241560_ED5780 -.word 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC2C80000, 0xC1200000, 0xC32C0000, 0x43070000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241AA4, D_80241560_ED5780, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, func_80240000_ED4220, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000002, 0x802E37A0, 0x80000022, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3648, 0x00000089, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000007, 0x802E4310, 0x00000057, 0x00000000, 0xFFFFFFC4, 0x00000006, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80244BA0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241A1C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244144, 0x00000046, 0x00000001, 0x80241720, 0x00000044, 0x00000001, 0x80244B40, 0x00000044, 0x00000001, 0x802436E8, 0x00000044, 0x00000001, 0x80242BD8, 0x00000044, 0x00000001, 0x80244164, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241770, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241770, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241770, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x8024333C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802428DC, 0x00000044, 0x00000001, 0x80241A78, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80241A78, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x802415D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, code_ED4260_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC3B40000, 0x00000000, 0x00000000, 0x42B40000, 0xC2C80000, 0xC1200000, 0xC32C0000, 0x43070000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241AA4, D_80241560_ED5780, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, func_80240000_ED4220, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000002, 0x802E37A0, 0x80000022, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3648, 0x00000089, 0x00000002, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000000FA, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, 0x802E3628, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000007, 0x802E4310, 0x00000057, 0x00000000, 0xFFFFFFC4, 0x00000006, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80244BA0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241A1C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244144, 0x00000046, 0x00000001, 0x80241720, 0x00000044, 0x00000001, 0x80244B40, 0x00000044, 0x00000001, 0x802436E8, 0x00000044, 0x00000001, 0x80242BD8, 0x00000044, 0x00000001, 0x80244164, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000C, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEF7, 0x00000024, 0x00000002, 0xFE363C81, 0x000000F7, 0x00000024, 0x00000002, 0xFE363C82, 0x000000C7, 0x00000024, 0x00000002, 0xFE363C83, 0x00000139, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241770, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED4, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFEED, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF47, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241770, 0x00000024, 0x00000002, 0xFE363C80, 0x00000107, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF08, 0x00000024, 0x00000002, 0xFE363C82, 0x0000016A, 0x00000024, 0x00000002, 0xFE363C83, 0x00000092, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241770, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x8024333C, 0x00000016, 0x00000001, 0x00000002, 0x00000044, 0x00000001, 0x802428DC, 0x00000044, 0x00000001, 0x80241A78, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80241A78, 0x00000044, 0x00000001, 0x80285C70, 0x00000023, 0x00000000, 0x00000046, 0x00000001, 0x802415D0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, ED4260_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 glabel D_80241DA0_ED5FC0 .word 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802E49F4, 0xFE363C80, 0x00000001, 0x00000010, 0x00000002, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, func_80240198_ED43B8, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402BC_ED44DC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFCE, 0x000000AA, 0x00000181, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000064, 0x0000005A, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24FAE80, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24C0A80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7D50, 0x00000043, 0x00000005, 0x802D6EC8, 0x00000038, 0xFE363C82, 0xFE363C83, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000035, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6A, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E04, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, 0x802D6708, 0x00000035, 0x00000001, 0x00000044, 0x00000001, 0x80242010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000003, 0x802DC7C8, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802E1C00, 0x0000000A, 0x00000037, 0x0000006C, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C86, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C86, 0xFFFFFFF6, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFE363C83, 0xFE363C86, 0xFE363C85, 0x00000043, 0x00000005, 0x802D6C60, 0x0000003C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000008, 0x00000001, 0x00000028, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080024, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFCE, 0x0000005A, 0x0000003C, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24A7F4D, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24A7F4D, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C82, 0xFE363C80, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000005A, 0x0000010E, 0x00000118, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000004, 0x802DE510, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7D4D, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A2280, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000044, 0x00000001, 0x80241EA0, 0x00000044, 0x00000001, 0x80241F30, 0x00000044, 0x00000001, 0x80242120, 0x00000044, 0x00000001, 0x8024215C, 0x00000044, 0x00000001, 0x80242278, 0x00000044, 0x00000001, 0x802423FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x000000AA, 0x0000004B, 0x00000096, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000038, 0x00000000, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000064, 0x0000000F, 0x00000096, 0x00000001, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C80, 0x0000002F, 0x00000002, 0xFE363C82, 0xF24FAE80, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24C0A80, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7D50, 0x00000043, 0x00000005, 0x802D6EC8, 0x00000038, 0xFE363C82, 0xFE363C83, 0xFE363C82, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x8024253C, 0x00000044, 0x00000001, 0x802425CC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D7044, 0x00000038, 0x00000001, 0x00000043, 0x00000005, 0x802D6C60, 0x00000038, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000043, 0x00000005, 0x802D6EC8, 0x00000038, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x0000003C, 0x00000001, 0x00000046, 0x00000001, 0x802424D4, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802E37A0, 0x80000024, 0x00000008, 0x00000001, 0x00000168, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080017, 0x00000043, 0x00000002, 0x802DE674, 0xF24A7B4D, 0x00000043, 0x00000005, 0x802DEF24, 0xFFFFFF9C, 0xFFFFFFF6, 0xFFFFFF54, 0x0000004B, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7E80, 0x00000046, 0x00000001, 0x802426AC, 0x00000008, 0x00000001, 0x0000003C, 0x00000043, 0x00000003, 0x802D78AC, 0x80244BA8, 0x00000002, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFF9C, 0xFFFFFFF6, 0xFFFFFF54, 0x00000043, 0x00000003, 0x802DEF5C, 0x00000096, 0x00000000, 0x00000043, 0x00000002, 0x802DE6A4, 0x0001000F, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFF7F, 0x00000009, 0xFFFFFF4F, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DC8D0, 0xFFFFFFFC, 0x00000043, 0x00000003, 0x802D7044, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x0000003C, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFFFFFFC7, 0xFFFFFFEC, 0xFFFFFF97, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0x0000005A, 0x00000000, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24BE280, 0x00000000, 0x000001C2, 0xF24ADE80, 0xF24A6280, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010030, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000008, 0x00000001, 0x0000000A, 0x00000046, 0x00000001, 0x802416B4, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C90002, 0x00C90001, 0x00000005, 0x00110082, 0x00000043, 0x00000003, 0x802DC228, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C90003, 0x00C90007, 0x00000000, 0x00110083, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C90006, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C90001, 0x00000024, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C81, 0x00000001, 0x00000046, 0x00000001, 0x80241DA4, 0x00000043, 0x00000002, 0x802E3F18, 0x0000005A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C90003, 0x00C90007, 0x00000000, 0x00110084, 0x00000043, 0x00000005, 0x802DD82C, 0x00000000, 0x00C90002, 0x00C90001, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00C90001, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000046, 0x00000001, 0x802416D8, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000043, 0x00000003, 0x802D7044, 0x00000034, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x0000003D, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000015, 0x7FFFFE00, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x0000003D, 0x00000000, 0x00000043, 0x00000003, 0x802D7044, 0x0000003C, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000F, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000010, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000011, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000037, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E04, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF9C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000050, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E04, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000005, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFC18, 0x00000024, 0x00000002, 0xFE363C82, 0x000007D0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E04, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFF830, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E04, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000008, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFA24, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E04, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000009, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFC18, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000001, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80241E04, 0x00000057, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000031, 0x00000044, 0x00000001, 0x80242010, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x002D0041, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000003C, 0x00000000, 0x00000037, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000001C2, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C90002, 0x00C90001, 0x00000000, 0x001100C6, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000003, 0x802D78AC, 0x80244BB0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E0, 0x00000001, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C8A, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0x00000000, 0x00000000, 0x00000013, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802E2E80, 0x00000001, 0x00000043, 0x00000001, 0x802E3A70, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C82, 0x00000016, 0x00000001, 0xFFFFFFFF, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00C90004, 0x00C90008, 0x00000000, 0x00110081, 0x0000001C, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000004, 0x802DE754, 0xFFFFFFEF, 0xFFFFFFEF, 0x00000014, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000043, 0x00000003, 0x802DEF5C, 0x00000064, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A7E80, 0x00000000, 0x000001C2, 0xF24ADE80, 0xF24A6280, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00060006, 0x00000043, 0x00000002, 0x802E3EA8, 0xFE363C81, 0x00000043, 0x00000007, 0x802E4310, 0x00000057, 0x00000000, 0xFFFFFFC4, 0x00000006, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000001, 0x802E3FA4, 0x00000043, 0x00000002, 0x802E2E80, 0x00000000, 0x00000046, 0x00000001, 0x802426D4, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000004, 0x802E20AC, 0x00000000, 0x00000000, 0x00000013, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004E, 0x00000006, 0x8024348C, 0x00000080, 0x0000000F, 0x80243484, 0x00000000, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C86, 0x0000001E, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C81, 0xFE363C86, 0x00000027, 0x00000002, 0xFE363C84, 0xFE363C86, 0x00000014, 0x00000001, 0xFE363C83, 0x00000021, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000056, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000012, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DE754, 0xFE363C80, 0xFE363C85, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x00000000, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000000, 0x00000057, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x802416B4, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x0000002D, 0x00000044, 0x00000001, 0x80243718, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000145, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AD680, 0xF24A5680, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000005, 0x00110078, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C90009, 0x00C90005, 0x00000005, 0x00000018, 0x00000001, 0x00000030, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000000, 0x00000044, 0x00000001, 0x80243718, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000145, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AD680, 0xF24A5680, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000005, 0x00110079, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000001, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C90001, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x00000262, 0x00000000, 0x00000043, 0x0000000A, 0x802E4EF0, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x0000000F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90001, 0x00C90001, 0x00000000, 0x0011007A, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C90005, 0x00C90001, 0x00000000, 0x00000043, 0x00000002, 0x802DF348, 0xFE363C80, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0xFE363C80, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000005, 0x0011007B, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000001, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x0011007C, 0x00000043, 0x00000002, 0x802DE138, 0x001E0011, 0x00000008, 0x00000001, 0x0000000A, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD848, 0xFFFFFFFF, 0x00C90003, 0x00C90007, 0x00000000, 0x0011007D, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD848, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000000, 0x0011007E, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000024, 0x00000002, 0xF84060DF, 0x00000001, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00400000, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000005, 0x0011007F, 0x00000013, 0x00000000, 0x00000018, 0x00000001, 0x00000031, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x00110080, 0x00000024, 0x00000002, 0xF84060E0, 0x00000001, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000000, 0x00110085, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00C90004, 0x00C90008, 0x00000000, 0x00000018, 0x00000001, 0x0000003C, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90003, 0x00C90007, 0x00000000, 0x00110086, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00C90002, 0x00C90001, 0x00000000, 0x00110087, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000046, 0x00000001, 0x802416D8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x802438B8, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000030, 0x0000000A, 0x00000002, 0xF84060DF, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00C90008, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00400000, 0x00000001, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000030, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000001, 0x0000001B, 0x00000001, 0x00000031, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFFFFFFBD, 0xFFFFFFEC, 0xFFFFFF97, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80243310, 0x42A00000, 0xC2700000, 0x00000000, 0x00000D01, 0x80243E68, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00C90001, 0x00000000, 0x00000000, 0x00000000, 0x001A00DF, 0x00000001, 0x80243F54, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_ED9170.data.s b/ver/us/asm/data/ED9170.data.s similarity index 100% rename from ver/us/asm/data/code_ED9170.data.s rename to ver/us/asm/data/ED9170.data.s diff --git a/ver/us/asm/data/code_EDC6D0.data.s b/ver/us/asm/data/EDC6D0.data.s similarity index 100% rename from ver/us/asm/data/code_EDC6D0.data.s rename to ver/us/asm/data/EDC6D0.data.s diff --git a/ver/us/asm/data/code_EE20E0.data.s b/ver/us/asm/data/EE20E0.data.s similarity index 100% rename from ver/us/asm/data/code_EE20E0.data.s rename to ver/us/asm/data/EE20E0.data.s diff --git a/ver/us/asm/data/code_EE8970.data.s b/ver/us/asm/data/EE8970.data.s similarity index 50% rename from ver/us/asm/data/code_EE8970.data.s rename to ver/us/asm/data/EE8970.data.s index 3a18f81504..05c09a1406 100644 --- a/ver/us/asm/data/code_EE8970.data.s +++ b/ver/us/asm/data/EE8970.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802423C0_EE8970 -.word 0x44340000, 0x00000000, 0x00000000, 0x43870000, 0xC4340000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802426EC, D_802423C0_EE8970, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EE65B0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EE65B0_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245340, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245348, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242588, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024252C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000001F, 0xC3FA0000, 0x00000000, 0xC2B40000, 0x00000019, 0xC3FF0000, 0x00000000, 0x00000000, 0x00000020, 0xC3FA0000, 0x00000000, 0x42DC0000, 0x00000021, 0xC37A0000, 0x00000000, 0xC2B40000, 0x0000001A, 0xC3700000, 0x00000000, 0x00000000, 0x00000022, 0xC37A0000, 0x00000000, 0x42DC0000, 0x0000001B, 0xC2480000, 0x00000000, 0x41C80000, 0x0000001C, 0x428C0000, 0x42700000, 0xC2BE0000, 0x0000001D, 0x43CD0000, 0x42700000, 0xC2BE0000, 0x0000001E, 0x44098000, 0x00000000, 0x42480000, 0x00000023, 0xC2480000, 0x00000000, 0x42DC0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244F30, 0x00000044, 0x00000001, 0x80244F60, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x8024262C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000035, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80242490, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80242490, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80243EA8, 0x00000044, 0x00000001, 0x80245254, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x802425E4, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80242420, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EE68BC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240340_EE68F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 +.word 0x44340000, 0x00000000, 0x00000000, 0x43870000, 0xC4340000, 0x00000000, 0x00000000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802426EC, D_802423C0_EE8970, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011E, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EE65B0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EE65B0_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245340, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245348, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242588, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024252C, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000001F, 0xC3FA0000, 0x00000000, 0xC2B40000, 0x00000019, 0xC3FF0000, 0x00000000, 0x00000000, 0x00000020, 0xC3FA0000, 0x00000000, 0x42DC0000, 0x00000021, 0xC37A0000, 0x00000000, 0xC2B40000, 0x0000001A, 0xC3700000, 0x00000000, 0x00000000, 0x00000022, 0xC37A0000, 0x00000000, 0x42DC0000, 0x0000001B, 0xC2480000, 0x00000000, 0x41C80000, 0x0000001C, 0x428C0000, 0x42700000, 0xC2BE0000, 0x0000001D, 0x43CD0000, 0x42700000, 0xC2BE0000, 0x0000001E, 0x44098000, 0x00000000, 0x42480000, 0x00000023, 0xC2480000, 0x00000000, 0x42DC0000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244F30, 0x00000044, 0x00000001, 0x80244F60, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x8024262C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000035, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80242490, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80242490, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80243EA8, 0x00000044, 0x00000001, 0x80245254, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x802425E4, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80242420, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, func_8024030C_EE68BC, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240340_EE68F0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000 glabel D_802431FC_EE97AC .word 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C81, 0x00000030, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0x00000030, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFB, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x4404C000, 0x42960000, 0x42A20000, 0x43F08000, 0x42A00000, 0x42A20000, 0x43D78000, 0x42960000, 0x42A20000, 0x43BE8000, 0x428C0000, 0x42A20000, 0x43A58000, 0x42960000, 0x42A20000, 0x438C8000, 0x42A00000, 0x42A20000, 0x43670000, 0x42960000, 0x42A20000, 0x43350000, 0x428C0000, 0x42A20000, 0x43030000, 0x42960000, 0x42A20000, 0x42A20000, 0x42A00000, 0x42A20000, 0x41F80000, 0x42960000, 0x42A20000, 0xC1980000, 0x428C0000, 0x42A20000, 0xC28A0000, 0x42960000, 0x42A20000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802E37A0, 0x80000023, 0x00000043, 0x00000005, func_802E2A80, 0x000000A5, 0x802433B4, 0x0000000D, 0x0000000A, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000007B, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFE5, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFF6, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000043, 0x00000004, func_8024046C_EE6A1C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E3908, 0x80000023, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1FB4, 0x00000213, 0x00000051, 0x0000001E, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802E0158, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, 0x802E01B8, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000002, 0x802D6400, 0x0000007B, 0x00000056, 0x00000000, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF6, 0x00000043, 0x00000002, 0x802DE674, 0xF24A7B4D, 0x00000043, 0x00000005, 0x802DEF08, 0x00000213, 0x00000030, 0xFE363C82, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFF1, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7B4D, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0x00000213, 0x00000044, 0xFE363C82, 0x0000000A, 0x00000057, 0x00000000, 0x00000045, 0x00000002, 0x80243200, 0xFD050F89, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000001, func_802403D4_EE6984, 0x0000000B, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000045, 0x00000002, 0x80243318, 0xFE363C8E, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80243450, 0x0000000B, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000049, 0x00000001, 0xFE363C8E, 0x00000043, 0x00000001, func_8024042C_EE69DC, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0x0000007B, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000043, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000002F3, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, 0x802DC8D0, 0xFFFFFFFC, 0x00000043, 0x00000003, 0x802D6708, 0x0000007B, 0x00000000, 0x00000024, 0x00000002, 0xF97188A5, 0x00000000, 0x00000049, 0x00000001, 0xFD050F89, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000001, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x00000193, 0x00000000, 0x0000024F, 0x00000037, 0x00000079, 0x00000043, 0x00000003, 0x802D6708, 0x0000007B, 0x00000001, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C88, 0x00000014, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24BE280, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24BE280, 0x00000024, 0x00000002, 0xFE363C89, 0x000000B4, 0x00000005, 0x00000001, 0xFE363C89, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000007B, 0x0000024F, 0x00000037, 0x00000079, 0x00000026, 0x00000002, 0xFE363C83, 0xFE363C82, 0x0000002F, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000005, 0x802D6208, 0x0000007B, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000007B, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C82, 0xF24A7AB4, 0x0000000D, 0x00000002, 0xFE363C89, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002C, 0x00000002, 0xFE363C85, 0xFE363C88, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0xFFFFFFE2, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFD8, 0x0000002F, 0x00000002, 0xFE363C87, 0xF24B6A80, 0x0000002F, 0x00000002, 0xFE363C88, 0xF24B6A80, 0x00000005, 0x00000001, 0x0000003C, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000007B, 0x0000024F, 0x00000037, 0x00000079, 0x00000043, 0x00000005, 0x802D6208, 0x0000007B, 0xFE363C83, 0xFE363C83, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000007B, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C87, 0x0000002C, 0x00000002, 0xFE363C86, 0xFE363C88, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xF97188A4, 0x00000000, 0x00000024, 0x00000002, 0xF97188A5, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000 @@ -54,4 +54,4 @@ glabel jtbl_80245398_EEB948 .word L80241F54_EE8504, L80241F64_EE8514, L80241F7C_EE852C, L80241F8C_EE853C, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L8024200C_EE85BC, L80241FA4_EE8554, L80241FB4_EE8564, L80241FCC_EE857C, L80241FE4_EE8594, L80241FFC_EE85AC, 0, 0, 0 glabel D_802453E0_EEB990 -.word 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, code_EE65B0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000 +.word 0x43A00000, 0x00000000, 0x00000000, 0x43870000, 0xC32A0000, 0x00000000, 0x425C0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x802401A8, EE65B0_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x0019011F, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000007F, 0x00000000, 0x00000008, 0x00000012, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000034, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000035, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80241760, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240120, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802412C0, 0x00000046, 0x00000001, 0x80241300, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000044, 0x00000001, 0x802404D8, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x8024017C, 0x00000044, 0x00000001, 0x80285C70, 0x00000013, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000E, 0x7FFFFE00, 0x00000044, 0x00000001, 0x802413B0, 0x00000046, 0x00000001, 0x80240060, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000024, 0x00000002, 0xFE363C83, 0x00000007, 0x00000024, 0x00000002, 0xFE363C84, 0x00000005, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000001, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0xFE363C84, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000041A, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AA280, 0xF24A8A80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9480, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0009, 0x00CB0009, 0x00000205, 0x001100C3, 0x00000043, 0x00000003, 0x802DB654, 0x0000000A, 0x00CB0009, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000043, 0x00000003, 0x802D78AC, 0x80241768, 0x00000009, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DB3C8, 0x0000000B, 0x00000030, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFFFFFFE2, 0x0000001E, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x0000001E, 0xFFFFFFE2, 0x00000014, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802DB310, 0x0000000B, 0x00000000, 0x00000000, 0xFE363C80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x000000DC, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802DF124, 0x0000000A, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802DB5E8, 0x0000000A, 0xF24A7A80, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C81, 0x00000190, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x00000113, 0xFE363C82, 0x0000001E, 0x00000045, 0x00000002, 0x8024032C, 0xFE363C89, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A6, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000049, 0x00000001, 0xFE363C89, 0x00000043, 0x00000004, 0x802DC5C0, 0x0000000A, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x0000000A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0x0000000A, 0xFE363C80, 0x000001C2, 0xFE363C82, 0x0000001E, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000048, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000032, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010021, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080007, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010002, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009B, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000032, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009C, 0x00000018, 0x00000001, 0x00000039, 0x0000000A, 0x00000002, 0xF8406102, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009D, 0x00000024, 0x00000002, 0xF8406102, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009E, 0x00000013, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x0000000A, 0x00CB0007, 0x00CB0001, 0x00000205, 0x0011009F, 0x00000023, 0x00000000, 0x00000024, 0x00000002, 0xF97188A6, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DB4EC, 0x0000000A, 0x00000040, 0x00000028, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000A, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000044, 0x00000001, 0x8024032C, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000A, 0x00000000, 0x000001C2, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80240B28, 0x00000024, 0x00000002, 0xF97188A6, 0x00000000, 0x00000044, 0x00000001, 0x8024094C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC7C8, 0x0000000B, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0x0000000B, 0x00CB0002, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000A, 0x00000003, 0x00000043, 0x00000003, 0x802DD3E0, 0x0000000B, 0x00000003, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000A, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x00000043, 0x0000000A, 0x802DD520, 0x0000000B, 0x00000000, 0x00000001, 0x00000005, 0x00000005, 0x0000000D, 0x00000005, 0x00000000, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x0000010E, 0xFFFFFFFB, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x0000000B, 0x00000000, 0x000001C2, 0xFFFFFFFB, 0x00000043, 0x00000003, 0x80048F68, 0xFFFFFFFF, 0x8024079C, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00400D01, 0x80240CD0, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x0000000B, 0x80240300, 0x00000000, 0x437A0000, 0x00000000, 0x00008F01, 0x80240DB4, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00CB0001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E1, 0x00000002, 0x80240EE0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF84060F9, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802CCF00, 0xFFFFFF4C, 0x00000000, 0xFFFFFFEE, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x802412E0, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0xF24A7CE7, 0x0000000D, 0xF24A7D80, 0x00000010, 0xF24A7E1A, 0x00000013, 0xF24A7EB4, 0x00000016, 0xF24A7F4D, 0x00000019, 0xF24A7EB4, 0x00000018, 0xF24A7E1A, 0x00000019, 0xF24A7D80, 0x00000018, 0xF24A7CE7, 0x0000000A, 0xF24A814D, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060F9, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000056, 0x00000000, 0x00000030, 0x00000001, 0x80241360, 0x00000005, 0x00000001, 0x0000000A, 0x00000032, 0x00000002, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0xFE363C81, 0xFE363C82, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFFFFFF56, 0x00000000, 0x00000023, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x00000258, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ADE80, 0xF24A5680, 0x00000043, 0x00000004, 0x802D914C, 0x00000000, 0xF249B280, 0xF24ADE80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF4C, 0x00000000, 0xFFFFFFF1, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000006, 0x00000004, 0xFFFFFF42, 0x00000000, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000006, 0x00000043, 0x00000004, 0x802D7AC0, 0x0000000B, 0x00000187, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0xFFFFFFCE, 0x00000078, 0x00000002, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x0000000C, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0x0000000E, 0x7FFFFE00, 0x00000043, 0x00000005, 0x802D6C60, 0x00000010, 0x00000000, 0xFFFFFFCE, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x31330000, 0x666C6F5F, 0x30300000 diff --git a/ver/us/asm/data/code_EEFAD0.data.s b/ver/us/asm/data/EEFAD0.data.s similarity index 61% rename from ver/us/asm/data/code_EEFAD0.data.s rename to ver/us/asm/data/EEFAD0.data.s index 781b1a3593..49caf06907 100644 --- a/ver/us/asm/data/code_EEFAD0.data.s +++ b/ver/us/asm/data/EEFAD0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802429D0_EEFAD0 -.word 0xC4340000, 0x00000000, 0x00000000, 0x42B40000, 0x44318000, 0x42C80000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BD0, D_802429D0_EEFAD0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190120, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245440, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245448, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242AA0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242AFC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0xC39B0000, 0x00000000, 0x00000000, 0x0000000B, 0x43988000, 0x42C80000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244534, 0x00000046, 0x00000001, 0x80243FA4, 0x00000044, 0x00000001, 0x802434CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80242BA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80245224, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80242B58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80242A30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, code_EED100_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_EED140, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD1C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000044, 0x00000001, 0x80242F00, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x000002D5, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000044, 0x00000001, 0x80242F00, 0x00000043, 0x00000002, 0x802D6400, 0x00000041, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000043, 0x00000024, 0x00000002, 0xFE363C86, 0x00000044, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802431AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000047, 0x00000024, 0x00000002, 0xFE363C84, 0x00000048, 0x00000024, 0x00000002, 0xFE363C85, 0x00000049, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004A, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, 0x802431AC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000050, 0x00000024, 0x00000002, 0xFE363C85, 0x00000051, 0x00000024, 0x00000002, 0xFE363C86, 0x00000052, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802431AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000055, 0x00000024, 0x00000002, 0xFE363C84, 0x00000056, 0x00000024, 0x00000002, 0xFE363C85, 0x00000057, 0x00000024, 0x00000002, 0xFE363C86, 0x00000058, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802431AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 +.word 0xC4340000, 0x00000000, 0x00000000, 0x42B40000, 0x44318000, 0x42C80000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80242BD0, D_802429D0_EEFAD0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190120, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245440, 0x00000004, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80245448, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242AA0, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242AFC, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0xC39B0000, 0x00000000, 0x00000000, 0x0000000B, 0x43988000, 0x42C80000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x80244534, 0x00000046, 0x00000001, 0x80243FA4, 0x00000044, 0x00000001, 0x802434CC, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80242BA0, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000012, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000014, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000016, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000018, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000013, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000015, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000017, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000019, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x80245224, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80242B58, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80242A30, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EED100_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_EED140, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD1C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEFC, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000064, 0x00000044, 0x00000001, 0x80242F00, 0x00000024, 0x00000002, 0xFE363C80, 0x000000FA, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x000002D5, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x000000B4, 0x00000044, 0x00000001, 0x80242F00, 0x00000043, 0x00000002, 0x802D6400, 0x00000041, 0x00000024, 0x00000002, 0xFE363C83, 0x00000041, 0x00000024, 0x00000002, 0xFE363C84, 0x00000042, 0x00000024, 0x00000002, 0xFE363C85, 0x00000043, 0x00000024, 0x00000002, 0xFE363C86, 0x00000044, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802431AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000047, 0x00000024, 0x00000002, 0xFE363C83, 0x00000047, 0x00000024, 0x00000002, 0xFE363C84, 0x00000048, 0x00000024, 0x00000002, 0xFE363C85, 0x00000049, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004A, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, 0x802431AC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000050, 0x00000024, 0x00000002, 0xFE363C85, 0x00000051, 0x00000024, 0x00000002, 0xFE363C86, 0x00000052, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802431AC, 0x00000043, 0x00000002, 0x802D6400, 0x00000055, 0x00000024, 0x00000002, 0xFE363C83, 0x00000055, 0x00000024, 0x00000002, 0xFE363C84, 0x00000056, 0x00000024, 0x00000002, 0xFE363C85, 0x00000057, 0x00000024, 0x00000002, 0xFE363C86, 0x00000058, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802431AC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000 glabel D_80243760_EF0860 .word 0x001D00F0, 0x001D00F1 @@ -15,7 +15,7 @@ glabel D_80243778_EF0878 .word 0x001D00E0, 0x001D00E1, 0x001D00E2, 0x001D00E3, 0x001D00E4, 0x001D00E5, 0x001D00E6, 0x001D00E7, 0x001D00E8, 0x001D00E9, 0x001D00EA, 0x001D00EB, 0x001D00EC, 0x001D00ED, 0x001D00EE, 0x001D00EF glabel D_802437B8_EF08B8 -.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, func_80240624_EED724, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, func_80240C18_EEDD18, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, func_80240C18_EEDD18, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_EED21C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240688_EED788, 0x00000043, 0x00000001, code_EED1E0_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, code_EED1E0_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, code_EED1E0_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_EED7E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_EEDEE8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, func_802400E0_EED1E0, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240560_EED660, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_EED300, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_EED3AC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802404FC_EED5FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802437C4, 0x00000043, 0x00000003, func_80240148_EED248, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000001, func_80240528_EED628, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000045, 0x00000002, 0x80243DA8, 0xFE363C8A, 0x00000043, 0x00000002, 0x802DE674, 0xF24A7D4D, 0x00000043, 0x00000005, 0x802DEF08, 0x000001C2, 0x000000B4, 0xFFFFFF88, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, func_80240E18_EEDF18, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, 0x80243EE0, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FB, 0x00000043, 0x00000002, 0x8011A804, 0x80243928, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8EE0, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x80243E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 +.word 0x430C0000, 0x43340000, 0x435C0000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212D, 0x00000043, 0x00000002, func_80240624_EED724, 0xFD050F80, 0x00000008, 0x00000001, 0x00000055, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x0000212E, 0x00000043, 0x00000003, func_80240C18_EEDD18, 0x00000046, 0x00000046, 0x00000008, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802E37A0, 0x0000208E, 0x00000043, 0x00000003, func_80240C18_EEDD18, 0x00000032, 0x00000032, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_8024011C_EED21C, 0xFD050F80, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000002F, 0x00000043, 0x00000001, func_80240688_EED788, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc2, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000001, EED1E0_DeadUnkPartnerPosFunc, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000003, 0x00000043, 0x00000002, func_802406E0_EED7E0, 0xFD050F80, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060FB, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x80048290, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_80240DE8_EEDEE8, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000001, 0x00200000, 0x00000043, 0x00000001, func_802400E0_EED1E0, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000003, func_80240560_EED660, 0xFD050F80, 0xFE363C89, 0x00000043, 0x00000003, 0x802E4064, 0x0000000F, 0xFE363C8C, 0x00000043, 0x00000001, func_80240200_EED300, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DC, 0x000000A0, 0x00000028, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF8405D36, 0x00000000, 0x00000024, 0x00000002, 0xF8405D36, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DA, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DB, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000001, func_802402AC_EED3AC, 0x0000000A, 0x00000002, 0xFE363C80, 0xFFFFFFFF, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0xFE363C8B, 0x00000043, 0x00000002, func_802404FC_EED5FC, 0xFE363C8B, 0x00000012, 0x00000000, 0x00000043, 0x00000002, 0x802DCACC, 0x00000002, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DF, 0x000000A0, 0x00000028, 0x00000043, 0x00000002, 0x802DE138, 0x001E000D, 0x00000043, 0x00000001, 0x802DE040, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x802437C4, 0x00000043, 0x00000003, func_80240148_EED248, 0xFE363C8B, 0xFE363C8D, 0x00000024, 0x00000002, 0xF84060FB, 0x00000001, 0x00000043, 0x00000002, func_802405F0_EED6F0, 0xFE363C89, 0x00000043, 0x00000001, func_80240528_EED628, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000001, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DD, 0x000000A0, 0x00000028, 0x00000012, 0x00000000, 0x00000043, 0x00000004, 0x802DDE0C, 0x001D00DE, 0x000000A0, 0x00000028, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000003, 0x802E2EAC, 0x00000000, 0x00200000, 0x00000043, 0x00000001, func_802400FC_EED1FC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000006, 0x00000008, 0x00000001, 0x00000002, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000045, 0x00000002, 0x80243DA8, 0xFE363C8A, 0x00000043, 0x00000002, 0x802DE674, 0xF24A7D4D, 0x00000043, 0x00000005, 0x802DEF08, 0x000001C2, 0x000000B4, 0xFFFFFF88, 0x0000001E, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF97188A7, 0x00000000, 0x00000043, 0x00000001, func_80240E18_EEDF18, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000014, 0x00000001, 0xFE363C80, 0x00000021, 0x00000002, 0x0000026C, 0x00000294, 0x00000043, 0x00000007, 0x802E4310, 0x0000015C, 0x00000280, 0x00000091, 0xFFFFFF9C, 0x0000000D, 0xF84060EC, 0x00000024, 0x00000002, 0xF97188A7, 0x00000001, 0x00000023, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF97188A7, 0x00000000, 0x00000047, 0x00000005, 0x80243EE0, 0x00000080, 0x00000014, 0x00000001, 0x00000000, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8DC0, 0x0000015E, 0x000000F0, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000024, 0x00000002, 0xFD050F80, 0xFE363C80, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060FB, 0x00000043, 0x00000002, 0x8011A804, 0x80243928, 0x00000043, 0x00000007, 0x8011A58C, 0x802F8EE0, 0x000001D8, 0x00000064, 0xFFFFFF9C, 0x00000000, D_80000000, 0x00000043, 0x00000002, 0x8011A804, 0x80243E10, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 glabel D_80244070_EF1170 .word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3F800000, 0x0000002D, 0x0000003C, 0x42C80000, 0x00000000, 0x00000003, 0x40666666, 0x0000000A, 0x00000001, 0x42F00000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000258, 0x00000043, 0x00000002, func_80242780_EEF880, 0x80244088, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0018001C, 0x00000000, 0x00000000, 0x802440B8, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000, 0x00000000, 0x80244128, 0x43DC0000, 0x43110000, 0x41700000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800A0082, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000001B8, 0x00000091, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001E5, 0x00000091, 0x00000037, 0x000000E1, 0x0000005F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244128, 0x44160000, 0x43110000, 0x41700000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800A0082, 0x000A0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000258, 0x00000091, 0x0000000F, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000001E5, 0x00000091, 0x00000037, 0x000000E1, 0x0000005F, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x007D0000, 0x007D0000, 0x007D0005, 0x007D0005, 0x007D0000, 0x007D0000, 0x007D0006, 0x007D0006, 0x007D0005, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x007D0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244154, 0x1A240006, 0x00000001, 0x80244344, 0x1A200006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_802429A0_EEFAA0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x0000000A, 0x00000002, 0xF97188A9, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000000B4, 0x00000024, 0x00000002, 0xF97188A9, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000032, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xF97188A9, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, 0x802E37A0, 0x0000204D, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7DB4, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000005E, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000061, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000006C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x0000006F, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000061, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x0000006F, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000001A, 0x00000043, 0x00000002, 0x802D7634, 0x0000001B, 0x00000043, 0x00000002, 0x802D7634, 0x00000020, 0x00000043, 0x00000002, 0x802D7634, 0x00000021, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C87, 0xFE363C88, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000005E, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000061, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000006C, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x0000006F, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000061, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x0000006F, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802429A0_EEFAA0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x0000000A, 0x00000002, 0xF97188AA, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0x00000032, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000000B4, 0x00000024, 0x00000002, 0xF97188AA, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000032, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xF97188AA, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, 0x802E37A0, 0x0000204D, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7DB4, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000065, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000068, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000073, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000076, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000081, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000084, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000068, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000076, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000084, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x0000001D, 0x00000043, 0x00000002, 0x802D7634, 0x0000001E, 0x00000043, 0x00000002, 0x802D7634, 0x00000023, 0x00000043, 0x00000002, 0x802D7634, 0x00000024, 0x00000043, 0x00000002, 0x802D7634, 0x00000029, 0x00000043, 0x00000002, 0x802D7634, 0x0000002A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C87, 0xFE363C88, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000065, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000068, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000073, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000076, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000081, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x00000084, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000068, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000076, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x00000084, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802429A0_EEFAA0, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x0000000A, 0x00000002, 0xF97188AB, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C86, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x000000B4, 0x00000024, 0x00000002, 0xF97188AB, 0x00000001, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xFFFFFFCE, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x000000B4, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xF97188AB, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000002, 0x802E37A0, 0x0000204D, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x0000001E, 0xF24A7DB4, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7B4D, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C85, 0xFE363C86, 0x0000001E, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000007A, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x0000007D, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000088, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x0000008B, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x0000007D, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x0000008B, 0xFE363C87, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802D7634, 0x00000026, 0x00000043, 0x00000002, 0x802D7634, 0x00000027, 0x00000043, 0x00000002, 0x802D7634, 0x0000002C, 0x00000043, 0x00000002, 0x802D7634, 0x0000002D, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C87, 0xFE363C88, 0x0000000F, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000007A, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x0000007D, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000088, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000005, 0x802D6C60, 0x0000008B, 0x00000000, 0xFE363C86, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x0000007D, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D6D84, 0x0000008B, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF97188A9, 0x00000000, 0x00000024, 0x00000002, 0xF97188AA, 0x00000000, 0x00000024, 0x00000002, 0xF97188AB, 0x00000000, 0x00000043, 0x00000003, 0x802D75C0, 0x0000001A, 0x0000005E, 0x00000043, 0x00000003, 0x802D75C0, 0x0000001B, 0x0000005E, 0x00000043, 0x00000003, 0x802D75C0, 0x0000001D, 0x00000065, 0x00000043, 0x00000003, 0x802D75C0, 0x0000001E, 0x00000065, 0x00000043, 0x00000003, 0x802D75C0, 0x00000020, 0x0000006C, 0x00000043, 0x00000003, 0x802D75C0, 0x00000021, 0x0000006C, 0x00000043, 0x00000003, 0x802D75C0, 0x00000023, 0x00000073, 0x00000043, 0x00000003, 0x802D75C0, 0x00000024, 0x00000073, 0x00000043, 0x00000003, 0x802D75C0, 0x00000026, 0x0000007A, 0x00000043, 0x00000003, 0x802D75C0, 0x00000027, 0x0000007A, 0x00000043, 0x00000003, 0x802D75C0, 0x00000029, 0x00000081, 0x00000043, 0x00000003, 0x802D75C0, 0x0000002A, 0x00000081, 0x00000043, 0x00000003, 0x802D75C0, 0x0000002C, 0x00000088, 0x00000043, 0x00000003, 0x802D75C0, 0x0000002D, 0x00000088, 0x00000047, 0x00000005, 0x80244560, 0x00000080, 0x0000001A, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024495C, 0x00000080, 0x0000001D, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80244560, 0x00000080, 0x00000020, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024495C, 0x00000080, 0x00000023, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80244E28, 0x00000080, 0x00000026, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024495C, 0x00000080, 0x00000029, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80244E28, 0x00000080, 0x0000002C, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x666C6F5F, 0x30300000, 0x666C6F5F, 0x31370000 diff --git a/ver/us/asm/data/code_EF58E0.data.s b/ver/us/asm/data/EF58E0.data.s similarity index 86% rename from ver/us/asm/data/code_EF58E0.data.s rename to ver/us/asm/data/EF58E0.data.s index 0c1f1c85e4..010f4cbe04 100644 --- a/ver/us/asm/data/code_EF58E0.data.s +++ b/ver/us/asm/data/EF58E0.data.s @@ -3,7 +3,7 @@ .section .data glabel D_802432D0_EF58E0 -.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024388C, D_802432D0_EF58E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190121, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802453A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802453A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024364C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802436A8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0xC4048000, 0x00000000, 0xC2DC0000, 0x00000011, 0xC4070000, 0x00000000, 0xC2480000, 0x00000010, 0xC4048000, 0x00000000, 0x42A00000, 0x00000014, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000013, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000012, 0xC3870000, 0x00000000, 0x420C0000, 0x00000017, 0xC3020000, 0x00000000, 0xC2480000, 0x00000016, 0xC3020000, 0x00000000, 0xC2480000, 0x00000015, 0xC30C0000, 0x00000000, 0x42960000, 0x0000001B, 0x42F00000, 0x00000000, 0xC2480000, 0x0000001A, 0x42F00000, 0x00000000, 0xC2480000, 0x00000018, 0x43020000, 0x00000000, 0x42700000, 0x00000019, 0x42F00000, 0x00000000, 0x42F00000, 0x0000001F, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001E, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001D, 0x43870000, 0x00000000, 0xC2480000, 0x0000001C, 0x438C0000, 0x00000000, 0x42480000, 0x00000021, 0x44034000, 0x00000000, 0xC28C0000, 0x00000020, 0x44034000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802452D8, 0x00000046, 0x00000001, 0x80245330, 0x00000044, 0x00000001, 0x80244334, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000010, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000017, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000019, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFDF6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF8A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD28, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE10, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF8B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF84, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C0, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000135, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001E8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C82, 0x000002DD, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x8024374C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000038, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000039, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000040, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000037, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80243704, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80243330, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, code_EF2610_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_EF2650, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000026, 0x00000044, 0x00000001, 0x80244080, 0x00000024, 0x00000002, 0xFE363C84, 0x00000024, 0x00000024, 0x00000002, 0xFE363C85, 0x00000013, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000044, 0x00000001, 0x80244080, 0x00000024, 0x00000002, 0xFE363C84, 0x00000025, 0x00000024, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8E, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000028, 0x00000044, 0x00000001, 0x80244080, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 +.word 0xC4368000, 0x00000000, 0x00000000, 0x42B40000, 0x44368000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8024388C, D_802432D0_EF58E0, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190121, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802453A0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802453A8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024364C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802436A8, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0xC4048000, 0x00000000, 0xC2DC0000, 0x00000011, 0xC4070000, 0x00000000, 0xC2480000, 0x00000010, 0xC4048000, 0x00000000, 0x42A00000, 0x00000014, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000013, 0xC3870000, 0x00000000, 0xC2F00000, 0x00000012, 0xC3870000, 0x00000000, 0x420C0000, 0x00000017, 0xC3020000, 0x00000000, 0xC2480000, 0x00000016, 0xC3020000, 0x00000000, 0xC2480000, 0x00000015, 0xC30C0000, 0x00000000, 0x42960000, 0x0000001B, 0x42F00000, 0x00000000, 0xC2480000, 0x0000001A, 0x42F00000, 0x00000000, 0xC2480000, 0x00000018, 0x43020000, 0x00000000, 0x42700000, 0x00000019, 0x42F00000, 0x00000000, 0x42F00000, 0x0000001F, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001E, 0x438C0000, 0x00000000, 0xC2DC0000, 0x0000001D, 0x43870000, 0x00000000, 0xC2480000, 0x0000001C, 0x438C0000, 0x00000000, 0x42480000, 0x00000021, 0x44034000, 0x00000000, 0xC28C0000, 0x00000020, 0x44034000, 0x00000000, 0x42480000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802452D8, 0x00000046, 0x00000001, 0x80245330, 0x00000044, 0x00000001, 0x80244334, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000000F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000010, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000014, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000017, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000019, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001B, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001C, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x0000001F, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000020, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD20, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF77, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFDF6, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFF8A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFD28, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE10, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFF60, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF8B, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFA4, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFCA, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF84, 0x00000024, 0x00000002, 0xFE363C82, 0x00000096, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFC9, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0x000000C0, 0x00000024, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000135, 0x00000024, 0x00000002, 0xFE363C83, 0x00000085, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000024, 0x00000002, 0xFE363C80, 0x000001E8, 0x00000024, 0x00000002, 0xFE363C81, 0x0000002E, 0x00000024, 0x00000002, 0xFE363C82, 0x000002DD, 0x00000024, 0x00000002, 0xFE363C83, 0x00000089, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x802433A0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x8024374C, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x0000001E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000020, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000021, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000030, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000034, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000036, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000038, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000039, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000040, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000001F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000022, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000023, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000002F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000033, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000037, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000003F, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000027, 0x00000002, 0xFE363C80, 0x0000008C, 0x0000000D, 0x00000002, 0xFE363C80, 0x00010000, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFF0000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00010000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80243704, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x80243330, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF2610_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240040_EF2650, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0xFE363C84, 0x00000043, 0x00000002, D_802DF3F0, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000017, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DB, 0x00400000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C87, 0x0000005A, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C88, 0x00000006, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x00000013, 0x00000000, 0x00000004, 0x00000001, 0x00000032, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C87, 0x00000000, 0x00000028, 0x00000002, 0xFE363C88, 0x00000001, 0x00000027, 0x00000002, 0xFE363C87, 0xFE363C88, 0x0000000E, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C85, 0x00000043, 0x00000006, 0x802E382C, 0x000001DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000057, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000001, 0xFE363C89, 0x7FFFFE00, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000032, 0x0000000F, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C88, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFE363C87, 0x0000005A, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C85, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C86, 0xFE363C87, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000023, 0x00000024, 0x00000002, 0xFE363C85, 0x0000000E, 0x00000024, 0x00000002, 0xFE363C86, 0x0000000F, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8A, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8B, 0x00000024, 0x00000002, 0xFE363C89, 0x00000026, 0x00000044, 0x00000001, 0x80244080, 0x00000024, 0x00000002, 0xFE363C84, 0x00000024, 0x00000024, 0x00000002, 0xFE363C85, 0x00000013, 0x00000024, 0x00000002, 0xFE363C86, 0x00000014, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8C, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8D, 0x00000024, 0x00000002, 0xFE363C89, 0x00000027, 0x00000044, 0x00000001, 0x80244080, 0x00000024, 0x00000002, 0xFE363C84, 0x00000025, 0x00000024, 0x00000002, 0xFE363C85, 0x00000018, 0x00000024, 0x00000002, 0xFE363C86, 0x00000019, 0x00000024, 0x00000002, 0xFE363C87, 0xFD050F8E, 0x00000024, 0x00000002, 0xFE363C88, 0xFD050F8F, 0x00000024, 0x00000002, 0xFE363C89, 0x00000028, 0x00000044, 0x00000001, 0x80244080, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000 glabel D_802444BC_EF6ACC .word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3FC00000, 0x0000003C, 0x0000001E, 0x42700000, 0x42480000, 0x00000003, 0x40600000, 0x0000003C, 0x0000000A, 0x42A00000, 0x428C0000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD76, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x0000001E, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x00000190, 0x00000043, 0x00000002, func_80241C90_EF42A0, 0x802444D4, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001C0018, 0x00000000, 0x00000000, 0x80244504, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000, 0x3FC00000, 0x0000001E, 0x00000032, 0x42700000, 0x41F00000, 0x00000003, 0x40C00000, 0x00000000, 0x00000000, 0x42C80000, 0x41F00000, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000002, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000003, 0x00000012, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0x00000003, 0x00000043, 0x00000003, 0x8004930C, 0x00000007, 0x00000004, 0x00000043, 0x00000002, func_8024299C_EF4FAC, 0x802445A0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x0000000A, 0x00000064, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x800499B0, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000004, 0x80049738, 0xFFFFFFFF, 0x00000010, 0x00000001, 0x00000043, 0x00000002, 0x800483E0, 0xFFFFFFFF, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00150016, 0x00000000, 0x00000000, 0x802445D0, 0x8007D3C0, 0x00000000, 0x80244640, 0x00000000, 0x00000000, 0x00130000, 0x00000000, 0x80244574, 0xC3390000, 0x42B40000, 0x41200000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0xFFFFFF47, 0x0000005A, 0x0000000A, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFF47, 0x0000005A, 0x00000000, 0x00000055, 0x00000078, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244574, 0x43480000, 0x42B40000, 0xC1C80000, 0x00000C00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x000000C8, 0x0000005A, 0xFFFFFFE7, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x000000C8, 0x0000005A, 0x00000000, 0x00000055, 0x00000078, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000032, 0x8024470C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000033, 0x8024470C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000034, 0x8024470C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000035, 0x8024470C, 0x00000000, 0xC47A0000, 0x00000000, 0x00000C04, 0x00000000, 0x00000000, 0x00000000, 0x00000000, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004A0001, 0x004A0003, 0x004A0004, 0x004A0004, 0x004A0001, 0x004A0001, 0x004A0009, 0x004A0009, 0x004A0006, 0x004A0008, 0x004A0007, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x004A0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80244738, 0x1A090003, 0x00000001, 0x80244928, 0x1A0A0003, 0x00000001, 0x80244B18, 0x1A0C0003, 0x00000001, 0x80244D08, 0x1A0C0003, 0x00000001, 0x80244EF8, 0x1A0C0003, 0x00000001, 0x802450E8, 0x1A0C0003, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000008, 0x8011A58C, 0x802F8A38, 0x00000294, 0x0000003C, 0xFFFFFF8D, 0x00000000, 0x00000082, D_80000000, 0x00000043, 0x00000002, 0x8011A8C0, 0xF84060EE, 0x00000043, 0x00000007, 0x802E4310, 0x0000003E, 0xFFFFFF0B, 0x00000000, 0x00000069, 0x00000011, 0xF84060ED, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x666C6F5F, 0x31360000, 0x666C6F5F, 0x31380000 diff --git a/ver/us/asm/data/EF8250.data.s b/ver/us/asm/data/EF8250.data.s new file mode 100644 index 0000000000..34fcaecf27 --- /dev/null +++ b/ver/us/asm/data/EF8250.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel D_802407D0_EF8250 +.word 0xC3A00000, 0x00000000, 0x00000000, 0x42B40000, 0x42100000, 0x00000000, 0x42200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240A24, D_802407D0_EF8250, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190122, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000033, 0x00000000, 0x00000008, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x80000025, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, EF7A80_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, EF7A80_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80247070, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024095C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0xC3480000, 0x00000000, 0x42F00000, 0x0000000C, 0x00000000, 0x00000000, 0x42F00000, 0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802466CC, 0x00000044, 0x00000001, 0x80247054, 0x00000044, 0x00000001, 0x802436E0, 0x00000044, 0x00000001, 0x80245704, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x802409E4, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408C0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408C0, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x802409B8, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x80244088, 0x00000044, 0x00000001, 0x802409B8, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240830, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, EF7A80_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000009F, 0x00000005, 0x00000001, 0xFE363C8E, 0x0000002C, 0x00000002, 0xFE363C83, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7E8B, 0x0000002C, 0x00000002, 0xFE363C87, 0xF24A7A8B, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000043, 0x00000008, EF7A80_DeadUnkFloatFunc, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x0000000F, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000043, 0x00000008, EF7A80_DeadUnkFloatFunc, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x00000014, 0x00000000, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24AA280, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0xFE363C8F, 0xFE363C88, 0xFE363C89, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C8F, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C8A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A0280, 0x00000043, 0x00000003, 0x802E1D00, 0x00000064, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24D9A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C85, 0x00000000, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7BB0, 0x00000026, 0x00000002, 0xFE363C87, 0xF24A7BB0, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C8E, 0x00000027, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000044, 0x00000001, 0x80241094, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8E, 0x00000010, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, 0x802E1D00, 0x00000050, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000019, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x0000000A, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, EF7A80_DeadUnkFloatFunc, 0xFE363C8F, 0xFE363C8E, 0xF24A7E80, 0xF24A7EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000008, EF7A80_DeadUnkFloatFunc, 0xFE363C8F, 0xFE363C8D, 0xF24A7EE0, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8E, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8D, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7EB0, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000020, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000015, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000016, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000017, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000018, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000019, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000029, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000025, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000013, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001F, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000020, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A6680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000015, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFFD3, 0x00000024, 0x00000002, 0xFE363C85, 0x00000005, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000032, 0x0000001C, 0x0000001B, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000014, 0x00000032, 0x0000001C, 0x0000001B, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000014, 0x00000000, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0xFFFFFFCE, 0xFFFFFFE4, 0xFFFFFFE5, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000014, 0xFFFFFFCE, 0xFFFFFFE4, 0xFFFFFFE5, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000017, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000026, 0x00000002, 0xFE363C82, 0x00000050, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7880, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000015, 0xFFFFFFC9, 0x00000005, 0x00000010, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000015, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000015, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000015, 0x00000037, 0xFFFFFFFB, 0xFFFFFFF0, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000016, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000026, 0x00000002, 0xFE363C82, 0x00000050, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7880, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000018, 0x0000003C, 0x00000000, 0x00000010, 0x00000043, 0x00000006, 0x802D60E4, 0x00000018, 0xFE363C82, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000018, 0xFFFFFFC4, 0x00000000, 0xFFFFFFF0, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000016, 0x00000000, 0x00000000, 0x0000001B, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000017, 0x00000000, 0x00000000, 0x0000001B, 0x00000043, 0x00000006, 0x802D60E4, 0x00000016, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000017, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000016, 0x00000000, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000017, 0x00000000, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000019, 0x00000000, 0x00000000, 0xFFFFFFD7, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001A, 0x00000000, 0x00000000, 0xFFFFFFD7, 0x00000043, 0x00000006, 0x802D60E4, 0x00000019, 0xFE363C82, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001A, 0xFE363C82, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000019, 0x00000000, 0x00000000, 0x00000029, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001A, 0x00000000, 0x00000000, 0x00000029, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000012, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A1680, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001D, 0x0000007C, 0x00000011, 0x00000003, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001D, 0xFE363C82, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001D, 0xFFFFFF84, 0xFFFFFFEF, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A8680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000E, 0x00000002, 0xFE363C81, 0xFFFFFFD8, 0x00000026, 0x00000002, 0xFE363C81, 0xFFFFFFD8, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000000E, 0x00000002, 0xFE363C84, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C85, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0xFFFFFFDE, 0x00000032, 0x0000000A, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000021, 0xFFFFFFDE, 0x00000032, 0x0000000A, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0x00000000, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, 0x802D60E4, 0x00000029, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000021, 0x00000000, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, 0x802D60E4, 0x00000021, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0x00000022, 0xFFFFFFCE, 0xFFFFFFF6, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000021, 0x00000022, 0xFFFFFFCE, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000003C, 0x0000000A, 0x0000001B, 0x0000001E, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000001E, 0x00000000, 0x0000001B, 0x00000055, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000005B, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF2E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x000001E5, 0x00000046, 0x00000001, 0x802413F0, 0x0000005B, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000005B, 0x00000001, 0xFAA2B583, 0x0000000A, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000024, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000044, 0x00000001, 0x80241ED4, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000044, 0x00000001, 0x80242174, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027C, 0x00000002, 0x00000044, 0x00000001, 0x80242474, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000044, 0x00000001, 0x80242620, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000046, 0x00000001, 0x802413F0, 0x00000046, 0x00000001, 0x802413F0, 0x00000046, 0x00000001, 0x802413F0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802D6400, 0x0000001B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C82, 0x00000064, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000001D, 0x00000000, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000078, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000001D, 0x00000000, 0xFE363C80, 0x0000000A, 0xFE363C82, 0x00000064, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000006, 0x00000030, 0x00000001, 0x80242DC8, 0x00000005, 0x00000001, 0x00000008, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802E382C, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x00000006, 0x802E382C, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A8280, 0x00000005, 0x00000001, 0x00000002, 0x00000030, 0x00000001, 0x80242DC8, 0x00000005, 0x00000001, 0x00000008, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802E382C, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001A0, 0x00000000, 0x00000046, 0x00000028, 0x0000000A, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000024, 0x00000000, 0x00000046, 0x00000028, 0x0000000A, 0xF24A8680, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000043, 0x00000006, 0x802E382C, 0x000001A0, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000024, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0xF24A8A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8280, 0x00000046, 0x00000001, 0x80242910, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x00000491, 0x00000000, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000003E8, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, 0x80242B18, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000003, 0x802D78AC, 0x80247078, 0x00000001, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40A00000, 0x00000000, 0xC1200000, 0x00000000, 0xC0A00000, 0x00000000, 0xC1A00000, 0x00000000, 0x42480000, 0x00000000, 0xC1200000, 0x00000000, 0x42D20000, 0x00000000, 0xC1200000, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000003, 0x802D6708, 0x00000031, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D6708, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000014, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000015, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000016, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000017, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000018, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000019, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240E90, 0x00000043, 0x00000003, 0x802D6708, 0x00000031, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D6708, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000003, 0x802D6708, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000014, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027C, 0x00000002, 0x00000043, 0x00000003, 0x802D6708, 0x00000015, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000003, 0x802D6708, 0x00000016, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000017, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000018, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000019, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001A, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000043, 0x00000003, 0x802D6708, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436A0, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436B0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436C0, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436D0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0x00002710, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, 0x802D63A8, 0x00000031, 0xFE363C81, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C81, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80241284, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C8E, 0xF24A7E80, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x0000002E, 0x00000002, 0xFE363C8E, 0xF24A7E50, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8F, 0xFE363C8E, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000438, 0x00000026, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000009, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000029, 0x00000002, 0xFE363C80, 0x00004000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000004, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000002, 0x00000029, 0x00000002, 0xFE363C81, 0x00004000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000005, 0x0000002B, 0x00000002, 0xFE363C82, 0x00000002, 0x00000029, 0x00000002, 0xFE363C82, 0x00004000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000006, 0x0000002B, 0x00000002, 0xFE363C83, 0x00000002, 0x00000029, 0x00000002, 0xFE363C83, 0x00004000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x0000002B, 0x00000002, 0xFE363C84, 0x00000002, 0x00000029, 0x00000002, 0xFE363C84, 0x00008000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C85, 0x00000008, 0x0000002B, 0x00000002, 0xFE363C85, 0x00000002, 0x00000029, 0x00000002, 0xFE363C85, 0x00004000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000D, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000E, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000F, 0x00000000, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000B, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000A, 0x00000000, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000009, 0x00000000, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000, 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x001A0000, 0xC25C0000, 0x41700000, 0x420C0000, 0xC31B0000, 0x420C0000, 0x420C0000, 0xC37F0000, 0x42960000, 0x420C0000, 0xC3B18000, 0x431B0000, 0x420C0000, 0xC3E38000, 0x439D8000, 0x420C0000, 0xC1A00000, 0x41700000, 0x41F00000, 0xC2F00000, 0x420C0000, 0x41F00000, 0xC35C0000, 0x42960000, 0x41F00000, 0xC3A00000, 0x431B0000, 0x41F00000, 0xC3D20000, 0x439D8000, 0x41F00000, 0x42820000, 0x41700000, 0x41F00000, 0xC20C0000, 0x420C0000, 0x41F00000, 0xC3070000, 0x42960000, 0x41F00000, 0xC36B0000, 0x431B0000, 0x41F00000, 0xC3A78000, 0x439D8000, 0x41F00000, 0x42F00000, 0x41700000, 0x41F00000, 0x41A00000, 0x420C0000, 0x41F00000, 0xC2A00000, 0x42960000, 0x41F00000, 0xC3340000, 0x431B0000, 0x41F00000, 0xC38C0000, 0x439D8000, 0x41F00000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0x0000001E, 0x00000000, 0x00000032, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000041, 0x00000000, 0x00000032, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5880, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C9, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000004, 0x0000019E, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000004, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000004, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000003C, 0x80243F98, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000000, 0x0000019F, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000003C, 0x80243FD4, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000046, 0x80244010, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000002, 0x0000019F, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, 0x8024404C, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, 0x802E1FB4, 0x00000028, 0x00000000, 0x000000C8, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFC3, 0x00000058, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DB78C, 0x00000001, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DB78C, 0x00000002, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000041, 0xFE363C81, 0x00000050, 0x00000043, 0x00000003, 0x802DBFE4, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x000001C2, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000006, 0x802DD810, 0x00000004, 0x00570209, 0x00570201, 0x00000000, 0x001100BB, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, 0x802442A0, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5880, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C1, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000004, 0x802E1EFC, 0xFFFFFF06, 0x00000000, 0x00000032, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C2, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x8004893C, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0xFFFFFFC9, 0x0000000F, 0x00000023, 0x00000043, 0x00000003, 0x802DBF70, 0x00000003, 0xFE363C80, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000004, 0x0000005A, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000B4, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0x0000001E, 0x00000000, 0x00000050, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000000, 0x0000005A, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFFFFFFEC, 0x0000000F, 0x0000001E, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000001, 0x0000010E, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0x00000041, 0x0000000F, 0x0000001E, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000002, 0x0000010E, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0x00000078, 0x0000000F, 0x0000001E, 0x00000044, 0x00000001, 0x802447A4, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DC228, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DC228, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, 0x802DC228, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000003, 0x00560202, 0x00560201, 0x00000010, 0x001100B9, 0x00000043, 0x00000004, 0x802DC064, 0x00000003, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000010E, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0x00000002, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, 0x802DC064, 0x00000002, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000003, 0x00560202, 0x00560201, 0x00000010, 0x001100BA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0x00000002, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000023, 0x00000000, 0x00000043, 0x00000004, 0x800493D0, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80244604, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802E0260, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24ABE80, 0xF24A6280, 0x00000046, 0x00000001, 0x80244E5C, 0x00000014, 0x00000001, 0xF70F2E87, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x80244F00, 0x00000027, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, 0x80245034, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802E0260, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000003, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, 0x80244E5C, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000000, 0x00000046, 0x00000001, 0x80244F00, 0x00000027, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x80245034, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000003, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40A00000, 0x00000000, 0xC1200000, 0x00000000, 0xC0A00000, 0x00000000, 0xC1A00000, 0x00000000, 0x42480000, 0x00000000, 0xC1200000, 0x00000000, 0x42D20000, 0x00000000, 0xC1200000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000047, 0x00000005, 0x80245258, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245258, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245504, 0x00100000, 0x802456D4, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245574, 0x00100000, 0x802456C4, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245300, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802455E4, 0x00100000, 0x802456E4, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245354, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245654, 0x00100000, 0x802456F4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B6, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B7, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BD, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5680, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B8, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BE, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x800493D0, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80244604, 0x00000043, 0x00000003, 0x80049154, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0x00000002, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0x00000003, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80244B6C, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80243F40, 0x00000000, 0x41700000, 0x42700000, 0x00440D05, 0x80245BC0, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000001, 0x80243F40, 0x42820000, 0x41700000, 0x42700000, 0x00440D05, 0x80245C34, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000002, 0x80243F40, 0x43070000, 0x41700000, 0x420C0000, 0x00440D05, 0x80245CA8, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000003, 0x80243F6C, 0xC2700000, 0x00000000, 0x42480000, 0x00440D05, 0x80245AD8, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560204, 0x00560204, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000004, 0x80243F6C, 0x00000000, 0xC47A0000, 0x00000000, 0x00440D05, 0x80245B60, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570204, 0x00570204, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000005, 0x80245D1C, 0x1A0B0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x666C6F5F, 0x31370000, 0x666C6F5F, 0x31350000 diff --git a/ver/us/asm/data/code_a5dd0_len_114e0.data.s b/ver/us/asm/data/a5dd0_len_114e0.data.s similarity index 100% rename from ver/us/asm/data/code_a5dd0_len_114e0.data.s rename to ver/us/asm/data/a5dd0_len_114e0.data.s diff --git a/ver/us/asm/data/battle/move/auto_jump_765D10.data.s b/ver/us/asm/data/battle/move/auto_jump/765D10.data.s similarity index 100% rename from ver/us/asm/data/battle/move/auto_jump_765D10.data.s rename to ver/us/asm/data/battle/move/auto_jump/765D10.data.s diff --git a/ver/us/asm/data/battle/move/auto_multibounce_76A920.data.s b/ver/us/asm/data/battle/move/auto_multibounce/76A920.data.s similarity index 100% rename from ver/us/asm/data/battle/move/auto_multibounce_76A920.data.s rename to ver/us/asm/data/battle/move/auto_multibounce/76A920.data.s diff --git a/ver/us/asm/data/battle/move/auto_smash_7635F0.data.s b/ver/us/asm/data/battle/move/auto_smash/7635F0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/auto_smash_7635F0.data.s rename to ver/us/asm/data/battle/move/auto_smash/7635F0.data.s diff --git a/ver/us/asm/data/battle/move/d_down_jump_781AF0.data.s b/ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/d_down_jump_781AF0.data.s rename to ver/us/asm/data/battle/move/d_down_jump/781AF0.data.s diff --git a/ver/us/asm/data/battle/move/d_down_pound_74AF40.data.s b/ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s similarity index 100% rename from ver/us/asm/data/battle/move/d_down_pound_74AF40.data.s rename to ver/us/asm/data/battle/move/d_down_pound/74AF40.data.s diff --git a/ver/us/asm/data/battle/move/dizzy_stomp_748EC0.data.s b/ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/dizzy_stomp_748EC0.data.s rename to ver/us/asm/data/battle/move/dizzy_stomp/748EC0.data.s diff --git a/ver/us/asm/data/battle/move/earthquake_jump_785C20.data.s b/ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s similarity index 100% rename from ver/us/asm/data/battle/move/earthquake_jump_785C20.data.s rename to ver/us/asm/data/battle/move/earthquake_jump/785C20.data.s diff --git a/ver/us/asm/data/battle/move/hammer_734650.data.s b/ver/us/asm/data/battle/move/hammer/734650.data.s similarity index 100% rename from ver/us/asm/data/battle/move/hammer_734650.data.s rename to ver/us/asm/data/battle/move/hammer/734650.data.s diff --git a/ver/us/asm/data/battle/move/hammer_charge_0_74F3D0.data.s b/ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/hammer_charge_0_74F3D0.data.s rename to ver/us/asm/data/battle/move/hammer_charge_0/74F3D0.data.s diff --git a/ver/us/asm/data/battle/move/hammer_charge_1_7598D0.data.s b/ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/hammer_charge_1_7598D0.data.s rename to ver/us/asm/data/battle/move/hammer_charge_1/7598D0.data.s diff --git a/ver/us/asm/data/battle/move/hammer_charge_2_75E8F0.data.s b/ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/hammer_charge_2_75E8F0.data.s rename to ver/us/asm/data/battle/move/hammer_charge_2/75E8F0.data.s diff --git a/ver/us/asm/data/battle/move/hammer_throw_752500.data.s b/ver/us/asm/data/battle/move/hammer_throw/752500.data.s similarity index 100% rename from ver/us/asm/data/battle/move/hammer_throw_752500.data.s rename to ver/us/asm/data/battle/move/hammer_throw/752500.data.s diff --git a/ver/us/asm/data/battle/move/jump_73D9A0.data.s b/ver/us/asm/data/battle/move/jump/73D9A0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/jump_73D9A0.data.s rename to ver/us/asm/data/battle/move/jump/73D9A0.data.s diff --git a/ver/us/asm/data/battle/move/jump_charge_0_74D850.data.s b/ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s similarity index 100% rename from ver/us/asm/data/battle/move/jump_charge_0_74D850.data.s rename to ver/us/asm/data/battle/move/jump_charge_0/74D850.data.s diff --git a/ver/us/asm/data/battle/move/jump_charge_1_75CCE0.data.s b/ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/jump_charge_1_75CCE0.data.s rename to ver/us/asm/data/battle/move/jump_charge_1/75CCE0.data.s diff --git a/ver/us/asm/data/battle/move/jump_charge_2_761C80.data.s b/ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s similarity index 100% rename from ver/us/asm/data/battle/move/jump_charge_2_761C80.data.s rename to ver/us/asm/data/battle/move/jump_charge_2/761C80.data.s diff --git a/ver/us/asm/data/battle/move/mega_jump_771020.data.s b/ver/us/asm/data/battle/move/mega_jump/771020.data.s similarity index 100% rename from ver/us/asm/data/battle/move/mega_jump_771020.data.s rename to ver/us/asm/data/battle/move/mega_jump/771020.data.s diff --git a/ver/us/asm/data/battle/move/mega_quake_756900.data.s b/ver/us/asm/data/battle/move/mega_quake/756900.data.s similarity index 100% rename from ver/us/asm/data/battle/move/mega_quake_756900.data.s rename to ver/us/asm/data/battle/move/mega_quake/756900.data.s diff --git a/ver/us/asm/data/battle/move/mega_smash_777740.data.s b/ver/us/asm/data/battle/move/mega_smash/777740.data.s similarity index 100% rename from ver/us/asm/data/battle/move/mega_smash_777740.data.s rename to ver/us/asm/data/battle/move/mega_smash/777740.data.s diff --git a/ver/us/asm/data/battle/move/multibounce_740DB0.data.s b/ver/us/asm/data/battle/move/multibounce/740DB0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/multibounce_740DB0.data.s rename to ver/us/asm/data/battle/move/multibounce/740DB0.data.s diff --git a/ver/us/asm/data/battle/move/power_bounce_743FE0.data.s b/ver/us/asm/data/battle/move/power_bounce/743FE0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/power_bounce_743FE0.data.s rename to ver/us/asm/data/battle/move/power_bounce/743FE0.data.s diff --git a/ver/us/asm/data/battle/move/power_jump_76D850.data.s b/ver/us/asm/data/battle/move/power_jump/76D850.data.s similarity index 100% rename from ver/us/asm/data/battle/move/power_jump_76D850.data.s rename to ver/us/asm/data/battle/move/power_jump/76D850.data.s diff --git a/ver/us/asm/data/battle/move/power_quake_767D40.data.s b/ver/us/asm/data/battle/move/power_quake/767D40.data.s similarity index 100% rename from ver/us/asm/data/battle/move/power_quake_767D40.data.s rename to ver/us/asm/data/battle/move/power_quake/767D40.data.s diff --git a/ver/us/asm/data/battle/move/power_smash_772C50.data.s b/ver/us/asm/data/battle/move/power_smash/772C50.data.s similarity index 100% rename from ver/us/asm/data/battle/move/power_smash_772C50.data.s rename to ver/us/asm/data/battle/move/power_smash/772C50.data.s diff --git a/ver/us/asm/data/battle/move/quake_hammer_73AF80.data.s b/ver/us/asm/data/battle/move/quake_hammer/73AF80.data.s similarity index 100% rename from ver/us/asm/data/battle/move/quake_hammer_73AF80.data.s rename to ver/us/asm/data/battle/move/quake_hammer/73AF80.data.s diff --git a/ver/us/asm/data/battle/move/shell_crack_77F3D0.data.s b/ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/shell_crack_77F3D0.data.s rename to ver/us/asm/data/battle/move/shell_crack/77F3D0.data.s diff --git a/ver/us/asm/data/battle/move/shrink_smash_77CC30.data.s b/ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s similarity index 100% rename from ver/us/asm/data/battle/move/shrink_smash_77CC30.data.s rename to ver/us/asm/data/battle/move/shrink_smash/77CC30.data.s diff --git a/ver/us/asm/data/battle/move/shrink_stomp_783C90.data.s b/ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s similarity index 100% rename from ver/us/asm/data/battle/move/shrink_stomp_783C90.data.s rename to ver/us/asm/data/battle/move/shrink_stomp/783C90.data.s diff --git a/ver/us/asm/data/battle/move/sleep_stomp_746F00.data.s b/ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s similarity index 100% rename from ver/us/asm/data/battle/move/sleep_stomp_746F00.data.s rename to ver/us/asm/data/battle/move/sleep_stomp/746F00.data.s diff --git a/ver/us/asm/data/battle/move/spin_smash_737A20.data.s b/ver/us/asm/data/battle/move/spin_smash/737A20.data.s similarity index 100% rename from ver/us/asm/data/battle/move/spin_smash_737A20.data.s rename to ver/us/asm/data/battle/move/spin_smash/737A20.data.s diff --git a/ver/us/asm/data/battle/move/super_jump_76F420.data.s b/ver/us/asm/data/battle/move/super_jump/76F420.data.s similarity index 100% rename from ver/us/asm/data/battle/move/super_jump_76F420.data.s rename to ver/us/asm/data/battle/move/super_jump/76F420.data.s diff --git a/ver/us/asm/data/battle/move/super_smash_7751B0.data.s b/ver/us/asm/data/battle/move/super_smash/7751B0.data.s similarity index 100% rename from ver/us/asm/data/battle/move/super_smash_7751B0.data.s rename to ver/us/asm/data/battle/move/super_smash/7751B0.data.s diff --git a/ver/us/asm/data/battle/move/unknown_move_779E20.data.s b/ver/us/asm/data/battle/move/unknown_move/779E20.data.s similarity index 100% rename from ver/us/asm/data/battle/move/unknown_move_779E20.data.s rename to ver/us/asm/data/battle/move/unknown_move/779E20.data.s diff --git a/ver/us/asm/data/battle/partner/goompa_6F0B30.data.s b/ver/us/asm/data/battle/partner/6F0B30.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/goompa_6F0B30.data.s rename to ver/us/asm/data/battle/partner/6F0B30.data.s diff --git a/ver/us/asm/data/battle/partner/goombario_6F2290.data.s b/ver/us/asm/data/battle/partner/6F2290.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/goombario_6F2290.data.s rename to ver/us/asm/data/battle/partner/6F2290.data.s diff --git a/ver/us/asm/data/battle/partner/kooper_6F62B0.data.s b/ver/us/asm/data/battle/partner/6F62B0.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/kooper_6F62B0.data.s rename to ver/us/asm/data/battle/partner/6F62B0.data.s diff --git a/ver/us/asm/data/battle/partner/bombette_6FB350.data.s b/ver/us/asm/data/battle/partner/6FB350.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/bombette_6FB350.data.s rename to ver/us/asm/data/battle/partner/6FB350.data.s diff --git a/ver/us/asm/data/battle/partner/parakarry_701590.data.s b/ver/us/asm/data/battle/partner/701590.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/parakarry_701590.data.s rename to ver/us/asm/data/battle/partner/701590.data.s diff --git a/ver/us/asm/data/battle/partner/watt_704A80.data.s b/ver/us/asm/data/battle/partner/704A80.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/watt_704A80.data.s rename to ver/us/asm/data/battle/partner/704A80.data.s diff --git a/ver/us/asm/data/battle/partner/sushie_708B70.data.s b/ver/us/asm/data/battle/partner/708B70.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/sushie_708B70.data.s rename to ver/us/asm/data/battle/partner/708B70.data.s diff --git a/ver/us/asm/data/battle/partner/lakilester_70DED0.data.s b/ver/us/asm/data/battle/partner/70DED0.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/lakilester_70DED0.data.s rename to ver/us/asm/data/battle/partner/70DED0.data.s diff --git a/ver/us/asm/data/battle/partner/bow_7111F0.data.s b/ver/us/asm/data/battle/partner/7111F0.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/bow_7111F0.data.s rename to ver/us/asm/data/battle/partner/7111F0.data.s diff --git a/ver/us/asm/data/battle/partner/twink_714DC0.data.s b/ver/us/asm/data/battle/partner/714DC0.data.s similarity index 100% rename from ver/us/asm/data/battle/partner/twink_714DC0.data.s rename to ver/us/asm/data/battle/partner/714DC0.data.s diff --git a/ver/us/asm/data/battle/star/chill_out_7909C0.data.s b/ver/us/asm/data/battle/star/chill_out/7909C0.data.s similarity index 100% rename from ver/us/asm/data/battle/star/chill_out_7909C0.data.s rename to ver/us/asm/data/battle/star/chill_out/7909C0.data.s diff --git a/ver/us/asm/data/battle/star/focus_78A490.data.s b/ver/us/asm/data/battle/star/focus/78A490.data.s similarity index 100% rename from ver/us/asm/data/battle/star/focus_78A490.data.s rename to ver/us/asm/data/battle/star/focus/78A490.data.s diff --git a/ver/us/asm/data/battle/star/lullaby_78D770.data.s b/ver/us/asm/data/battle/star/lullaby/78D770.data.s similarity index 100% rename from ver/us/asm/data/battle/star/lullaby_78D770.data.s rename to ver/us/asm/data/battle/star/lullaby/78D770.data.s diff --git a/ver/us/asm/data/battle/star/peach_beam_79ACA0.data.s b/ver/us/asm/data/battle/star/peach_beam/79ACA0.data.s similarity index 100% rename from ver/us/asm/data/battle/star/peach_beam_79ACA0.data.s rename to ver/us/asm/data/battle/star/peach_beam/79ACA0.data.s diff --git a/ver/us/asm/data/battle/star/peach_dash_79DE50.data.s b/ver/us/asm/data/battle/star/peach_dash/79DE50.data.s similarity index 100% rename from ver/us/asm/data/battle/star/peach_dash_79DE50.data.s rename to ver/us/asm/data/battle/star/peach_dash/79DE50.data.s diff --git a/ver/us/asm/data/battle/star/peach_focus_79C4D0.data.s b/ver/us/asm/data/battle/star/peach_focus/79C4D0.data.s similarity index 100% rename from ver/us/asm/data/battle/star/peach_focus_79C4D0.data.s rename to ver/us/asm/data/battle/star/peach_focus/79C4D0.data.s diff --git a/ver/us/asm/data/battle/star/refresh_78C070.data.s b/ver/us/asm/data/battle/star/refresh/78C070.data.s similarity index 100% rename from ver/us/asm/data/battle/star/refresh_78C070.data.s rename to ver/us/asm/data/battle/star/refresh/78C070.data.s diff --git a/ver/us/asm/data/battle/star/smooch_7923C0.data.s b/ver/us/asm/data/battle/star/smooch/7923C0.data.s similarity index 100% rename from ver/us/asm/data/battle/star/smooch_7923C0.data.s rename to ver/us/asm/data/battle/star/smooch/7923C0.data.s diff --git a/ver/us/asm/data/battle/star/star_beam_7984B0.data.s b/ver/us/asm/data/battle/star/star_beam/7984B0.data.s similarity index 100% rename from ver/us/asm/data/battle/star/star_beam_7984B0.data.s rename to ver/us/asm/data/battle/star/star_beam/7984B0.data.s diff --git a/ver/us/asm/data/battle/star/star_storm_78EEC0.data.s b/ver/us/asm/data/battle/star/star_storm/78EEC0.data.s similarity index 100% rename from ver/us/asm/data/battle/star/star_storm_78EEC0.data.s rename to ver/us/asm/data/battle/star/star_storm/78EEC0.data.s diff --git a/ver/us/asm/data/battle/star/time_out_794240.data.s b/ver/us/asm/data/battle/star/time_out/794240.data.s similarity index 100% rename from ver/us/asm/data/battle/star/time_out_794240.data.s rename to ver/us/asm/data/battle/star/time_out/794240.data.s diff --git a/ver/us/asm/data/battle/star/up_and_away_7959B0.data.s b/ver/us/asm/data/battle/star/up_and_away/7959B0.data.s similarity index 100% rename from ver/us/asm/data/battle/star/up_and_away_7959B0.data.s rename to ver/us/asm/data/battle/star/up_and_away/7959B0.data.s diff --git a/ver/us/asm/data/code_EB54C0.data.s b/ver/us/asm/data/code_EB54C0.data.s deleted file mode 100644 index 28496abff4..0000000000 --- a/ver/us/asm/data/code_EB54C0.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_80240390_EB54C0 -.word 0xC3C30000, 0x00000000, 0x43520000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240D60, D_80240390_EB54C0, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00190113, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000024, 0x00000043, 0x00000002, 0x802E37A0, 0x8000006B, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000008, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EB5130_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EB5130_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80240450, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x80240450, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802420F0, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80240724, 0x00000080, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000031, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000006, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000006, 0x00000001, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFFFFFBB4, 0x00000027, 0x00000002, 0xFE363C81, 0x0000012C, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFE0C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000032, 0x00000001, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000001, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0x0000012C, 0x00000027, 0x00000002, 0xFE363C81, 0xFFFFFE0C, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802D6400, 0x00000029, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C83, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C83, 0xFE363C81, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C81, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000008, 0x00000043, 0x00000001, 0x802E01B8, 0x00000043, 0x00000002, 0x802DE6F8, 0x00000017, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x000000EF, 0x00000043, 0x00000003, 0x802D6480, 0x0000002B, 0x00000002, 0x00000043, 0x00000003, 0x802D6480, 0x00000029, 0x00000002, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000000, 0x00000043, 0x00000003, 0x802D75C0, 0x00000013, 0x00000029, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802D7634, 0x00000013, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, 0x802D67E4, 0x00000002, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x00000014, 0x00000001, 0xFE363C8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_8024030C_EB543C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000009, 0x00000044, 0x00000001, 0x80240958, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000001, 0x00000043, 0x00000003, 0x802D6708, 0x0000002B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x0000000A, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x0000000A, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000008C, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A8080, 0x00000012, 0x00000000, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000012, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C84, 0x0000011D, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A85B4, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000024, 0x00000002, 0xFE363C8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000023, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0x00000000, 0xFE363C84, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000007, 0x43480000, 0x43160000, 0x43340000, 0x00000009, 0x43480000, 0x43160000, 0x43340000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A000F, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x802420C0, 0x00000046, 0x00000001, 0x80240EE0, 0x00000024, 0x00000002, 0xFE363C80, 0x80240790, 0x00000044, 0x00000001, 0x80285C70, 0x00000008, 0x00000001, 0x00000001, 0x00000044, 0x00000001, 0x802403E0, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000013, 0x00000003, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x80240D30, 0x00000057, 0x00000000, 0x00000044, 0x00000001, 0x802407BC, 0x00000044, 0x00000001, 0x802408A8, 0x00000044, 0x00000001, 0x80240A34, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002E, 0x00000044, 0x00000001, 0x802404EC, 0x00000024, 0x00000002, 0xFE363C80, 0x0000002F, 0x00000044, 0x00000001, 0x80240608, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000008, 0x8011A58C, 0x802F92E0, 0x000001E0, 0x000000EB, 0x000000AF, 0x00000000, 0x00000000, D_80000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000005, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x80240FD0, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000002, func_80240340_EB5470, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x0000000E, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DF4B4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x0008001A, 0x00000008, 0x00000001, 0x00000023, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF971888C, 0x00000001, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8280, 0x00000043, 0x00000004, 0x802DD70C, 0xFFFFFFFF, 0x0000032C, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x0000000A, 0x00000002, 0xF971888E, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF24FF280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A6A80, 0x00000043, 0x00000004, 0x802D91E8, 0x00000000, 0xF251FA80, 0xF24F28E7, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8E80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802DE644, 0xF24A8680, 0x00000043, 0x00000004, 0x802DE754, 0x000000FA, 0x000000D2, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000005, 0x802DDEEC, 0x00100116, 0x000001B8, 0x000000F0, 0x000000A5, 0x00000008, 0x00000001, 0x00000014, 0x00000024, 0x00000002, 0xF971888D, 0x00000001, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80241010, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x43960000, 0x43320000, 0x42F00000, 0x43A00000, 0x432A0000, 0x43250000, 0x43AA0000, 0x43220000, 0x43480000, 0x43C08000, 0x431B0000, 0x43700000, 0x43D98000, 0x43200000, 0x437F0000, 0x43E10000, 0x43250000, 0x43610000, 0x43DC0000, 0x432C0000, 0x43430000, 0x43DE8000, 0x43340000, 0x42F00000, 0x43CA8000, 0x433E0000, 0x42A00000, 0x43B40000, 0x43430000, 0x428C0000, 0x43AA0000, 0x43480000, 0x42B40000, 0x439D8000, 0x433E0000, 0x42DC0000, 0x43938000, 0x43340000, 0x43340000, 0x43870000, 0x432F0000, 0x43660000, 0x437F0000, 0x432A0000, 0x43520000, 0x437F0000, 0x432B0000, 0x432F0000, 0x43820000, 0x432D0000, 0x43200000, 0x43870000, 0x432F0000, 0x43160000, 0x43910000, 0x43320000, 0x430E0000, 0x43980000, 0x43360000, 0x43070000, 0x43A50000, 0x43390000, 0x43110000, 0x43AF0000, 0x433E0000, 0x431B0000, 0x43B80000, 0x436B0000, 0x432A0000, 0x43B80000, 0x43938000, 0x432A0000, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000190, 0x00000096, 0x000000C8, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000190, 0x00000096, 0x000000C8, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF2509280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5680, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8280, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x0000000A, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF971888E, 0x00000000, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x0000012C, 0x00000096, 0x000000AA, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0xF2518280, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24AB680, 0xF24A5E80, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7FB4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000003, 0x00000001, 0x00000014, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xF9718890, 0x00000000, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000170, 0x00000136, 0x000000AA, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A7DB4, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0x0000000A, 0x00000028, 0x00000002, 0xFE363C83, 0x00000005, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x0000000A, 0x00000002, 0xF971888F, 0x00000001, 0x00000028, 0x00000002, 0xFE363C84, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000043, 0x00000004, 0x802DE510, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0xFFFFFFFB, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFE363C84, 0xFE363C82, 0xFE363C83, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xF971888D, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000044, 0x00000001, 0x80241460, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0xF24A8680, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000A, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000023, 0x80241340, 0x00000007, 0x00000000, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000001, 0x00000043, 0x00000003, 0x802DB3C8, 0x00000000, 0x0000000A, 0x00000043, 0x00000005, 0x802DB310, 0x00000000, 0x00000000, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, 0x802DB654, 0x00000000, 0x00B60007, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000002, 0x802DE674, 0x00000000, 0x00000043, 0x00000005, 0x802DEF08, 0x000000F5, 0x000000AB, 0x000000B0, 0x00000008, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000020, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0x000000F5, 0x000000BF, 0x000000AB, 0x00000008, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000028, 0x80241394, 0x00000008, 0x00000000, 0x00000003, 0x00000001, 0x00000014, 0x00000043, 0x00000001, func_802E2B74, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000046, 0x00000001, 0x80241648, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000019, 0x00000024, 0x00000002, 0xF9718890, 0x00000001, 0x00000043, 0x00000001, func_8024036C_EB549C, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000046, 0x802413F4, 0x00000009, 0x00000000, 0x00000003, 0x00000001, 0x00000015, 0x00000043, 0x00000001, func_802E2B74, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000046, 0x00000001, 0x80241648, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x00000004, 0x00000001, 0x00000015, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000005, 0x802E1C00, 0x0000012C, 0x000001F4, 0x00000014, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C85, 0xFE363C82, 0xFE363C86, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C86, 0x00000046, 0x00000001, 0x80241648, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802D78AC, 0x802420F8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x0000012C, 0x000000B4, 0x00000050, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000024, 0x00000002, 0xF971888C, 0x00000000, 0x00000024, 0x00000002, 0xF971888D, 0x00000000, 0x00000024, 0x00000002, 0xF971888E, 0x00000000, 0x00000024, 0x00000002, 0xF971888F, 0x00000000, 0x00000024, 0x00000002, 0xF9718890, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x8024173C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240F20, 0x43DE8000, 0x43160000, 0x432F0000, 0x00110509, 0x8024131C, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000, 0x00000001, 0x80240F4C, 0x438E8000, 0x43200000, 0x42A00000, 0x00110509, 0x80241C3C, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x001A000B, 0x00000001, 0x80241CE0, 0x00000000, 0x00000001, 0x80241ED0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6B7A6E5F, 0x32300000, 0x6B7A6E5F, 0x32330000 diff --git a/ver/us/asm/data/code_EB7850.data.s b/ver/us/asm/data/code_EB7850.data.s deleted file mode 100644 index 08c1c21897..0000000000 --- a/ver/us/asm/data/code_EB7850.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_80240620_EB7850 -.word 0x00000000, 0x00000000, 0x42C80000, 0x42B40000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240C34, D_80240620_EB7850, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x0000002A, 0x00000000, 0x00000008, 0x00000043, 0x00000002, 0x802E376C, 0x00000009, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EB7230_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EB7230_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000003, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000258, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000001, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802406B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0xFE363C80, 0x00000004, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000024, 0x00000002, 0xFE363C81, 0x000001F4, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000001, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802406B0, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000001, 0x00000002, 0x00000003, 0x00000003, 0x00000002, 0x00000001, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFD, 0xFFFFFFFD, 0xFFFFFFFE, 0xFFFFFFFF, 0x00000005, 0x00000001, 0x00000000, 0x00000030, 0x00000001, 0x80240984, 0x00000005, 0x00000001, 0x0000000C, 0x00000031, 0x00000001, 0xFE363C81, 0x00000027, 0x00000002, 0xFD050F8A, 0xFE363C81, 0x00000008, 0x00000001, 0x00000003, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000044, 0x00000001, 0x802409B4, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6480, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFF97, 0x00000024, 0x00000002, 0xFE363C85, 0x00000028, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000006, 0x00000003, 0x00000001, 0x0000000A, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000000, 0xFE363C80, 0xFE363C81, 0x00000043, 0x00000005, 0x802D67E4, 0x00000000, 0x00000001, 0xFE363C82, 0xFE363C83, 0x00000028, 0x00000002, 0xFE363C80, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C81, 0x000002BC, 0x00000027, 0x00000002, 0xFE363C82, 0x000000C8, 0x00000028, 0x00000002, 0xFE363C83, 0x0000012C, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000028, 0x0000000C, 0x00000002, 0xFD050F8A, 0x00000A8C, 0x00000027, 0x00000002, 0xFD050F8A, 0x00000014, 0x00000012, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000013, 0x00000000, 0x00000012, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000028, 0x00000002, 0xFE363C85, 0x00000001, 0x00000028, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFD050F8A, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x0000000A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000012, 0x00000043, 0x00000002, 0x802E6F50, 0x000A0010, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000001, 0x80241BE0, 0x00000044, 0x00000001, 0x80240670, 0x00000044, 0x00000001, 0x80240A20, 0x00000024, 0x00000002, 0xFE363C80, 0x00000010, 0x00000044, 0x00000001, 0x8024074C, 0x00000024, 0x00000002, 0xFE363C80, 0x00000011, 0x00000044, 0x00000001, 0x80240868, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00280018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00140014, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00B60009, 0x00B60007, 0x00000005, 0x00100117, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DC064, 0xFFFFFFFF, 0x0000005A, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DB3C8, 0xFFFFFFFF, 0x0000000A, 0x00000043, 0x00000005, 0x802DB310, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x000000B4, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00B60007, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80240DD0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24BE280, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000003C, 0x00000043, 0x00000005, 0x802D83DC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000AB4, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x42480000, 0x4525A000, 0xC1A00000, 0x43160000, 0x45322000, 0xC2340000, 0x436B0000, 0x45386000, 0xC2700000, 0x43A78000, 0x453B8000, 0xC2960000, 0xC1A00000, 0x4525A000, 0xC1A00000, 0xC2F00000, 0x45322000, 0xC2200000, 0xC35C0000, 0x453B8000, 0xC2200000, 0x41200000, 0x4525A000, 0xC1A00000, 0x41A00000, 0x452F0000, 0xC2700000, 0x41F00000, 0x45340000, 0xC2C80000, 0x42200000, 0x45368000, 0xC3160000, 0x42480000, 0x4537C000, 0xC35C0000, 0xC20C0000, 0x4525A000, 0xC1A00000, 0xC2820000, 0x452DC000, 0xC1F00000, 0xC2BE0000, 0x45322000, 0xC2200000, 0xC2FA0000, 0x45340000, 0xC2480000, 0xC31B0000, 0x45354000, 0xC2700000, 0xC3390000, 0x45363000, 0xC28C0000, 0x00000082, 0xFFFFFF6A, 0x00000082, 0xFFFFFF6A, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000030, 0x00000001, 0x80241018, 0x00000005, 0x00000001, 0xFE363C80, 0x00000031, 0x00000001, 0xFE363C81, 0x00000006, 0x00000000, 0x0000000A, 0x00000002, 0xF9718891, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AD, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000001, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001AE, 0x00000000, 0xFE363C81, 0x00000AF0, 0x00000000, 0x00000024, 0x00000002, 0xF9718891, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000003, 0xFE363C80, 0x00000044, 0x00000001, 0x80241028, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x00000032, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, 0x80240F40, 0x00000004, 0x00000004, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFEC, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000A, 0x80240F70, 0x00000003, 0x00000004, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0x0000000A, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x0000000F, 0x80240F94, 0x00000005, 0x00000004, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000065, 0x00000002, 0xFFFFFFCE, 0x00000A5A, 0xFFFFFFEC, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C8F, 0x00000043, 0x00000005, func_802E2A80, 0x00000014, 0x80240FD0, 0x00000006, 0x00000004, 0x00000023, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0x00000001, 0xFE363C84, 0x0000000A, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000029, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000043, 0x00000004, func_80240478_EB76A8, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802E5160, 0xFE363C8E, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x00000008, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000043, 0x00000002, 0x802DE6F8, 0x0000000A, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000200, 0x00000000, 0x00000043, 0x00000001, func_80240504_EB7734, 0x00000044, 0x00000001, 0x80240E98, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x802DE6A4, 0x00080000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x00000C12, 0x000000A0, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000028, 0x00000002, 0xFE363C80, 0x00000064, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0x0000000A, 0xFE363C80, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DE510, 0xFFFFFFF6, 0xFE363C80, 0x00000005, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0xFFFFFFF6, 0xFE363C80, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000B18, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x802410F4, 0x00000008, 0x00000001, 0x00000023, 0x00000043, 0x00000007, 0x8011A58C, 0x802F92E0, 0x00000000, 0x00000A5A, 0x00000000, 0x00000094, D_80000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000056, 0x00000000, 0x00000043, 0x00000001, func_80240520_EB7750, 0x00000057, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000043, 0x00000005, func_802403D8_EB7608, 0xFE363C89, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000005, 0x802E1C00, 0xFE363C83, 0x00000BB8, 0x0000000A, 0x00000001, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000005, func_80240310_EB7540, 0xFE363C89, 0xFE363C82, 0xFE363C80, 0xFE363C84, 0x00000027, 0x00000002, 0xFE363C82, 0xFFFFFFFF, 0x00000008, 0x00000001, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x0000002D, 0x00000043, 0x00000003, 0x802D78AC, 0x80241C18, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFF9C, 0x00000000, 0x00000043, 0x00000003, 0x802DB654, 0xFFFFFFFF, 0x00160008, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80241418, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80240D20, 0x00000000, 0xC47A0000, 0x00000000, 0x00110709, 0x80240E0C, 0x00000000, 0x00000000, 0x0000005A, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00B60001, 0x00B60004, 0x00B60006, 0x00B60006, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00B60001, 0x00000000, 0x00000000, 0x00000000, 0x001A0000, 0x00000001, 0x80240D4C, 0x00000000, 0xC47A0000, 0x00000000, 0x19100004, 0x802417AC, 0x00000000, 0x00000000, 0x0000010E, D_80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160000, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00160001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80241800, 0x00000000, 0x00000001, 0x802419F0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/code_ED1840.data.s b/ver/us/asm/data/code_ED1840.data.s deleted file mode 100644 index 673dc1fd60..0000000000 --- a/ver/us/asm/data/code_ED1840.data.s +++ /dev/null @@ -1,9 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_80241850_ED1840 -.word 0xC4020000, 0x00000000, 0x00000000, 0x42B40000, 0x44020000, 0x00000000, 0x00000000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80241CCC, D_80241850_ED1840, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190118, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000030, 0x00000000, 0x00000008, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802441C0, 0x00000005, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000001, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x802441C8, 0x00000000, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241BCC, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80241C28, 0x00080000, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x8024417C, 0x00000044, 0x00000001, 0x8024260C, 0x00000044, 0x00000001, 0x802434D8, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000009, 0x00000006, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFE01, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFFC, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFEC1, 0x00000024, 0x00000002, 0xFE363C83, 0x0000000A, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFED2, 0x00000024, 0x00000002, 0xFE363C81, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFFE0, 0x00000024, 0x00000002, 0xFE363C83, 0x00000074, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0x00000033, 0x00000024, 0x00000002, 0xFE363C81, 0x00000012, 0x00000024, 0x00000002, 0xFE363C82, 0x0000008D, 0x00000024, 0x00000002, 0xFE363C83, 0x0000007F, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0x000000EA, 0x00000024, 0x00000002, 0xFE363C81, 0x00000026, 0x00000024, 0x00000002, 0xFE363C82, 0x000001F6, 0x00000024, 0x00000002, 0xFE363C83, 0x00000062, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFDF3, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF5D, 0x00000024, 0x00000002, 0xFE363C82, 0xFFFFFE70, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFB0, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, 0x80241920, 0x00000024, 0x00000002, 0xFE363C80, 0xFFFFFEA6, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF6C, 0x00000024, 0x00000002, 0xFE363C82, 0x00000205, 0x00000024, 0x00000002, 0xFE363C83, 0xFFFFFFA5, 0x00000024, 0x00000002, 0xFE363C84, 0x0000003C, 0x00000044, 0x00000001, 0x80241920, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000005, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x80241C84, 0x00000044, 0x00000001, 0x80285C70, 0x00000046, 0x00000001, 0x802418B0, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, code_ECFFF0_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8B, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C8C, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C8D, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C8E, 0xFE363C84, 0x00000028, 0x00000002, 0xFE363C8C, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C8D, 0xFE363C81, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8C, 0x0000002F, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x00000026, 0x00000002, 0xFE363C8F, 0xF24C0A80, 0x0000002F, 0x00000002, 0xFE363C8F, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C8F, 0x0000000B, 0x00000024, 0x00000002, 0xFE363C85, 0x000000C8, 0x0000002A, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x00000027, 0x00000002, 0xFE363C85, 0x00000001, 0x00000005, 0x00000001, 0xFE363C85, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x000000C7, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C83, 0x000000D2, 0x00000028, 0x00000002, 0xFE363C83, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000027, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C82, 0xFE363C81, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8C, 0xFE363C80, 0x00000043, 0x00000003, 0x802E1D00, 0xFE363C8D, 0xFE363C81, 0x00000027, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x00000027, 0x00000002, 0xFE363C81, 0xFE363C8B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000000D, 0xFE363C80, 0xFE363C8E, 0xFE363C81, 0x000000C8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C8F, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0xFE363C86, 0x00000024, 0x00000002, 0xFE363C88, 0xFE363C85, 0x00000024, 0x00000002, 0xFE363C87, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C86, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C82, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C81, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C80, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000001, func_80240040_ED0030, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C86, 0x00000001, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C83, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C84, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C85, 0x00000027, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000027, 0x00000002, 0xFE363C82, 0x00000008, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000011, 0x00000004, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000028, 0x00000002, 0xFE363C81, 0x0000000A, 0x00000043, 0x00000007, 0x802E4310, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000000, 0x00000057, 0x00000000, 0x00000013, 0x00000000, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000006, 0x802E382C, 0x000000F8, 0x00000000, 0xFE363C83, 0xFE363C84, 0xFE363C85, 0x00000057, 0x00000000, 0x00000043, 0x00000005, 0x802E1C00, 0x00000000, 0x000000B4, 0x00000014, 0x00000002, 0x00000003, 0x00000001, 0x00000001, 0x00000043, 0x00000001, 0x802E1C7C, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C88, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C89, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C81, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C87, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0x00000045, 0x00000024, 0x00000002, 0xFE363C83, 0x00000045, 0x00000024, 0x00000002, 0xFE363C84, 0x00000046, 0x00000024, 0x00000002, 0xFE363C85, 0x00000047, 0x00000024, 0x00000002, 0xFE363C86, 0x00000048, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C83, 0x0000004B, 0x00000024, 0x00000002, 0xFE363C84, 0x0000004C, 0x00000024, 0x00000002, 0xFE363C85, 0x0000004D, 0x00000024, 0x00000002, 0xFE363C86, 0x0000004E, 0x00000024, 0x00000002, 0xFE363C8A, 0x000000AE, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000053, 0x00000024, 0x00000002, 0xFE363C83, 0x00000053, 0x00000024, 0x00000002, 0xFE363C84, 0x00000054, 0x00000024, 0x00000002, 0xFE363C85, 0x00000055, 0x00000024, 0x00000002, 0xFE363C86, 0x00000056, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000059, 0x00000024, 0x00000002, 0xFE363C83, 0x00000059, 0x00000024, 0x00000002, 0xFE363C84, 0x0000005A, 0x00000024, 0x00000002, 0xFE363C85, 0x0000005B, 0x00000024, 0x00000002, 0xFE363C86, 0x0000005C, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000061, 0x00000024, 0x00000002, 0xFE363C83, 0x00000061, 0x00000024, 0x00000002, 0xFE363C84, 0x00000062, 0x00000024, 0x00000002, 0xFE363C85, 0x00000063, 0x00000024, 0x00000002, 0xFE363C86, 0x00000064, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000043, 0x00000002, 0x802D6400, 0x00000067, 0x00000024, 0x00000002, 0xFE363C83, 0x00000067, 0x00000024, 0x00000002, 0xFE363C84, 0x00000068, 0x00000024, 0x00000002, 0xFE363C85, 0x00000069, 0x00000024, 0x00000002, 0xFE363C86, 0x0000006A, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000044, 0x00000001, 0x802422EC, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240150_ED0140, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000002, 0x802D6400, 0xFE363C89, 0x00000027, 0x00000002, 0xFE363C82, 0x00000023, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000043, 0x00000007, 0x802E4310, 0x00000141, 0xFFFFFF06, 0x00000064, 0x00000000, 0x0000000D, 0xF84060E6, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x0000000E, 0x00000044, 0x00000001, 0x80243214, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000001, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xF84060E6, 0x00000000, 0x0000000A, 0x00000002, 0xF70F2E84, 0x00000001, 0x0000000A, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000016, 0x00000044, 0x00000001, 0x80243214, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x0000000F, 0x00000010, 0x00000001, 0x0000000E, 0x80243430, 0x8024343C, 0x00000000, 0x00000000, 0x80243294, 0xC3480000, 0x00000000, 0x3F800000, 0x00000000, 0x00000002, 0x00000013, 0x00000014, 0x00000001, 0x00000012, 0x80243468, 0x80243474, 0x00000000, 0x00000000, 0x8024333C, 0x00000000, 0x00000000, 0x3F800000, 0x00000000, 0x00000002, 0x00000017, 0x00000018, 0x00000001, 0x00000016, 0x802434A0, 0x802434AC, 0x00000000, 0x00000000, 0x80243384, 0x43480000, 0x00000000, 0x3F800000, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E84, 0x00000000, 0x00000024, 0x00000002, 0xF70F2E85, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x80243444, 0x00000047, 0x00000005, 0x80242C10, 0x00001000, 0x0000000F, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242C10, 0x00100000, 0x80243458, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x8024347C, 0x00000047, 0x00000005, 0x80242C10, 0x00001000, 0x00000010, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242C10, 0x00100000, 0x80243490, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x802434B4, 0x00000047, 0x00000005, 0x80242C10, 0x00001000, 0x00000011, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242C10, 0x00100000, 0x802434C8, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x3F800000, 0x000001F4, 0x0000000A, 0x42480000, 0x41F00000, 0x00000003, 0x40600000, 0x00000028, 0x00000003, 0x42C80000, 0x41F00000, 0x00000001, 0x00000043, 0x00000002, 0x8004E89C, 0x802435E0, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001E0018, 0x00000000, 0x00000000, 0x80243610, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000 - -glabel D_8024365C_ED364C -.word 0x40900000, 0x40600000, 0x40266666, 0x40000000, 0x3FC00000, 0x41A00000, 0x3F800000, 0x0000001E, 0x00000005, 0x42A00000, 0x41F00000, 0x00000002, 0x40900000, 0x00000006, 0x00000001, 0x42B40000, 0x41F00000, 0x00000001, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000005, 0xFFFFFD8A, 0x00000043, 0x00000003, 0x8004930C, 0x00000006, 0x00000032, 0x00000043, 0x00000003, 0x8004930C, 0x00000001, 0x000000C8, 0x00000043, 0x00000002, func_8024162C_ED161C, 0x80243674, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x001A0018, 0x00000000, 0x00000000, 0x802436A4, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00130000, 0x00000000, 0x00180018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00630000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFF, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C81, 0x00000000, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFF, 0x00000000, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFF, 0xFE363C80, 0x00000032, 0xFE363C82, 0x0000000F, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048B18, 0xFFFFFFFF, 0x802436A4, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x00000019, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFF, 0x00000002, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000023, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x8004930C, 0x00000000, 0x00000002, 0x00000043, 0x00000003, 0x80048B18, 0xFFFFFFFF, 0x8024376C, 0x00000043, 0x00000001, 0x800486CC, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x8024376C, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x802438F8, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80243630, 0xC3AF0000, 0x00000000, 0x42200000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0xFFFFFEA2, 0x00000000, 0x00000028, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFEA2, 0x00000000, 0x00000028, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x80243630, 0x43820000, 0x00000000, 0x42960000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000010E, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0004, 0x33322666, 0x33320004, 0x33323FFF, 0x33320004, 0x33326665, 0x33320004, 0x33327FFF, 0x26660004, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030000, 0x00000104, 0x00000000, 0x0000004B, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0x00000104, 0x00000000, 0x0000004B, 0x000000C8, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00480001, 0x00480002, 0x00480003, 0x00480003, 0x00480001, 0x00480001, 0x00480008, 0x00480008, 0x00480006, 0x00480007, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00480001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x80243714, 0xC2480000, 0x425C0000, 0x42B40000, 0x00002D00, 0x00000000, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFFCE, 0x00000037, 0x0000005A, 0x0000001E, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x0000005A, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x80243740, 0x00000000, 0xC47A0000, 0x00000000, 0x00002D04, 0x80243984, 0x00000000, 0x00000000, 0x0000005A, 0x800F00A3, 0x00060000, 0x00A40004, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980003, 0x3FFF2666, 0x4CCC0003, 0x3FFF3FFF, 0x3FFF0003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0002, 0x33322666, 0x33320002, 0x33323FFF, 0x33320002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00040000, 0xFFFFFFCE, 0x00000037, 0x0000005A, 0x00000064, 0x00000000, 0xFFFF8001, 0x00000000, 0xFFFFFFCE, 0x00000032, 0x0000005A, 0x000000FA, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x004B0002, 0x004B0002, 0x004B0003, 0x004B0003, 0x004B0001, 0x004B0002, 0x004B0006, 0x004B0006, 0x004B0004, 0x004B0002, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x004B0001, 0x00000003, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x802439BC, 0x1A100005, 0x00000001, 0x80243BAC, 0x1A150005, 0x00000001, 0x80243D9C, 0x1A170002, 0x00000001, 0x80243F8C, 0x1A170002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x666C6F5F, 0x30300000, 0x666C6F5F, 0x30330000 diff --git a/ver/us/asm/data/code_EF8250.data.s b/ver/us/asm/data/code_EF8250.data.s deleted file mode 100644 index 834875fd0d..0000000000 --- a/ver/us/asm/data/code_EF8250.data.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macro.inc" - -.section .data - -glabel D_802407D0_EF8250 -.word 0xC3A00000, 0x00000000, 0x00000000, 0x42B40000, 0x42100000, 0x00000000, 0x42200000, 0x43870000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x80240A24, D_802407D0_EF8250, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, func_80200000, 0x00190122, 0x00000014, 0x00000001, 0xF5DE0180, 0x00000018, 0x00000001, 0x00000035, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000033, 0x00000000, 0x00000008, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x80000025, 0x00000000, 0x0000001C, 0x00000000, 0x00000043, 0x00000005, 0x802E339C, 0x00000000, 0x00000031, 0x00000000, 0x00000008, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C86, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C87, 0x00000001, 0x0000000A, 0x00000002, 0xFE363C88, 0x00000001, 0x00000043, 0x00000001, code_EF7A80_DeadUnkTexturePanFunc, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000001, code_EF7A80_DeadUnkTexturePanFunc2, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x0000001B, 0x00000043, 0x00000003, 0x802DF78C, 0x0000003C, 0x00000000, 0x00000044, 0x00000001, 0x80286004, 0x00000043, 0x00000003, 0x802D78AC, 0x80247070, 0x00000001, 0x00000008, 0x00000001, 0x00000064, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x8024095C, 0x00080000, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000B, 0xC3480000, 0x00000000, 0x42F00000, 0x0000000C, 0x00000000, 0x00000000, 0x42F00000, 0x0000000D, 0x432A0000, 0x00000000, 0x42F00000, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x00000024, 0x00000002, 0xF5DE0329, 0x00000026, 0x00000043, 0x00000002, 0x802E6F50, 0xFFFFFFFF, 0x00000043, 0x00000003, 0x802D8B60, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D7CD8, 0x00000000, 0x00000003, 0x00000019, 0x00000010, 0x00001000, 0x00000043, 0x00000005, func_802D8248, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D7B70, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x80048338, 0x00000000, 0x802466CC, 0x00000044, 0x00000001, 0x80247054, 0x00000044, 0x00000001, 0x802436E0, 0x00000044, 0x00000001, 0x80245704, 0x00000043, 0x00000004, AddCoin, 0x00000003, 0x00000008, 0x00000002, 0x00000056, 0x00000000, 0x00000043, 0x00000002, 0x802D7384, 0x802409E4, 0x00000057, 0x00000000, 0x00000043, 0x00000003, 0x802D6688, 0x00000009, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000B, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000C, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000D, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000E, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000F, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000007, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000008, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x0000000A, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000010, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000011, 0x00000001, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF74, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408C0, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000002, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFF38, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C85, 0x00000001, 0x00000024, 0x00000002, 0xFE363C86, 0x00000000, 0x00000024, 0x00000002, 0xFE363C87, 0x00000000, 0x00000024, 0x00000002, 0xFE363C88, 0x00000000, 0x00000024, 0x00000002, 0xFE363C89, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000044, 0x00000001, 0x802408C0, 0x00000057, 0x00000000, 0x00000043, 0x00000002, 0x802D790C, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000001, 0x7FFFFE00, 0x00000024, 0x00000002, 0xFE363C80, 0x802409B8, 0x00000044, 0x00000001, 0x80285C70, 0x00000012, 0x00000000, 0x00000044, 0x00000001, 0x80244088, 0x00000044, 0x00000001, 0x802409B8, 0x00000013, 0x00000000, 0x00000046, 0x00000001, 0x80240830, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000001, code_EF7A80_DeadUnk1, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000004D, 0x00000001, 0x0000000B, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0x00000004, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000006, 0x00000005, 0x00000001, 0x00000005, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000005E, 0x00000000, 0xF24BBE1A, 0xF24C1280, 0xF24A6A1A, 0xF24A3A80, 0xF24C1280, 0xF24A6A1A, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000001, func_80240340_EF7DC0, 0x00000008, 0x00000001, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C80, 0x00000002, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8E, 0x0000009F, 0x00000005, 0x00000001, 0xFE363C8E, 0x0000002C, 0x00000002, 0xFE363C83, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A8B, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000002E, 0x00000002, 0xFE363C86, 0xF24A7E8B, 0x0000002C, 0x00000002, 0xFE363C87, 0xF24A7A8B, 0x00000026, 0x00000002, 0xFE363C88, 0xFE363C86, 0x00000043, 0x00000008, code_EF7A80_DeadUnkFloatFunc, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x0000000F, 0x00000000, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C88, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C89, 0xFE363C87, 0x00000043, 0x00000008, code_EF7A80_DeadUnkFloatFunc, 0xFE363C8E, 0xFE363C8A, 0xF24A7A80, 0xF24A7B50, 0x00000014, 0x00000000, 0x0000005A, 0x0000002C, 0x00000002, 0xFE363C89, 0xFE363C8A, 0x00000026, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x0000002E, 0x00000002, 0xFE363C8A, 0xF24AA280, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C8F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0xFE363C8F, 0xFE363C88, 0xFE363C89, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0xFE363C8F, 0xFE363C8A, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C8F, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xF24C8A80, 0x00000026, 0x00000002, 0xFE363C81, 0xF24BE280, 0x00000026, 0x00000002, 0xFE363C82, 0xF24A0280, 0x00000043, 0x00000003, 0x802E1D00, 0x00000064, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C83, 0xFFFFFFCE, 0x0000002F, 0x00000002, 0xFE363C83, 0xF24D9A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C85, 0x00000000, 0x00000026, 0x00000002, 0xFE363C86, 0xF24A7BB0, 0x00000026, 0x00000002, 0xFE363C87, 0xF24A7BB0, 0x00000024, 0x00000002, 0xFE363C8F, 0xFE363C8E, 0x00000027, 0x00000002, 0xFE363C8F, 0x00002710, 0x00000044, 0x00000001, 0x80241094, 0x00000027, 0x00000002, 0xFE363C8E, 0x00000001, 0x0000000F, 0x00000002, 0xFE363C8E, 0x00000010, 0x00000024, 0x00000002, 0xFE363C8E, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000004, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000001, 0x00000024, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000005, 0x00000001, 0x0000000C, 0x00000043, 0x00000003, 0x802E1D00, 0x00000050, 0xFE363C80, 0x00000028, 0x00000002, 0xFE363C80, 0x00000028, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C81, 0x00000043, 0x00000003, 0x802E1D00, 0x00000032, 0xFE363C82, 0x00000028, 0x00000002, 0xFE363C82, 0x00000019, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000005, 0x0000000A, 0x00000001, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000008, code_EF7A80_DeadUnkFloatFunc, 0xFE363C8F, 0xFE363C8E, 0xF24A7E80, 0xF24A7EE0, 0x00000002, 0x00000000, 0x00000000, 0x00000043, 0x00000008, code_EF7A80_DeadUnkFloatFunc, 0xFE363C8F, 0xFE363C8D, 0xF24A7EE0, 0xF24A7E80, 0x00000002, 0x00000000, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0xFE363C8E, 0x00000026, 0x00000002, 0xFE363C81, 0xFE363C8D, 0x00000026, 0x00000002, 0xFE363C82, 0xFE363C8E, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000002D, 0x00000002, 0xFE363C80, 0xF24A7EB0, 0x0000002E, 0x00000002, 0xFE363C80, 0xF24C0A80, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001F, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000020, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000015, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000016, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000017, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000018, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000019, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001A, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001B, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001D, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000029, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000021, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000024, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000025, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000026, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000027, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000028, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000022, 0xFE363C80, 0x00000000, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000001, 0x00000026, 0x00000002, 0xFE363C81, 0x00000001, 0x00000026, 0x00000002, 0xFE363C82, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001F, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000020, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000013, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000014, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000015, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000005, 0x802D6208, 0x00000016, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000017, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000018, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000019, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x0000001A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x0000001B, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000E, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000E, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000005, 0x802D6208, 0x0000001D, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000029, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000021, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D6208, 0x00000024, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000025, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000026, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000027, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000028, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D6208, 0x00000022, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000008, 0x00000001, 0x00000001, 0x00000024, 0x00000002, 0xFAA2B582, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000013, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFF6, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A5280, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0xFFFFFFB2, 0x00000013, 0x00000002, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001F, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000020, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001F, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000020, 0x0000004E, 0xFFFFFFED, 0xFFFFFFFE, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A6680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000C, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000015, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C82, 0xFFFFFFD3, 0x00000024, 0x00000002, 0xFE363C85, 0x00000005, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C82, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000005, 0x00000013, 0x00000000, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000024, 0x00000002, 0xFE363C84, 0x00000000, 0x00000024, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C80, 0x0000005A, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000032, 0x0000001C, 0x0000001B, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000014, 0x00000032, 0x0000001C, 0x0000001B, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0x00000000, 0xFE363C81, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000014, 0x00000000, 0xFE363C81, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C80, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000013, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000006, 0x802D60E4, 0x00000014, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000013, 0xFFFFFFCE, 0xFFFFFFE4, 0xFFFFFFE5, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000014, 0xFFFFFFCE, 0xFFFFFFE4, 0xFFFFFFE5, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000017, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000026, 0x00000002, 0xFE363C82, 0x00000050, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7880, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000015, 0xFFFFFFC9, 0x00000005, 0x00000010, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000015, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000015, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000015, 0x00000037, 0xFFFFFFFB, 0xFFFFFFF0, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A7A80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000016, 0x000001E7, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7C80, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000026, 0x00000002, 0xFE363C82, 0x00000050, 0x0000002E, 0x00000002, 0xFE363C85, 0xF24A7880, 0x0000000A, 0x00000002, 0xFE363C85, 0x00000000, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000018, 0x0000003C, 0x00000000, 0x00000010, 0x00000043, 0x00000006, 0x802D60E4, 0x00000018, 0xFE363C82, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000018, 0xFFFFFFC4, 0x00000000, 0xFFFFFFF0, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000016, 0x00000000, 0x00000000, 0x0000001B, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000017, 0x00000000, 0x00000000, 0x0000001B, 0x00000043, 0x00000006, 0x802D60E4, 0x00000016, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x00000017, 0xFE363C82, 0x00000001, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000016, 0x00000000, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000017, 0x00000000, 0x00000000, 0xFFFFFFE5, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000019, 0x00000000, 0x00000000, 0xFFFFFFD7, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001A, 0x00000000, 0x00000000, 0xFFFFFFD7, 0x00000043, 0x00000006, 0x802D60E4, 0x00000019, 0xFE363C82, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001A, 0xFE363C82, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000019, 0x00000000, 0x00000000, 0x00000029, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001A, 0x00000000, 0x00000000, 0x00000029, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8680, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000012, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C85, 0xF24A7AE0, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000C, 0x00000002, 0xFE363C81, 0xFFFFFFE7, 0x00000026, 0x00000002, 0xFE363C81, 0xF24A1680, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A7A80, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7A80, 0x0000000F, 0x00000002, 0xFE363C82, 0x00000050, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001D, 0x0000007C, 0x00000011, 0x00000003, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001D, 0xFE363C80, 0xFE363C81, 0x00000000, 0x00000043, 0x00000006, 0x802D60E4, 0x0000001D, 0xFE363C82, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000043, 0x00000005, 0x802D5FE0, 0x0000001D, 0xFFFFFF84, 0xFFFFFFEF, 0xFFFFFFFD, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000026, 0x00000002, 0xFE363C80, 0x00000000, 0x00000026, 0x00000002, 0xFE363C81, 0x00000000, 0x00000026, 0x00000002, 0xFE363C82, 0x00000000, 0x00000026, 0x00000002, 0xFE363C83, 0xF24A8680, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A7E80, 0x00000026, 0x00000002, 0xFE363C85, 0xF24A8E80, 0x00000056, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x000001E6, 0x00000000, 0x00000057, 0x00000000, 0x00000005, 0x00000001, 0x0000012C, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000002C, 0x00000002, 0xFE363C80, 0xFE363C83, 0x0000002C, 0x00000002, 0xFE363C81, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C82, 0xFE363C85, 0x0000000E, 0x00000002, 0xFE363C81, 0xFFFFFFD8, 0x00000026, 0x00000002, 0xFE363C81, 0xFFFFFFD8, 0x0000002E, 0x00000002, 0xFE363C84, 0xF24A7880, 0x0000000E, 0x00000002, 0xFE363C84, 0x00000001, 0x00000004, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C82, 0x0000003C, 0x00000026, 0x00000002, 0xFE363C85, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0xFFFFFFDE, 0x00000032, 0x0000000A, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000021, 0xFFFFFFDE, 0x00000032, 0x0000000A, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0x00000000, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, 0x802D60E4, 0x00000029, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000021, 0x00000000, 0xFE363C81, 0xFE363C80, 0x00000043, 0x00000006, 0x802D60E4, 0x00000021, 0xFE363C82, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000029, 0x00000022, 0xFFFFFFCE, 0xFFFFFFF6, 0x00000043, 0x00000005, 0x802D5FE0, 0x00000021, 0x00000022, 0xFFFFFFCE, 0xFFFFFFF6, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000003, 0x00000001, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000003C, 0x0000000A, 0x0000001B, 0x0000001E, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000001E, 0x00000000, 0x0000001B, 0x00000055, 0x00000000, 0x0000001B, 0x00000050, 0x00000023, 0x0000001B, 0x0000005B, 0x00000001, 0xFE363C80, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000C, 0x00000002, 0xFE363C80, 0xFFFFFF2E, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802E37A0, 0x000001E5, 0x00000046, 0x00000001, 0x802413F0, 0x0000005B, 0x00000001, 0xFE363C8A, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8A, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000024, 0x00000002, 0xFAA2B581, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x0000005B, 0x00000001, 0xFAA2B583, 0x0000000A, 0x00000002, 0xFAA2B583, 0x00000001, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000001, 0x0000000D, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000002, 0x00000004, 0x00000001, 0x0000000B, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000003, 0x00000001, 0x0000000B, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000000, 0x00000024, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000044, 0x00000001, 0x80241ED4, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000001, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000000, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000044, 0x00000001, 0x80242174, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027C, 0x00000002, 0x00000044, 0x00000001, 0x80242474, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000044, 0x00000001, 0x80242620, 0x00000004, 0x00000001, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xF5DE027C, 0x00000002, 0x0000000A, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0x00000028, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8080, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000024, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000046, 0x00000001, 0x802413F0, 0x00000046, 0x00000001, 0x802413F0, 0x00000046, 0x00000001, 0x802413F0, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000002, 0x802D6400, 0x0000001B, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000001D, 0x00000000, 0xFE363C80, 0x00000032, 0xFE363C82, 0x00000064, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000001D, 0x00000000, 0xFE363C80, 0x0000001E, 0xFE363C82, 0x00000078, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x0000000F, 0x802E58EC, 0x0000001D, 0x00000000, 0xFE363C80, 0x0000000A, 0xFE363C82, 0x00000064, 0x00000014, 0x00000000, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000006, 0x00000030, 0x00000001, 0x80242DC8, 0x00000005, 0x00000001, 0x00000008, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802E382C, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0x00000002, 0x00000027, 0x00000002, 0xFE363C81, 0x00000005, 0x00000043, 0x00000006, 0x802E382C, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000002, 0x0000000F, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0x00000001, 0x00000006, 0x00000000, 0x00000026, 0x00000002, 0xFE363C84, 0xF24A8280, 0x00000005, 0x00000001, 0x00000002, 0x00000030, 0x00000001, 0x80242DC8, 0x00000005, 0x00000001, 0x00000008, 0x00000033, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000006, 0x802E382C, 0x00000190, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000027, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000019, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008, 0x00000001, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C83, 0xFE363C84, 0x0000002C, 0x00000002, 0xFE363C84, 0xF24A7C80, 0x00000006, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000006, 0x802E382C, 0x000001A0, 0x00000000, 0x00000046, 0x00000028, 0x0000000A, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000024, 0x00000000, 0x00000046, 0x00000028, 0x0000000A, 0xF24A8680, 0x0000001E, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A7E80, 0x00000043, 0x00000006, 0x802E382C, 0x000001A0, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000024, 0x00000000, 0x00000000, 0x0000001E, 0x0000001E, 0xF24A8A80, 0x00000028, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000043, 0x00000005, 0x802D8758, 0x00000000, 0x00000000, 0x00000014, 0xF24A8280, 0x00000046, 0x00000001, 0x80242910, 0x00000043, 0x00000004, 0x802D7AC0, 0x00000014, 0x00000491, 0x00000000, 0x00000043, 0x00000003, 0x802E3330, 0x00000000, 0x000003E8, 0x00000043, 0x00000002, 0x802DE404, 0x00000001, 0x00000008, 0x00000001, 0x0000001E, 0x00000046, 0x00000001, 0x80242B18, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000003, 0x802D78AC, 0x80247078, 0x00000001, 0x00000008, 0x00000001, 0x00000046, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000003, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFAA2B583, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40A00000, 0x00000000, 0xC1200000, 0x00000000, 0xC0A00000, 0x00000000, 0xC1A00000, 0x00000000, 0x42480000, 0x00000000, 0xC1200000, 0x00000000, 0x42D20000, 0x00000000, 0xC1200000, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000035, 0x00000043, 0x00000003, 0x802D6708, 0x00000031, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D6708, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000014, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000015, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000016, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000017, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000018, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000019, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001A, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000044, 0x00000001, 0x80240E90, 0x00000043, 0x00000003, 0x802D6708, 0x00000031, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027C, 0x00000001, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000013, 0x7FFFFE00, 0x00000043, 0x00000003, 0x802D6708, 0x0000001F, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000020, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000001, 0x00000043, 0x00000003, 0x802D6708, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000014, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027C, 0x00000002, 0x00000043, 0x00000003, 0x802D6708, 0x00000015, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000002, 0x00000043, 0x00000003, 0x802D6708, 0x00000016, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000017, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000018, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000019, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x0000001A, 0x00000000, 0x00000013, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x00000043, 0x00000003, 0x802D6708, 0x0000001D, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000029, 0x00000000, 0x00000043, 0x00000003, 0x802D6708, 0x00000021, 0x00000000, 0x00000043, 0x00000004, AddCoin, 0x00000000, 0x00000012, 0x7FFFFE00, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436A0, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436B0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000001, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436C0, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80242E28, 0x00100000, 0x802436D0, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000003, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000004, 0x00000047, 0x00000005, 0x80242E28, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0x00000000, 0x00000005, 0x00000001, 0x00000010, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C80, 0x00000027, 0x00000002, 0xFE363C81, 0x00002710, 0x00000027, 0x00000002, 0xFE363C80, 0x00000001, 0x00000043, 0x00000003, 0x802D63A8, 0x00000031, 0xFE363C81, 0x00000043, 0x00000003, 0x802D6708, 0xFE363C81, 0x00000000, 0x00000006, 0x00000000, 0x00000044, 0x00000001, 0x80241284, 0x00000043, 0x00000003, 0x802D6688, 0x00000024, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000025, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000026, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000027, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000028, 0x00000001, 0x00000043, 0x00000003, 0x802D6688, 0x00000029, 0x00000001, 0x00000056, 0x00000000, 0x00000026, 0x00000002, 0xFE363C8E, 0xF24A7E80, 0x00000003, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE027D, 0x00000003, 0x0000002E, 0x00000002, 0xFE363C8E, 0xF24A7E50, 0x00000013, 0x00000000, 0x0000002C, 0x00000002, 0xFE363C8F, 0xFE363C8E, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000438, 0x00000026, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C80, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C80, 0x00000009, 0x0000002B, 0x00000002, 0xFE363C80, 0x00000004, 0x00000029, 0x00000002, 0xFE363C80, 0x00004000, 0x00000024, 0x00000002, 0xFE363C81, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C81, 0x00000004, 0x0000002B, 0x00000002, 0xFE363C81, 0x00000002, 0x00000029, 0x00000002, 0xFE363C81, 0x00004000, 0x00000024, 0x00000002, 0xFE363C82, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C82, 0x00000005, 0x0000002B, 0x00000002, 0xFE363C82, 0x00000002, 0x00000029, 0x00000002, 0xFE363C82, 0x00004000, 0x00000024, 0x00000002, 0xFE363C83, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C83, 0x00000006, 0x0000002B, 0x00000002, 0xFE363C83, 0x00000002, 0x00000029, 0x00000002, 0xFE363C83, 0x00004000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C84, 0x00000002, 0x0000002B, 0x00000002, 0xFE363C84, 0x00000002, 0x00000029, 0x00000002, 0xFE363C84, 0x00008000, 0x00000024, 0x00000002, 0xFE363C85, 0xFE363C8F, 0x0000002A, 0x00000002, 0xFE363C85, 0x00000008, 0x0000002B, 0x00000002, 0xFE363C85, 0x00000002, 0x00000029, 0x00000002, 0xFE363C85, 0x00004000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000C, 0x00000000, 0xFE363C80, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000D, 0x00000000, 0xFE363C81, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000E, 0x00000000, 0xFE363C82, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000F, 0x00000000, 0xFE363C83, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000B, 0x00000000, 0xFE363C84, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x0000000A, 0x00000000, 0xFE363C85, 0x00000000, 0x00000043, 0x00000005, 0x802D67E4, 0x00000009, 0x00000000, 0xFE363C85, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000004, 0x00000001, 0x00000000, 0x00000057, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00200018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x00140000, 0x00000000, 0x00220018, 0x00000000, 0x00000000, 0x00000000, 0x8007D3C0, 0x00000000, 0x8007D4EC, 0x00000000, 0x00000000, 0x001A0000, 0xC25C0000, 0x41700000, 0x420C0000, 0xC31B0000, 0x420C0000, 0x420C0000, 0xC37F0000, 0x42960000, 0x420C0000, 0xC3B18000, 0x431B0000, 0x420C0000, 0xC3E38000, 0x439D8000, 0x420C0000, 0xC1A00000, 0x41700000, 0x41F00000, 0xC2F00000, 0x420C0000, 0x41F00000, 0xC35C0000, 0x42960000, 0x41F00000, 0xC3A00000, 0x431B0000, 0x41F00000, 0xC3D20000, 0x439D8000, 0x41F00000, 0x42820000, 0x41700000, 0x41F00000, 0xC20C0000, 0x420C0000, 0x41F00000, 0xC3070000, 0x42960000, 0x41F00000, 0xC36B0000, 0x431B0000, 0x41F00000, 0xC3A78000, 0x439D8000, 0x41F00000, 0x42F00000, 0x41700000, 0x41F00000, 0x41A00000, 0x420C0000, 0x41F00000, 0xC2A00000, 0x42960000, 0x41F00000, 0xC3340000, 0x431B0000, 0x41F00000, 0xC38C0000, 0x439D8000, 0x41F00000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0x0000001E, 0x00000000, 0x00000032, 0x00000043, 0x00000003, 0x802DEF5C, 0x0000005A, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000041, 0x00000000, 0x00000032, 0x00000008, 0x00000001, 0x0000001E, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5880, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C9, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010029, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, 0x802DE6A4, 0x00010000, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000004, 0x0000019E, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000004, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000004, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000003C, 0x80243F98, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000000, 0x0000019F, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x0000003C, 0x80243FD4, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000046, 0x80244010, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000004, 0x802DD70C, 0x00000002, 0x0000019F, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000004, 0x802DC064, 0x00000002, 0x0000010E, 0x00000000, 0x00000043, 0x00000005, func_802E2A80, 0x00000050, 0x8024404C, 0x00000005, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000001, func_802E2B74, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000008, 0x00000001, 0x00000001, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000001, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000008, 0x00000001, 0x00000005, 0x00000043, 0x00000005, 0x802E1FB4, 0x00000028, 0x00000000, 0x000000C8, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x0000002D, 0x00000012, 0x00000000, 0x00000024, 0x00000002, 0xFE363C83, 0x00000019, 0x00000013, 0x00000000, 0x00000024, 0x00000002, 0xFE363C84, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C84, 0xFFFFFFFB, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x0000000D, 0x00000002, 0xFE363C82, 0xFFFFFFC3, 0x00000058, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000000, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DB78C, 0x00000000, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000001, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DB78C, 0x00000001, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000058, 0x00000000, 0x00000043, 0x00000004, 0x802DC5C0, 0x00000002, 0x00000100, 0x00000001, 0x00000043, 0x00000005, 0x802DB78C, 0x00000002, 0xFE363C80, 0x00000037, 0xFE363C83, 0x00000059, 0x00000000, 0x00000008, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0xFFFFFFFC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFC, 0x00000041, 0xFE363C81, 0x00000050, 0x00000043, 0x00000003, 0x802DBFE4, 0xFFFFFFFC, 0x0000010E, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x000001C2, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000006, 0x802DD810, 0x00000004, 0x00570209, 0x00570201, 0x00000000, 0x001100BB, 0x00000008, 0x00000001, 0x00000014, 0x00000044, 0x00000001, 0x802442A0, 0x00000008, 0x00000001, 0x00000050, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5880, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C1, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000024, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000004, 0x802E1EFC, 0xFFFFFF06, 0x00000000, 0x00000032, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802DD1D4, 0xFE363C80, 0x00000043, 0x00000002, 0x802DCB18, 0x00000008, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000008, 0x00000043, 0x00000003, 0x802DB5E8, 0xFFFFFFFC, 0xF24A7A80, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000027, 0x00000002, 0xFE363C82, 0x00000014, 0x00000027, 0x00000002, 0xFE363C83, 0x00000014, 0x00000043, 0x00000006, 0x802DBC24, 0xFFFFFFFC, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000003, 0x802DF124, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFC, 0x00000000, 0x00000043, 0x00000002, 0x802DCA48, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFC, 0x00080009, 0x00080001, 0x00000005, 0x001100C2, 0x00000043, 0x00000001, 0x802DCA8C, 0x00000043, 0x00000001, 0x802DCEE8, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000005, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049370, 0x00000000, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000007, 0x00000000, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x000003E8, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A8A80, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000043, 0x00000002, 0x8004893C, 0x00000003, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x8004861C, 0xFE363C80, 0x00000014, 0x00000001, 0xFE363C80, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000005, 0x802DB210, 0x00000003, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0x00000004, 0xFFFFFFC9, 0x0000000F, 0x00000023, 0x00000043, 0x00000003, 0x802DBF70, 0x00000003, 0xFE363C80, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000004, 0x0000005A, 0x00000043, 0x00000003, 0x802DEF5C, 0x000000B4, 0x00000000, 0x00000043, 0x00000004, 0x802DE510, 0x0000001E, 0x00000000, 0x00000050, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000000, 0x0000005A, 0x00000043, 0x00000005, 0x802DB210, 0x00000000, 0xFFFFFFEC, 0x0000000F, 0x0000001E, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000001, 0x0000010E, 0x00000043, 0x00000005, 0x802DB210, 0x00000001, 0x00000041, 0x0000000F, 0x0000001E, 0x00000043, 0x00000003, 0x802DBFE4, 0x00000002, 0x0000010E, 0x00000043, 0x00000005, 0x802DB210, 0x00000002, 0x00000078, 0x0000000F, 0x0000001E, 0x00000044, 0x00000001, 0x802447A4, 0x00000013, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x802DC228, 0x00000003, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000003, 0x802DC228, 0x00000000, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000003, 0x802DC228, 0x00000001, 0x00000001, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000003, 0x802DC228, 0x00000002, 0x00000001, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000003, 0x00560202, 0x00560201, 0x00000010, 0x001100B9, 0x00000043, 0x00000004, 0x802DC064, 0x00000003, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, 0x802DC064, 0x00000000, 0x0000005A, 0x00000000, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, 0x802DC064, 0x00000001, 0x0000010E, 0x00000000, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0x00000002, 0x00490016, 0x00490001, 0x00000010, 0x001100BF, 0x00000043, 0x00000004, 0x802DC064, 0x00000002, 0x0000010E, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xFD050F8A, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0x00000003, 0x00560202, 0x00560201, 0x00000010, 0x001100BA, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000006, 0x802DD810, 0x00000000, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000006, 0x802DD810, 0x00000001, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000016, 0x00000001, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0x00000002, 0x00490016, 0x00490001, 0x00000010, 0x001100C0, 0x00000023, 0x00000000, 0x00000043, 0x00000004, 0x800493D0, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80244604, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000002, 0x802E0260, 0x00000001, 0x00000043, 0x00000004, 0x802DC5C0, 0xFFFFFFFC, 0x00000100, 0x00000001, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24ABE80, 0xF24A6280, 0x00000046, 0x00000001, 0x80244E5C, 0x00000014, 0x00000001, 0xF70F2E87, 0x00000016, 0x00000001, 0x00000000, 0x00000046, 0x00000001, 0x80244F00, 0x00000027, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000016, 0x00000001, 0x00000001, 0x00000046, 0x00000001, 0x80245034, 0x00000023, 0x00000000, 0x00000043, 0x00000002, 0x802E0260, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000003, 0x00000046, 0x00000001, 0x80245138, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000F, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000002, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000001, 0x00000043, 0x00000005, 0x802D8D40, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, 0x802D9320, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000003, 0x802D93E4, 0x00000000, 0xF24A9A80, 0x00000043, 0x00000004, 0x802D903C, 0x00000000, 0xF24ABE80, 0xF24A6280, 0x00000043, 0x00000003, 0x802D90D8, 0x00000000, 0x0000012C, 0x00000043, 0x00000004, 0x802D8C7C, 0x00000000, 0x00000000, 0x00000001, 0x00000043, 0x00000003, 0x802D9848, 0x00000000, 0xF24A7E80, 0x00000046, 0x00000001, 0x80244E5C, 0x0000000A, 0x00000002, 0xF70F2E87, 0x00000000, 0x00000046, 0x00000001, 0x80244F00, 0x00000027, 0x00000002, 0xF70F2E87, 0x00000001, 0x00000043, 0x00000003, 0x802D9DE4, 0x00000000, 0xF24A8A80, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x80245034, 0x00000013, 0x00000000, 0x00000043, 0x00000002, 0x802DE448, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000000, 0x00000043, 0x00000005, 0x802DC654, 0x00000003, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000001, 0x00000043, 0x00000005, 0x802DC654, 0x00000000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000002, 0x00000043, 0x00000005, 0x802DC654, 0x00000001, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000A, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000024, 0x00000002, 0xFD050F8A, 0x00000003, 0x00000043, 0x00000005, 0x802DC654, 0x00000002, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000046, 0x00000001, 0x802453A8, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x40A00000, 0x00000000, 0xC1200000, 0x00000000, 0xC0A00000, 0x00000000, 0xC1A00000, 0x00000000, 0x42480000, 0x00000000, 0xC1200000, 0x00000000, 0x42D20000, 0x00000000, 0xC1200000, 0x00000000, 0x00000024, 0x00000002, 0xFD050F8A, 0xFFFFFFFF, 0x00000047, 0x00000005, 0x80245258, 0x00001000, 0x00000017, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245258, 0x00001000, 0x00000013, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245504, 0x00100000, 0x802456D4, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245574, 0x00100000, 0x802456C4, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245300, 0x00001000, 0x00000016, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x802455E4, 0x00100000, 0x802456E4, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245354, 0x00001000, 0x00000012, 0x00000001, 0x00000000, 0x00000047, 0x00000005, 0x80245654, 0x00100000, 0x802456F4, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000014, 0x00000001, 0xF70F2E86, 0x00000016, 0x00000001, 0x00000000, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B6, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BC, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000016, 0x00000001, 0x00000001, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B7, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BD, 0x00000013, 0x00000000, 0x00000027, 0x00000002, 0xF70F2E86, 0x00000001, 0x00000016, 0x00000001, 0x00000002, 0x00000043, 0x00000007, 0x802D9B68, 0x00000000, 0xF24A9A80, 0x00000000, 0x0000012C, 0xF24AC680, 0xF24A5680, 0x00000043, 0x00000002, 0x800496C4, 0xFE363C80, 0x0000000A, 0x00000002, 0xFE363C80, 0x00000003, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000005, 0x001100B8, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00560202, 0x00560201, 0x00000000, 0x00000012, 0x00000000, 0x00000043, 0x00000006, 0x802DD810, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000005, 0x001100BE, 0x00000043, 0x00000003, 0x802DC228, 0xFFFFFFFF, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000005, 0x802DD82C, 0xFFFFFFFF, 0x00490016, 0x00490001, 0x00000000, 0x00000013, 0x00000000, 0x00000043, 0x00000004, 0x800493D0, 0x00000003, 0x00000000, 0x00000001, 0x00000008, 0x00000001, 0x00000005, 0x00000044, 0x00000001, 0x80244604, 0x00000043, 0x00000003, 0x80049154, 0x00000000, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0x00000001, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0x00000002, 0x00000000, 0x00000043, 0x00000003, 0x80049154, 0x00000003, 0x00000000, 0x00000023, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80048C5C, 0xFFFFFFFF, 0x80244B6C, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000000C, 0x00000002, 0xF5DE0180, 0x00000034, 0x00000043, 0x00000003, 0x80049154, 0xFFFFFFFF, 0x80245804, 0x00000043, 0x00000003, 0x8004928C, 0xFFFFFFFF, 0x80244CB4, 0x00000012, 0x00000000, 0x00000043, 0x00000005, 0x802DB210, 0xFFFFFFFF, 0x00000000, 0xFFFFFC18, 0x00000000, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x80243F40, 0x00000000, 0x41700000, 0x42700000, 0x00440D05, 0x80245BC0, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000001, 0x80243F40, 0x42820000, 0x41700000, 0x42700000, 0x00440D05, 0x80245C34, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000002, 0x80243F40, 0x43070000, 0x41700000, 0x420C0000, 0x00440D05, 0x80245CA8, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00490001, 0x00490002, 0x00490003, 0x00490003, 0x00490001, 0x00490001, 0x00490004, 0x00490004, 0x00490003, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00490001, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000003, 0x80243F6C, 0xC2700000, 0x00000000, 0x42480000, 0x00440D05, 0x80245AD8, 0x00000000, 0x00000000, 0x0000005A, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560204, 0x00560204, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00560201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000004, 0x80243F6C, 0x00000000, 0xC47A0000, 0x00000000, 0x00440D05, 0x80245B60, 0x00000000, 0x00000000, 0x0000010E, 0x8019008C, 0x00020000, 0x00A30002, 0x00000082, 0x00020000, 0x00920002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x59980002, 0x3FFF2666, 0x4CCC0002, 0x3FFF3FFF, 0x3FFF0002, 0x33326665, 0x33320002, 0x33327FFF, 0x26660002, 0x26660000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001999, 0x3FFF0003, 0x33322666, 0x33320003, 0x33323FFF, 0x33320003, 0x33326665, 0x33320003, 0x33327FFF, 0x26660003, 0x33320000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570204, 0x00570204, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00570201, 0x00000000, 0x00000000, 0x00000000, 0x001A00E4, 0x00000005, 0x80245D1C, 0x1A0B0007, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C85, 0xFE363C8F, 0xFE363C87, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0x00000001, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000153, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0xFFFFFFFF, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000033, 0x00000003, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0x00000033, 0x00000003, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x0000000A, 0x00000002, 0xFE363C8A, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8A, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C84, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000046, 0x00000001, 0xFE363C84, 0x00000013, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004C, 0x00000001, 0xF24A8280, 0x00000030, 0x00000001, 0xFE363C80, 0x00000034, 0x00000004, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000043, 0x00000004, 0x802DF41C, 0xFE363C86, 0xFE363C8F, 0xFE363C88, 0x00000043, 0x00000002, 0x802E37A0, 0x00000165, 0x00000043, 0x00000002, 0x802E37A0, 0x00000166, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C81, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C83, 0x00000166, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C83, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C81, 0x00000031, 0x00000001, 0xFE363C82, 0x00000005, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C83, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C82, 0x00000000, 0x00000005, 0x00000001, 0x00000005, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C84, 0xF24A7AE7, 0xF24A7B4D, 0xFE363C8F, 0x00000000, 0x0000000A, 0x00000002, 0xFBD3E280, 0x00000000, 0x00000024, 0x00000002, 0xFBD3E280, 0x00000001, 0x00000043, 0x00000004, 0x802D7A04, 0xFE363C84, 0x00000165, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000006, func_80240600_EF8080, 0xFE363C84, 0xF24A7AE7, 0xF24A79B4, 0xFE363C8F, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000006, 0x00000000, 0x00000030, 0x00000001, 0xFE363C82, 0x00000031, 0x00000001, 0xFE363C83, 0x00000005, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000043, 0x00000005, 0x802D5FE0, 0xFE363C84, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000008, 0x00000001, 0x00000001, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C83, 0x00000000, 0x00000030, 0x00000001, 0xFE363C83, 0x00000031, 0x00000001, 0xFE363C84, 0x00000005, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000033, 0x00000003, 0xFE363C89, 0xFE363C8A, 0xFE363C8B, 0x0000000A, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000012, 0x00000000, 0x00000043, 0x00000003, 0x802E2F8C, 0xFE363C8B, 0xFE363C8C, 0x0000000A, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000003, 0x802E2F30, 0xFE363C8B, 0x00000001, 0x00000043, 0x00000007, 0x802E4410, 0xFE363C85, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0xFE363C89, 0xFE363C8A, 0x00000013, 0x00000000, 0x00000013, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x00000056, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C84, 0x00000000, 0x00000030, 0x00000001, 0xFE363C84, 0x00000031, 0x00000001, 0xFE363C85, 0x00000005, 0x00000001, 0xFE363C85, 0x00000033, 0x00000003, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000043, 0x0000000F, 0x802E58EC, 0x00000014, 0x00000000, 0xFE363C86, 0xFE363C87, 0xFE363C88, 0x00000064, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000013, 0x00000000, 0x00000057, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C85, 0x00000000, 0x00000046, 0x00000001, 0xFE363C85, 0x00000013, 0x00000000, 0x00000008, 0x00000001, 0x0000000F, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x666C6F5F, 0x31370000, 0x666C6F5F, 0x31350000 diff --git a/ver/us/asm/data/code_E2D410.data.s b/ver/us/asm/data/entity/default/E2D410.data.s similarity index 100% rename from ver/us/asm/data/code_E2D410.data.s rename to ver/us/asm/data/entity/default/E2D410.data.s diff --git a/ver/us/asm/data/code_E2EFD0.data.s b/ver/us/asm/data/entity/jan_iwa/E2EFD0.data.s similarity index 100% rename from ver/us/asm/data/code_E2EFD0.data.s rename to ver/us/asm/data/entity/jan_iwa/E2EFD0.data.s diff --git a/ver/us/asm/data/code_E31380.data.s b/ver/us/asm/data/entity/sbk_omo/E31380.data.s similarity index 100% rename from ver/us/asm/data/code_E31380.data.s rename to ver/us/asm/data/entity/sbk_omo/E31380.data.s diff --git a/ver/us/asm/data/code_1422A0.data.s b/ver/us/asm/data/pause/1422A0.data.s similarity index 100% rename from ver/us/asm/data/code_1422A0.data.s rename to ver/us/asm/data/pause/1422A0.data.s diff --git a/ver/us/asm/data/code_3195D0.data.s b/ver/us/asm/data/world/partner/3195D0.data.s similarity index 100% rename from ver/us/asm/data/code_3195D0.data.s rename to ver/us/asm/data/world/partner/3195D0.data.s diff --git a/ver/us/asm/data/code_31B000.data.s b/ver/us/asm/data/world/partner/31B000.data.s similarity index 100% rename from ver/us/asm/data/code_31B000.data.s rename to ver/us/asm/data/world/partner/31B000.data.s diff --git a/ver/us/asm/data/code_31CB60.data.s b/ver/us/asm/data/world/partner/31CB60.data.s similarity index 100% rename from ver/us/asm/data/code_31CB60.data.s rename to ver/us/asm/data/world/partner/31CB60.data.s diff --git a/ver/us/asm/data/code_31DDC0.data.s b/ver/us/asm/data/world/partner/31DDC0.data.s similarity index 100% rename from ver/us/asm/data/code_31DDC0.data.s rename to ver/us/asm/data/world/partner/31DDC0.data.s diff --git a/ver/us/asm/data/code_320B20.data.s b/ver/us/asm/data/world/partner/320B20.data.s similarity index 100% rename from ver/us/asm/data/code_320B20.data.s rename to ver/us/asm/data/world/partner/320B20.data.s diff --git a/ver/us/asm/data/code_3239B0.data.s b/ver/us/asm/data/world/partner/3239B0.data.s similarity index 100% rename from ver/us/asm/data/code_3239B0.data.s rename to ver/us/asm/data/world/partner/3239B0.data.s diff --git a/ver/us/asm/data/code_324930.data.s b/ver/us/asm/data/world/partner/324930.data.s similarity index 100% rename from ver/us/asm/data/code_324930.data.s rename to ver/us/asm/data/world/partner/324930.data.s diff --git a/ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s b/ver/us/asm/nonmatchings/101b90_len_8f0/func_802DEAA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DEAA0.s rename to ver/us/asm/nonmatchings/101b90_len_8f0/func_802DEAA0.s diff --git a/ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s b/ver/us/asm/nonmatchings/101b90_len_8f0/func_802DED60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DED60.s rename to ver/us/asm/nonmatchings/101b90_len_8f0/func_802DED60.s diff --git a/ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s b/ver/us/asm/nonmatchings/101b90_len_8f0/func_802DEEA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DEEA0.s rename to ver/us/asm/nonmatchings/101b90_len_8f0/func_802DEEA0.s diff --git a/ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s b/ver/us/asm/nonmatchings/101b90_len_8f0/func_802DEFB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DEFB4.s rename to ver/us/asm/nonmatchings/101b90_len_8f0/func_802DEFB4.s diff --git a/ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s b/ver/us/asm/nonmatchings/101b90_len_8f0/func_802DF00C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DF00C.s rename to ver/us/asm/nonmatchings/101b90_len_8f0/func_802DF00C.s diff --git a/ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s b/ver/us/asm/nonmatchings/101b90_len_8f0/func_802DF2D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_101b90_len_8f0/func_802DF2D8.s rename to ver/us/asm/nonmatchings/101b90_len_8f0/func_802DF2D8.s diff --git a/ver/us/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s b/ver/us/asm/nonmatchings/101b90_len_8f0/load_sprite.s similarity index 100% rename from ver/us/asm/nonmatchings/code_101b90_len_8f0/load_sprite.s rename to ver/us/asm/nonmatchings/101b90_len_8f0/load_sprite.s diff --git a/ver/us/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s b/ver/us/asm/nonmatchings/102610_len_2330/func_802E0DE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_102610_len_2330/func_802E0DE0.s rename to ver/us/asm/nonmatchings/102610_len_2330/func_802E0DE0.s diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E17A8.s b/ver/us/asm/nonmatchings/102C80/func_802E17A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_102C80/func_802E17A8.s rename to ver/us/asm/nonmatchings/102C80/func_802E17A8.s diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E1EDC.s b/ver/us/asm/nonmatchings/102C80/func_802E1EDC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_102C80/func_802E1EDC.s rename to ver/us/asm/nonmatchings/102C80/func_802E1EDC.s diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E246C.s b/ver/us/asm/nonmatchings/102C80/func_802E246C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_102C80/func_802E246C.s rename to ver/us/asm/nonmatchings/102C80/func_802E246C.s diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E263C.s b/ver/us/asm/nonmatchings/102C80/func_802E263C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_102C80/func_802E263C.s rename to ver/us/asm/nonmatchings/102C80/func_802E263C.s diff --git a/ver/us/asm/nonmatchings/code_102C80/func_802E2BA4.s b/ver/us/asm/nonmatchings/102C80/func_802E2BA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_102C80/func_802E2BA4.s rename to ver/us/asm/nonmatchings/102C80/func_802E2BA4.s diff --git a/ver/us/asm/nonmatchings/code_10400_len_d30/func_800354EC.s b/ver/us/asm/nonmatchings/10400_len_d30/func_800354EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_10400_len_d30/func_800354EC.s rename to ver/us/asm/nonmatchings/10400_len_d30/func_800354EC.s diff --git a/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035704.s b/ver/us/asm/nonmatchings/10400_len_d30/func_80035704.s similarity index 98% rename from ver/us/asm/nonmatchings/code_10400_len_d30/func_80035704.s rename to ver/us/asm/nonmatchings/10400_len_d30/func_80035704.s index 28a81ce9c0..7501255e13 100644 --- a/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035704.s +++ b/ver/us/asm/nonmatchings/10400_len_d30/func_80035704.s @@ -158,7 +158,7 @@ glabel L80035814_10C14 /* 10D2C 8003592C 00000000 */ nop /* 10D30 80035930 0C0B0CBB */ jal init_script_list /* 10D34 80035934 00000000 */ nop -/* 10D38 80035938 0C00E14B */ jal init_npc_list +/* 10D38 80035938 0C00E14B */ jal npc_list_update_current /* 10D3C 8003593C 00000000 */ nop /* 10D40 80035940 0C044396 */ jal func_80110E58 /* 10D44 80035944 00000000 */ nop @@ -217,7 +217,7 @@ glabel L80035814_10C14 /* 10E08 80035A08 A0220931 */ sb $v0, %lo(D_800A0931)($at) /* 10E0C 80035A0C 0C037DD0 */ jal update_player /* 10E10 80035A10 00000000 */ nop -/* 10E14 80035A14 0C00E64C */ jal update_npcs +/* 10E14 80035A14 0C00E64C */ jal npc_list_update /* 10E18 80035A18 00000000 */ nop /* 10E1C 80035A1C 0C00F949 */ jal update_counters /* 10E20 80035A20 00000000 */ nop @@ -242,7 +242,7 @@ glabel L80035814_10C14 glabel L80035A68_10E68 /* 10E68 80035A68 0C037DD0 */ jal update_player /* 10E6C 80035A6C 00000000 */ nop -/* 10E70 80035A70 0C00E64C */ jal update_npcs +/* 10E70 80035A70 0C00E64C */ jal npc_list_update /* 10E74 80035A74 00000000 */ nop /* 10E78 80035A78 0C00F949 */ jal update_counters /* 10E7C 80035A7C 00000000 */ nop @@ -277,7 +277,7 @@ glabel L80035AE0_10EE0 /* 10EE4 80035AE4 0000202D */ daddu $a0, $zero, $zero /* 10EE8 80035AE8 0C037DD0 */ jal update_player /* 10EEC 80035AEC 00000000 */ nop -/* 10EF0 80035AF0 0C00E64C */ jal update_npcs +/* 10EF0 80035AF0 0C00E64C */ jal npc_list_update /* 10EF4 80035AF4 00000000 */ nop /* 10EF8 80035AF8 0C00F949 */ jal update_counters /* 10EFC 80035AFC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_10400_len_d30/func_80035B40.s b/ver/us/asm/nonmatchings/10400_len_d30/func_80035B40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_10400_len_d30/func_80035B40.s rename to ver/us/asm/nonmatchings/10400_len_d30/func_80035B40.s diff --git a/ver/us/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s b/ver/us/asm/nonmatchings/10400_len_d30/state_step_language_select.s similarity index 98% rename from ver/us/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s rename to ver/us/asm/nonmatchings/10400_len_d30/state_step_language_select.s index 81617d2696..4fe53092cb 100644 --- a/ver/us/asm/nonmatchings/code_10400_len_d30/state_step_language_select.s +++ b/ver/us/asm/nonmatchings/10400_len_d30/state_step_language_select.s @@ -30,7 +30,7 @@ glabel state_step_language_select .L80035228: /* 10628 80035228 0C037DD0 */ jal update_player /* 1062C 8003522C 00000000 */ nop -/* 10630 80035230 0C00E64C */ jal update_npcs +/* 10630 80035230 0C00E64C */ jal npc_list_update /* 10634 80035234 00000000 */ nop /* 10638 80035238 0C00F949 */ jal update_counters /* 1063C 8003523C 00000000 */ nop @@ -164,7 +164,7 @@ glabel state_step_language_select /* 10824 80035424 00000000 */ nop /* 10828 80035428 0C0B0C77 */ jal clear_script_list /* 1082C 8003542C 00000000 */ nop -/* 10830 80035430 0C00E12F */ jal clear_npcs +/* 10830 80035430 0C00E12F */ jal npc_list_clear /* 10834 80035434 00000000 */ nop /* 10838 80035438 0C04432E */ jal clear_entity_data /* 1083C 8003543C 0000202D */ daddu $a0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s b/ver/us/asm/nonmatchings/104940_len_dc0/func_802E30C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E30C0.s rename to ver/us/asm/nonmatchings/104940_len_dc0/func_802E30C0.s diff --git a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s b/ver/us/asm/nonmatchings/104940_len_dc0/func_802E3370.s similarity index 100% rename from ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3370.s rename to ver/us/asm/nonmatchings/104940_len_dc0/func_802E3370.s diff --git a/ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/ver/us/asm/nonmatchings/104940_len_dc0/func_802E3BA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s rename to ver/us/asm/nonmatchings/104940_len_dc0/func_802E3BA4.s diff --git a/ver/us/asm/nonmatchings/code_105700_len_2130/func_802E3EE0.s b/ver/us/asm/nonmatchings/105700_len_2130/func_802E3EE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_105700_len_2130/func_802E3EE0.s rename to ver/us/asm/nonmatchings/105700_len_2130/func_802E3EE0.s diff --git a/ver/us/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s b/ver/us/asm/nonmatchings/105700_len_2130/func_802E3F0C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s rename to ver/us/asm/nonmatchings/105700_len_2130/func_802E3F0C.s diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E4710.s b/ver/us/asm/nonmatchings/105F90/func_802E4710.s similarity index 100% rename from ver/us/asm/nonmatchings/code_105F90/func_802E4710.s rename to ver/us/asm/nonmatchings/105F90/func_802E4710.s diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E4730.s b/ver/us/asm/nonmatchings/105F90/func_802E4730.s similarity index 100% rename from ver/us/asm/nonmatchings/code_105F90/func_802E4730.s rename to ver/us/asm/nonmatchings/105F90/func_802E4730.s diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E4C10.s b/ver/us/asm/nonmatchings/105F90/func_802E4C10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_105F90/func_802E4C10.s rename to ver/us/asm/nonmatchings/105F90/func_802E4C10.s diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s b/ver/us/asm/nonmatchings/105F90/func_802E4E04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_105F90/func_802E4E04.s rename to ver/us/asm/nonmatchings/105F90/func_802E4E04.s diff --git a/ver/us/asm/nonmatchings/code_105F90/func_802E5324.s b/ver/us/asm/nonmatchings/105F90/func_802E5324.s similarity index 100% rename from ver/us/asm/nonmatchings/code_105F90/func_802E5324.s rename to ver/us/asm/nonmatchings/105F90/func_802E5324.s diff --git a/ver/us/asm/nonmatchings/code_1060_len_310/func_80025F44.s b/ver/us/asm/nonmatchings/1060_len_310/func_80025F44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1060_len_310/func_80025F44.s rename to ver/us/asm/nonmatchings/1060_len_310/func_80025F44.s diff --git a/ver/us/asm/nonmatchings/code_106EF0/func_802E586C.s b/ver/us/asm/nonmatchings/106EF0/func_802E586C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_106EF0/func_802E586C.s rename to ver/us/asm/nonmatchings/106EF0/func_802E586C.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E5FB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E5FB0.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6064.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6064.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6064.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6064.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6118.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6118.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6118.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6118.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6178.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6178.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6178.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6178.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E619C.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E619C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E619C.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E619C.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E61B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E61B0.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6338.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6338.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6338.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6338.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6390.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6390.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6390.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6390.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E63A8.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E63A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E63A8.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E63A8.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6574.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6574.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6574.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6B6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6B6C.s diff --git a/ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s b/ver/us/asm/nonmatchings/107830_len_e70/func_802E6C24.s similarity index 100% rename from ver/us/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s rename to ver/us/asm/nonmatchings/107830_len_e70/func_802E6C24.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/entity_init_Chest.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/entity_init_Chest.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E6E20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E6E20.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E90.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E6E90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E90.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E6E90.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E6ED8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E6ED8.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7034.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7034.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7034.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7034.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E70B0.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E70B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E70B0.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E70B0.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E71F8.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E71F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E71F8.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E71F8.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7230.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7230.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E742C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E742C.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75C0.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E75C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75C0.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E75C0.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E75E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E75E4.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7AE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7AE4.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C70.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7C70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C70.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7C70.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C8C.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7C8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C8C.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7C8C.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7CB8.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7CB8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7CB8.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7CB8.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D28.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7D28.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D28.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7D28.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7D38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D38.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7D38.s diff --git a/ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s b/ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7D54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1086a0_len_fc0/func_802E7D54.s rename to ver/us/asm/nonmatchings/1086a0_len_fc0/func_802E7D54.s diff --git a/ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s b/ver/us/asm/nonmatchings/109660_len_1270/func_802E7DE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7DE0.s rename to ver/us/asm/nonmatchings/109660_len_1270/func_802E7DE0.s diff --git a/ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s b/ver/us/asm/nonmatchings/109660_len_1270/func_802E7FA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_109660_len_1270/func_802E7FA0.s rename to ver/us/asm/nonmatchings/109660_len_1270/func_802E7FA0.s diff --git a/ver/us/asm/nonmatchings/code_109660_len_1270/func_802E854C.s b/ver/us/asm/nonmatchings/109660_len_1270/func_802E854C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_109660_len_1270/func_802E854C.s rename to ver/us/asm/nonmatchings/109660_len_1270/func_802E854C.s diff --git a/ver/us/asm/nonmatchings/code_10A230/push_entity_matrix.s b/ver/us/asm/nonmatchings/10A230/push_entity_matrix.s similarity index 100% rename from ver/us/asm/nonmatchings/code_10A230/push_entity_matrix.s rename to ver/us/asm/nonmatchings/10A230/push_entity_matrix.s diff --git a/ver/us/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s b/ver/us/asm/nonmatchings/111f0_len_860/func_80035EEC.s similarity index 98% rename from ver/us/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s rename to ver/us/asm/nonmatchings/111f0_len_860/func_80035EEC.s index ecd5237b24..52b503a817 100644 --- a/ver/us/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s +++ b/ver/us/asm/nonmatchings/111f0_len_860/func_80035EEC.s @@ -79,7 +79,7 @@ glabel func_80035EEC .L80036000: /* 11400 80036000 0C00F949 */ jal update_counters /* 11404 80036004 00000000 */ nop -/* 11408 80036008 0C00E64C */ jal update_npcs +/* 11408 80036008 0C00E64C */ jal npc_list_update /* 1140C 8003600C 00000000 */ nop /* 11410 80036010 0C037DD0 */ jal update_player /* 11414 80036014 00000000 */ nop @@ -112,7 +112,7 @@ glabel func_80035EEC /* 11478 80036078 0800D83B */ j .L800360EC /* 1147C 8003607C A6030000 */ sh $v1, ($s0) .L80036080: -/* 11480 80036080 0C00E64C */ jal update_npcs +/* 11480 80036080 0C00E64C */ jal npc_list_update /* 11484 80036084 00000000 */ nop /* 11488 80036088 0C037DD0 */ jal update_player /* 1148C 8003608C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003617C.s b/ver/us/asm/nonmatchings/111f0_len_860/func_8003617C.s similarity index 98% rename from ver/us/asm/nonmatchings/code_111f0_len_860/func_8003617C.s rename to ver/us/asm/nonmatchings/111f0_len_860/func_8003617C.s index 1b378acdf3..6ab6fc2338 100644 --- a/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003617C.s +++ b/ver/us/asm/nonmatchings/111f0_len_860/func_8003617C.s @@ -24,7 +24,7 @@ glabel func_8003617C /* 115AC 800361AC 00400008 */ jr $v0 /* 115B0 800361B0 00000000 */ nop glabel L800361B4_115B4 -/* 115B4 800361B4 0C00E64C */ jal update_npcs +/* 115B4 800361B4 0C00E64C */ jal npc_list_update /* 115B8 800361B8 00000000 */ nop /* 115BC 800361BC 0C037DD0 */ jal update_player /* 115C0 800361C0 00000000 */ nop @@ -113,7 +113,7 @@ glabel L80036244_11644 glabel L800362F8_116F8 /* 116F8 800362F8 0C00F949 */ jal update_counters /* 116FC 800362FC 00000000 */ nop -/* 11700 80036300 0C00E64C */ jal update_npcs +/* 11700 80036300 0C00E64C */ jal npc_list_update /* 11704 80036304 00000000 */ nop /* 11708 80036308 0C037DD0 */ jal update_player /* 1170C 8003630C 00000000 */ nop @@ -146,7 +146,7 @@ glabel L800362F8_116F8 /* 11774 80036374 0800D8FA */ j .L800363E8 /* 11778 80036378 A4C30000 */ sh $v1, ($a2) glabel L8003637C_1177C -/* 1177C 8003637C 0C00E64C */ jal update_npcs +/* 1177C 8003637C 0C00E64C */ jal npc_list_update /* 11780 80036380 00000000 */ nop /* 11784 80036384 0C037DD0 */ jal update_player /* 11788 80036388 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003646C.s b/ver/us/asm/nonmatchings/111f0_len_860/func_8003646C.s similarity index 98% rename from ver/us/asm/nonmatchings/code_111f0_len_860/func_8003646C.s rename to ver/us/asm/nonmatchings/111f0_len_860/func_8003646C.s index b15c79ed51..c0094b4f58 100644 --- a/ver/us/asm/nonmatchings/code_111f0_len_860/func_8003646C.s +++ b/ver/us/asm/nonmatchings/111f0_len_860/func_8003646C.s @@ -70,7 +70,7 @@ glabel func_8003646C .L8003655C: /* 1195C 8003655C 0C00F949 */ jal update_counters /* 11960 80036560 00000000 */ nop -/* 11964 80036564 0C00E64C */ jal update_npcs +/* 11964 80036564 0C00E64C */ jal npc_list_update /* 11968 80036568 00000000 */ nop /* 1196C 8003656C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 11970 80036570 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -107,7 +107,7 @@ glabel func_8003646C /* 119E8 800365E8 0C00CD3C */ jal set_game_mode /* 119EC 800365EC 24040004 */ addiu $a0, $zero, 4 .L800365F0: -/* 119F0 800365F0 0C00E64C */ jal update_npcs +/* 119F0 800365F0 0C00E64C */ jal npc_list_update /* 119F4 800365F4 00000000 */ nop /* 119F8 800365F8 0C037DD0 */ jal update_player /* 119FC 800365FC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s b/ver/us/asm/nonmatchings/11a50_len_7a0/step_intro.s similarity index 99% rename from ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s rename to ver/us/asm/nonmatchings/11a50_len_7a0/step_intro.s index 388e754baa..d4ec2b0720 100644 --- a/ver/us/asm/nonmatchings/code_11a50_len_7a0/step_intro.s +++ b/ver/us/asm/nonmatchings/11a50_len_7a0/step_intro.s @@ -219,7 +219,7 @@ glabel L80036AA0_11EA0 /* 11F60 80036B60 00000000 */ nop /* 11F64 80036B64 0C037F14 */ jal clear_player_status /* 11F68 80036B68 00000000 */ nop -/* 11F6C 80036B6C 0C00E12F */ jal clear_npcs +/* 11F6C 80036B6C 0C00E12F */ jal npc_list_clear /* 11F70 80036B70 00000000 */ nop /* 11F74 80036B74 0C039CE8 */ jal clear_player_data /* 11F78 80036B78 00000000 */ nop @@ -307,7 +307,7 @@ glabel L80036C40_12040 /* 120B0 80036CB0 AC830000 */ sw $v1, ($a0) /* 120B4 80036CB4 0C00F949 */ jal update_counters /* 120B8 80036CB8 00000000 */ nop -/* 120BC 80036CBC 0C00E64C */ jal update_npcs +/* 120BC 80036CBC 0C00E64C */ jal npc_list_update /* 120C0 80036CC0 00000000 */ nop /* 120C4 80036CC4 0C016754 */ jal update_effects /* 120C8 80036CC8 00000000 */ nop @@ -330,7 +330,7 @@ glabel L80036D04_12104 /* 12108 80036D08 00000000 */ nop /* 1210C 80036D0C 0C00B500 */ jal update_cameras /* 12110 80036D10 00000000 */ nop -/* 12114 80036D14 0C00E64C */ jal update_npcs +/* 12114 80036D14 0C00E64C */ jal npc_list_update /* 12118 80036D18 00000000 */ nop /* 1211C 80036D1C 3C04800A */ lui $a0, %hi(D_800A0954) /* 12120 80036D20 24840954 */ addiu $a0, $a0, %lo(D_800A0954) diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s b/ver/us/asm/nonmatchings/121f0_len_1290/begin_state_title_screen.s similarity index 99% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s rename to ver/us/asm/nonmatchings/121f0_len_1290/begin_state_title_screen.s index 6a98ec1e38..d50ac701cf 100644 --- a/ver/us/asm/nonmatchings/code_121f0_len_1290/begin_state_title_screen.s +++ b/ver/us/asm/nonmatchings/121f0_len_1290/begin_state_title_screen.s @@ -143,7 +143,7 @@ glabel begin_state_title_screen /* 123F0 80036FF0 00000000 */ nop /* 123F4 80036FF4 0C0482EC */ jal clear_entity_models /* 123F8 80036FF8 00000000 */ nop -/* 123FC 80036FFC 0C00E12F */ jal clear_npcs +/* 123FC 80036FFC 0C00E12F */ jal npc_list_clear /* 12400 80037000 00000000 */ nop /* 12404 80037004 0C050440 */ jal func_80141100 /* 12408 80037008 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s b/ver/us/asm/nonmatchings/121f0_len_1290/func_800375A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/func_800375A4.s rename to ver/us/asm/nonmatchings/121f0_len_1290/func_800375A4.s diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s b/ver/us/asm/nonmatchings/121f0_len_1290/step_title_screen.s similarity index 99% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s rename to ver/us/asm/nonmatchings/121f0_len_1290/step_title_screen.s index 546bddc7b1..c3f89c6d15 100644 --- a/ver/us/asm/nonmatchings/code_121f0_len_1290/step_title_screen.s +++ b/ver/us/asm/nonmatchings/121f0_len_1290/step_title_screen.s @@ -280,7 +280,7 @@ glabel L80037450_12850 /* 12890 80037490 00000000 */ nop /* 12894 80037494 0C047889 */ jal func_8011E224 /* 12898 80037498 00000000 */ nop -/* 1289C 8003749C 0C00E12F */ jal clear_npcs +/* 1289C 8003749C 0C00E12F */ jal npc_list_clear /* 128A0 800374A0 00000000 */ nop /* 128A4 800374A4 0C050440 */ jal func_80141100 /* 128A8 800374A8 00000000 */ nop @@ -342,7 +342,7 @@ glabel L8003756C_1296C /* 12974 80037574 30420008 */ andi $v0, $v0, 8 /* 12978 80037578 14400005 */ bnez $v0, .L80037590 /* 1297C 8003757C 00000000 */ nop -/* 12980 80037580 0C00E64C */ jal update_npcs +/* 12980 80037580 0C00E64C */ jal npc_list_update /* 12984 80037584 00000000 */ nop /* 12988 80037588 0C00B500 */ jal update_cameras /* 1298C 8003758C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s b/ver/us/asm/nonmatchings/121f0_len_1290/title_append_gfx.s similarity index 100% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/title_append_gfx.s rename to ver/us/asm/nonmatchings/121f0_len_1290/title_append_gfx.s diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_copyright.s b/ver/us/asm/nonmatchings/121f0_len_1290/title_draw_copyright.s similarity index 100% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_copyright.s rename to ver/us/asm/nonmatchings/121f0_len_1290/title_draw_copyright.s diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_images.s b/ver/us/asm/nonmatchings/121f0_len_1290/title_draw_images.s similarity index 100% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_images.s rename to ver/us/asm/nonmatchings/121f0_len_1290/title_draw_images.s diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_logo.s b/ver/us/asm/nonmatchings/121f0_len_1290/title_draw_logo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_logo.s rename to ver/us/asm/nonmatchings/121f0_len_1290/title_draw_logo.s diff --git a/ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_press_start.s b/ver/us/asm/nonmatchings/121f0_len_1290/title_draw_press_start.s similarity index 100% rename from ver/us/asm/nonmatchings/code_121f0_len_1290/title_draw_press_start.s rename to ver/us/asm/nonmatchings/121f0_len_1290/title_draw_press_start.s diff --git a/ver/us/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s b/ver/us/asm/nonmatchings/13480_len_3f0/next_demo_scene.s similarity index 99% rename from ver/us/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s rename to ver/us/asm/nonmatchings/13480_len_3f0/next_demo_scene.s index a77ab6139a..6bd729c61a 100644 --- a/ver/us/asm/nonmatchings/code_13480_len_3f0/next_demo_scene.s +++ b/ver/us/asm/nonmatchings/13480_len_3f0/next_demo_scene.s @@ -133,7 +133,7 @@ glabel L800381C8_135C8 /* 136C4 800382C4 00000000 */ nop /* 136C8 800382C8 0C037F14 */ jal clear_player_status /* 136CC 800382CC 00000000 */ nop -/* 136D0 800382D0 0C00E12F */ jal clear_npcs +/* 136D0 800382D0 0C00E12F */ jal npc_list_clear /* 136D4 800382D4 00000000 */ nop /* 136D8 800382D8 0C039CE8 */ jal clear_player_data /* 136DC 800382DC 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_1370_len_7d0/gfx_task_main.s b/ver/us/asm/nonmatchings/1370_len_7d0/gfx_task_main.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1370_len_7d0/gfx_task_main.s rename to ver/us/asm/nonmatchings/1370_len_7d0/gfx_task_main.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80242BA0.s b/ver/us/asm/nonmatchings/163400/func_80242BA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80242BA0.s rename to ver/us/asm/nonmatchings/163400/func_80242BA0.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80242D94.s b/ver/us/asm/nonmatchings/163400/func_80242D94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80242D94.s rename to ver/us/asm/nonmatchings/163400/func_80242D94.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80242DEC.s b/ver/us/asm/nonmatchings/163400/func_80242DEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80242DEC.s rename to ver/us/asm/nonmatchings/163400/func_80242DEC.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80242E00.s b/ver/us/asm/nonmatchings/163400/func_80242E00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80242E00.s rename to ver/us/asm/nonmatchings/163400/func_80242E00.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80242F68.s b/ver/us/asm/nonmatchings/163400/func_80242F68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80242F68.s rename to ver/us/asm/nonmatchings/163400/func_80242F68.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802431A0.s b/ver/us/asm/nonmatchings/163400/func_802431A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802431A0.s rename to ver/us/asm/nonmatchings/163400/func_802431A0.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_8024330C.s b/ver/us/asm/nonmatchings/163400/func_8024330C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_8024330C.s rename to ver/us/asm/nonmatchings/163400/func_8024330C.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243380.s b/ver/us/asm/nonmatchings/163400/func_80243380.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243380.s rename to ver/us/asm/nonmatchings/163400/func_80243380.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802433F4.s b/ver/us/asm/nonmatchings/163400/func_802433F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802433F4.s rename to ver/us/asm/nonmatchings/163400/func_802433F4.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243468.s b/ver/us/asm/nonmatchings/163400/func_80243468.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243468.s rename to ver/us/asm/nonmatchings/163400/func_80243468.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802434DC.s b/ver/us/asm/nonmatchings/163400/func_802434DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802434DC.s rename to ver/us/asm/nonmatchings/163400/func_802434DC.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243550.s b/ver/us/asm/nonmatchings/163400/func_80243550.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243550.s rename to ver/us/asm/nonmatchings/163400/func_80243550.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802435C4.s b/ver/us/asm/nonmatchings/163400/func_802435C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802435C4.s rename to ver/us/asm/nonmatchings/163400/func_802435C4.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243628.s b/ver/us/asm/nonmatchings/163400/func_80243628.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243628.s rename to ver/us/asm/nonmatchings/163400/func_80243628.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_8024368C.s b/ver/us/asm/nonmatchings/163400/func_8024368C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_8024368C.s rename to ver/us/asm/nonmatchings/163400/func_8024368C.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802436F0.s b/ver/us/asm/nonmatchings/163400/func_802436F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802436F0.s rename to ver/us/asm/nonmatchings/163400/func_802436F0.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243754.s b/ver/us/asm/nonmatchings/163400/func_80243754.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243754.s rename to ver/us/asm/nonmatchings/163400/func_80243754.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802437B8.s b/ver/us/asm/nonmatchings/163400/func_802437B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802437B8.s rename to ver/us/asm/nonmatchings/163400/func_802437B8.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_8024381C.s b/ver/us/asm/nonmatchings/163400/func_8024381C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_8024381C.s rename to ver/us/asm/nonmatchings/163400/func_8024381C.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243898.s b/ver/us/asm/nonmatchings/163400/func_80243898.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243898.s rename to ver/us/asm/nonmatchings/163400/func_80243898.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243908.s b/ver/us/asm/nonmatchings/163400/func_80243908.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243908.s rename to ver/us/asm/nonmatchings/163400/func_80243908.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243B10.s b/ver/us/asm/nonmatchings/163400/func_80243B10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243B10.s rename to ver/us/asm/nonmatchings/163400/func_80243B10.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243CCC.s b/ver/us/asm/nonmatchings/163400/func_80243CCC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243CCC.s rename to ver/us/asm/nonmatchings/163400/func_80243CCC.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80243EEC.s b/ver/us/asm/nonmatchings/163400/func_80243EEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80243EEC.s rename to ver/us/asm/nonmatchings/163400/func_80243EEC.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80244030.s b/ver/us/asm/nonmatchings/163400/func_80244030.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80244030.s rename to ver/us/asm/nonmatchings/163400/func_80244030.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802440BC.s b/ver/us/asm/nonmatchings/163400/func_802440BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802440BC.s rename to ver/us/asm/nonmatchings/163400/func_802440BC.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_802448E0.s b/ver/us/asm/nonmatchings/163400/func_802448E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_802448E0.s rename to ver/us/asm/nonmatchings/163400/func_802448E0.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80244B00.s b/ver/us/asm/nonmatchings/163400/func_80244B00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80244B00.s rename to ver/us/asm/nonmatchings/163400/func_80244B00.s diff --git a/ver/us/asm/nonmatchings/code_163400/func_80244BC4.s b/ver/us/asm/nonmatchings/163400/func_80244BC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_163400/func_80244BC4.s rename to ver/us/asm/nonmatchings/163400/func_80244BC4.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244C30.s b/ver/us/asm/nonmatchings/165490/func_80244C30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80244C30.s rename to ver/us/asm/nonmatchings/165490/func_80244C30.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244CEC.s b/ver/us/asm/nonmatchings/165490/func_80244CEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80244CEC.s rename to ver/us/asm/nonmatchings/165490/func_80244CEC.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244D60.s b/ver/us/asm/nonmatchings/165490/func_80244D60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80244D60.s rename to ver/us/asm/nonmatchings/165490/func_80244D60.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244DD0.s b/ver/us/asm/nonmatchings/165490/func_80244DD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80244DD0.s rename to ver/us/asm/nonmatchings/165490/func_80244DD0.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244E54.s b/ver/us/asm/nonmatchings/165490/func_80244E54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80244E54.s rename to ver/us/asm/nonmatchings/165490/func_80244E54.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244F44.s b/ver/us/asm/nonmatchings/165490/func_80244F44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80244F44.s rename to ver/us/asm/nonmatchings/165490/func_80244F44.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80244FD4.s b/ver/us/asm/nonmatchings/165490/func_80244FD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80244FD4.s rename to ver/us/asm/nonmatchings/165490/func_80244FD4.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_8024544C.s b/ver/us/asm/nonmatchings/165490/func_8024544C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_8024544C.s rename to ver/us/asm/nonmatchings/165490/func_8024544C.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245588.s b/ver/us/asm/nonmatchings/165490/func_80245588.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80245588.s rename to ver/us/asm/nonmatchings/165490/func_80245588.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_802455D8.s b/ver/us/asm/nonmatchings/165490/func_802455D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_802455D8.s rename to ver/us/asm/nonmatchings/165490/func_802455D8.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245628.s b/ver/us/asm/nonmatchings/165490/func_80245628.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80245628.s rename to ver/us/asm/nonmatchings/165490/func_80245628.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245678.s b/ver/us/asm/nonmatchings/165490/func_80245678.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80245678.s rename to ver/us/asm/nonmatchings/165490/func_80245678.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_802456C8.s b/ver/us/asm/nonmatchings/165490/func_802456C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_802456C8.s rename to ver/us/asm/nonmatchings/165490/func_802456C8.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245718.s b/ver/us/asm/nonmatchings/165490/func_80245718.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80245718.s rename to ver/us/asm/nonmatchings/165490/func_80245718.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245768.s b/ver/us/asm/nonmatchings/165490/func_80245768.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80245768.s rename to ver/us/asm/nonmatchings/165490/func_80245768.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_802457B8.s b/ver/us/asm/nonmatchings/165490/func_802457B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_802457B8.s rename to ver/us/asm/nonmatchings/165490/func_802457B8.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245808.s b/ver/us/asm/nonmatchings/165490/func_80245808.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80245808.s rename to ver/us/asm/nonmatchings/165490/func_80245808.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80245A40.s b/ver/us/asm/nonmatchings/165490/func_80245A40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80245A40.s rename to ver/us/asm/nonmatchings/165490/func_80245A40.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80246B2C.s b/ver/us/asm/nonmatchings/165490/func_80246B2C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80246B2C.s rename to ver/us/asm/nonmatchings/165490/func_80246B2C.s diff --git a/ver/us/asm/nonmatchings/code_165490/func_80246CBC.s b/ver/us/asm/nonmatchings/165490/func_80246CBC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_165490/func_80246CBC.s rename to ver/us/asm/nonmatchings/165490/func_80246CBC.s diff --git a/ver/us/asm/nonmatchings/code_167570/func_80246D10.s b/ver/us/asm/nonmatchings/167570/func_80246D10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_167570/func_80246D10.s rename to ver/us/asm/nonmatchings/167570/func_80246D10.s diff --git a/ver/us/asm/nonmatchings/code_167570/func_80246E24.s b/ver/us/asm/nonmatchings/167570/func_80246E24.s similarity index 100% rename from ver/us/asm/nonmatchings/code_167570/func_80246E24.s rename to ver/us/asm/nonmatchings/167570/func_80246E24.s diff --git a/ver/us/asm/nonmatchings/code_167570/func_80247198.s b/ver/us/asm/nonmatchings/167570/func_80247198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_167570/func_80247198.s rename to ver/us/asm/nonmatchings/167570/func_80247198.s diff --git a/ver/us/asm/nonmatchings/code_167570/func_802471EC.s b/ver/us/asm/nonmatchings/167570/func_802471EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_167570/func_802471EC.s rename to ver/us/asm/nonmatchings/167570/func_802471EC.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_80247D30.s b/ver/us/asm/nonmatchings/168590/func_80247D30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_80247D30.s rename to ver/us/asm/nonmatchings/168590/func_80247D30.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_80247FD0.s b/ver/us/asm/nonmatchings/168590/func_80247FD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_80247FD0.s rename to ver/us/asm/nonmatchings/168590/func_80247FD0.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_80248024.s b/ver/us/asm/nonmatchings/168590/func_80248024.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_80248024.s rename to ver/us/asm/nonmatchings/168590/func_80248024.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_80248170.s b/ver/us/asm/nonmatchings/168590/func_80248170.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_80248170.s rename to ver/us/asm/nonmatchings/168590/func_80248170.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_802481B8.s b/ver/us/asm/nonmatchings/168590/func_802481B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_802481B8.s rename to ver/us/asm/nonmatchings/168590/func_802481B8.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_8024830C.s b/ver/us/asm/nonmatchings/168590/func_8024830C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_8024830C.s rename to ver/us/asm/nonmatchings/168590/func_8024830C.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_80248A80.s b/ver/us/asm/nonmatchings/168590/func_80248A80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_80248A80.s rename to ver/us/asm/nonmatchings/168590/func_80248A80.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_80248BF4.s b/ver/us/asm/nonmatchings/168590/func_80248BF4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_80248BF4.s rename to ver/us/asm/nonmatchings/168590/func_80248BF4.s diff --git a/ver/us/asm/nonmatchings/code_168590/func_8024932C.s b/ver/us/asm/nonmatchings/168590/func_8024932C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_168590/func_8024932C.s rename to ver/us/asm/nonmatchings/168590/func_8024932C.s diff --git a/ver/us/asm/nonmatchings/code_169BE0/func_80249380.s b/ver/us/asm/nonmatchings/169BE0/func_80249380.s similarity index 100% rename from ver/us/asm/nonmatchings/code_169BE0/func_80249380.s rename to ver/us/asm/nonmatchings/169BE0/func_80249380.s diff --git a/ver/us/asm/nonmatchings/code_169BE0/func_8024997C.s b/ver/us/asm/nonmatchings/169BE0/func_8024997C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_169BE0/func_8024997C.s rename to ver/us/asm/nonmatchings/169BE0/func_8024997C.s diff --git a/ver/us/asm/nonmatchings/code_169BE0/func_80249AA4.s b/ver/us/asm/nonmatchings/169BE0/func_80249AA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_169BE0/func_80249AA4.s rename to ver/us/asm/nonmatchings/169BE0/func_80249AA4.s diff --git a/ver/us/asm/nonmatchings/code_169BE0/func_80249AB8.s b/ver/us/asm/nonmatchings/169BE0/func_80249AB8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_169BE0/func_80249AB8.s rename to ver/us/asm/nonmatchings/169BE0/func_80249AB8.s diff --git a/ver/us/asm/nonmatchings/code_16F740/begin_battle.s b/ver/us/asm/nonmatchings/16F740/begin_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/begin_battle.s rename to ver/us/asm/nonmatchings/16F740/begin_battle.s diff --git a/ver/us/asm/nonmatchings/code_16F740/end_battle.s b/ver/us/asm/nonmatchings/16F740/end_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/end_battle.s rename to ver/us/asm/nonmatchings/16F740/end_battle.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80240E60.s b/ver/us/asm/nonmatchings/16F740/func_80240E60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80240E60.s rename to ver/us/asm/nonmatchings/16F740/func_80240E60.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80240FDC.s b/ver/us/asm/nonmatchings/16F740/func_80240FDC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80240FDC.s rename to ver/us/asm/nonmatchings/16F740/func_80240FDC.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80241B14.s b/ver/us/asm/nonmatchings/16F740/func_80241B14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80241B14.s rename to ver/us/asm/nonmatchings/16F740/func_80241B14.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80242FE0.s b/ver/us/asm/nonmatchings/16F740/func_80242FE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80242FE0.s rename to ver/us/asm/nonmatchings/16F740/func_80242FE0.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_802439D8.s b/ver/us/asm/nonmatchings/16F740/func_802439D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_802439D8.s rename to ver/us/asm/nonmatchings/16F740/func_802439D8.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80244008.s b/ver/us/asm/nonmatchings/16F740/func_80244008.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80244008.s rename to ver/us/asm/nonmatchings/16F740/func_80244008.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80244710.s b/ver/us/asm/nonmatchings/16F740/func_80244710.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80244710.s rename to ver/us/asm/nonmatchings/16F740/func_80244710.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80244D90.s b/ver/us/asm/nonmatchings/16F740/func_80244D90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80244D90.s rename to ver/us/asm/nonmatchings/16F740/func_80244D90.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80244E38.s b/ver/us/asm/nonmatchings/16F740/func_80244E38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80244E38.s rename to ver/us/asm/nonmatchings/16F740/func_80244E38.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80245440.s b/ver/us/asm/nonmatchings/16F740/func_80245440.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80245440.s rename to ver/us/asm/nonmatchings/16F740/func_80245440.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_8024721C.s b/ver/us/asm/nonmatchings/16F740/func_8024721C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_8024721C.s rename to ver/us/asm/nonmatchings/16F740/func_8024721C.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80247B04.s b/ver/us/asm/nonmatchings/16F740/func_80247B04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80247B04.s rename to ver/us/asm/nonmatchings/16F740/func_80247B04.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_802480F0.s b/ver/us/asm/nonmatchings/16F740/func_802480F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_802480F0.s rename to ver/us/asm/nonmatchings/16F740/func_802480F0.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80248190.s b/ver/us/asm/nonmatchings/16F740/func_80248190.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80248190.s rename to ver/us/asm/nonmatchings/16F740/func_80248190.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80248660.s b/ver/us/asm/nonmatchings/16F740/func_80248660.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80248660.s rename to ver/us/asm/nonmatchings/16F740/func_80248660.s diff --git a/ver/us/asm/nonmatchings/code_16F740/func_80248B08.s b/ver/us/asm/nonmatchings/16F740/func_80248B08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/func_80248B08.s rename to ver/us/asm/nonmatchings/16F740/func_80248B08.s diff --git a/ver/us/asm/nonmatchings/code_16F740/switch_to_partner.s b/ver/us/asm/nonmatchings/16F740/switch_to_partner.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/switch_to_partner.s rename to ver/us/asm/nonmatchings/16F740/switch_to_partner.s diff --git a/ver/us/asm/nonmatchings/code_16F740/switch_to_player.s b/ver/us/asm/nonmatchings/16F740/switch_to_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/switch_to_player.s rename to ver/us/asm/nonmatchings/16F740/switch_to_player.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_end_player_turn.s b/ver/us/asm/nonmatchings/16F740/update_end_player_turn.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_end_player_turn.s rename to ver/us/asm/nonmatchings/16F740/update_end_player_turn.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_enemy_action.s b/ver/us/asm/nonmatchings/16F740/update_enemy_action.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_enemy_action.s rename to ver/us/asm/nonmatchings/16F740/update_enemy_action.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_enemy_change_turn.s b/ver/us/asm/nonmatchings/16F740/update_enemy_change_turn.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_enemy_change_turn.s rename to ver/us/asm/nonmatchings/16F740/update_enemy_change_turn.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_heroes_start_turn.s b/ver/us/asm/nonmatchings/16F740/update_heroes_start_turn.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_heroes_start_turn.s rename to ver/us/asm/nonmatchings/16F740/update_heroes_start_turn.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_partner_action.s b/ver/us/asm/nonmatchings/16F740/update_partner_action.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_partner_action.s rename to ver/us/asm/nonmatchings/16F740/update_partner_action.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_player_action.s b/ver/us/asm/nonmatchings/16F740/update_player_action.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_player_action.s rename to ver/us/asm/nonmatchings/16F740/update_player_action.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_player_change_turn.s b/ver/us/asm/nonmatchings/16F740/update_player_change_turn.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_player_change_turn.s rename to ver/us/asm/nonmatchings/16F740/update_player_change_turn.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_run_away.s b/ver/us/asm/nonmatchings/16F740/update_run_away.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_run_away.s rename to ver/us/asm/nonmatchings/16F740/update_run_away.s diff --git a/ver/us/asm/nonmatchings/code_16F740/update_swap_partner.s b/ver/us/asm/nonmatchings/16F740/update_swap_partner.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16F740/update_swap_partner.s rename to ver/us/asm/nonmatchings/16F740/update_swap_partner.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/draw_enemy_health_bars.s b/ver/us/asm/nonmatchings/16c8e0/draw_enemy_health_bars.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/draw_enemy_health_bars.s rename to ver/us/asm/nonmatchings/16c8e0/draw_enemy_health_bars.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s b/ver/us/asm/nonmatchings/16c8e0/draw_main_battle_ui.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/draw_main_battle_ui.s rename to ver/us/asm/nonmatchings/16c8e0/draw_main_battle_ui.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/func_8023ED5C.s b/ver/us/asm/nonmatchings/16c8e0/func_8023ED5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/func_8023ED5C.s rename to ver/us/asm/nonmatchings/16c8e0/func_8023ED5C.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/func_8023F060.s b/ver/us/asm/nonmatchings/16c8e0/func_8023F060.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/func_8023F060.s rename to ver/us/asm/nonmatchings/16c8e0/func_8023F060.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/func_8023F088.s b/ver/us/asm/nonmatchings/16c8e0/func_8023F088.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/func_8023F088.s rename to ver/us/asm/nonmatchings/16c8e0/func_8023F088.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/func_802409F4.s b/ver/us/asm/nonmatchings/16c8e0/func_802409F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/func_802409F4.s rename to ver/us/asm/nonmatchings/16c8e0/func_802409F4.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/func_80240AA8.s b/ver/us/asm/nonmatchings/16c8e0/func_80240AA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/func_80240AA8.s rename to ver/us/asm/nonmatchings/16c8e0/func_80240AA8.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/initialize_battle.s b/ver/us/asm/nonmatchings/16c8e0/initialize_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/initialize_battle.s rename to ver/us/asm/nonmatchings/16c8e0/initialize_battle.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/update_battle_state.s b/ver/us/asm/nonmatchings/16c8e0/update_battle_state.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/update_battle_state.s rename to ver/us/asm/nonmatchings/16c8e0/update_battle_state.s diff --git a/ver/us/asm/nonmatchings/code_16c8e0/update_starpoints_display.s b/ver/us/asm/nonmatchings/16c8e0/update_starpoints_display.s similarity index 100% rename from ver/us/asm/nonmatchings/code_16c8e0/update_starpoints_display.s rename to ver/us/asm/nonmatchings/16c8e0/update_starpoints_display.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s b/ver/us/asm/nonmatchings/1776B0/AddBattleCamOffsetZ.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s rename to ver/us/asm/nonmatchings/1776B0/AddBattleCamOffsetZ.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/AddBattleCamZoom.s b/ver/us/asm/nonmatchings/1776B0/AddBattleCamZoom.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/AddBattleCamZoom.s rename to ver/us/asm/nonmatchings/1776B0/AddBattleCamZoom.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/BattleCamTargetActor.s b/ver/us/asm/nonmatchings/1776B0/BattleCamTargetActor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/BattleCamTargetActor.s rename to ver/us/asm/nonmatchings/1776B0/BattleCamTargetActor.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/FreezeBattleCam.s b/ver/us/asm/nonmatchings/1776B0/FreezeBattleCam.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/FreezeBattleCam.s rename to ver/us/asm/nonmatchings/1776B0/FreezeBattleCam.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/MoveBattleCamOver.s b/ver/us/asm/nonmatchings/1776B0/MoveBattleCamOver.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/MoveBattleCamOver.s rename to ver/us/asm/nonmatchings/1776B0/MoveBattleCamOver.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s b/ver/us/asm/nonmatchings/1776B0/SetBattleCamOffsetZ.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s rename to ver/us/asm/nonmatchings/1776B0/SetBattleCamOffsetZ.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/SetBattleCamTarget.s b/ver/us/asm/nonmatchings/1776B0/SetBattleCamTarget.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/SetBattleCamTarget.s rename to ver/us/asm/nonmatchings/1776B0/SetBattleCamTarget.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/SetBattleCamYaw.s b/ver/us/asm/nonmatchings/1776B0/SetBattleCamYaw.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/SetBattleCamYaw.s rename to ver/us/asm/nonmatchings/1776B0/SetBattleCamYaw.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/SetBattleCamZoom.s b/ver/us/asm/nonmatchings/1776B0/SetBattleCamZoom.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/SetBattleCamZoom.s rename to ver/us/asm/nonmatchings/1776B0/SetBattleCamZoom.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/UseCamPreset.s b/ver/us/asm/nonmatchings/1776B0/UseCamPreset.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/UseCamPreset.s rename to ver/us/asm/nonmatchings/1776B0/UseCamPreset.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/add_cam_zoom.s b/ver/us/asm/nonmatchings/1776B0/add_cam_zoom.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/add_cam_zoom.s rename to ver/us/asm/nonmatchings/1776B0/add_cam_zoom.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/cam_target_actor.s b/ver/us/asm/nonmatchings/1776B0/cam_target_actor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/cam_target_actor.s rename to ver/us/asm/nonmatchings/1776B0/cam_target_actor.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_80248DD0.s b/ver/us/asm/nonmatchings/1776B0/func_80248DD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_80248DD0.s rename to ver/us/asm/nonmatchings/1776B0/func_80248DD0.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_80248DE4.s b/ver/us/asm/nonmatchings/1776B0/func_80248DE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_80248DE4.s rename to ver/us/asm/nonmatchings/1776B0/func_80248DE4.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_80249804.s b/ver/us/asm/nonmatchings/1776B0/func_80249804.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_80249804.s rename to ver/us/asm/nonmatchings/1776B0/func_80249804.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024A214.s b/ver/us/asm/nonmatchings/1776B0/func_8024A214.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024A214.s rename to ver/us/asm/nonmatchings/1776B0/func_8024A214.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024A990.s b/ver/us/asm/nonmatchings/1776B0/func_8024A990.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024A990.s rename to ver/us/asm/nonmatchings/1776B0/func_8024A990.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024AFE4.s b/ver/us/asm/nonmatchings/1776B0/func_8024AFE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024AFE4.s rename to ver/us/asm/nonmatchings/1776B0/func_8024AFE4.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024B5FC.s b/ver/us/asm/nonmatchings/1776B0/func_8024B5FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024B5FC.s rename to ver/us/asm/nonmatchings/1776B0/func_8024B5FC.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024B9A0.s b/ver/us/asm/nonmatchings/1776B0/func_8024B9A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024B9A0.s rename to ver/us/asm/nonmatchings/1776B0/func_8024B9A0.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024BDA4.s b/ver/us/asm/nonmatchings/1776B0/func_8024BDA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024BDA4.s rename to ver/us/asm/nonmatchings/1776B0/func_8024BDA4.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024C180.s b/ver/us/asm/nonmatchings/1776B0/func_8024C180.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024C180.s rename to ver/us/asm/nonmatchings/1776B0/func_8024C180.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024C570.s b/ver/us/asm/nonmatchings/1776B0/func_8024C570.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024C570.s rename to ver/us/asm/nonmatchings/1776B0/func_8024C570.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024C944.s b/ver/us/asm/nonmatchings/1776B0/func_8024C944.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024C944.s rename to ver/us/asm/nonmatchings/1776B0/func_8024C944.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024CB68.s b/ver/us/asm/nonmatchings/1776B0/func_8024CB68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024CB68.s rename to ver/us/asm/nonmatchings/1776B0/func_8024CB68.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024CE9C.s b/ver/us/asm/nonmatchings/1776B0/func_8024CE9C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024CE9C.s rename to ver/us/asm/nonmatchings/1776B0/func_8024CE9C.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E3D8.s b/ver/us/asm/nonmatchings/1776B0/func_8024E3D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E3D8.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E3D8.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E40C.s b/ver/us/asm/nonmatchings/1776B0/func_8024E40C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E40C.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E40C.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E45C.s b/ver/us/asm/nonmatchings/1776B0/func_8024E45C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E45C.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E45C.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E484.s b/ver/us/asm/nonmatchings/1776B0/func_8024E484.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E484.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E484.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E554.s b/ver/us/asm/nonmatchings/1776B0/func_8024E554.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E554.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E554.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E584.s b/ver/us/asm/nonmatchings/1776B0/func_8024E584.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E584.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E584.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E60C.s b/ver/us/asm/nonmatchings/1776B0/func_8024E60C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E60C.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E60C.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E664.s b/ver/us/asm/nonmatchings/1776B0/func_8024E664.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E664.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E664.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E6B4.s b/ver/us/asm/nonmatchings/1776B0/func_8024E6B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E6B4.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E6B4.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E748.s b/ver/us/asm/nonmatchings/1776B0/func_8024E748.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E748.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E748.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E820.s b/ver/us/asm/nonmatchings/1776B0/func_8024E820.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E820.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E820.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024E9B0.s b/ver/us/asm/nonmatchings/1776B0/func_8024E9B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024E9B0.s rename to ver/us/asm/nonmatchings/1776B0/func_8024E9B0.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024EB84.s b/ver/us/asm/nonmatchings/1776B0/func_8024EB84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024EB84.s rename to ver/us/asm/nonmatchings/1776B0/func_8024EB84.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024ECF8.s b/ver/us/asm/nonmatchings/1776B0/func_8024ECF8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024ECF8.s rename to ver/us/asm/nonmatchings/1776B0/func_8024ECF8.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/func_8024EDA4.s b/ver/us/asm/nonmatchings/1776B0/func_8024EDA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/func_8024EDA4.s rename to ver/us/asm/nonmatchings/1776B0/func_8024EDA4.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/move_cam_over.s b/ver/us/asm/nonmatchings/1776B0/move_cam_over.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/move_cam_over.s rename to ver/us/asm/nonmatchings/1776B0/move_cam_over.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/set_cam_target_pos.s b/ver/us/asm/nonmatchings/1776B0/set_cam_target_pos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/set_cam_target_pos.s rename to ver/us/asm/nonmatchings/1776B0/set_cam_target_pos.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/set_cam_zoffset.s b/ver/us/asm/nonmatchings/1776B0/set_cam_zoffset.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/set_cam_zoffset.s rename to ver/us/asm/nonmatchings/1776B0/set_cam_zoffset.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/set_cam_zoom.s b/ver/us/asm/nonmatchings/1776B0/set_cam_zoom.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/set_cam_zoom.s rename to ver/us/asm/nonmatchings/1776B0/set_cam_zoom.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/unfreeze_cam.s b/ver/us/asm/nonmatchings/1776B0/unfreeze_cam.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/unfreeze_cam.s rename to ver/us/asm/nonmatchings/1776B0/unfreeze_cam.s diff --git a/ver/us/asm/nonmatchings/code_1776B0/use_cam_preset.s b/ver/us/asm/nonmatchings/1776B0/use_cam_preset.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1776B0/use_cam_preset.s rename to ver/us/asm/nonmatchings/1776B0/use_cam_preset.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/ForceCloseMessageBox.s b/ver/us/asm/nonmatchings/17D6A0/ForceCloseMessageBox.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/ForceCloseMessageBox.s rename to ver/us/asm/nonmatchings/17D6A0/ForceCloseMessageBox.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/SetMessageBoxDuration.s b/ver/us/asm/nonmatchings/17D6A0/SetMessageBoxDuration.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/SetMessageBoxDuration.s rename to ver/us/asm/nonmatchings/17D6A0/SetMessageBoxDuration.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/ShowMessageBox.s b/ver/us/asm/nonmatchings/17D6A0/ShowMessageBox.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/ShowMessageBox.s rename to ver/us/asm/nonmatchings/17D6A0/ShowMessageBox.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/ShowVariableMessageBox.s b/ver/us/asm/nonmatchings/17D6A0/ShowVariableMessageBox.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/ShowVariableMessageBox.s rename to ver/us/asm/nonmatchings/17D6A0/ShowVariableMessageBox.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s b/ver/us/asm/nonmatchings/17D6A0/close_action_command_instruction_popup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s rename to ver/us/asm/nonmatchings/17D6A0/close_action_command_instruction_popup.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/create_popup.s b/ver/us/asm/nonmatchings/17D6A0/create_popup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/create_popup.s rename to ver/us/asm/nonmatchings/17D6A0/create_popup.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024EDC0.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EDC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024EDC0.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024EDC0.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024EDEC.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EDEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024EDEC.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024EDEC.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024EE48.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EE48.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024EE48.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024EE48.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024EEA8.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EEA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024EEA8.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024EEA8.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024EF08.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EF08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024EF08.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024EF08.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024EFA4.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EFA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024EFA4.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024EFA4.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024EFE0.s b/ver/us/asm/nonmatchings/17D6A0/func_8024EFE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024EFE0.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024EFE0.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024F394.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F394.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024F394.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024F394.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024F5AC.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F5AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024F5AC.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024F5AC.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024F768.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F768.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024F768.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024F768.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024F7C8.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F7C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024F7C8.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024F7C8.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024F84C.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F84C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024F84C.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024F84C.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024F940.s b/ver/us/asm/nonmatchings/17D6A0/func_8024F940.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024F940.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024F940.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024FAE8.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FAE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024FAE8.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024FAE8.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024FAFC.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FAFC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024FAFC.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024FAFC.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_8024FB3C.s b/ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_8024FB3C.s rename to ver/us/asm/nonmatchings/17D6A0/func_8024FB3C.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_80250818.s b/ver/us/asm/nonmatchings/17D6A0/func_80250818.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_80250818.s rename to ver/us/asm/nonmatchings/17D6A0/func_80250818.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_80251434.s b/ver/us/asm/nonmatchings/17D6A0/func_80251434.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_80251434.s rename to ver/us/asm/nonmatchings/17D6A0/func_80251434.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_80251454.s b/ver/us/asm/nonmatchings/17D6A0/func_80251454.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_80251454.s rename to ver/us/asm/nonmatchings/17D6A0/func_80251454.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/func_80251474.s b/ver/us/asm/nonmatchings/17D6A0/func_80251474.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/func_80251474.s rename to ver/us/asm/nonmatchings/17D6A0/func_80251474.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/is_popup_displayed.s b/ver/us/asm/nonmatchings/17D6A0/is_popup_displayed.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/is_popup_displayed.s rename to ver/us/asm/nonmatchings/17D6A0/is_popup_displayed.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/set_popup_duration.s b/ver/us/asm/nonmatchings/17D6A0/set_popup_duration.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/set_popup_duration.s rename to ver/us/asm/nonmatchings/17D6A0/set_popup_duration.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/show_battle_message.s b/ver/us/asm/nonmatchings/17D6A0/show_battle_message.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/show_battle_message.s rename to ver/us/asm/nonmatchings/17D6A0/show_battle_message.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/show_message_popup.s b/ver/us/asm/nonmatchings/17D6A0/show_message_popup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/show_message_popup.s rename to ver/us/asm/nonmatchings/17D6A0/show_message_popup.s diff --git a/ver/us/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s b/ver/us/asm/nonmatchings/17D6A0/show_variable_battle_message.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s rename to ver/us/asm/nonmatchings/17D6A0/show_variable_battle_message.s diff --git a/ver/us/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s b/ver/us/asm/nonmatchings/17FEB0/calc_item_damage_enemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_17FEB0/calc_item_damage_enemy.s rename to ver/us/asm/nonmatchings/17FEB0/calc_item_damage_enemy.s diff --git a/ver/us/asm/nonmatchings/code_181810/EndActorSpeech.s b/ver/us/asm/nonmatchings/181810/EndActorSpeech.s similarity index 100% rename from ver/us/asm/nonmatchings/code_181810/EndActorSpeech.s rename to ver/us/asm/nonmatchings/181810/EndActorSpeech.s diff --git a/ver/us/asm/nonmatchings/code_181810/LoadBattleDmaData.s b/ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s similarity index 100% rename from ver/us/asm/nonmatchings/code_181810/LoadBattleDmaData.s rename to ver/us/asm/nonmatchings/181810/LoadBattleDmaData.s diff --git a/ver/us/asm/nonmatchings/code_181810/load_tattle_flags.s b/ver/us/asm/nonmatchings/181810/load_tattle_flags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_181810/load_tattle_flags.s rename to ver/us/asm/nonmatchings/181810/load_tattle_flags.s diff --git a/ver/us/asm/nonmatchings/code_181810/save_tattle_flags.s b/ver/us/asm/nonmatchings/181810/save_tattle_flags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_181810/save_tattle_flags.s rename to ver/us/asm/nonmatchings/181810/save_tattle_flags.s diff --git a/ver/us/asm/nonmatchings/code_182B30/_remove_part_decoration.s b/ver/us/asm/nonmatchings/182B30/_remove_part_decoration.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/_remove_part_decoration.s rename to ver/us/asm/nonmatchings/182B30/_remove_part_decoration.s diff --git a/ver/us/asm/nonmatchings/code_182B30/disable_actor_blur.s b/ver/us/asm/nonmatchings/182B30/disable_actor_blur.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/disable_actor_blur.s rename to ver/us/asm/nonmatchings/182B30/disable_actor_blur.s diff --git a/ver/us/asm/nonmatchings/code_182B30/enable_actor_blur.s b/ver/us/asm/nonmatchings/182B30/enable_actor_blur.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/enable_actor_blur.s rename to ver/us/asm/nonmatchings/182B30/enable_actor_blur.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802549F4.s b/ver/us/asm/nonmatchings/182B30/func_802549F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_802549F4.s rename to ver/us/asm/nonmatchings/182B30/func_802549F4.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_80254C50.s b/ver/us/asm/nonmatchings/182B30/func_80254C50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_80254C50.s rename to ver/us/asm/nonmatchings/182B30/func_80254C50.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802550BC.s b/ver/us/asm/nonmatchings/182B30/func_802550BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_802550BC.s rename to ver/us/asm/nonmatchings/182B30/func_802550BC.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802552EC.s b/ver/us/asm/nonmatchings/182B30/func_802552EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_802552EC.s rename to ver/us/asm/nonmatchings/182B30/func_802552EC.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_80255FE0.s b/ver/us/asm/nonmatchings/182B30/func_80255FE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_80255FE0.s rename to ver/us/asm/nonmatchings/182B30/func_80255FE0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802571F0.s b/ver/us/asm/nonmatchings/182B30/func_802571F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_802571F0.s rename to ver/us/asm/nonmatchings/182B30/func_802571F0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_80257DA4.s b/ver/us/asm/nonmatchings/182B30/func_80257DA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_80257DA4.s rename to ver/us/asm/nonmatchings/182B30/func_80257DA4.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_80258E14.s b/ver/us/asm/nonmatchings/182B30/func_80258E14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_80258E14.s rename to ver/us/asm/nonmatchings/182B30/func_80258E14.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802591EC.s b/ver/us/asm/nonmatchings/182B30/func_802591EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_802591EC.s rename to ver/us/asm/nonmatchings/182B30/func_802591EC.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_80259494.s b/ver/us/asm/nonmatchings/182B30/func_80259494.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_80259494.s rename to ver/us/asm/nonmatchings/182B30/func_80259494.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025950C.s b/ver/us/asm/nonmatchings/182B30/func_8025950C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025950C.s rename to ver/us/asm/nonmatchings/182B30/func_8025950C.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802596C0.s b/ver/us/asm/nonmatchings/182B30/func_802596C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_802596C0.s rename to ver/us/asm/nonmatchings/182B30/func_802596C0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_802597B0.s b/ver/us/asm/nonmatchings/182B30/func_802597B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_802597B0.s rename to ver/us/asm/nonmatchings/182B30/func_802597B0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025995C.s b/ver/us/asm/nonmatchings/182B30/func_8025995C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025995C.s rename to ver/us/asm/nonmatchings/182B30/func_8025995C.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_80259AAC.s b/ver/us/asm/nonmatchings/182B30/func_80259AAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_80259AAC.s rename to ver/us/asm/nonmatchings/182B30/func_80259AAC.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_80259D9C.s b/ver/us/asm/nonmatchings/182B30/func_80259D9C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_80259D9C.s rename to ver/us/asm/nonmatchings/182B30/func_80259D9C.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025A2C4.s b/ver/us/asm/nonmatchings/182B30/func_8025A2C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025A2C4.s rename to ver/us/asm/nonmatchings/182B30/func_8025A2C4.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025A50C.s b/ver/us/asm/nonmatchings/182B30/func_8025A50C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025A50C.s rename to ver/us/asm/nonmatchings/182B30/func_8025A50C.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025A74C.s b/ver/us/asm/nonmatchings/182B30/func_8025A74C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025A74C.s rename to ver/us/asm/nonmatchings/182B30/func_8025A74C.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025AA80.s b/ver/us/asm/nonmatchings/182B30/func_8025AA80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025AA80.s rename to ver/us/asm/nonmatchings/182B30/func_8025AA80.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025AD90.s b/ver/us/asm/nonmatchings/182B30/func_8025AD90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025AD90.s rename to ver/us/asm/nonmatchings/182B30/func_8025AD90.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025B1A8.s b/ver/us/asm/nonmatchings/182B30/func_8025B1A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025B1A8.s rename to ver/us/asm/nonmatchings/182B30/func_8025B1A8.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025B5C0.s b/ver/us/asm/nonmatchings/182B30/func_8025B5C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025B5C0.s rename to ver/us/asm/nonmatchings/182B30/func_8025B5C0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025BAA0.s b/ver/us/asm/nonmatchings/182B30/func_8025BAA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025BAA0.s rename to ver/us/asm/nonmatchings/182B30/func_8025BAA0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025C120.s b/ver/us/asm/nonmatchings/182B30/func_8025C120.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025C120.s rename to ver/us/asm/nonmatchings/182B30/func_8025C120.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025C918.s b/ver/us/asm/nonmatchings/182B30/func_8025C918.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025C918.s rename to ver/us/asm/nonmatchings/182B30/func_8025C918.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025CD40.s b/ver/us/asm/nonmatchings/182B30/func_8025CD40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025CD40.s rename to ver/us/asm/nonmatchings/182B30/func_8025CD40.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025CEC8.s b/ver/us/asm/nonmatchings/182B30/func_8025CEC8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025CEC8.s rename to ver/us/asm/nonmatchings/182B30/func_8025CEC8.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D160.s b/ver/us/asm/nonmatchings/182B30/func_8025D160.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D160.s rename to ver/us/asm/nonmatchings/182B30/func_8025D160.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D290.s b/ver/us/asm/nonmatchings/182B30/func_8025D290.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D290.s rename to ver/us/asm/nonmatchings/182B30/func_8025D290.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D2B0.s b/ver/us/asm/nonmatchings/182B30/func_8025D2B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D2B0.s rename to ver/us/asm/nonmatchings/182B30/func_8025D2B0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D3CC.s b/ver/us/asm/nonmatchings/182B30/func_8025D3CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D3CC.s rename to ver/us/asm/nonmatchings/182B30/func_8025D3CC.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D4A0.s b/ver/us/asm/nonmatchings/182B30/func_8025D4A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D4A0.s rename to ver/us/asm/nonmatchings/182B30/func_8025D4A0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D4C8.s b/ver/us/asm/nonmatchings/182B30/func_8025D4C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D4C8.s rename to ver/us/asm/nonmatchings/182B30/func_8025D4C8.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D620.s b/ver/us/asm/nonmatchings/182B30/func_8025D620.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D620.s rename to ver/us/asm/nonmatchings/182B30/func_8025D620.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D640.s b/ver/us/asm/nonmatchings/182B30/func_8025D640.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D640.s rename to ver/us/asm/nonmatchings/182B30/func_8025D640.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D6FC.s b/ver/us/asm/nonmatchings/182B30/func_8025D6FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D6FC.s rename to ver/us/asm/nonmatchings/182B30/func_8025D6FC.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D71C.s b/ver/us/asm/nonmatchings/182B30/func_8025D71C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D71C.s rename to ver/us/asm/nonmatchings/182B30/func_8025D71C.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D810.s b/ver/us/asm/nonmatchings/182B30/func_8025D810.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D810.s rename to ver/us/asm/nonmatchings/182B30/func_8025D810.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D830.s b/ver/us/asm/nonmatchings/182B30/func_8025D830.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D830.s rename to ver/us/asm/nonmatchings/182B30/func_8025D830.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D8EC.s b/ver/us/asm/nonmatchings/182B30/func_8025D8EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D8EC.s rename to ver/us/asm/nonmatchings/182B30/func_8025D8EC.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025D90C.s b/ver/us/asm/nonmatchings/182B30/func_8025D90C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025D90C.s rename to ver/us/asm/nonmatchings/182B30/func_8025D90C.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025DA68.s b/ver/us/asm/nonmatchings/182B30/func_8025DA68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025DA68.s rename to ver/us/asm/nonmatchings/182B30/func_8025DA68.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025DBD0.s b/ver/us/asm/nonmatchings/182B30/func_8025DBD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025DBD0.s rename to ver/us/asm/nonmatchings/182B30/func_8025DBD0.s diff --git a/ver/us/asm/nonmatchings/code_182B30/func_8025DD60.s b/ver/us/asm/nonmatchings/182B30/func_8025DD60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/func_8025DD60.s rename to ver/us/asm/nonmatchings/182B30/func_8025DD60.s diff --git a/ver/us/asm/nonmatchings/code_182B30/reset_actor_blur.s b/ver/us/asm/nonmatchings/182B30/reset_actor_blur.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/reset_actor_blur.s rename to ver/us/asm/nonmatchings/182B30/reset_actor_blur.s diff --git a/ver/us/asm/nonmatchings/code_182B30/update_actor_shadow.s b/ver/us/asm/nonmatchings/182B30/update_actor_shadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/update_actor_shadow.s rename to ver/us/asm/nonmatchings/182B30/update_actor_shadow.s diff --git a/ver/us/asm/nonmatchings/code_182B30/update_player_actor_shadow.s b/ver/us/asm/nonmatchings/182B30/update_player_actor_shadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_182B30/update_player_actor_shadow.s rename to ver/us/asm/nonmatchings/182B30/update_player_actor_shadow.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025DEB0.s b/ver/us/asm/nonmatchings/18C790/func_8025DEB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025DEB0.s rename to ver/us/asm/nonmatchings/18C790/func_8025DEB0.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025DEC4.s b/ver/us/asm/nonmatchings/18C790/func_8025DEC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025DEC4.s rename to ver/us/asm/nonmatchings/18C790/func_8025DEC4.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025E030.s b/ver/us/asm/nonmatchings/18C790/func_8025E030.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025E030.s rename to ver/us/asm/nonmatchings/18C790/func_8025E030.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025E044.s b/ver/us/asm/nonmatchings/18C790/func_8025E044.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025E044.s rename to ver/us/asm/nonmatchings/18C790/func_8025E044.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025E108.s b/ver/us/asm/nonmatchings/18C790/func_8025E108.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025E108.s rename to ver/us/asm/nonmatchings/18C790/func_8025E108.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025E14C.s b/ver/us/asm/nonmatchings/18C790/func_8025E14C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025E14C.s rename to ver/us/asm/nonmatchings/18C790/func_8025E14C.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025E190.s b/ver/us/asm/nonmatchings/18C790/func_8025E190.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025E190.s rename to ver/us/asm/nonmatchings/18C790/func_8025E190.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_8025FF8C.s b/ver/us/asm/nonmatchings/18C790/func_8025FF8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_8025FF8C.s rename to ver/us/asm/nonmatchings/18C790/func_8025FF8C.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_802601BC.s b/ver/us/asm/nonmatchings/18C790/func_802601BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_802601BC.s rename to ver/us/asm/nonmatchings/18C790/func_802601BC.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_80260948.s b/ver/us/asm/nonmatchings/18C790/func_80260948.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_80260948.s rename to ver/us/asm/nonmatchings/18C790/func_80260948.s diff --git a/ver/us/asm/nonmatchings/code_18C790/func_80260A20.s b/ver/us/asm/nonmatchings/18C790/func_80260A20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18C790/func_80260A20.s rename to ver/us/asm/nonmatchings/18C790/func_80260A20.s diff --git a/ver/us/asm/nonmatchings/code_18F340/FXRecoverFP.s b/ver/us/asm/nonmatchings/18F340/FXRecoverFP.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/FXRecoverFP.s rename to ver/us/asm/nonmatchings/18F340/FXRecoverFP.s diff --git a/ver/us/asm/nonmatchings/code_18F340/FXRecoverHP.s b/ver/us/asm/nonmatchings/18F340/FXRecoverHP.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/FXRecoverHP.s rename to ver/us/asm/nonmatchings/18F340/FXRecoverHP.s diff --git a/ver/us/asm/nonmatchings/code_18F340/activate_defend_command.s b/ver/us/asm/nonmatchings/18F340/activate_defend_command.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/activate_defend_command.s rename to ver/us/asm/nonmatchings/18F340/activate_defend_command.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80260A60.s b/ver/us/asm/nonmatchings/18F340/func_80260A60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80260A60.s rename to ver/us/asm/nonmatchings/18F340/func_80260A60.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80260B70.s b/ver/us/asm/nonmatchings/18F340/func_80260B70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80260B70.s rename to ver/us/asm/nonmatchings/18F340/func_80260B70.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80260BF4.s b/ver/us/asm/nonmatchings/18F340/func_80260BF4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80260BF4.s rename to ver/us/asm/nonmatchings/18F340/func_80260BF4.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80260E90.s b/ver/us/asm/nonmatchings/18F340/func_80260E90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80260E90.s rename to ver/us/asm/nonmatchings/18F340/func_80260E90.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261064.s b/ver/us/asm/nonmatchings/18F340/func_80261064.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261064.s rename to ver/us/asm/nonmatchings/18F340/func_80261064.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802610CC.s b/ver/us/asm/nonmatchings/18F340/func_802610CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802610CC.s rename to ver/us/asm/nonmatchings/18F340/func_802610CC.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261164.s b/ver/us/asm/nonmatchings/18F340/func_80261164.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261164.s rename to ver/us/asm/nonmatchings/18F340/func_80261164.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802611E8.s b/ver/us/asm/nonmatchings/18F340/func_802611E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802611E8.s rename to ver/us/asm/nonmatchings/18F340/func_802611E8.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_8026127C.s b/ver/us/asm/nonmatchings/18F340/func_8026127C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_8026127C.s rename to ver/us/asm/nonmatchings/18F340/func_8026127C.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802613BC.s b/ver/us/asm/nonmatchings/18F340/func_802613BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802613BC.s rename to ver/us/asm/nonmatchings/18F340/func_802613BC.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261478.s b/ver/us/asm/nonmatchings/18F340/func_80261478.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261478.s rename to ver/us/asm/nonmatchings/18F340/func_80261478.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261530.s b/ver/us/asm/nonmatchings/18F340/func_80261530.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261530.s rename to ver/us/asm/nonmatchings/18F340/func_80261530.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802615C8.s b/ver/us/asm/nonmatchings/18F340/func_802615C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802615C8.s rename to ver/us/asm/nonmatchings/18F340/func_802615C8.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261648.s b/ver/us/asm/nonmatchings/18F340/func_80261648.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261648.s rename to ver/us/asm/nonmatchings/18F340/func_80261648.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802616B4.s b/ver/us/asm/nonmatchings/18F340/func_802616B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802616B4.s rename to ver/us/asm/nonmatchings/18F340/func_802616B4.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802616F4.s b/ver/us/asm/nonmatchings/18F340/func_802616F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802616F4.s rename to ver/us/asm/nonmatchings/18F340/func_802616F4.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802619B4.s b/ver/us/asm/nonmatchings/18F340/func_802619B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802619B4.s rename to ver/us/asm/nonmatchings/18F340/func_802619B4.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802619E8.s b/ver/us/asm/nonmatchings/18F340/func_802619E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802619E8.s rename to ver/us/asm/nonmatchings/18F340/func_802619E8.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261B40.s b/ver/us/asm/nonmatchings/18F340/func_80261B40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261B40.s rename to ver/us/asm/nonmatchings/18F340/func_80261B40.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261DF4.s b/ver/us/asm/nonmatchings/18F340/func_80261DF4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261DF4.s rename to ver/us/asm/nonmatchings/18F340/func_80261DF4.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_80261FB4.s b/ver/us/asm/nonmatchings/18F340/func_80261FB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_80261FB4.s rename to ver/us/asm/nonmatchings/18F340/func_80261FB4.s diff --git a/ver/us/asm/nonmatchings/code_18F340/func_802620F8.s b/ver/us/asm/nonmatchings/18F340/func_802620F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_18F340/func_802620F8.s rename to ver/us/asm/nonmatchings/18F340/func_802620F8.s diff --git a/ver/us/asm/nonmatchings/code_190A10/func_80262130.s b/ver/us/asm/nonmatchings/190A10/func_80262130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190A10/func_80262130.s rename to ver/us/asm/nonmatchings/190A10/func_80262130.s diff --git a/ver/us/asm/nonmatchings/code_190A10/func_8026220C.s b/ver/us/asm/nonmatchings/190A10/func_8026220C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190A10/func_8026220C.s rename to ver/us/asm/nonmatchings/190A10/func_8026220C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/add_xz_vec3f.s b/ver/us/asm/nonmatchings/190B20/add_xz_vec3f.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/add_xz_vec3f.s rename to ver/us/asm/nonmatchings/190B20/add_xz_vec3f.s diff --git a/ver/us/asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s b/ver/us/asm/nonmatchings/190B20/add_xz_vec3f_copy1.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/add_xz_vec3f_copy1.s rename to ver/us/asm/nonmatchings/190B20/add_xz_vec3f_copy1.s diff --git a/ver/us/asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s b/ver/us/asm/nonmatchings/190B20/add_xz_vec3f_copy2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/add_xz_vec3f_copy2.s rename to ver/us/asm/nonmatchings/190B20/add_xz_vec3f_copy2.s diff --git a/ver/us/asm/nonmatchings/code_190B20/count_power_plus.s b/ver/us/asm/nonmatchings/190B20/count_power_plus.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/count_power_plus.s rename to ver/us/asm/nonmatchings/190B20/count_power_plus.s diff --git a/ver/us/asm/nonmatchings/code_190B20/create_actor.s b/ver/us/asm/nonmatchings/190B20/create_actor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/create_actor.s rename to ver/us/asm/nonmatchings/190B20/create_actor.s diff --git a/ver/us/asm/nonmatchings/code_190B20/create_target_list.s b/ver/us/asm/nonmatchings/190B20/create_target_list.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/create_target_list.s rename to ver/us/asm/nonmatchings/190B20/create_target_list.s diff --git a/ver/us/asm/nonmatchings/code_190B20/deduct_current_move_fp.s b/ver/us/asm/nonmatchings/190B20/deduct_current_move_fp.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/deduct_current_move_fp.s rename to ver/us/asm/nonmatchings/190B20/deduct_current_move_fp.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263064.s b/ver/us/asm/nonmatchings/190B20/func_80263064.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263064.s rename to ver/us/asm/nonmatchings/190B20/func_80263064.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263230.s b/ver/us/asm/nonmatchings/190B20/func_80263230.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263230.s rename to ver/us/asm/nonmatchings/190B20/func_80263230.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_8026324C.s b/ver/us/asm/nonmatchings/190B20/func_8026324C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_8026324C.s rename to ver/us/asm/nonmatchings/190B20/func_8026324C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263268.s b/ver/us/asm/nonmatchings/190B20/func_80263268.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263268.s rename to ver/us/asm/nonmatchings/190B20/func_80263268.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263300.s b/ver/us/asm/nonmatchings/190B20/func_80263300.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263300.s rename to ver/us/asm/nonmatchings/190B20/func_80263300.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_802633E8.s b/ver/us/asm/nonmatchings/190B20/func_802633E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_802633E8.s rename to ver/us/asm/nonmatchings/190B20/func_802633E8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263434.s b/ver/us/asm/nonmatchings/190B20/func_80263434.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263434.s rename to ver/us/asm/nonmatchings/190B20/func_80263434.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263464.s b/ver/us/asm/nonmatchings/190B20/func_80263464.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263464.s rename to ver/us/asm/nonmatchings/190B20/func_80263464.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_802634B8.s b/ver/us/asm/nonmatchings/190B20/func_802634B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_802634B8.s rename to ver/us/asm/nonmatchings/190B20/func_802634B8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_802636E4.s b/ver/us/asm/nonmatchings/190B20/func_802636E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_802636E4.s rename to ver/us/asm/nonmatchings/190B20/func_802636E4.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263914.s b/ver/us/asm/nonmatchings/190B20/func_80263914.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263914.s rename to ver/us/asm/nonmatchings/190B20/func_80263914.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263C60.s b/ver/us/asm/nonmatchings/190B20/func_80263C60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263C60.s rename to ver/us/asm/nonmatchings/190B20/func_80263C60.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263CC4.s b/ver/us/asm/nonmatchings/190B20/func_80263CC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263CC4.s rename to ver/us/asm/nonmatchings/190B20/func_80263CC4.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263E08.s b/ver/us/asm/nonmatchings/190B20/func_80263E08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263E08.s rename to ver/us/asm/nonmatchings/190B20/func_80263E08.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80263FE8.s b/ver/us/asm/nonmatchings/190B20/func_80263FE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80263FE8.s rename to ver/us/asm/nonmatchings/190B20/func_80263FE8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80264084.s b/ver/us/asm/nonmatchings/190B20/func_80264084.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80264084.s rename to ver/us/asm/nonmatchings/190B20/func_80264084.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80265CE8.s b/ver/us/asm/nonmatchings/190B20/func_80265CE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80265CE8.s rename to ver/us/asm/nonmatchings/190B20/func_80265CE8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80265D44.s b/ver/us/asm/nonmatchings/190B20/func_80265D44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80265D44.s rename to ver/us/asm/nonmatchings/190B20/func_80265D44.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_802664DC.s b/ver/us/asm/nonmatchings/190B20/func_802664DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_802664DC.s rename to ver/us/asm/nonmatchings/190B20/func_802664DC.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266684.s b/ver/us/asm/nonmatchings/190B20/func_80266684.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266684.s rename to ver/us/asm/nonmatchings/190B20/func_80266684.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_802666E4.s b/ver/us/asm/nonmatchings/190B20/func_802666E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_802666E4.s rename to ver/us/asm/nonmatchings/190B20/func_802666E4.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_802667F0.s b/ver/us/asm/nonmatchings/190B20/func_802667F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_802667F0.s rename to ver/us/asm/nonmatchings/190B20/func_802667F0.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266970.s b/ver/us/asm/nonmatchings/190B20/func_80266970.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266970.s rename to ver/us/asm/nonmatchings/190B20/func_80266970.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266978.s b/ver/us/asm/nonmatchings/190B20/func_80266978.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266978.s rename to ver/us/asm/nonmatchings/190B20/func_80266978.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266ADC.s b/ver/us/asm/nonmatchings/190B20/func_80266ADC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266ADC.s rename to ver/us/asm/nonmatchings/190B20/func_80266ADC.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266AF8.s b/ver/us/asm/nonmatchings/190B20/func_80266AF8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266AF8.s rename to ver/us/asm/nonmatchings/190B20/func_80266AF8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266B14.s b/ver/us/asm/nonmatchings/190B20/func_80266B14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266B14.s rename to ver/us/asm/nonmatchings/190B20/func_80266B14.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266D6C.s b/ver/us/asm/nonmatchings/190B20/func_80266D6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266D6C.s rename to ver/us/asm/nonmatchings/190B20/func_80266D6C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266DAC.s b/ver/us/asm/nonmatchings/190B20/func_80266DAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266DAC.s rename to ver/us/asm/nonmatchings/190B20/func_80266DAC.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266E14.s b/ver/us/asm/nonmatchings/190B20/func_80266E14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266E14.s rename to ver/us/asm/nonmatchings/190B20/func_80266E14.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266E40.s b/ver/us/asm/nonmatchings/190B20/func_80266E40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266E40.s rename to ver/us/asm/nonmatchings/190B20/func_80266E40.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266EA8.s b/ver/us/asm/nonmatchings/190B20/func_80266EA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266EA8.s rename to ver/us/asm/nonmatchings/190B20/func_80266EA8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266EE8.s b/ver/us/asm/nonmatchings/190B20/func_80266EE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266EE8.s rename to ver/us/asm/nonmatchings/190B20/func_80266EE8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266F60.s b/ver/us/asm/nonmatchings/190B20/func_80266F60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266F60.s rename to ver/us/asm/nonmatchings/190B20/func_80266F60.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266F8C.s b/ver/us/asm/nonmatchings/190B20/func_80266F8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266F8C.s rename to ver/us/asm/nonmatchings/190B20/func_80266F8C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80266FD8.s b/ver/us/asm/nonmatchings/190B20/func_80266FD8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80266FD8.s rename to ver/us/asm/nonmatchings/190B20/func_80266FD8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80267018.s b/ver/us/asm/nonmatchings/190B20/func_80267018.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80267018.s rename to ver/us/asm/nonmatchings/190B20/func_80267018.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_8026709C.s b/ver/us/asm/nonmatchings/190B20/func_8026709C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_8026709C.s rename to ver/us/asm/nonmatchings/190B20/func_8026709C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_802670C8.s b/ver/us/asm/nonmatchings/190B20/func_802670C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_802670C8.s rename to ver/us/asm/nonmatchings/190B20/func_802670C8.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_8026777C.s b/ver/us/asm/nonmatchings/190B20/func_8026777C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_8026777C.s rename to ver/us/asm/nonmatchings/190B20/func_8026777C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_8026787C.s b/ver/us/asm/nonmatchings/190B20/func_8026787C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_8026787C.s rename to ver/us/asm/nonmatchings/190B20/func_8026787C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/func_80267A3C.s b/ver/us/asm/nonmatchings/190B20/func_80267A3C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/func_80267A3C.s rename to ver/us/asm/nonmatchings/190B20/func_80267A3C.s diff --git a/ver/us/asm/nonmatchings/code_190B20/inflict_status.s b/ver/us/asm/nonmatchings/190B20/inflict_status.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/inflict_status.s rename to ver/us/asm/nonmatchings/190B20/inflict_status.s diff --git a/ver/us/asm/nonmatchings/code_190B20/inflict_status_set_duration.s b/ver/us/asm/nonmatchings/190B20/inflict_status_set_duration.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/inflict_status_set_duration.s rename to ver/us/asm/nonmatchings/190B20/inflict_status_set_duration.s diff --git a/ver/us/asm/nonmatchings/code_190B20/load_partner_actor.s b/ver/us/asm/nonmatchings/190B20/load_partner_actor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/load_partner_actor.s rename to ver/us/asm/nonmatchings/190B20/load_partner_actor.s diff --git a/ver/us/asm/nonmatchings/code_190B20/load_player_actor.s b/ver/us/asm/nonmatchings/190B20/load_player_actor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/load_player_actor.s rename to ver/us/asm/nonmatchings/190B20/load_player_actor.s diff --git a/ver/us/asm/nonmatchings/code_190B20/lookup_status_chance.s b/ver/us/asm/nonmatchings/190B20/lookup_status_chance.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/lookup_status_chance.s rename to ver/us/asm/nonmatchings/190B20/lookup_status_chance.s diff --git a/ver/us/asm/nonmatchings/code_190B20/lookup_status_duration_mod.s b/ver/us/asm/nonmatchings/190B20/lookup_status_duration_mod.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/lookup_status_duration_mod.s rename to ver/us/asm/nonmatchings/190B20/lookup_status_duration_mod.s diff --git a/ver/us/asm/nonmatchings/code_190B20/play_movement_dust_effects.s b/ver/us/asm/nonmatchings/190B20/play_movement_dust_effects.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/play_movement_dust_effects.s rename to ver/us/asm/nonmatchings/190B20/play_movement_dust_effects.s diff --git a/ver/us/asm/nonmatchings/code_190B20/reset_all_actor_sounds.s b/ver/us/asm/nonmatchings/190B20/reset_all_actor_sounds.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/reset_all_actor_sounds.s rename to ver/us/asm/nonmatchings/190B20/reset_all_actor_sounds.s diff --git a/ver/us/asm/nonmatchings/code_190B20/set_animation.s b/ver/us/asm/nonmatchings/190B20/set_animation.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/set_animation.s rename to ver/us/asm/nonmatchings/190B20/set_animation.s diff --git a/ver/us/asm/nonmatchings/code_190B20/set_animation_rate.s b/ver/us/asm/nonmatchings/190B20/set_animation_rate.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/set_animation_rate.s rename to ver/us/asm/nonmatchings/190B20/set_animation_rate.s diff --git a/ver/us/asm/nonmatchings/code_190B20/show_damage_popup.s b/ver/us/asm/nonmatchings/190B20/show_damage_popup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/show_damage_popup.s rename to ver/us/asm/nonmatchings/190B20/show_damage_popup.s diff --git a/ver/us/asm/nonmatchings/code_190B20/start_rumble_type.s b/ver/us/asm/nonmatchings/190B20/start_rumble_type.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/start_rumble_type.s rename to ver/us/asm/nonmatchings/190B20/start_rumble_type.s diff --git a/ver/us/asm/nonmatchings/code_190B20/try_inflict_status.s b/ver/us/asm/nonmatchings/190B20/try_inflict_status.s similarity index 100% rename from ver/us/asm/nonmatchings/code_190B20/try_inflict_status.s rename to ver/us/asm/nonmatchings/190B20/try_inflict_status.s diff --git a/ver/us/asm/nonmatchings/code_1967B0/LoadFreeItemScript.s b/ver/us/asm/nonmatchings/1967B0/LoadFreeItemScript.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1967B0/LoadFreeItemScript.s rename to ver/us/asm/nonmatchings/1967B0/LoadFreeItemScript.s diff --git a/ver/us/asm/nonmatchings/code_1967B0/LoadItemScript.s b/ver/us/asm/nonmatchings/1967B0/LoadItemScript.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1967B0/LoadItemScript.s rename to ver/us/asm/nonmatchings/1967B0/LoadItemScript.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s b/ver/us/asm/nonmatchings/196AA0/CloseActionCommandInfo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/CloseActionCommandInfo.s rename to ver/us/asm/nonmatchings/196AA0/CloseActionCommandInfo.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/LoadActionCommand.s b/ver/us/asm/nonmatchings/196AA0/LoadActionCommand.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/LoadActionCommand.s rename to ver/us/asm/nonmatchings/196AA0/LoadActionCommand.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/check_block_input.s b/ver/us/asm/nonmatchings/196AA0/check_block_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/check_block_input.s rename to ver/us/asm/nonmatchings/196AA0/check_block_input.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268224.s b/ver/us/asm/nonmatchings/196AA0/func_80268224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268224.s rename to ver/us/asm/nonmatchings/196AA0/func_80268224.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268284.s b/ver/us/asm/nonmatchings/196AA0/func_80268284.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268284.s rename to ver/us/asm/nonmatchings/196AA0/func_80268284.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268770.s b/ver/us/asm/nonmatchings/196AA0/func_80268770.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268770.s rename to ver/us/asm/nonmatchings/196AA0/func_80268770.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268798.s b/ver/us/asm/nonmatchings/196AA0/func_80268798.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268798.s rename to ver/us/asm/nonmatchings/196AA0/func_80268798.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_802687BC.s b/ver/us/asm/nonmatchings/196AA0/func_802687BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_802687BC.s rename to ver/us/asm/nonmatchings/196AA0/func_802687BC.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_802687E4.s b/ver/us/asm/nonmatchings/196AA0/func_802687E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_802687E4.s rename to ver/us/asm/nonmatchings/196AA0/func_802687E4.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_8026880C.s b/ver/us/asm/nonmatchings/196AA0/func_8026880C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_8026880C.s rename to ver/us/asm/nonmatchings/196AA0/func_8026880C.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268834.s b/ver/us/asm/nonmatchings/196AA0/func_80268834.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268834.s rename to ver/us/asm/nonmatchings/196AA0/func_80268834.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268858.s b/ver/us/asm/nonmatchings/196AA0/func_80268858.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268858.s rename to ver/us/asm/nonmatchings/196AA0/func_80268858.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268938.s b/ver/us/asm/nonmatchings/196AA0/func_80268938.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268938.s rename to ver/us/asm/nonmatchings/196AA0/func_80268938.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268AF8.s b/ver/us/asm/nonmatchings/196AA0/func_80268AF8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268AF8.s rename to ver/us/asm/nonmatchings/196AA0/func_80268AF8.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268C9C.s b/ver/us/asm/nonmatchings/196AA0/func_80268C9C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268C9C.s rename to ver/us/asm/nonmatchings/196AA0/func_80268C9C.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80268E88.s b/ver/us/asm/nonmatchings/196AA0/func_80268E88.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80268E88.s rename to ver/us/asm/nonmatchings/196AA0/func_80268E88.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80269118.s b/ver/us/asm/nonmatchings/196AA0/func_80269118.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80269118.s rename to ver/us/asm/nonmatchings/196AA0/func_80269118.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80269160.s b/ver/us/asm/nonmatchings/196AA0/func_80269160.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80269160.s rename to ver/us/asm/nonmatchings/196AA0/func_80269160.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_802691C8.s b/ver/us/asm/nonmatchings/196AA0/func_802691C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_802691C8.s rename to ver/us/asm/nonmatchings/196AA0/func_802691C8.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80269344.s b/ver/us/asm/nonmatchings/196AA0/func_80269344.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80269344.s rename to ver/us/asm/nonmatchings/196AA0/func_80269344.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80269370.s b/ver/us/asm/nonmatchings/196AA0/func_80269370.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80269370.s rename to ver/us/asm/nonmatchings/196AA0/func_80269370.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_8026939C.s b/ver/us/asm/nonmatchings/196AA0/func_8026939C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_8026939C.s rename to ver/us/asm/nonmatchings/196AA0/func_8026939C.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_80269470.s b/ver/us/asm/nonmatchings/196AA0/func_80269470.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_80269470.s rename to ver/us/asm/nonmatchings/196AA0/func_80269470.s diff --git a/ver/us/asm/nonmatchings/code_196AA0/func_802694A4.s b/ver/us/asm/nonmatchings/196AA0/func_802694A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_196AA0/func_802694A4.s rename to ver/us/asm/nonmatchings/196AA0/func_802694A4.s diff --git a/ver/us/asm/nonmatchings/code_197F40/AddActorDecoration.s b/ver/us/asm/nonmatchings/197F40/AddActorDecoration.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/AddActorDecoration.s rename to ver/us/asm/nonmatchings/197F40/AddActorDecoration.s diff --git a/ver/us/asm/nonmatchings/code_197F40/AddActorVar.s b/ver/us/asm/nonmatchings/197F40/AddActorVar.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/AddActorVar.s rename to ver/us/asm/nonmatchings/197F40/AddActorVar.s diff --git a/ver/us/asm/nonmatchings/code_197F40/BoostAttack.s b/ver/us/asm/nonmatchings/197F40/BoostAttack.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/BoostAttack.s rename to ver/us/asm/nonmatchings/197F40/BoostAttack.s diff --git a/ver/us/asm/nonmatchings/code_197F40/BoostDefense.s b/ver/us/asm/nonmatchings/197F40/BoostDefense.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/BoostDefense.s rename to ver/us/asm/nonmatchings/197F40/BoostDefense.s diff --git a/ver/us/asm/nonmatchings/code_197F40/ChooseNextTarget.s b/ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/ChooseNextTarget.s rename to ver/us/asm/nonmatchings/197F40/ChooseNextTarget.s diff --git a/ver/us/asm/nonmatchings/code_197F40/CopyBuffs.s b/ver/us/asm/nonmatchings/197F40/CopyBuffs.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/CopyBuffs.s rename to ver/us/asm/nonmatchings/197F40/CopyBuffs.s diff --git a/ver/us/asm/nonmatchings/code_197F40/CreatePartShadow.s b/ver/us/asm/nonmatchings/197F40/CreatePartShadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/CreatePartShadow.s rename to ver/us/asm/nonmatchings/197F40/CreatePartShadow.s diff --git a/ver/us/asm/nonmatchings/code_197F40/ElectrifyActor.s b/ver/us/asm/nonmatchings/197F40/ElectrifyActor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/ElectrifyActor.s rename to ver/us/asm/nonmatchings/197F40/ElectrifyActor.s diff --git a/ver/us/asm/nonmatchings/code_197F40/GetActorAttackBoost.s b/ver/us/asm/nonmatchings/197F40/GetActorAttackBoost.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/GetActorAttackBoost.s rename to ver/us/asm/nonmatchings/197F40/GetActorAttackBoost.s diff --git a/ver/us/asm/nonmatchings/code_197F40/GetActorDefenseBoost.s b/ver/us/asm/nonmatchings/197F40/GetActorDefenseBoost.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/GetActorDefenseBoost.s rename to ver/us/asm/nonmatchings/197F40/GetActorDefenseBoost.s diff --git a/ver/us/asm/nonmatchings/code_197F40/GetBattleVar.s b/ver/us/asm/nonmatchings/197F40/GetBattleVar.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/GetBattleVar.s rename to ver/us/asm/nonmatchings/197F40/GetBattleVar.s diff --git a/ver/us/asm/nonmatchings/code_197F40/GetDistanceToGoal.s b/ver/us/asm/nonmatchings/197F40/GetDistanceToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/GetDistanceToGoal.s rename to ver/us/asm/nonmatchings/197F40/GetDistanceToGoal.s diff --git a/ver/us/asm/nonmatchings/code_197F40/GetOwnerTarget.s b/ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/GetOwnerTarget.s rename to ver/us/asm/nonmatchings/197F40/GetOwnerTarget.s diff --git a/ver/us/asm/nonmatchings/code_197F40/GetStatusFlags.s b/ver/us/asm/nonmatchings/197F40/GetStatusFlags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/GetStatusFlags.s rename to ver/us/asm/nonmatchings/197F40/GetStatusFlags.s diff --git a/ver/us/asm/nonmatchings/code_197F40/HealActor.s b/ver/us/asm/nonmatchings/197F40/HealActor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/HealActor.s rename to ver/us/asm/nonmatchings/197F40/HealActor.s diff --git a/ver/us/asm/nonmatchings/code_197F40/LoadBattleSection.s b/ver/us/asm/nonmatchings/197F40/LoadBattleSection.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/LoadBattleSection.s rename to ver/us/asm/nonmatchings/197F40/LoadBattleSection.s diff --git a/ver/us/asm/nonmatchings/code_197F40/ModifyActorDecoration.s b/ver/us/asm/nonmatchings/197F40/ModifyActorDecoration.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/ModifyActorDecoration.s rename to ver/us/asm/nonmatchings/197F40/ModifyActorDecoration.s diff --git a/ver/us/asm/nonmatchings/code_197F40/RemoveActorDecoration.s b/ver/us/asm/nonmatchings/197F40/RemoveActorDecoration.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/RemoveActorDecoration.s rename to ver/us/asm/nonmatchings/197F40/RemoveActorDecoration.s diff --git a/ver/us/asm/nonmatchings/code_197F40/RemovePartShadow.s b/ver/us/asm/nonmatchings/197F40/RemovePartShadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/RemovePartShadow.s rename to ver/us/asm/nonmatchings/197F40/RemovePartShadow.s diff --git a/ver/us/asm/nonmatchings/code_197F40/ResetActorSounds.s b/ver/us/asm/nonmatchings/197F40/ResetActorSounds.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/ResetActorSounds.s rename to ver/us/asm/nonmatchings/197F40/ResetActorSounds.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SetActorSounds.s b/ver/us/asm/nonmatchings/197F40/SetActorSounds.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SetActorSounds.s rename to ver/us/asm/nonmatchings/197F40/SetActorSounds.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SetActorType.s b/ver/us/asm/nonmatchings/197F40/SetActorType.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SetActorType.s rename to ver/us/asm/nonmatchings/197F40/SetActorType.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SetBattleVar.s b/ver/us/asm/nonmatchings/197F40/SetBattleVar.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SetBattleVar.s rename to ver/us/asm/nonmatchings/197F40/SetBattleVar.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SetGoalToIndex.s b/ver/us/asm/nonmatchings/197F40/SetGoalToIndex.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SetGoalToIndex.s rename to ver/us/asm/nonmatchings/197F40/SetGoalToIndex.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SetOwnerTarget.s b/ver/us/asm/nonmatchings/197F40/SetOwnerTarget.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SetOwnerTarget.s rename to ver/us/asm/nonmatchings/197F40/SetOwnerTarget.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SetPartAlpha.s b/ver/us/asm/nonmatchings/197F40/SetPartAlpha.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SetPartAlpha.s rename to ver/us/asm/nonmatchings/197F40/SetPartAlpha.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SetPartSounds.s b/ver/us/asm/nonmatchings/197F40/SetPartSounds.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SetPartSounds.s rename to ver/us/asm/nonmatchings/197F40/SetPartSounds.s diff --git a/ver/us/asm/nonmatchings/code_197F40/SummonEnemy.s b/ver/us/asm/nonmatchings/197F40/SummonEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/SummonEnemy.s rename to ver/us/asm/nonmatchings/197F40/SummonEnemy.s diff --git a/ver/us/asm/nonmatchings/code_197F40/UseIdleAnimation.s b/ver/us/asm/nonmatchings/197F40/UseIdleAnimation.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/UseIdleAnimation.s rename to ver/us/asm/nonmatchings/197F40/UseIdleAnimation.s diff --git a/ver/us/asm/nonmatchings/code_197F40/VanishActor.s b/ver/us/asm/nonmatchings/197F40/VanishActor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/VanishActor.s rename to ver/us/asm/nonmatchings/197F40/VanishActor.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026E198.s b/ver/us/asm/nonmatchings/197F40/func_8026E198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026E198.s rename to ver/us/asm/nonmatchings/197F40/func_8026E198.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026E208.s b/ver/us/asm/nonmatchings/197F40/func_8026E208.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026E208.s rename to ver/us/asm/nonmatchings/197F40/func_8026E208.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026E260.s b/ver/us/asm/nonmatchings/197F40/func_8026E260.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026E260.s rename to ver/us/asm/nonmatchings/197F40/func_8026E260.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026E558.s b/ver/us/asm/nonmatchings/197F40/func_8026E558.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026E558.s rename to ver/us/asm/nonmatchings/197F40/func_8026E558.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026E914.s b/ver/us/asm/nonmatchings/197F40/func_8026E914.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026E914.s rename to ver/us/asm/nonmatchings/197F40/func_8026E914.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026E9A0.s b/ver/us/asm/nonmatchings/197F40/func_8026E9A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026E9A0.s rename to ver/us/asm/nonmatchings/197F40/func_8026E9A0.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026EA7C.s b/ver/us/asm/nonmatchings/197F40/func_8026EA7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026EA7C.s rename to ver/us/asm/nonmatchings/197F40/func_8026EA7C.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026EB20.s b/ver/us/asm/nonmatchings/197F40/func_8026EB20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026EB20.s rename to ver/us/asm/nonmatchings/197F40/func_8026EB20.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026EBF8.s b/ver/us/asm/nonmatchings/197F40/func_8026EBF8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026EBF8.s rename to ver/us/asm/nonmatchings/197F40/func_8026EBF8.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026ED20.s b/ver/us/asm/nonmatchings/197F40/func_8026ED20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026ED20.s rename to ver/us/asm/nonmatchings/197F40/func_8026ED20.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026EDE4.s b/ver/us/asm/nonmatchings/197F40/func_8026EDE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026EDE4.s rename to ver/us/asm/nonmatchings/197F40/func_8026EDE4.s diff --git a/ver/us/asm/nonmatchings/code_197F40/func_8026F1A0.s b/ver/us/asm/nonmatchings/197F40/func_8026F1A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/func_8026F1A0.s rename to ver/us/asm/nonmatchings/197F40/func_8026F1A0.s diff --git a/ver/us/asm/nonmatchings/code_197F40/set_goal_pos_to_part.s b/ver/us/asm/nonmatchings/197F40/set_goal_pos_to_part.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/set_goal_pos_to_part.s rename to ver/us/asm/nonmatchings/197F40/set_goal_pos_to_part.s diff --git a/ver/us/asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s b/ver/us/asm/nonmatchings/197F40/set_part_goal_to_actor_part.s similarity index 100% rename from ver/us/asm/nonmatchings/code_197F40/set_part_goal_to_actor_part.s rename to ver/us/asm/nonmatchings/197F40/set_part_goal_to_actor_part.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s b/ver/us/asm/nonmatchings/19FAF0/CancelablePlayerRunToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/CancelablePlayerRunToGoal.s rename to ver/us/asm/nonmatchings/19FAF0/CancelablePlayerRunToGoal.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/DidActionSucceed.s b/ver/us/asm/nonmatchings/19FAF0/DidActionSucceed.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/DidActionSucceed.s rename to ver/us/asm/nonmatchings/19FAF0/DidActionSucceed.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/DispatchDamagePlayerEvent.s b/ver/us/asm/nonmatchings/19FAF0/DispatchDamagePlayerEvent.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/DispatchDamagePlayerEvent.s rename to ver/us/asm/nonmatchings/19FAF0/DispatchDamagePlayerEvent.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/EnablePlayerBlur.s b/ver/us/asm/nonmatchings/19FAF0/EnablePlayerBlur.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/EnablePlayerBlur.s rename to ver/us/asm/nonmatchings/19FAF0/EnablePlayerBlur.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/GetMenuSelection.s b/ver/us/asm/nonmatchings/19FAF0/GetMenuSelection.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/GetMenuSelection.s rename to ver/us/asm/nonmatchings/19FAF0/GetMenuSelection.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerDamageEnemy.s b/ver/us/asm/nonmatchings/19FAF0/PlayerDamageEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/PlayerDamageEnemy.s rename to ver/us/asm/nonmatchings/19FAF0/PlayerDamageEnemy.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s b/ver/us/asm/nonmatchings/19FAF0/PlayerFallToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/PlayerFallToGoal.s rename to ver/us/asm/nonmatchings/19FAF0/PlayerFallToGoal.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerLandJump.s b/ver/us/asm/nonmatchings/19FAF0/PlayerLandJump.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/PlayerLandJump.s rename to ver/us/asm/nonmatchings/19FAF0/PlayerLandJump.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerPowerBounceEnemy.s b/ver/us/asm/nonmatchings/19FAF0/PlayerPowerBounceEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/PlayerPowerBounceEnemy.s rename to ver/us/asm/nonmatchings/19FAF0/PlayerPowerBounceEnemy.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s b/ver/us/asm/nonmatchings/19FAF0/PlayerRunToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/PlayerRunToGoal.s rename to ver/us/asm/nonmatchings/19FAF0/PlayerRunToGoal.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/PlayerTestEnemy.s b/ver/us/asm/nonmatchings/19FAF0/PlayerTestEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/PlayerTestEnemy.s rename to ver/us/asm/nonmatchings/19FAF0/PlayerTestEnemy.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s b/ver/us/asm/nonmatchings/19FAF0/calc_player_damage_enemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/calc_player_damage_enemy.s rename to ver/us/asm/nonmatchings/19FAF0/calc_player_damage_enemy.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s b/ver/us/asm/nonmatchings/19FAF0/calc_player_test_enemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/calc_player_test_enemy.s rename to ver/us/asm/nonmatchings/19FAF0/calc_player_test_enemy.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s b/ver/us/asm/nonmatchings/19FAF0/dispatch_damage_event_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/dispatch_damage_event_player.s rename to ver/us/asm/nonmatchings/19FAF0/dispatch_damage_event_player.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/dispatch_event_player.s b/ver/us/asm/nonmatchings/19FAF0/dispatch_event_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/dispatch_event_player.s rename to ver/us/asm/nonmatchings/19FAF0/dispatch_event_player.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/dispatch_event_player_continue_turn.s b/ver/us/asm/nonmatchings/19FAF0/dispatch_event_player_continue_turn.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/dispatch_event_player_continue_turn.s rename to ver/us/asm/nonmatchings/19FAF0/dispatch_event_player_continue_turn.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_802712A0.s b/ver/us/asm/nonmatchings/19FAF0/func_802712A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_802712A0.s rename to ver/us/asm/nonmatchings/19FAF0/func_802712A0.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80271328.s b/ver/us/asm/nonmatchings/19FAF0/func_80271328.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_80271328.s rename to ver/us/asm/nonmatchings/19FAF0/func_80271328.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_802713B0.s b/ver/us/asm/nonmatchings/19FAF0/func_802713B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_802713B0.s rename to ver/us/asm/nonmatchings/19FAF0/func_802713B0.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80271484.s b/ver/us/asm/nonmatchings/19FAF0/func_80271484.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_80271484.s rename to ver/us/asm/nonmatchings/19FAF0/func_80271484.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80271588.s b/ver/us/asm/nonmatchings/19FAF0/func_80271588.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_80271588.s rename to ver/us/asm/nonmatchings/19FAF0/func_80271588.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80273444.s b/ver/us/asm/nonmatchings/19FAF0/func_80273444.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_80273444.s rename to ver/us/asm/nonmatchings/19FAF0/func_80273444.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80274A18.s b/ver/us/asm/nonmatchings/19FAF0/func_80274A18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_80274A18.s rename to ver/us/asm/nonmatchings/19FAF0/func_80274A18.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_802752AC.s b/ver/us/asm/nonmatchings/19FAF0/func_802752AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_802752AC.s rename to ver/us/asm/nonmatchings/19FAF0/func_802752AC.s diff --git a/ver/us/asm/nonmatchings/code_19FAF0/func_80275F00.s b/ver/us/asm/nonmatchings/19FAF0/func_80275F00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_19FAF0/func_80275F00.s rename to ver/us/asm/nonmatchings/19FAF0/func_80275F00.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/DropStarPoints.s b/ver/us/asm/nonmatchings/1A5830/DropStarPoints.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/DropStarPoints.s rename to ver/us/asm/nonmatchings/1A5830/DropStarPoints.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/EnemyDamageTarget.s b/ver/us/asm/nonmatchings/1A5830/EnemyDamageTarget.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/EnemyDamageTarget.s rename to ver/us/asm/nonmatchings/1A5830/EnemyDamageTarget.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/EnemyTestTarget.s b/ver/us/asm/nonmatchings/1A5830/EnemyTestTarget.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/EnemyTestTarget.s rename to ver/us/asm/nonmatchings/1A5830/EnemyTestTarget.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/FallPartTo.s b/ver/us/asm/nonmatchings/1A5830/FallPartTo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/FallPartTo.s rename to ver/us/asm/nonmatchings/1A5830/FallPartTo.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/FallToGoal.s b/ver/us/asm/nonmatchings/1A5830/FallToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/FallToGoal.s rename to ver/us/asm/nonmatchings/1A5830/FallToGoal.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/FlyPartTo.s b/ver/us/asm/nonmatchings/1A5830/FlyPartTo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/FlyPartTo.s rename to ver/us/asm/nonmatchings/1A5830/FlyPartTo.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/FlyToGoal.s b/ver/us/asm/nonmatchings/1A5830/FlyToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/FlyToGoal.s rename to ver/us/asm/nonmatchings/1A5830/FlyToGoal.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/IdleFlyToGoal.s b/ver/us/asm/nonmatchings/1A5830/IdleFlyToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/IdleFlyToGoal.s rename to ver/us/asm/nonmatchings/1A5830/IdleFlyToGoal.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/IdleJumpToGoal.s b/ver/us/asm/nonmatchings/1A5830/IdleJumpToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/IdleJumpToGoal.s rename to ver/us/asm/nonmatchings/1A5830/IdleJumpToGoal.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/IdleRunToGoal.s b/ver/us/asm/nonmatchings/1A5830/IdleRunToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/IdleRunToGoal.s rename to ver/us/asm/nonmatchings/1A5830/IdleRunToGoal.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpPartTo.s b/ver/us/asm/nonmatchings/1A5830/JumpPartTo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/JumpPartTo.s rename to ver/us/asm/nonmatchings/1A5830/JumpPartTo.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpToGoal.s b/ver/us/asm/nonmatchings/1A5830/JumpToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/JumpToGoal.s rename to ver/us/asm/nonmatchings/1A5830/JumpToGoal.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s b/ver/us/asm/nonmatchings/1A5830/JumpToGoalSimple2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/JumpToGoalSimple2.s rename to ver/us/asm/nonmatchings/1A5830/JumpToGoalSimple2.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/JumpWithBounce.s b/ver/us/asm/nonmatchings/1A5830/JumpWithBounce.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/JumpWithBounce.s rename to ver/us/asm/nonmatchings/1A5830/JumpWithBounce.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/LandJump.s b/ver/us/asm/nonmatchings/1A5830/LandJump.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/LandJump.s rename to ver/us/asm/nonmatchings/1A5830/LandJump.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/LandJumpPart.s b/ver/us/asm/nonmatchings/1A5830/LandJumpPart.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/LandJumpPart.s rename to ver/us/asm/nonmatchings/1A5830/LandJumpPart.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/RemoveActor.s b/ver/us/asm/nonmatchings/1A5830/RemoveActor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/RemoveActor.s rename to ver/us/asm/nonmatchings/1A5830/RemoveActor.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/RunPartTo.s b/ver/us/asm/nonmatchings/1A5830/RunPartTo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/RunPartTo.s rename to ver/us/asm/nonmatchings/1A5830/RunPartTo.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/RunToGoal.s b/ver/us/asm/nonmatchings/1A5830/RunToGoal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/RunToGoal.s rename to ver/us/asm/nonmatchings/1A5830/RunToGoal.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/SetPartSize.s b/ver/us/asm/nonmatchings/1A5830/SetPartSize.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/SetPartSize.s rename to ver/us/asm/nonmatchings/1A5830/SetPartSize.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/ver/us/asm/nonmatchings/1A5830/calc_enemy_damage_target.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s rename to ver/us/asm/nonmatchings/1A5830/calc_enemy_damage_target.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/calc_enemy_test_target.s b/ver/us/asm/nonmatchings/1A5830/calc_enemy_test_target.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/calc_enemy_test_target.s rename to ver/us/asm/nonmatchings/1A5830/calc_enemy_test_target.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s b/ver/us/asm/nonmatchings/1A5830/dispatch_damage_event_actor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/dispatch_damage_event_actor.s rename to ver/us/asm/nonmatchings/1A5830/dispatch_damage_event_actor.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/play_hit_sound.s b/ver/us/asm/nonmatchings/1A5830/play_hit_sound.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/play_hit_sound.s rename to ver/us/asm/nonmatchings/1A5830/play_hit_sound.s diff --git a/ver/us/asm/nonmatchings/code_1A5830/update_lerp_battle.s b/ver/us/asm/nonmatchings/1A5830/update_lerp_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1A5830/update_lerp_battle.s rename to ver/us/asm/nonmatchings/1A5830/update_lerp_battle.s diff --git a/ver/us/asm/nonmatchings/code_1AC760/PartnerAfflictEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerAfflictEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1AC760/PartnerAfflictEnemy.s rename to ver/us/asm/nonmatchings/1AC760/PartnerAfflictEnemy.s diff --git a/ver/us/asm/nonmatchings/code_1AC760/PartnerDamageEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerDamageEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1AC760/PartnerDamageEnemy.s rename to ver/us/asm/nonmatchings/1AC760/PartnerDamageEnemy.s diff --git a/ver/us/asm/nonmatchings/code_1AC760/PartnerPowerBounceEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerPowerBounceEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1AC760/PartnerPowerBounceEnemy.s rename to ver/us/asm/nonmatchings/1AC760/PartnerPowerBounceEnemy.s diff --git a/ver/us/asm/nonmatchings/code_1AC760/PartnerTestEnemy.s b/ver/us/asm/nonmatchings/1AC760/PartnerTestEnemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1AC760/PartnerTestEnemy.s rename to ver/us/asm/nonmatchings/1AC760/PartnerTestEnemy.s diff --git a/ver/us/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s b/ver/us/asm/nonmatchings/1AC760/calc_partner_damage_enemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1AC760/calc_partner_damage_enemy.s rename to ver/us/asm/nonmatchings/1AC760/calc_partner_damage_enemy.s diff --git a/ver/us/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s b/ver/us/asm/nonmatchings/1AC760/calc_partner_test_enemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1AC760/calc_partner_test_enemy.s rename to ver/us/asm/nonmatchings/1AC760/calc_partner_test_enemy.s diff --git a/ver/us/asm/nonmatchings/code_1AC760/dispatch_damage_event_partner.s b/ver/us/asm/nonmatchings/1AC760/dispatch_damage_event_partner.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1AC760/dispatch_damage_event_partner.s rename to ver/us/asm/nonmatchings/1AC760/dispatch_damage_event_partner.s diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/MerleeUpdateFX.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/MerleeUpdateFX.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/MerleeUpdateFX.s diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/check_conversation_trigger.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/check_conversation_trigger.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/check_conversation_trigger.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/check_conversation_trigger.s diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/create_encounters.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/create_encounters.s similarity index 99% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/create_encounters.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/create_encounters.s index 5e5e5012eb..716c85a525 100644 --- a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/create_encounters.s +++ b/ver/us/asm/nonmatchings/1a1f0_len_5390/create_encounters.s @@ -267,12 +267,12 @@ glabel create_encounters /* 1EE74 80043A74 14400006 */ bnez $v0, .L80043A90 /* 1EE78 80043A78 00000000 */ nop /* 1EE7C 80043A7C 8E4501C4 */ lw $a1, 0x1c4($s2) -/* 1EE80 80043A80 0C00E219 */ jal create_standard_npc +/* 1EE80 80043A80 0C00E219 */ jal npc_create_standard /* 1EE84 80043A84 03C0202D */ daddu $a0, $fp, $zero /* 1EE88 80043A88 08010EA6 */ j .L80043A98 /* 1EE8C 80043A8C 00000000 */ nop .L80043A90: -/* 1EE90 80043A90 0C00E220 */ jal create_partner_npc +/* 1EE90 80043A90 0C00E220 */ jal npc_create_partner /* 1EE94 80043A94 03C0202D */ daddu $a0, $fp, $zero .L80043A98: /* 1EE98 80043A98 0C00E2B7 */ jal get_npc_by_index diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/draw_encounters_pre_battle.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/draw_encounters_pre_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/draw_encounters_pre_battle.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/draw_encounters_pre_battle.s diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/show_first_strike_message.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/show_first_strike_message.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/show_first_strike_message.s diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_neutral.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_neutral.s diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_post_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_post_battle.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_post_battle.s diff --git a/ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s b/ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_pre_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1a1f0_len_5390/update_encounters_pre_battle.s rename to ver/us/asm/nonmatchings/1a1f0_len_5390/update_encounters_pre_battle.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/func_800271FC.s b/ver/us/asm/nonmatchings/1b40_len_20b0/func_800271FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/func_800271FC.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/func_800271FC.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s b/ver/us/asm/nonmatchings/1b40_len_20b0/func_8002725C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/func_8002725C.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/func_80027600.s b/ver/us/asm/nonmatchings/1b40_len_20b0/func_80027600.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/func_80027600.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/func_80027600.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/func_80027774.s b/ver/us/asm/nonmatchings/1b40_len_20b0/func_80027774.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/func_80027774.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/func_80027774.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s b/ver/us/asm/nonmatchings/1b40_len_20b0/func_800279B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/func_800279B4.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s b/ver/us/asm/nonmatchings/1b40_len_20b0/func_80027BAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/func_80027BAC.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/func_80027BAC.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_background.s b/ver/us/asm/nonmatchings/1b40_len_20b0/gfx_draw_background.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_background.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/gfx_draw_background.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s b/ver/us/asm/nonmatchings/1b40_len_20b0/gfx_draw_frame.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/gfx_draw_frame.s diff --git a/ver/us/asm/nonmatchings/code_1b40_len_20b0/gfx_init_state.s b/ver/us/asm/nonmatchings/1b40_len_20b0/gfx_init_state.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1b40_len_20b0/gfx_init_state.s rename to ver/us/asm/nonmatchings/1b40_len_20b0/gfx_init_state.s diff --git a/ver/us/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s b/ver/us/asm/nonmatchings/1f580_len_1940/BindNpcAI.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s rename to ver/us/asm/nonmatchings/1f580_len_1940/BindNpcAI.s diff --git a/ver/us/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s b/ver/us/asm/nonmatchings/1f580_len_1940/RemoveEncounter.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s rename to ver/us/asm/nonmatchings/1f580_len_1940/RemoveEncounter.s diff --git a/ver/us/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s b/ver/us/asm/nonmatchings/1f580_len_1940/RemoveNpc.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s rename to ver/us/asm/nonmatchings/1f580_len_1940/RemoveNpc.s diff --git a/ver/us/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s b/ver/us/asm/nonmatchings/1f580_len_1940/SetNpcAux.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s rename to ver/us/asm/nonmatchings/1f580_len_1940/SetNpcAux.s diff --git a/ver/us/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s b/ver/us/asm/nonmatchings/1f580_len_1940/StartBossBattle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s rename to ver/us/asm/nonmatchings/1f580_len_1940/StartBossBattle.s diff --git a/ver/us/asm/nonmatchings/code_1f580_len_1940/start_battle.s b/ver/us/asm/nonmatchings/1f580_len_1940/start_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1f580_len_1940/start_battle.s rename to ver/us/asm/nonmatchings/1f580_len_1940/start_battle.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message.s b/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message_string.s b/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_message_string.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_message_string.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_messages.s b/ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_messages.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/draw_merlee_messages.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/draw_merlee_messages.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045AC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045AC0.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045AC0.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045B10.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045B10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045B10.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045B10.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045BC8.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045BC8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045BC8.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045BC8.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045C88.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045C88.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045C88.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045C88.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045CC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045CC4.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045CC4.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045D00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045D00.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045D00.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045D7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045D7C.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045D7C.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80045FB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80045FB4.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80045FB4.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80046030.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80046030.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80046030.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80046030.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800465E0.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_800465E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800465E0.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_800465E0.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047608.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047608.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047608.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800476F4.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_800476F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800476F4.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_800476F4.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_8004778C.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_8004778C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_8004778C.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_8004778C.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800477F4.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_800477F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800477F4.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_800477F4.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047820.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047820.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047820.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047820.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047898.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047898.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047898.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800478F8.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_800478F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800478F8.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_800478F8.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047928.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047928.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047928.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047928.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_800479A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800479A0.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_800479A0.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047A00.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047A00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047A00.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047A00.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047A30.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047A30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047A30.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047A30.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047AA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047AA8.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047AA8.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047B08.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047B08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047B08.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047B08.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047B38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047B38.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047B38.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047B84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047B84.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047B84.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047BE4.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047BE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047BE4.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047BE4.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047C14.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047C14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047C14.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047C14.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047CA4.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047CA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047CA4.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047CA4.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047D00.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047D00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047D00.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047D00.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047D30.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047D30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047D30.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047D30.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047DC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047DC0.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047DC0.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047E1C.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047E1C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047E1C.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047E1C.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047E4C.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047E4C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047E4C.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047E4C.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047EDC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047EDC.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047EDC.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047F28.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047F28.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047F28.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047F28.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047F58.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047F58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047F58.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047F58.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80047FE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80047FE8.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80047FE8.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048034.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80048034.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048034.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80048034.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048064.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80048064.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048064.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80048064.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_800480F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_800480F4.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_800480F4.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048140.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80048140.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048140.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80048140.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048170.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80048170.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048170.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80048170.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_80048200.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_80048200.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_80048200.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s b/ver/us/asm/nonmatchings/20ec0_len_5040/func_8004824C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/func_8004824C.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/func_8004824C.s diff --git a/ver/us/asm/nonmatchings/code_20ec0_len_5040/update_merlee_messages.s b/ver/us/asm/nonmatchings/20ec0_len_5040/update_merlee_messages.s similarity index 100% rename from ver/us/asm/nonmatchings/code_20ec0_len_5040/update_merlee_messages.s rename to ver/us/asm/nonmatchings/20ec0_len_5040/update_merlee_messages.s diff --git a/ver/us/asm/nonmatchings/code_23680/DoBasicAI.s b/ver/us/asm/nonmatchings/23680/DoBasicAI.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/DoBasicAI.s rename to ver/us/asm/nonmatchings/23680/DoBasicAI.s diff --git a/ver/us/asm/nonmatchings/code_23680/func_80048E34.s b/ver/us/asm/nonmatchings/23680/func_80048E34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/func_80048E34.s rename to ver/us/asm/nonmatchings/23680/func_80048E34.s diff --git a/ver/us/asm/nonmatchings/code_23680/func_800490B4.s b/ver/us/asm/nonmatchings/23680/func_800490B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/func_800490B4.s rename to ver/us/asm/nonmatchings/23680/func_800490B4.s diff --git a/ver/us/asm/nonmatchings/code_23680/func_800495A0.s b/ver/us/asm/nonmatchings/23680/func_800495A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/func_800495A0.s rename to ver/us/asm/nonmatchings/23680/func_800495A0.s diff --git a/ver/us/asm/nonmatchings/code_23680/func_800496B8.s b/ver/us/asm/nonmatchings/23680/func_800496B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/func_800496B8.s rename to ver/us/asm/nonmatchings/23680/func_800496B8.s diff --git a/ver/us/asm/nonmatchings/code_23680/func_80049C04.s b/ver/us/asm/nonmatchings/23680/func_80049C04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/func_80049C04.s rename to ver/us/asm/nonmatchings/23680/func_80049C04.s diff --git a/ver/us/asm/nonmatchings/code_23680/func_80049F7C.s b/ver/us/asm/nonmatchings/23680/func_80049F7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/func_80049F7C.s rename to ver/us/asm/nonmatchings/23680/func_80049F7C.s diff --git a/ver/us/asm/nonmatchings/code_23680/func_8004A124.s b/ver/us/asm/nonmatchings/23680/func_8004A124.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/func_8004A124.s rename to ver/us/asm/nonmatchings/23680/func_8004A124.s diff --git a/ver/us/asm/nonmatchings/code_23680/get_coin_drop_amount.s b/ver/us/asm/nonmatchings/23680/get_coin_drop_amount.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/get_coin_drop_amount.s rename to ver/us/asm/nonmatchings/23680/get_coin_drop_amount.s diff --git a/ver/us/asm/nonmatchings/code_23680/spawn_drops.s b/ver/us/asm/nonmatchings/23680/spawn_drops.s similarity index 100% rename from ver/us/asm/nonmatchings/code_23680/spawn_drops.s rename to ver/us/asm/nonmatchings/23680/spawn_drops.s diff --git a/ver/us/asm/nonmatchings/code_25AF0/func_8004A784.s b/ver/us/asm/nonmatchings/25AF0/func_8004A784.s similarity index 100% rename from ver/us/asm/nonmatchings/code_25AF0/func_8004A784.s rename to ver/us/asm/nonmatchings/25AF0/func_8004A784.s diff --git a/ver/us/asm/nonmatchings/code_25f00_len_940/create_audio_system.s b/ver/us/asm/nonmatchings/25f00_len_940/create_audio_system.s similarity index 100% rename from ver/us/asm/nonmatchings/code_25f00_len_940/create_audio_system.s rename to ver/us/asm/nonmatchings/25f00_len_940/create_audio_system.s diff --git a/ver/us/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s b/ver/us/asm/nonmatchings/25f00_len_940/func_8004AE08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_25f00_len_940/func_8004AE08.s rename to ver/us/asm/nonmatchings/25f00_len_940/func_8004AE08.s diff --git a/ver/us/asm/nonmatchings/code_25f00_len_940/func_8004B328.s b/ver/us/asm/nonmatchings/25f00_len_940/func_8004B328.s similarity index 100% rename from ver/us/asm/nonmatchings/code_25f00_len_940/func_8004B328.s rename to ver/us/asm/nonmatchings/25f00_len_940/func_8004B328.s diff --git a/ver/us/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s b/ver/us/asm/nonmatchings/25f00_len_940/nuAuDmaCallBack.s similarity index 100% rename from ver/us/asm/nonmatchings/code_25f00_len_940/nuAuDmaCallBack.s rename to ver/us/asm/nonmatchings/25f00_len_940/nuAuDmaCallBack.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004B748.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004B748.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004B748.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004BA74.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004BA74.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004BA74.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C0E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C0E4.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C0E4.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C268.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C268.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C268.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C2A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C2A4.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C2A4.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C300.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C300.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C300.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C444.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C444.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C444.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C578.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C578.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C578.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C844.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C844.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C844.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C844.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004C884.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004C884.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004C884.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CD94.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004CD94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CD94.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004CD94.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CDF8.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004CDF8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CDF8.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004CDF8.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CE70.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004CE70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CE70.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004CE70.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CEA4.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004CEA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CEA4.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004CEA4.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CEC4.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004CEC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CEC4.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004CEC4.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CF0C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004CF0C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CF0C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004CF0C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CF3C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004CF3C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004CF3C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004CF3C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D00C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D00C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D00C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D00C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D038.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D038.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D038.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D038.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D050.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D050.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D050.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D050.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D07C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D07C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D07C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D07C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D114.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D114.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D114.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D114.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D130.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D130.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D130.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D15C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D15C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D15C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D15C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D180.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D180.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D180.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D180.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D1B4.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D1B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D1B4.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D1B4.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D23C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D23C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D23C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D23C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D2B0.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D2B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D2B0.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D2B0.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D2E4.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D2E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D2E4.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D2E4.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D310.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D310.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D310.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D324.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D324.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D324.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D324.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D33C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D33C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D33C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D33C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D354.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D354.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D354.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D354.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D36C.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D36C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D36C.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D36C.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D3A0.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D3A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D3A0.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D3A0.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D3F8.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D3F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D3F8.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D3F8.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D428.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D428.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D428.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D428.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D484.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D484.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D484.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D484.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s b/ver/us/asm/nonmatchings/26840_len_20d0/func_8004D4BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/func_8004D4BC.s rename to ver/us/asm/nonmatchings/26840_len_20d0/func_8004D4BC.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_load_sfx_groups_from_SEF.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_load_sfx_groups_from_SEF.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/snd_load_sfx_groups_from_SEF.s rename to ver/us/asm/nonmatchings/26840_len_20d0/snd_load_sfx_groups_from_SEF.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_modifiers.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_set_modifiers.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_modifiers.s rename to ver/us/asm/nonmatchings/26840_len_20d0/snd_set_modifiers.s diff --git a/ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_player_modifiers.s b/ver/us/asm/nonmatchings/26840_len_20d0/snd_set_player_modifiers.s similarity index 100% rename from ver/us/asm/nonmatchings/code_26840_len_20d0/snd_set_player_modifiers.s rename to ver/us/asm/nonmatchings/26840_len_20d0/snd_set_player_modifiers.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D510.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004D510.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D510.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004D510.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004D7E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004D7E0.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DA74.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DA74.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DAE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DAE0.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DB28.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB28.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DB28.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DB4C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DB4C.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DB4C.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DC80.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DC80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DC80.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DC80.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DCB8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DCB8.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DCB8.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DE2C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DE2C.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004DFD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004DFD4.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004DFD4.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004E0F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E0F4.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004E0F4.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E344.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004E344.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E344.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004E344.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004E4B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004E4B8.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E844.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004E844.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E844.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004E844.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E880.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004E880.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E880.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004E880.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E904.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004E904.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004E904.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004E904.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004EA34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004EA34.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004EAD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004EAD4.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC04.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004EC04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC04.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004EC04.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8004EC68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8004EC68.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8004EC68.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050568.s b/ver/us/asm/nonmatchings/28910_len_5090/func_80050568.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_80050568.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_80050568.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800505E4.s b/ver/us/asm/nonmatchings/28910_len_5090/func_800505E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_800505E4.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_800505E4.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050654.s b/ver/us/asm/nonmatchings/28910_len_5090/func_80050654.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_80050654.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_80050654.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8005068C.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8005068C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8005068C.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8005068C.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_800506C8.s b/ver/us/asm/nonmatchings/28910_len_5090/func_800506C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_800506C8.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_800506C8.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_8005087C.s b/ver/us/asm/nonmatchings/28910_len_5090/func_8005087C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_8005087C.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_8005087C.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050888.s b/ver/us/asm/nonmatchings/28910_len_5090/func_80050888.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_80050888.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_80050888.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050900.s b/ver/us/asm/nonmatchings/28910_len_5090/func_80050900.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_80050900.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_80050900.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/func_80050970.s b/ver/us/asm/nonmatchings/28910_len_5090/func_80050970.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/func_80050970.s rename to ver/us/asm/nonmatchings/28910_len_5090/func_80050970.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F5_TrackVoice.s b/ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_F5_TrackVoice.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_F5_TrackVoice.s rename to ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_F5_TrackVoice.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FC_Jump.s b/ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_FC_Jump.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FC_Jump.s rename to ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_FC_Jump.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FD.s b/ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_FD.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FD.s rename to ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_FD.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FF.s b/ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_FF.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/snd_BGMCmd_FF.s rename to ver/us/asm/nonmatchings/28910_len_5090/snd_BGMCmd_FF.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/snd_get_player_with_song_name.s b/ver/us/asm/nonmatchings/28910_len_5090/snd_get_player_with_song_name.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/snd_get_player_with_song_name.s rename to ver/us/asm/nonmatchings/28910_len_5090/snd_get_player_with_song_name.s diff --git a/ver/us/asm/nonmatchings/code_28910_len_5090/snd_initialize_bgm_player.s b/ver/us/asm/nonmatchings/28910_len_5090/snd_initialize_bgm_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_28910_len_5090/snd_initialize_bgm_player.s rename to ver/us/asm/nonmatchings/28910_len_5090/snd_initialize_bgm_player.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050B90.s b/ver/us/asm/nonmatchings/2BF90/func_80050B90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050B90.s rename to ver/us/asm/nonmatchings/2BF90/func_80050B90.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050C64.s b/ver/us/asm/nonmatchings/2BF90/func_80050C64.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050C64.s rename to ver/us/asm/nonmatchings/2BF90/func_80050C64.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050CA0.s b/ver/us/asm/nonmatchings/2BF90/func_80050CA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050CA0.s rename to ver/us/asm/nonmatchings/2BF90/func_80050CA0.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050D50.s b/ver/us/asm/nonmatchings/2BF90/func_80050D50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050D50.s rename to ver/us/asm/nonmatchings/2BF90/func_80050D50.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050E18.s b/ver/us/asm/nonmatchings/2BF90/func_80050E18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050E18.s rename to ver/us/asm/nonmatchings/2BF90/func_80050E18.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050E84.s b/ver/us/asm/nonmatchings/2BF90/func_80050E84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050E84.s rename to ver/us/asm/nonmatchings/2BF90/func_80050E84.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050EF0.s b/ver/us/asm/nonmatchings/2BF90/func_80050EF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050EF0.s rename to ver/us/asm/nonmatchings/2BF90/func_80050EF0.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050F64.s b/ver/us/asm/nonmatchings/2BF90/func_80050F64.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050F64.s rename to ver/us/asm/nonmatchings/2BF90/func_80050F64.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80050FD0.s b/ver/us/asm/nonmatchings/2BF90/func_80050FD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80050FD0.s rename to ver/us/asm/nonmatchings/2BF90/func_80050FD0.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80051050.s b/ver/us/asm/nonmatchings/2BF90/func_80051050.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80051050.s rename to ver/us/asm/nonmatchings/2BF90/func_80051050.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_800510A4.s b/ver/us/asm/nonmatchings/2BF90/func_800510A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_800510A4.s rename to ver/us/asm/nonmatchings/2BF90/func_800510A4.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80051334.s b/ver/us/asm/nonmatchings/2BF90/func_80051334.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80051334.s rename to ver/us/asm/nonmatchings/2BF90/func_80051334.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_80051434.s b/ver/us/asm/nonmatchings/2BF90/func_80051434.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_80051434.s rename to ver/us/asm/nonmatchings/2BF90/func_80051434.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_800521D0.s b/ver/us/asm/nonmatchings/2BF90/func_800521D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_800521D0.s rename to ver/us/asm/nonmatchings/2BF90/func_800521D0.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_800521E8.s b/ver/us/asm/nonmatchings/2BF90/func_800521E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_800521E8.s rename to ver/us/asm/nonmatchings/2BF90/func_800521E8.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_800522A8.s b/ver/us/asm/nonmatchings/2BF90/func_800522A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_800522A8.s rename to ver/us/asm/nonmatchings/2BF90/func_800522A8.s diff --git a/ver/us/asm/nonmatchings/code_2BF90/func_8005232C.s b/ver/us/asm/nonmatchings/2BF90/func_8005232C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2BF90/func_8005232C.s rename to ver/us/asm/nonmatchings/2BF90/func_8005232C.s diff --git a/ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s b/ver/us/asm/nonmatchings/2d9a0_len_890/func_80052660.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052660.s rename to ver/us/asm/nonmatchings/2d9a0_len_890/func_80052660.s diff --git a/ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s b/ver/us/asm/nonmatchings/2d9a0_len_890/func_80052BF8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052BF8.s rename to ver/us/asm/nonmatchings/2d9a0_len_890/func_80052BF8.s diff --git a/ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s b/ver/us/asm/nonmatchings/2d9a0_len_890/func_80052CFC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052CFC.s rename to ver/us/asm/nonmatchings/2d9a0_len_890/func_80052CFC.s diff --git a/ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052E18.s b/ver/us/asm/nonmatchings/2d9a0_len_890/func_80052E18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2d9a0_len_890/func_80052E18.s rename to ver/us/asm/nonmatchings/2d9a0_len_890/func_80052E18.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_800538F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_800538F8.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_800538F8.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_80053BE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053BE8.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_80053BE8.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_80053E58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053E58.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_80053E58.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_80053F80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80053F80.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_80053F80.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054AA0.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_80054AA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054AA0.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_80054AA0.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_80054C84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054C84.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_80054C84.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_80054CE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054CE0.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_80054CE0.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s b/ver/us/asm/nonmatchings/2e230_len_2190/func_80054DA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/func_80054DA8.s rename to ver/us/asm/nonmatchings/2e230_len_2190/func_80054DA8.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_fetch_SBN_file.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_fetch_SBN_file.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_fetch_SBN_file.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_fetch_SBN_file.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BGM.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_load_BGM.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BGM.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_load_BGM.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BK_to_bank.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_load_BK_to_bank.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_BK_to_bank.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_load_BK_to_bank.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_INIT.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_load_INIT.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_INIT.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_load_INIT.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PER.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_load_PER.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PER.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_load_PER.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PRG.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_load_PRG.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_PRG.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_load_PRG.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_song_files.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_load_song_files.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_load_song_files.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_load_song_files.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_memset.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_memset.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_memset.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_memset.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_read_rom.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_read_rom.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_read_rom.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_read_rom.s diff --git a/ver/us/asm/nonmatchings/code_2e230_len_2190/snd_swizzle_BK_instruments.s b/ver/us/asm/nonmatchings/2e230_len_2190/snd_swizzle_BK_instruments.s similarity index 100% rename from ver/us/asm/nonmatchings/code_2e230_len_2190/snd_swizzle_BK_instruments.s rename to ver/us/asm/nonmatchings/2e230_len_2190/snd_swizzle_BK_instruments.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_8005591C.s b/ver/us/asm/nonmatchings/30450/func_8005591C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_8005591C.s rename to ver/us/asm/nonmatchings/30450/func_8005591C.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055970.s b/ver/us/asm/nonmatchings/30450/func_80055970.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055970.s rename to ver/us/asm/nonmatchings/30450/func_80055970.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055A18.s b/ver/us/asm/nonmatchings/30450/func_80055A18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055A18.s rename to ver/us/asm/nonmatchings/30450/func_80055A18.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055A6C.s b/ver/us/asm/nonmatchings/30450/func_80055A6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055A6C.s rename to ver/us/asm/nonmatchings/30450/func_80055A6C.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055ABC.s b/ver/us/asm/nonmatchings/30450/func_80055ABC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055ABC.s rename to ver/us/asm/nonmatchings/30450/func_80055ABC.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055AF0.s b/ver/us/asm/nonmatchings/30450/func_80055AF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055AF0.s rename to ver/us/asm/nonmatchings/30450/func_80055AF0.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055B28.s b/ver/us/asm/nonmatchings/30450/func_80055B28.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055B28.s rename to ver/us/asm/nonmatchings/30450/func_80055B28.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055B80.s b/ver/us/asm/nonmatchings/30450/func_80055B80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055B80.s rename to ver/us/asm/nonmatchings/30450/func_80055B80.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055BB8.s b/ver/us/asm/nonmatchings/30450/func_80055BB8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055BB8.s rename to ver/us/asm/nonmatchings/30450/func_80055BB8.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055BF0.s b/ver/us/asm/nonmatchings/30450/func_80055BF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055BF0.s rename to ver/us/asm/nonmatchings/30450/func_80055BF0.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055C2C.s b/ver/us/asm/nonmatchings/30450/func_80055C2C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055C2C.s rename to ver/us/asm/nonmatchings/30450/func_80055C2C.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055C64.s b/ver/us/asm/nonmatchings/30450/func_80055C64.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055C64.s rename to ver/us/asm/nonmatchings/30450/func_80055C64.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055C94.s b/ver/us/asm/nonmatchings/30450/func_80055C94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055C94.s rename to ver/us/asm/nonmatchings/30450/func_80055C94.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055CC4.s b/ver/us/asm/nonmatchings/30450/func_80055CC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055CC4.s rename to ver/us/asm/nonmatchings/30450/func_80055CC4.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_80055CE8.s b/ver/us/asm/nonmatchings/30450/func_80055CE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_80055CE8.s rename to ver/us/asm/nonmatchings/30450/func_80055CE8.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_800560BC.s b/ver/us/asm/nonmatchings/30450/func_800560BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_800560BC.s rename to ver/us/asm/nonmatchings/30450/func_800560BC.s diff --git a/ver/us/asm/nonmatchings/code_30450/func_8005610C.s b/ver/us/asm/nonmatchings/30450/func_8005610C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_30450/func_8005610C.s rename to ver/us/asm/nonmatchings/30450/func_8005610C.s diff --git a/ver/us/asm/nonmatchings/code_31650/alAudioFrame.s b/ver/us/asm/nonmatchings/31650/alAudioFrame.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/alAudioFrame.s rename to ver/us/asm/nonmatchings/31650/alAudioFrame.s diff --git a/ver/us/asm/nonmatchings/code_31650/alHeapInit.s b/ver/us/asm/nonmatchings/31650/alHeapInit.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/alHeapInit.s rename to ver/us/asm/nonmatchings/31650/alHeapInit.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80056250.s b/ver/us/asm/nonmatchings/31650/func_80056250.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80056250.s rename to ver/us/asm/nonmatchings/31650/func_80056250.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80056D5C.s b/ver/us/asm/nonmatchings/31650/func_80056D5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80056D5C.s rename to ver/us/asm/nonmatchings/31650/func_80056D5C.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80056E34.s b/ver/us/asm/nonmatchings/31650/func_80056E34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80056E34.s rename to ver/us/asm/nonmatchings/31650/func_80056E34.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80056EE8.s b/ver/us/asm/nonmatchings/31650/func_80056EE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80056EE8.s rename to ver/us/asm/nonmatchings/31650/func_80056EE8.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80056FA4.s b/ver/us/asm/nonmatchings/31650/func_80056FA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80056FA4.s rename to ver/us/asm/nonmatchings/31650/func_80056FA4.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80057224.s b/ver/us/asm/nonmatchings/31650/func_80057224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80057224.s rename to ver/us/asm/nonmatchings/31650/func_80057224.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_8005736C.s b/ver/us/asm/nonmatchings/31650/func_8005736C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_8005736C.s rename to ver/us/asm/nonmatchings/31650/func_8005736C.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80057548.s b/ver/us/asm/nonmatchings/31650/func_80057548.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80057548.s rename to ver/us/asm/nonmatchings/31650/func_80057548.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_800576EC.s b/ver/us/asm/nonmatchings/31650/func_800576EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_800576EC.s rename to ver/us/asm/nonmatchings/31650/func_800576EC.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80057874.s b/ver/us/asm/nonmatchings/31650/func_80057874.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80057874.s rename to ver/us/asm/nonmatchings/31650/func_80057874.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_800579D8.s b/ver/us/asm/nonmatchings/31650/func_800579D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_800579D8.s rename to ver/us/asm/nonmatchings/31650/func_800579D8.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80057C54.s b/ver/us/asm/nonmatchings/31650/func_80057C54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80057C54.s rename to ver/us/asm/nonmatchings/31650/func_80057C54.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80057D0C.s b/ver/us/asm/nonmatchings/31650/func_80057D0C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80057D0C.s rename to ver/us/asm/nonmatchings/31650/func_80057D0C.s diff --git a/ver/us/asm/nonmatchings/code_31650/func_80058004.s b/ver/us/asm/nonmatchings/31650/func_80058004.s similarity index 100% rename from ver/us/asm/nonmatchings/code_31650/func_80058004.s rename to ver/us/asm/nonmatchings/31650/func_80058004.s diff --git a/ver/us/asm/nonmatchings/code_3169f0/func_80200000.s b/ver/us/asm/nonmatchings/3169f0/func_80200000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3169f0/func_80200000.s rename to ver/us/asm/nonmatchings/3169f0/func_80200000.s diff --git a/ver/us/asm/nonmatchings/code_316C00/func_802AE000_316C00.s b/ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_316C00/func_802AE000_316C00.s rename to ver/us/asm/nonmatchings/316C00/func_802AE000_316C00.s diff --git a/ver/us/asm/nonmatchings/code_316a70/func_80200080.s b/ver/us/asm/nonmatchings/316a70/func_80200080.s similarity index 100% rename from ver/us/asm/nonmatchings/code_316a70/func_80200080.s rename to ver/us/asm/nonmatchings/316a70/func_80200080.s diff --git a/ver/us/asm/nonmatchings/code_316d90/func_802AE000.s b/ver/us/asm/nonmatchings/316d90/func_802AE000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_316d90/func_802AE000.s rename to ver/us/asm/nonmatchings/316d90/func_802AE000.s diff --git a/ver/us/asm/nonmatchings/code_325AD0/func_E0200000.s b/ver/us/asm/nonmatchings/325AD0/func_E0200000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325AD0/func_E0200000.s rename to ver/us/asm/nonmatchings/325AD0/func_E0200000.s diff --git a/ver/us/asm/nonmatchings/code_325AD0/func_E0200044.s b/ver/us/asm/nonmatchings/325AD0/func_E0200044.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325AD0/func_E0200044.s rename to ver/us/asm/nonmatchings/325AD0/func_E0200044.s diff --git a/ver/us/asm/nonmatchings/code_325AD0/func_E02000AC.s b/ver/us/asm/nonmatchings/325AD0/func_E02000AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325AD0/func_E02000AC.s rename to ver/us/asm/nonmatchings/325AD0/func_E02000AC.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200410.s b/ver/us/asm/nonmatchings/325EE0/func_E0200410.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200410.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200410.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200420.s b/ver/us/asm/nonmatchings/325EE0/func_E0200420.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200420.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200420.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200430.s b/ver/us/asm/nonmatchings/325EE0/func_E0200430.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200430.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200430.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200440.s b/ver/us/asm/nonmatchings/325EE0/func_E0200440.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200440.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200440.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200450.s b/ver/us/asm/nonmatchings/325EE0/func_E0200450.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200450.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200450.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200460.s b/ver/us/asm/nonmatchings/325EE0/func_E0200460.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200460.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200460.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200470.s b/ver/us/asm/nonmatchings/325EE0/func_E0200470.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200470.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200470.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200480.s b/ver/us/asm/nonmatchings/325EE0/func_E0200480.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200480.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200480.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200490.s b/ver/us/asm/nonmatchings/325EE0/func_E0200490.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200490.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200490.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02004A0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02004A0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02004A0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02004B0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02004B0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02004B0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02004C0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02004C0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02004C0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02004D0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02004D0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02004D0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02004E0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02004E0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02004E0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02004F0.s b/ver/us/asm/nonmatchings/325EE0/func_E02004F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02004F0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02004F0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200500.s b/ver/us/asm/nonmatchings/325EE0/func_E0200500.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200500.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200500.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200510.s b/ver/us/asm/nonmatchings/325EE0/func_E0200510.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200510.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200510.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200520.s b/ver/us/asm/nonmatchings/325EE0/func_E0200520.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200520.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200520.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200530.s b/ver/us/asm/nonmatchings/325EE0/func_E0200530.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200530.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200530.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200540.s b/ver/us/asm/nonmatchings/325EE0/func_E0200540.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200540.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200540.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200550.s b/ver/us/asm/nonmatchings/325EE0/func_E0200550.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200550.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200550.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200560.s b/ver/us/asm/nonmatchings/325EE0/func_E0200560.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200560.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200560.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200570.s b/ver/us/asm/nonmatchings/325EE0/func_E0200570.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200570.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200570.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200580.s b/ver/us/asm/nonmatchings/325EE0/func_E0200580.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200580.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200580.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200590.s b/ver/us/asm/nonmatchings/325EE0/func_E0200590.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200590.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200590.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02005A0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02005A0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02005A0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02005B0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02005B0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02005B0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02005C0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02005C0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02005C0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02005D0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02005D0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02005D0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02005E0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02005E0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02005E0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E02005F0.s b/ver/us/asm/nonmatchings/325EE0/func_E02005F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E02005F0.s rename to ver/us/asm/nonmatchings/325EE0/func_E02005F0.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200600.s b/ver/us/asm/nonmatchings/325EE0/func_E0200600.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200600.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200600.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200610.s b/ver/us/asm/nonmatchings/325EE0/func_E0200610.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200610.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200610.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200620.s b/ver/us/asm/nonmatchings/325EE0/func_E0200620.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200620.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200620.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200630.s b/ver/us/asm/nonmatchings/325EE0/func_E0200630.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200630.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200630.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200640.s b/ver/us/asm/nonmatchings/325EE0/func_E0200640.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200640.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200640.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200650.s b/ver/us/asm/nonmatchings/325EE0/func_E0200650.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200650.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200650.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200660.s b/ver/us/asm/nonmatchings/325EE0/func_E0200660.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200660.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200660.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200670.s b/ver/us/asm/nonmatchings/325EE0/func_E0200670.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200670.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200670.s diff --git a/ver/us/asm/nonmatchings/code_325EE0/func_E0200680.s b/ver/us/asm/nonmatchings/325EE0/func_E0200680.s similarity index 100% rename from ver/us/asm/nonmatchings/code_325EE0/func_E0200680.s rename to ver/us/asm/nonmatchings/325EE0/func_E0200680.s diff --git a/ver/us/asm/nonmatchings/code_3278F0/func_E0002000.s b/ver/us/asm/nonmatchings/3278F0/func_E0002000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3278F0/func_E0002000.s rename to ver/us/asm/nonmatchings/3278F0/func_E0002000.s diff --git a/ver/us/asm/nonmatchings/code_3278F0/func_E00021BC.s b/ver/us/asm/nonmatchings/3278F0/func_E00021BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3278F0/func_E00021BC.s rename to ver/us/asm/nonmatchings/3278F0/func_E00021BC.s diff --git a/ver/us/asm/nonmatchings/code_3278F0/func_E00022BC.s b/ver/us/asm/nonmatchings/3278F0/func_E00022BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3278F0/func_E00022BC.s rename to ver/us/asm/nonmatchings/3278F0/func_E00022BC.s diff --git a/ver/us/asm/nonmatchings/code_3278F0/func_E0002300.s b/ver/us/asm/nonmatchings/3278F0/func_E0002300.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3278F0/func_E0002300.s rename to ver/us/asm/nonmatchings/3278F0/func_E0002300.s diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C000.s b/ver/us/asm/nonmatchings/328110/func_E000C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_328110/func_E000C000.s rename to ver/us/asm/nonmatchings/328110/func_E000C000.s diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C094.s b/ver/us/asm/nonmatchings/328110/func_E000C094.s similarity index 100% rename from ver/us/asm/nonmatchings/code_328110/func_E000C094.s rename to ver/us/asm/nonmatchings/328110/func_E000C094.s diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C0C8.s b/ver/us/asm/nonmatchings/328110/func_E000C0C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_328110/func_E000C0C8.s rename to ver/us/asm/nonmatchings/328110/func_E000C0C8.s diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C160.s b/ver/us/asm/nonmatchings/328110/func_E000C160.s similarity index 100% rename from ver/us/asm/nonmatchings/code_328110/func_E000C160.s rename to ver/us/asm/nonmatchings/328110/func_E000C160.s diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C654.s b/ver/us/asm/nonmatchings/328110/func_E000C654.s similarity index 100% rename from ver/us/asm/nonmatchings/code_328110/func_E000C654.s rename to ver/us/asm/nonmatchings/328110/func_E000C654.s diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C754.s b/ver/us/asm/nonmatchings/328110/func_E000C754.s similarity index 100% rename from ver/us/asm/nonmatchings/code_328110/func_E000C754.s rename to ver/us/asm/nonmatchings/328110/func_E000C754.s diff --git a/ver/us/asm/nonmatchings/code_328110/func_E000C798.s b/ver/us/asm/nonmatchings/328110/func_E000C798.s similarity index 100% rename from ver/us/asm/nonmatchings/code_328110/func_E000C798.s rename to ver/us/asm/nonmatchings/328110/func_E000C798.s diff --git a/ver/us/asm/nonmatchings/code_32C110/func_E000E000.s b/ver/us/asm/nonmatchings/32C110/func_E000E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C110/func_E000E000.s rename to ver/us/asm/nonmatchings/32C110/func_E000E000.s diff --git a/ver/us/asm/nonmatchings/code_32C110/func_E000E174.s b/ver/us/asm/nonmatchings/32C110/func_E000E174.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C110/func_E000E174.s rename to ver/us/asm/nonmatchings/32C110/func_E000E174.s diff --git a/ver/us/asm/nonmatchings/code_32C110/func_E000E244.s b/ver/us/asm/nonmatchings/32C110/func_E000E244.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C110/func_E000E244.s rename to ver/us/asm/nonmatchings/32C110/func_E000E244.s diff --git a/ver/us/asm/nonmatchings/code_32C110/func_E000E288.s b/ver/us/asm/nonmatchings/32C110/func_E000E288.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C110/func_E000E288.s rename to ver/us/asm/nonmatchings/32C110/func_E000E288.s diff --git a/ver/us/asm/nonmatchings/code_32C7A0/func_E0010000.s b/ver/us/asm/nonmatchings/32C7A0/func_E0010000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C7A0/func_E0010000.s rename to ver/us/asm/nonmatchings/32C7A0/func_E0010000.s diff --git a/ver/us/asm/nonmatchings/code_32C7A0/func_E0010104.s b/ver/us/asm/nonmatchings/32C7A0/func_E0010104.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C7A0/func_E0010104.s rename to ver/us/asm/nonmatchings/32C7A0/func_E0010104.s diff --git a/ver/us/asm/nonmatchings/code_32C7A0/func_E00101E8.s b/ver/us/asm/nonmatchings/32C7A0/func_E00101E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C7A0/func_E00101E8.s rename to ver/us/asm/nonmatchings/32C7A0/func_E00101E8.s diff --git a/ver/us/asm/nonmatchings/code_32C7A0/func_E00103F4.s b/ver/us/asm/nonmatchings/32C7A0/func_E00103F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C7A0/func_E00103F4.s rename to ver/us/asm/nonmatchings/32C7A0/func_E00103F4.s diff --git a/ver/us/asm/nonmatchings/code_32C7A0/func_E00104B0.s b/ver/us/asm/nonmatchings/32C7A0/func_E00104B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C7A0/func_E00104B0.s rename to ver/us/asm/nonmatchings/32C7A0/func_E00104B0.s diff --git a/ver/us/asm/nonmatchings/code_32C7A0/func_E00104F4.s b/ver/us/asm/nonmatchings/32C7A0/func_E00104F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C7A0/func_E00104F4.s rename to ver/us/asm/nonmatchings/32C7A0/func_E00104F4.s diff --git a/ver/us/asm/nonmatchings/code_32C7A0/func_E0010510.s b/ver/us/asm/nonmatchings/32C7A0/func_E0010510.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32C7A0/func_E0010510.s rename to ver/us/asm/nonmatchings/32C7A0/func_E0010510.s diff --git a/ver/us/asm/nonmatchings/code_32DD10/func_E0012000.s b/ver/us/asm/nonmatchings/32DD10/func_E0012000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32DD10/func_E0012000.s rename to ver/us/asm/nonmatchings/32DD10/func_E0012000.s diff --git a/ver/us/asm/nonmatchings/code_32DD10/func_E0012104.s b/ver/us/asm/nonmatchings/32DD10/func_E0012104.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32DD10/func_E0012104.s rename to ver/us/asm/nonmatchings/32DD10/func_E0012104.s diff --git a/ver/us/asm/nonmatchings/code_32DD10/func_E0012204.s b/ver/us/asm/nonmatchings/32DD10/func_E0012204.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32DD10/func_E0012204.s rename to ver/us/asm/nonmatchings/32DD10/func_E0012204.s diff --git a/ver/us/asm/nonmatchings/code_32DD10/func_E0012448.s b/ver/us/asm/nonmatchings/32DD10/func_E0012448.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32DD10/func_E0012448.s rename to ver/us/asm/nonmatchings/32DD10/func_E0012448.s diff --git a/ver/us/asm/nonmatchings/code_32DD10/func_E0012504.s b/ver/us/asm/nonmatchings/32DD10/func_E0012504.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32DD10/func_E0012504.s rename to ver/us/asm/nonmatchings/32DD10/func_E0012504.s diff --git a/ver/us/asm/nonmatchings/code_32DD10/func_E0012548.s b/ver/us/asm/nonmatchings/32DD10/func_E0012548.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32DD10/func_E0012548.s rename to ver/us/asm/nonmatchings/32DD10/func_E0012548.s diff --git a/ver/us/asm/nonmatchings/code_32DD10/func_E0012564.s b/ver/us/asm/nonmatchings/32DD10/func_E0012564.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32DD10/func_E0012564.s rename to ver/us/asm/nonmatchings/32DD10/func_E0012564.s diff --git a/ver/us/asm/nonmatchings/code_32E490/func_E0014000.s b/ver/us/asm/nonmatchings/32E490/func_E0014000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32E490/func_E0014000.s rename to ver/us/asm/nonmatchings/32E490/func_E0014000.s diff --git a/ver/us/asm/nonmatchings/code_32E490/func_E0014260.s b/ver/us/asm/nonmatchings/32E490/func_E0014260.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32E490/func_E0014260.s rename to ver/us/asm/nonmatchings/32E490/func_E0014260.s diff --git a/ver/us/asm/nonmatchings/code_32E490/func_E001449C.s b/ver/us/asm/nonmatchings/32E490/func_E001449C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32E490/func_E001449C.s rename to ver/us/asm/nonmatchings/32E490/func_E001449C.s diff --git a/ver/us/asm/nonmatchings/code_32E490/func_E00144E0.s b/ver/us/asm/nonmatchings/32E490/func_E00144E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32E490/func_E00144E0.s rename to ver/us/asm/nonmatchings/32E490/func_E00144E0.s diff --git a/ver/us/asm/nonmatchings/code_32EE30/func_E0016000.s b/ver/us/asm/nonmatchings/32EE30/func_E0016000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32EE30/func_E0016000.s rename to ver/us/asm/nonmatchings/32EE30/func_E0016000.s diff --git a/ver/us/asm/nonmatchings/code_32EE30/func_E0016228.s b/ver/us/asm/nonmatchings/32EE30/func_E0016228.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32EE30/func_E0016228.s rename to ver/us/asm/nonmatchings/32EE30/func_E0016228.s diff --git a/ver/us/asm/nonmatchings/code_32EE30/func_E0016410.s b/ver/us/asm/nonmatchings/32EE30/func_E0016410.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32EE30/func_E0016410.s rename to ver/us/asm/nonmatchings/32EE30/func_E0016410.s diff --git a/ver/us/asm/nonmatchings/code_32EE30/func_E0016454.s b/ver/us/asm/nonmatchings/32EE30/func_E0016454.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32EE30/func_E0016454.s rename to ver/us/asm/nonmatchings/32EE30/func_E0016454.s diff --git a/ver/us/asm/nonmatchings/code_32F580/func_E0018000.s b/ver/us/asm/nonmatchings/32F580/func_E0018000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32F580/func_E0018000.s rename to ver/us/asm/nonmatchings/32F580/func_E0018000.s diff --git a/ver/us/asm/nonmatchings/code_32F580/func_E0018078.s b/ver/us/asm/nonmatchings/32F580/func_E0018078.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32F580/func_E0018078.s rename to ver/us/asm/nonmatchings/32F580/func_E0018078.s diff --git a/ver/us/asm/nonmatchings/code_32F580/func_E00182B4.s b/ver/us/asm/nonmatchings/32F580/func_E00182B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32F580/func_E00182B4.s rename to ver/us/asm/nonmatchings/32F580/func_E00182B4.s diff --git a/ver/us/asm/nonmatchings/code_32F580/func_E0018378.s b/ver/us/asm/nonmatchings/32F580/func_E0018378.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32F580/func_E0018378.s rename to ver/us/asm/nonmatchings/32F580/func_E0018378.s diff --git a/ver/us/asm/nonmatchings/code_32F580/func_E00183BC.s b/ver/us/asm/nonmatchings/32F580/func_E00183BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32F580/func_E00183BC.s rename to ver/us/asm/nonmatchings/32F580/func_E00183BC.s diff --git a/ver/us/asm/nonmatchings/code_32F580/func_E00183D8.s b/ver/us/asm/nonmatchings/32F580/func_E00183D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32F580/func_E00183D8.s rename to ver/us/asm/nonmatchings/32F580/func_E00183D8.s diff --git a/ver/us/asm/nonmatchings/code_32FE30/func_E001A000.s b/ver/us/asm/nonmatchings/32FE30/func_E001A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32FE30/func_E001A000.s rename to ver/us/asm/nonmatchings/32FE30/func_E001A000.s diff --git a/ver/us/asm/nonmatchings/code_32FE30/func_E001A224.s b/ver/us/asm/nonmatchings/32FE30/func_E001A224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32FE30/func_E001A224.s rename to ver/us/asm/nonmatchings/32FE30/func_E001A224.s diff --git a/ver/us/asm/nonmatchings/code_32FE30/func_E001A3FC.s b/ver/us/asm/nonmatchings/32FE30/func_E001A3FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32FE30/func_E001A3FC.s rename to ver/us/asm/nonmatchings/32FE30/func_E001A3FC.s diff --git a/ver/us/asm/nonmatchings/code_32FE30/func_E001A440.s b/ver/us/asm/nonmatchings/32FE30/func_E001A440.s similarity index 100% rename from ver/us/asm/nonmatchings/code_32FE30/func_E001A440.s rename to ver/us/asm/nonmatchings/32FE30/func_E001A440.s diff --git a/ver/us/asm/nonmatchings/code_330910/func_E001C000.s b/ver/us/asm/nonmatchings/330910/func_E001C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_330910/func_E001C000.s rename to ver/us/asm/nonmatchings/330910/func_E001C000.s diff --git a/ver/us/asm/nonmatchings/code_330910/func_E001C128.s b/ver/us/asm/nonmatchings/330910/func_E001C128.s similarity index 100% rename from ver/us/asm/nonmatchings/code_330910/func_E001C128.s rename to ver/us/asm/nonmatchings/330910/func_E001C128.s diff --git a/ver/us/asm/nonmatchings/code_330910/func_E001C200.s b/ver/us/asm/nonmatchings/330910/func_E001C200.s similarity index 100% rename from ver/us/asm/nonmatchings/code_330910/func_E001C200.s rename to ver/us/asm/nonmatchings/330910/func_E001C200.s diff --git a/ver/us/asm/nonmatchings/code_330910/func_E001C30C.s b/ver/us/asm/nonmatchings/330910/func_E001C30C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_330910/func_E001C30C.s rename to ver/us/asm/nonmatchings/330910/func_E001C30C.s diff --git a/ver/us/asm/nonmatchings/code_331940/func_E001E000.s b/ver/us/asm/nonmatchings/331940/func_E001E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_331940/func_E001E000.s rename to ver/us/asm/nonmatchings/331940/func_E001E000.s diff --git a/ver/us/asm/nonmatchings/code_331940/func_E001E378.s b/ver/us/asm/nonmatchings/331940/func_E001E378.s similarity index 100% rename from ver/us/asm/nonmatchings/code_331940/func_E001E378.s rename to ver/us/asm/nonmatchings/331940/func_E001E378.s diff --git a/ver/us/asm/nonmatchings/code_331940/func_E001E6E8.s b/ver/us/asm/nonmatchings/331940/func_E001E6E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_331940/func_E001E6E8.s rename to ver/us/asm/nonmatchings/331940/func_E001E6E8.s diff --git a/ver/us/asm/nonmatchings/code_331940/func_E001E730.s b/ver/us/asm/nonmatchings/331940/func_E001E730.s similarity index 100% rename from ver/us/asm/nonmatchings/code_331940/func_E001E730.s rename to ver/us/asm/nonmatchings/331940/func_E001E730.s diff --git a/ver/us/asm/nonmatchings/code_333EC0/func_E0020000.s b/ver/us/asm/nonmatchings/333EC0/func_E0020000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_333EC0/func_E0020000.s rename to ver/us/asm/nonmatchings/333EC0/func_E0020000.s diff --git a/ver/us/asm/nonmatchings/code_333EC0/func_E00202CC.s b/ver/us/asm/nonmatchings/333EC0/func_E00202CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_333EC0/func_E00202CC.s rename to ver/us/asm/nonmatchings/333EC0/func_E00202CC.s diff --git a/ver/us/asm/nonmatchings/code_333EC0/func_E0020468.s b/ver/us/asm/nonmatchings/333EC0/func_E0020468.s similarity index 100% rename from ver/us/asm/nonmatchings/code_333EC0/func_E0020468.s rename to ver/us/asm/nonmatchings/333EC0/func_E0020468.s diff --git a/ver/us/asm/nonmatchings/code_333EC0/func_E002058C.s b/ver/us/asm/nonmatchings/333EC0/func_E002058C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_333EC0/func_E002058C.s rename to ver/us/asm/nonmatchings/333EC0/func_E002058C.s diff --git a/ver/us/asm/nonmatchings/code_333EC0/func_E00205D0.s b/ver/us/asm/nonmatchings/333EC0/func_E00205D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_333EC0/func_E00205D0.s rename to ver/us/asm/nonmatchings/333EC0/func_E00205D0.s diff --git a/ver/us/asm/nonmatchings/code_33450/func_80058050.s b/ver/us/asm/nonmatchings/33450/func_80058050.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33450/func_80058050.s rename to ver/us/asm/nonmatchings/33450/func_80058050.s diff --git a/ver/us/asm/nonmatchings/code_33450/func_80058B20.s b/ver/us/asm/nonmatchings/33450/func_80058B20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33450/func_80058B20.s rename to ver/us/asm/nonmatchings/33450/func_80058B20.s diff --git a/ver/us/asm/nonmatchings/code_33450/func_80058C6C.s b/ver/us/asm/nonmatchings/33450/func_80058C6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33450/func_80058C6C.s rename to ver/us/asm/nonmatchings/33450/func_80058C6C.s diff --git a/ver/us/asm/nonmatchings/code_337240/func_E0022000.s b/ver/us/asm/nonmatchings/337240/func_E0022000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_337240/func_E0022000.s rename to ver/us/asm/nonmatchings/337240/func_E0022000.s diff --git a/ver/us/asm/nonmatchings/code_337240/func_E002254C.s b/ver/us/asm/nonmatchings/337240/func_E002254C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_337240/func_E002254C.s rename to ver/us/asm/nonmatchings/337240/func_E002254C.s diff --git a/ver/us/asm/nonmatchings/code_337240/func_E0022960.s b/ver/us/asm/nonmatchings/337240/func_E0022960.s similarity index 100% rename from ver/us/asm/nonmatchings/code_337240/func_E0022960.s rename to ver/us/asm/nonmatchings/337240/func_E0022960.s diff --git a/ver/us/asm/nonmatchings/code_337240/func_E0022998.s b/ver/us/asm/nonmatchings/337240/func_E0022998.s similarity index 100% rename from ver/us/asm/nonmatchings/code_337240/func_E0022998.s rename to ver/us/asm/nonmatchings/337240/func_E0022998.s diff --git a/ver/us/asm/nonmatchings/code_339250/func_E0024000.s b/ver/us/asm/nonmatchings/339250/func_E0024000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_339250/func_E0024000.s rename to ver/us/asm/nonmatchings/339250/func_E0024000.s diff --git a/ver/us/asm/nonmatchings/code_339250/func_E0024188.s b/ver/us/asm/nonmatchings/339250/func_E0024188.s similarity index 100% rename from ver/us/asm/nonmatchings/code_339250/func_E0024188.s rename to ver/us/asm/nonmatchings/339250/func_E0024188.s diff --git a/ver/us/asm/nonmatchings/code_339250/func_E00242E0.s b/ver/us/asm/nonmatchings/339250/func_E00242E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_339250/func_E00242E0.s rename to ver/us/asm/nonmatchings/339250/func_E00242E0.s diff --git a/ver/us/asm/nonmatchings/code_339250/func_E0024324.s b/ver/us/asm/nonmatchings/339250/func_E0024324.s similarity index 100% rename from ver/us/asm/nonmatchings/code_339250/func_E0024324.s rename to ver/us/asm/nonmatchings/339250/func_E0024324.s diff --git a/ver/us/asm/nonmatchings/code_339250/func_E00243BC.s b/ver/us/asm/nonmatchings/339250/func_E00243BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_339250/func_E00243BC.s rename to ver/us/asm/nonmatchings/339250/func_E00243BC.s diff --git a/ver/us/asm/nonmatchings/code_339250/func_E0024454.s b/ver/us/asm/nonmatchings/339250/func_E0024454.s similarity index 100% rename from ver/us/asm/nonmatchings/code_339250/func_E0024454.s rename to ver/us/asm/nonmatchings/339250/func_E0024454.s diff --git a/ver/us/asm/nonmatchings/code_33B180/func_E0026000.s b/ver/us/asm/nonmatchings/33B180/func_E0026000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33B180/func_E0026000.s rename to ver/us/asm/nonmatchings/33B180/func_E0026000.s diff --git a/ver/us/asm/nonmatchings/code_33B180/func_E002618C.s b/ver/us/asm/nonmatchings/33B180/func_E002618C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33B180/func_E002618C.s rename to ver/us/asm/nonmatchings/33B180/func_E002618C.s diff --git a/ver/us/asm/nonmatchings/code_33B180/func_E00264B0.s b/ver/us/asm/nonmatchings/33B180/func_E00264B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33B180/func_E00264B0.s rename to ver/us/asm/nonmatchings/33B180/func_E00264B0.s diff --git a/ver/us/asm/nonmatchings/code_33B180/func_E00264F4.s b/ver/us/asm/nonmatchings/33B180/func_E00264F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33B180/func_E00264F4.s rename to ver/us/asm/nonmatchings/33B180/func_E00264F4.s diff --git a/ver/us/asm/nonmatchings/code_33CDF0/func_E0028000.s b/ver/us/asm/nonmatchings/33CDF0/func_E0028000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33CDF0/func_E0028000.s rename to ver/us/asm/nonmatchings/33CDF0/func_E0028000.s diff --git a/ver/us/asm/nonmatchings/code_33CDF0/func_E0028248.s b/ver/us/asm/nonmatchings/33CDF0/func_E0028248.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33CDF0/func_E0028248.s rename to ver/us/asm/nonmatchings/33CDF0/func_E0028248.s diff --git a/ver/us/asm/nonmatchings/code_33CDF0/func_E00284E8.s b/ver/us/asm/nonmatchings/33CDF0/func_E00284E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33CDF0/func_E00284E8.s rename to ver/us/asm/nonmatchings/33CDF0/func_E00284E8.s diff --git a/ver/us/asm/nonmatchings/code_33CDF0/func_E002852C.s b/ver/us/asm/nonmatchings/33CDF0/func_E002852C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33CDF0/func_E002852C.s rename to ver/us/asm/nonmatchings/33CDF0/func_E002852C.s diff --git a/ver/us/asm/nonmatchings/code_33E8C0/func_E002A000.s b/ver/us/asm/nonmatchings/33E8C0/func_E002A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33E8C0/func_E002A000.s rename to ver/us/asm/nonmatchings/33E8C0/func_E002A000.s diff --git a/ver/us/asm/nonmatchings/code_33E8C0/func_E002A28C.s b/ver/us/asm/nonmatchings/33E8C0/func_E002A28C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33E8C0/func_E002A28C.s rename to ver/us/asm/nonmatchings/33E8C0/func_E002A28C.s diff --git a/ver/us/asm/nonmatchings/code_33E8C0/func_E002A380.s b/ver/us/asm/nonmatchings/33E8C0/func_E002A380.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33E8C0/func_E002A380.s rename to ver/us/asm/nonmatchings/33E8C0/func_E002A380.s diff --git a/ver/us/asm/nonmatchings/code_33E8C0/func_E002A3C4.s b/ver/us/asm/nonmatchings/33E8C0/func_E002A3C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33E8C0/func_E002A3C4.s rename to ver/us/asm/nonmatchings/33E8C0/func_E002A3C4.s diff --git a/ver/us/asm/nonmatchings/code_33FE80/func_E002C000.s b/ver/us/asm/nonmatchings/33FE80/func_E002C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33FE80/func_E002C000.s rename to ver/us/asm/nonmatchings/33FE80/func_E002C000.s diff --git a/ver/us/asm/nonmatchings/code_33FE80/func_E002C23C.s b/ver/us/asm/nonmatchings/33FE80/func_E002C23C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33FE80/func_E002C23C.s rename to ver/us/asm/nonmatchings/33FE80/func_E002C23C.s diff --git a/ver/us/asm/nonmatchings/code_33FE80/func_E002C3D0.s b/ver/us/asm/nonmatchings/33FE80/func_E002C3D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33FE80/func_E002C3D0.s rename to ver/us/asm/nonmatchings/33FE80/func_E002C3D0.s diff --git a/ver/us/asm/nonmatchings/code_33FE80/func_E002C414.s b/ver/us/asm/nonmatchings/33FE80/func_E002C414.s similarity index 100% rename from ver/us/asm/nonmatchings/code_33FE80/func_E002C414.s rename to ver/us/asm/nonmatchings/33FE80/func_E002C414.s diff --git a/ver/us/asm/nonmatchings/code_3419E0/func_E002E000.s b/ver/us/asm/nonmatchings/3419E0/func_E002E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3419E0/func_E002E000.s rename to ver/us/asm/nonmatchings/3419E0/func_E002E000.s diff --git a/ver/us/asm/nonmatchings/code_3419E0/func_E002E250.s b/ver/us/asm/nonmatchings/3419E0/func_E002E250.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3419E0/func_E002E250.s rename to ver/us/asm/nonmatchings/3419E0/func_E002E250.s diff --git a/ver/us/asm/nonmatchings/code_3419E0/func_E002E330.s b/ver/us/asm/nonmatchings/3419E0/func_E002E330.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3419E0/func_E002E330.s rename to ver/us/asm/nonmatchings/3419E0/func_E002E330.s diff --git a/ver/us/asm/nonmatchings/code_3419E0/func_E002E368.s b/ver/us/asm/nonmatchings/3419E0/func_E002E368.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3419E0/func_E002E368.s rename to ver/us/asm/nonmatchings/3419E0/func_E002E368.s diff --git a/ver/us/asm/nonmatchings/code_341d0/clear_effect_data.s b/ver/us/asm/nonmatchings/341d0/clear_effect_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/clear_effect_data.s rename to ver/us/asm/nonmatchings/341d0/clear_effect_data.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80058DD0.s b/ver/us/asm/nonmatchings/341d0/func_80058DD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80058DD0.s rename to ver/us/asm/nonmatchings/341d0/func_80058DD0.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80058E84.s b/ver/us/asm/nonmatchings/341d0/func_80058E84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80058E84.s rename to ver/us/asm/nonmatchings/341d0/func_80058E84.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80058F88.s b/ver/us/asm/nonmatchings/341d0/func_80058F88.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80058F88.s rename to ver/us/asm/nonmatchings/341d0/func_80058F88.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80059008.s b/ver/us/asm/nonmatchings/341d0/func_80059008.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80059008.s rename to ver/us/asm/nonmatchings/341d0/func_80059008.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_8005904C.s b/ver/us/asm/nonmatchings/341d0/func_8005904C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_8005904C.s rename to ver/us/asm/nonmatchings/341d0/func_8005904C.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80059310.s b/ver/us/asm/nonmatchings/341d0/func_80059310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80059310.s rename to ver/us/asm/nonmatchings/341d0/func_80059310.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_800598A0.s b/ver/us/asm/nonmatchings/341d0/func_800598A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_800598A0.s rename to ver/us/asm/nonmatchings/341d0/func_800598A0.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80059AB8.s b/ver/us/asm/nonmatchings/341d0/func_80059AB8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80059AB8.s rename to ver/us/asm/nonmatchings/341d0/func_80059AB8.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80059BD4.s b/ver/us/asm/nonmatchings/341d0/func_80059BD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80059BD4.s rename to ver/us/asm/nonmatchings/341d0/func_80059BD4.s diff --git a/ver/us/asm/nonmatchings/code_341d0/func_80059F94.s b/ver/us/asm/nonmatchings/341d0/func_80059F94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/func_80059F94.s rename to ver/us/asm/nonmatchings/341d0/func_80059F94.s diff --git a/ver/us/asm/nonmatchings/code_341d0/set_effect_pos_offset.s b/ver/us/asm/nonmatchings/341d0/set_effect_pos_offset.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/set_effect_pos_offset.s rename to ver/us/asm/nonmatchings/341d0/set_effect_pos_offset.s diff --git a/ver/us/asm/nonmatchings/code_341d0/update_effects.s b/ver/us/asm/nonmatchings/341d0/update_effects.s similarity index 100% rename from ver/us/asm/nonmatchings/code_341d0/update_effects.s rename to ver/us/asm/nonmatchings/341d0/update_effects.s diff --git a/ver/us/asm/nonmatchings/code_342140/func_E0030000.s b/ver/us/asm/nonmatchings/342140/func_E0030000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_342140/func_E0030000.s rename to ver/us/asm/nonmatchings/342140/func_E0030000.s diff --git a/ver/us/asm/nonmatchings/code_342140/func_E0030730.s b/ver/us/asm/nonmatchings/342140/func_E0030730.s similarity index 100% rename from ver/us/asm/nonmatchings/code_342140/func_E0030730.s rename to ver/us/asm/nonmatchings/342140/func_E0030730.s diff --git a/ver/us/asm/nonmatchings/code_342140/func_E0030A24.s b/ver/us/asm/nonmatchings/342140/func_E0030A24.s similarity index 100% rename from ver/us/asm/nonmatchings/code_342140/func_E0030A24.s rename to ver/us/asm/nonmatchings/342140/func_E0030A24.s diff --git a/ver/us/asm/nonmatchings/code_342140/func_E0030A68.s b/ver/us/asm/nonmatchings/342140/func_E0030A68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_342140/func_E0030A68.s rename to ver/us/asm/nonmatchings/342140/func_E0030A68.s diff --git a/ver/us/asm/nonmatchings/code_343680/func_E0032000.s b/ver/us/asm/nonmatchings/343680/func_E0032000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_343680/func_E0032000.s rename to ver/us/asm/nonmatchings/343680/func_E0032000.s diff --git a/ver/us/asm/nonmatchings/code_343680/func_E00321D8.s b/ver/us/asm/nonmatchings/343680/func_E00321D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_343680/func_E00321D8.s rename to ver/us/asm/nonmatchings/343680/func_E00321D8.s diff --git a/ver/us/asm/nonmatchings/code_343680/func_E0032420.s b/ver/us/asm/nonmatchings/343680/func_E0032420.s similarity index 100% rename from ver/us/asm/nonmatchings/code_343680/func_E0032420.s rename to ver/us/asm/nonmatchings/343680/func_E0032420.s diff --git a/ver/us/asm/nonmatchings/code_343680/func_E003245C.s b/ver/us/asm/nonmatchings/343680/func_E003245C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_343680/func_E003245C.s rename to ver/us/asm/nonmatchings/343680/func_E003245C.s diff --git a/ver/us/asm/nonmatchings/code_344A10/func_E0034000.s b/ver/us/asm/nonmatchings/344A10/func_E0034000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_344A10/func_E0034000.s rename to ver/us/asm/nonmatchings/344A10/func_E0034000.s diff --git a/ver/us/asm/nonmatchings/code_344A10/func_E0034110.s b/ver/us/asm/nonmatchings/344A10/func_E0034110.s similarity index 100% rename from ver/us/asm/nonmatchings/code_344A10/func_E0034110.s rename to ver/us/asm/nonmatchings/344A10/func_E0034110.s diff --git a/ver/us/asm/nonmatchings/code_344A10/func_E00342C8.s b/ver/us/asm/nonmatchings/344A10/func_E00342C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_344A10/func_E00342C8.s rename to ver/us/asm/nonmatchings/344A10/func_E00342C8.s diff --git a/ver/us/asm/nonmatchings/code_344A10/func_E0034310.s b/ver/us/asm/nonmatchings/344A10/func_E0034310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_344A10/func_E0034310.s rename to ver/us/asm/nonmatchings/344A10/func_E0034310.s diff --git a/ver/us/asm/nonmatchings/code_3454E0/func_E0036000.s b/ver/us/asm/nonmatchings/3454E0/func_E0036000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3454E0/func_E0036000.s rename to ver/us/asm/nonmatchings/3454E0/func_E0036000.s diff --git a/ver/us/asm/nonmatchings/code_3454E0/func_E00360E4.s b/ver/us/asm/nonmatchings/3454E0/func_E00360E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3454E0/func_E00360E4.s rename to ver/us/asm/nonmatchings/3454E0/func_E00360E4.s diff --git a/ver/us/asm/nonmatchings/code_3454E0/func_E00361D8.s b/ver/us/asm/nonmatchings/3454E0/func_E00361D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3454E0/func_E00361D8.s rename to ver/us/asm/nonmatchings/3454E0/func_E00361D8.s diff --git a/ver/us/asm/nonmatchings/code_3454E0/func_E0036224.s b/ver/us/asm/nonmatchings/3454E0/func_E0036224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3454E0/func_E0036224.s rename to ver/us/asm/nonmatchings/3454E0/func_E0036224.s diff --git a/ver/us/asm/nonmatchings/code_34DD20/func_E0038000.s b/ver/us/asm/nonmatchings/34DD20/func_E0038000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34DD20/func_E0038000.s rename to ver/us/asm/nonmatchings/34DD20/func_E0038000.s diff --git a/ver/us/asm/nonmatchings/code_34DD20/func_E0038424.s b/ver/us/asm/nonmatchings/34DD20/func_E0038424.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34DD20/func_E0038424.s rename to ver/us/asm/nonmatchings/34DD20/func_E0038424.s diff --git a/ver/us/asm/nonmatchings/code_34DD20/func_E0038704.s b/ver/us/asm/nonmatchings/34DD20/func_E0038704.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34DD20/func_E0038704.s rename to ver/us/asm/nonmatchings/34DD20/func_E0038704.s diff --git a/ver/us/asm/nonmatchings/code_34DD20/func_E0038748.s b/ver/us/asm/nonmatchings/34DD20/func_E0038748.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34DD20/func_E0038748.s rename to ver/us/asm/nonmatchings/34DD20/func_E0038748.s diff --git a/ver/us/asm/nonmatchings/code_34EC80/func_E003A000.s b/ver/us/asm/nonmatchings/34EC80/func_E003A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34EC80/func_E003A000.s rename to ver/us/asm/nonmatchings/34EC80/func_E003A000.s diff --git a/ver/us/asm/nonmatchings/code_34EC80/func_E003A1DC.s b/ver/us/asm/nonmatchings/34EC80/func_E003A1DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34EC80/func_E003A1DC.s rename to ver/us/asm/nonmatchings/34EC80/func_E003A1DC.s diff --git a/ver/us/asm/nonmatchings/code_34EC80/func_E003A310.s b/ver/us/asm/nonmatchings/34EC80/func_E003A310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34EC80/func_E003A310.s rename to ver/us/asm/nonmatchings/34EC80/func_E003A310.s diff --git a/ver/us/asm/nonmatchings/code_34EC80/func_E003A354.s b/ver/us/asm/nonmatchings/34EC80/func_E003A354.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34EC80/func_E003A354.s rename to ver/us/asm/nonmatchings/34EC80/func_E003A354.s diff --git a/ver/us/asm/nonmatchings/code_34F4C0/func_E003C000.s b/ver/us/asm/nonmatchings/34F4C0/func_E003C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34F4C0/func_E003C000.s rename to ver/us/asm/nonmatchings/34F4C0/func_E003C000.s diff --git a/ver/us/asm/nonmatchings/code_34F4C0/func_E003C244.s b/ver/us/asm/nonmatchings/34F4C0/func_E003C244.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34F4C0/func_E003C244.s rename to ver/us/asm/nonmatchings/34F4C0/func_E003C244.s diff --git a/ver/us/asm/nonmatchings/code_34F4C0/func_E003C47C.s b/ver/us/asm/nonmatchings/34F4C0/func_E003C47C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34F4C0/func_E003C47C.s rename to ver/us/asm/nonmatchings/34F4C0/func_E003C47C.s diff --git a/ver/us/asm/nonmatchings/code_34F4C0/func_E003C498.s b/ver/us/asm/nonmatchings/34F4C0/func_E003C498.s similarity index 100% rename from ver/us/asm/nonmatchings/code_34F4C0/func_E003C498.s rename to ver/us/asm/nonmatchings/34F4C0/func_E003C498.s diff --git a/ver/us/asm/nonmatchings/code_352440/func_E003E000.s b/ver/us/asm/nonmatchings/352440/func_E003E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_352440/func_E003E000.s rename to ver/us/asm/nonmatchings/352440/func_E003E000.s diff --git a/ver/us/asm/nonmatchings/code_352440/func_E003E400.s b/ver/us/asm/nonmatchings/352440/func_E003E400.s similarity index 100% rename from ver/us/asm/nonmatchings/code_352440/func_E003E400.s rename to ver/us/asm/nonmatchings/352440/func_E003E400.s diff --git a/ver/us/asm/nonmatchings/code_352440/func_E003E5F4.s b/ver/us/asm/nonmatchings/352440/func_E003E5F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_352440/func_E003E5F4.s rename to ver/us/asm/nonmatchings/352440/func_E003E5F4.s diff --git a/ver/us/asm/nonmatchings/code_352440/func_E003E638.s b/ver/us/asm/nonmatchings/352440/func_E003E638.s similarity index 100% rename from ver/us/asm/nonmatchings/code_352440/func_E003E638.s rename to ver/us/asm/nonmatchings/352440/func_E003E638.s diff --git a/ver/us/asm/nonmatchings/code_353300/func_E0040000.s b/ver/us/asm/nonmatchings/353300/func_E0040000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_353300/func_E0040000.s rename to ver/us/asm/nonmatchings/353300/func_E0040000.s diff --git a/ver/us/asm/nonmatchings/code_353300/func_E0040150.s b/ver/us/asm/nonmatchings/353300/func_E0040150.s similarity index 100% rename from ver/us/asm/nonmatchings/code_353300/func_E0040150.s rename to ver/us/asm/nonmatchings/353300/func_E0040150.s diff --git a/ver/us/asm/nonmatchings/code_353300/func_E0040210.s b/ver/us/asm/nonmatchings/353300/func_E0040210.s similarity index 100% rename from ver/us/asm/nonmatchings/code_353300/func_E0040210.s rename to ver/us/asm/nonmatchings/353300/func_E0040210.s diff --git a/ver/us/asm/nonmatchings/code_353300/func_E0040348.s b/ver/us/asm/nonmatchings/353300/func_E0040348.s similarity index 100% rename from ver/us/asm/nonmatchings/code_353300/func_E0040348.s rename to ver/us/asm/nonmatchings/353300/func_E0040348.s diff --git a/ver/us/asm/nonmatchings/code_3547A0/func_E0042000.s b/ver/us/asm/nonmatchings/3547A0/func_E0042000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3547A0/func_E0042000.s rename to ver/us/asm/nonmatchings/3547A0/func_E0042000.s diff --git a/ver/us/asm/nonmatchings/code_3547A0/func_E0042234.s b/ver/us/asm/nonmatchings/3547A0/func_E0042234.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3547A0/func_E0042234.s rename to ver/us/asm/nonmatchings/3547A0/func_E0042234.s diff --git a/ver/us/asm/nonmatchings/code_3547A0/func_E0042374.s b/ver/us/asm/nonmatchings/3547A0/func_E0042374.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3547A0/func_E0042374.s rename to ver/us/asm/nonmatchings/3547A0/func_E0042374.s diff --git a/ver/us/asm/nonmatchings/code_3547A0/func_E00423B8.s b/ver/us/asm/nonmatchings/3547A0/func_E00423B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3547A0/func_E00423B8.s rename to ver/us/asm/nonmatchings/3547A0/func_E00423B8.s diff --git a/ver/us/asm/nonmatchings/code_354F60/func_E0044000.s b/ver/us/asm/nonmatchings/354F60/func_E0044000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_354F60/func_E0044000.s rename to ver/us/asm/nonmatchings/354F60/func_E0044000.s diff --git a/ver/us/asm/nonmatchings/code_354F60/func_E0044424.s b/ver/us/asm/nonmatchings/354F60/func_E0044424.s similarity index 100% rename from ver/us/asm/nonmatchings/code_354F60/func_E0044424.s rename to ver/us/asm/nonmatchings/354F60/func_E0044424.s diff --git a/ver/us/asm/nonmatchings/code_354F60/func_E00448E4.s b/ver/us/asm/nonmatchings/354F60/func_E00448E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_354F60/func_E00448E4.s rename to ver/us/asm/nonmatchings/354F60/func_E00448E4.s diff --git a/ver/us/asm/nonmatchings/code_354F60/func_E004491C.s b/ver/us/asm/nonmatchings/354F60/func_E004491C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_354F60/func_E004491C.s rename to ver/us/asm/nonmatchings/354F60/func_E004491C.s diff --git a/ver/us/asm/nonmatchings/code_355EE0/func_E0046000.s b/ver/us/asm/nonmatchings/355EE0/func_E0046000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_355EE0/func_E0046000.s rename to ver/us/asm/nonmatchings/355EE0/func_E0046000.s diff --git a/ver/us/asm/nonmatchings/code_355EE0/func_E0046160.s b/ver/us/asm/nonmatchings/355EE0/func_E0046160.s similarity index 100% rename from ver/us/asm/nonmatchings/code_355EE0/func_E0046160.s rename to ver/us/asm/nonmatchings/355EE0/func_E0046160.s diff --git a/ver/us/asm/nonmatchings/code_355EE0/func_E004627C.s b/ver/us/asm/nonmatchings/355EE0/func_E004627C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_355EE0/func_E004627C.s rename to ver/us/asm/nonmatchings/355EE0/func_E004627C.s diff --git a/ver/us/asm/nonmatchings/code_355EE0/func_E00462C0.s b/ver/us/asm/nonmatchings/355EE0/func_E00462C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_355EE0/func_E00462C0.s rename to ver/us/asm/nonmatchings/355EE0/func_E00462C0.s diff --git a/ver/us/asm/nonmatchings/code_356980/func_E0048000.s b/ver/us/asm/nonmatchings/356980/func_E0048000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_356980/func_E0048000.s rename to ver/us/asm/nonmatchings/356980/func_E0048000.s diff --git a/ver/us/asm/nonmatchings/code_356980/func_E0048130.s b/ver/us/asm/nonmatchings/356980/func_E0048130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_356980/func_E0048130.s rename to ver/us/asm/nonmatchings/356980/func_E0048130.s diff --git a/ver/us/asm/nonmatchings/code_356980/func_E00481D4.s b/ver/us/asm/nonmatchings/356980/func_E00481D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_356980/func_E00481D4.s rename to ver/us/asm/nonmatchings/356980/func_E00481D4.s diff --git a/ver/us/asm/nonmatchings/code_356980/func_E0048218.s b/ver/us/asm/nonmatchings/356980/func_E0048218.s similarity index 100% rename from ver/us/asm/nonmatchings/code_356980/func_E0048218.s rename to ver/us/asm/nonmatchings/356980/func_E0048218.s diff --git a/ver/us/asm/nonmatchings/code_3584C0/func_E004A000.s b/ver/us/asm/nonmatchings/3584C0/func_E004A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3584C0/func_E004A000.s rename to ver/us/asm/nonmatchings/3584C0/func_E004A000.s diff --git a/ver/us/asm/nonmatchings/code_3584C0/func_E004A330.s b/ver/us/asm/nonmatchings/3584C0/func_E004A330.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3584C0/func_E004A330.s rename to ver/us/asm/nonmatchings/3584C0/func_E004A330.s diff --git a/ver/us/asm/nonmatchings/code_3584C0/func_E004A748.s b/ver/us/asm/nonmatchings/3584C0/func_E004A748.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3584C0/func_E004A748.s rename to ver/us/asm/nonmatchings/3584C0/func_E004A748.s diff --git a/ver/us/asm/nonmatchings/code_3584C0/func_E004A78C.s b/ver/us/asm/nonmatchings/3584C0/func_E004A78C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3584C0/func_E004A78C.s rename to ver/us/asm/nonmatchings/3584C0/func_E004A78C.s diff --git a/ver/us/asm/nonmatchings/code_359F20/func_E004C000.s b/ver/us/asm/nonmatchings/359F20/func_E004C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_359F20/func_E004C000.s rename to ver/us/asm/nonmatchings/359F20/func_E004C000.s diff --git a/ver/us/asm/nonmatchings/code_359F20/func_E004C20C.s b/ver/us/asm/nonmatchings/359F20/func_E004C20C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_359F20/func_E004C20C.s rename to ver/us/asm/nonmatchings/359F20/func_E004C20C.s diff --git a/ver/us/asm/nonmatchings/code_359F20/func_E004C364.s b/ver/us/asm/nonmatchings/359F20/func_E004C364.s similarity index 100% rename from ver/us/asm/nonmatchings/code_359F20/func_E004C364.s rename to ver/us/asm/nonmatchings/359F20/func_E004C364.s diff --git a/ver/us/asm/nonmatchings/code_359F20/func_E004C3A8.s b/ver/us/asm/nonmatchings/359F20/func_E004C3A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_359F20/func_E004C3A8.s rename to ver/us/asm/nonmatchings/359F20/func_E004C3A8.s diff --git a/ver/us/asm/nonmatchings/code_35B9D0/func_E004E000.s b/ver/us/asm/nonmatchings/35B9D0/func_E004E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35B9D0/func_E004E000.s rename to ver/us/asm/nonmatchings/35B9D0/func_E004E000.s diff --git a/ver/us/asm/nonmatchings/code_35B9D0/func_E004E164.s b/ver/us/asm/nonmatchings/35B9D0/func_E004E164.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35B9D0/func_E004E164.s rename to ver/us/asm/nonmatchings/35B9D0/func_E004E164.s diff --git a/ver/us/asm/nonmatchings/code_35B9D0/func_E004E1D0.s b/ver/us/asm/nonmatchings/35B9D0/func_E004E1D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35B9D0/func_E004E1D0.s rename to ver/us/asm/nonmatchings/35B9D0/func_E004E1D0.s diff --git a/ver/us/asm/nonmatchings/code_35B9D0/func_E004E214.s b/ver/us/asm/nonmatchings/35B9D0/func_E004E214.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35B9D0/func_E004E214.s rename to ver/us/asm/nonmatchings/35B9D0/func_E004E214.s diff --git a/ver/us/asm/nonmatchings/code_35BFD0/func_E0050000.s b/ver/us/asm/nonmatchings/35BFD0/func_E0050000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35BFD0/func_E0050000.s rename to ver/us/asm/nonmatchings/35BFD0/func_E0050000.s diff --git a/ver/us/asm/nonmatchings/code_35BFD0/func_E00501D8.s b/ver/us/asm/nonmatchings/35BFD0/func_E00501D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35BFD0/func_E00501D8.s rename to ver/us/asm/nonmatchings/35BFD0/func_E00501D8.s diff --git a/ver/us/asm/nonmatchings/code_35BFD0/func_E00502C4.s b/ver/us/asm/nonmatchings/35BFD0/func_E00502C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35BFD0/func_E00502C4.s rename to ver/us/asm/nonmatchings/35BFD0/func_E00502C4.s diff --git a/ver/us/asm/nonmatchings/code_35BFD0/func_E0050308.s b/ver/us/asm/nonmatchings/35BFD0/func_E0050308.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35BFD0/func_E0050308.s rename to ver/us/asm/nonmatchings/35BFD0/func_E0050308.s diff --git a/ver/us/asm/nonmatchings/code_35CA80/func_E0052000.s b/ver/us/asm/nonmatchings/35CA80/func_E0052000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35CA80/func_E0052000.s rename to ver/us/asm/nonmatchings/35CA80/func_E0052000.s diff --git a/ver/us/asm/nonmatchings/code_35CA80/func_E00520F0.s b/ver/us/asm/nonmatchings/35CA80/func_E00520F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35CA80/func_E00520F0.s rename to ver/us/asm/nonmatchings/35CA80/func_E00520F0.s diff --git a/ver/us/asm/nonmatchings/code_35CA80/func_E005241C.s b/ver/us/asm/nonmatchings/35CA80/func_E005241C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35CA80/func_E005241C.s rename to ver/us/asm/nonmatchings/35CA80/func_E005241C.s diff --git a/ver/us/asm/nonmatchings/code_35CA80/func_E0052460.s b/ver/us/asm/nonmatchings/35CA80/func_E0052460.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35CA80/func_E0052460.s rename to ver/us/asm/nonmatchings/35CA80/func_E0052460.s diff --git a/ver/us/asm/nonmatchings/code_35DA00/func_E0056000.s b/ver/us/asm/nonmatchings/35DA00/func_E0056000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35DA00/func_E0056000.s rename to ver/us/asm/nonmatchings/35DA00/func_E0056000.s diff --git a/ver/us/asm/nonmatchings/code_35DA00/func_E005630C.s b/ver/us/asm/nonmatchings/35DA00/func_E005630C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35DA00/func_E005630C.s rename to ver/us/asm/nonmatchings/35DA00/func_E005630C.s diff --git a/ver/us/asm/nonmatchings/code_35DA00/func_E0056B8C.s b/ver/us/asm/nonmatchings/35DA00/func_E0056B8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35DA00/func_E0056B8C.s rename to ver/us/asm/nonmatchings/35DA00/func_E0056B8C.s diff --git a/ver/us/asm/nonmatchings/code_35DA00/func_E0056BD0.s b/ver/us/asm/nonmatchings/35DA00/func_E0056BD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35DA00/func_E0056BD0.s rename to ver/us/asm/nonmatchings/35DA00/func_E0056BD0.s diff --git a/ver/us/asm/nonmatchings/code_35E920/func_E0058000.s b/ver/us/asm/nonmatchings/35E920/func_E0058000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35E920/func_E0058000.s rename to ver/us/asm/nonmatchings/35E920/func_E0058000.s diff --git a/ver/us/asm/nonmatchings/code_35E920/func_E00581B4.s b/ver/us/asm/nonmatchings/35E920/func_E00581B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35E920/func_E00581B4.s rename to ver/us/asm/nonmatchings/35E920/func_E00581B4.s diff --git a/ver/us/asm/nonmatchings/code_35E920/func_E0058490.s b/ver/us/asm/nonmatchings/35E920/func_E0058490.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35E920/func_E0058490.s rename to ver/us/asm/nonmatchings/35E920/func_E0058490.s diff --git a/ver/us/asm/nonmatchings/code_35E920/func_E00584D4.s b/ver/us/asm/nonmatchings/35E920/func_E00584D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_35E920/func_E00584D4.s rename to ver/us/asm/nonmatchings/35E920/func_E00584D4.s diff --git a/ver/us/asm/nonmatchings/code_3602C0/func_E005A000.s b/ver/us/asm/nonmatchings/3602C0/func_E005A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3602C0/func_E005A000.s rename to ver/us/asm/nonmatchings/3602C0/func_E005A000.s diff --git a/ver/us/asm/nonmatchings/code_3602C0/func_E005A1FC.s b/ver/us/asm/nonmatchings/3602C0/func_E005A1FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3602C0/func_E005A1FC.s rename to ver/us/asm/nonmatchings/3602C0/func_E005A1FC.s diff --git a/ver/us/asm/nonmatchings/code_3602C0/func_E005A3B0.s b/ver/us/asm/nonmatchings/3602C0/func_E005A3B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3602C0/func_E005A3B0.s rename to ver/us/asm/nonmatchings/3602C0/func_E005A3B0.s diff --git a/ver/us/asm/nonmatchings/code_3602C0/func_E005A3F4.s b/ver/us/asm/nonmatchings/3602C0/func_E005A3F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3602C0/func_E005A3F4.s rename to ver/us/asm/nonmatchings/3602C0/func_E005A3F4.s diff --git a/ver/us/asm/nonmatchings/code_360F40/func_E005C000.s b/ver/us/asm/nonmatchings/360F40/func_E005C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_360F40/func_E005C000.s rename to ver/us/asm/nonmatchings/360F40/func_E005C000.s diff --git a/ver/us/asm/nonmatchings/code_360F40/func_E005C180.s b/ver/us/asm/nonmatchings/360F40/func_E005C180.s similarity index 100% rename from ver/us/asm/nonmatchings/code_360F40/func_E005C180.s rename to ver/us/asm/nonmatchings/360F40/func_E005C180.s diff --git a/ver/us/asm/nonmatchings/code_360F40/func_E005C2B4.s b/ver/us/asm/nonmatchings/360F40/func_E005C2B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_360F40/func_E005C2B4.s rename to ver/us/asm/nonmatchings/360F40/func_E005C2B4.s diff --git a/ver/us/asm/nonmatchings/code_360F40/func_E005C2F8.s b/ver/us/asm/nonmatchings/360F40/func_E005C2F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_360F40/func_E005C2F8.s rename to ver/us/asm/nonmatchings/360F40/func_E005C2F8.s diff --git a/ver/us/asm/nonmatchings/code_3625C0/func_E005E000.s b/ver/us/asm/nonmatchings/3625C0/func_E005E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3625C0/func_E005E000.s rename to ver/us/asm/nonmatchings/3625C0/func_E005E000.s diff --git a/ver/us/asm/nonmatchings/code_3625C0/func_E005E1B8.s b/ver/us/asm/nonmatchings/3625C0/func_E005E1B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3625C0/func_E005E1B8.s rename to ver/us/asm/nonmatchings/3625C0/func_E005E1B8.s diff --git a/ver/us/asm/nonmatchings/code_3625C0/func_E005E318.s b/ver/us/asm/nonmatchings/3625C0/func_E005E318.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3625C0/func_E005E318.s rename to ver/us/asm/nonmatchings/3625C0/func_E005E318.s diff --git a/ver/us/asm/nonmatchings/code_3625C0/func_E005E334.s b/ver/us/asm/nonmatchings/3625C0/func_E005E334.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3625C0/func_E005E334.s rename to ver/us/asm/nonmatchings/3625C0/func_E005E334.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s b/ver/us/asm/nonmatchings/362a0_len_2f70/_add_hit_vert_to_buffer.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/_add_hit_vert_to_buffer.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/_add_hit_vert_to_buffer.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/allocate_hit_tables.s b/ver/us/asm/nonmatchings/362a0_len_2f70/allocate_hit_tables.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/allocate_hit_tables.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/allocate_hit_tables.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/func_8005DB00.s b/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/func_8005DB00.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DB00.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/func_8005DD54.s b/ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DD54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/func_8005DD54.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/func_8005DD54.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s b/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_center.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/get_collider_center.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_center.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/get_collider_type_by_id.s b/ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_type_by_id.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/get_collider_type_by_id.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/get_collider_type_by_id.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/get_flat_collider_normal.s b/ver/us/asm/nonmatchings/362a0_len_2f70/get_flat_collider_normal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/get_flat_collider_normal.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/get_flat_collider_normal.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/load_collision.s b/ver/us/asm/nonmatchings/362a0_len_2f70/load_collision.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/load_collision.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/load_collision.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/load_hit_asset.s b/ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_asset.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/load_hit_asset.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_asset.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s b/ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/load_hit_data.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/load_hit_data.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s b/ver/us/asm/nonmatchings/362a0_len_2f70/load_stage_collision.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/load_stage_collision.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/load_stage_collision.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/parent_collider_to_model.s b/ver/us/asm/nonmatchings/362a0_len_2f70/parent_collider_to_model.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/parent_collider_to_model.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/parent_collider_to_model.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s b/ver/us/asm/nonmatchings/362a0_len_2f70/test_down_ray_triangle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/test_down_ray_triangle.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/test_down_ray_triangle.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s b/ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_colliders.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_colliders.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_colliders.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s b/ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_entities.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_entities.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_entities.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s b/ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_triangle_general.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_triangle_general.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_triangle_general.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s b/ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_zones.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/test_ray_zones.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/test_ray_zones.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s b/ver/us/asm/nonmatchings/362a0_len_2f70/test_up_ray_collider.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_collider.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/test_up_ray_collider.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s b/ver/us/asm/nonmatchings/362a0_len_2f70/test_up_ray_triangle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/test_up_ray_triangle.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/test_up_ray_triangle.s diff --git a/ver/us/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s b/ver/us/asm/nonmatchings/362a0_len_2f70/update_collider_transform.s similarity index 100% rename from ver/us/asm/nonmatchings/code_362a0_len_2f70/update_collider_transform.s rename to ver/us/asm/nonmatchings/362a0_len_2f70/update_collider_transform.s diff --git a/ver/us/asm/nonmatchings/code_363160/func_E0060000.s b/ver/us/asm/nonmatchings/363160/func_E0060000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_363160/func_E0060000.s rename to ver/us/asm/nonmatchings/363160/func_E0060000.s diff --git a/ver/us/asm/nonmatchings/code_363160/func_E00601E0.s b/ver/us/asm/nonmatchings/363160/func_E00601E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_363160/func_E00601E0.s rename to ver/us/asm/nonmatchings/363160/func_E00601E0.s diff --git a/ver/us/asm/nonmatchings/code_363160/func_E006040C.s b/ver/us/asm/nonmatchings/363160/func_E006040C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_363160/func_E006040C.s rename to ver/us/asm/nonmatchings/363160/func_E006040C.s diff --git a/ver/us/asm/nonmatchings/code_363160/func_E0060450.s b/ver/us/asm/nonmatchings/363160/func_E0060450.s similarity index 100% rename from ver/us/asm/nonmatchings/code_363160/func_E0060450.s rename to ver/us/asm/nonmatchings/363160/func_E0060450.s diff --git a/ver/us/asm/nonmatchings/code_364300/func_E0062000.s b/ver/us/asm/nonmatchings/364300/func_E0062000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364300/func_E0062000.s rename to ver/us/asm/nonmatchings/364300/func_E0062000.s diff --git a/ver/us/asm/nonmatchings/code_364300/func_E0062220.s b/ver/us/asm/nonmatchings/364300/func_E0062220.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364300/func_E0062220.s rename to ver/us/asm/nonmatchings/364300/func_E0062220.s diff --git a/ver/us/asm/nonmatchings/code_364300/func_E00624A8.s b/ver/us/asm/nonmatchings/364300/func_E00624A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364300/func_E00624A8.s rename to ver/us/asm/nonmatchings/364300/func_E00624A8.s diff --git a/ver/us/asm/nonmatchings/code_364300/func_E00624EC.s b/ver/us/asm/nonmatchings/364300/func_E00624EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364300/func_E00624EC.s rename to ver/us/asm/nonmatchings/364300/func_E00624EC.s diff --git a/ver/us/asm/nonmatchings/code_364F10/func_E0064000.s b/ver/us/asm/nonmatchings/364F10/func_E0064000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364F10/func_E0064000.s rename to ver/us/asm/nonmatchings/364F10/func_E0064000.s diff --git a/ver/us/asm/nonmatchings/code_364F10/func_E00641A4.s b/ver/us/asm/nonmatchings/364F10/func_E00641A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364F10/func_E00641A4.s rename to ver/us/asm/nonmatchings/364F10/func_E00641A4.s diff --git a/ver/us/asm/nonmatchings/code_364F10/func_E00643DC.s b/ver/us/asm/nonmatchings/364F10/func_E00643DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364F10/func_E00643DC.s rename to ver/us/asm/nonmatchings/364F10/func_E00643DC.s diff --git a/ver/us/asm/nonmatchings/code_364F10/func_E0064414.s b/ver/us/asm/nonmatchings/364F10/func_E0064414.s similarity index 100% rename from ver/us/asm/nonmatchings/code_364F10/func_E0064414.s rename to ver/us/asm/nonmatchings/364F10/func_E0064414.s diff --git a/ver/us/asm/nonmatchings/code_366030/func_E0066000.s b/ver/us/asm/nonmatchings/366030/func_E0066000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_366030/func_E0066000.s rename to ver/us/asm/nonmatchings/366030/func_E0066000.s diff --git a/ver/us/asm/nonmatchings/code_366030/func_E0066498.s b/ver/us/asm/nonmatchings/366030/func_E0066498.s similarity index 100% rename from ver/us/asm/nonmatchings/code_366030/func_E0066498.s rename to ver/us/asm/nonmatchings/366030/func_E0066498.s diff --git a/ver/us/asm/nonmatchings/code_366030/func_E006672C.s b/ver/us/asm/nonmatchings/366030/func_E006672C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_366030/func_E006672C.s rename to ver/us/asm/nonmatchings/366030/func_E006672C.s diff --git a/ver/us/asm/nonmatchings/code_366030/func_E0066770.s b/ver/us/asm/nonmatchings/366030/func_E0066770.s similarity index 100% rename from ver/us/asm/nonmatchings/code_366030/func_E0066770.s rename to ver/us/asm/nonmatchings/366030/func_E0066770.s diff --git a/ver/us/asm/nonmatchings/code_36A8D0/func_E0068000.s b/ver/us/asm/nonmatchings/36A8D0/func_E0068000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36A8D0/func_E0068000.s rename to ver/us/asm/nonmatchings/36A8D0/func_E0068000.s diff --git a/ver/us/asm/nonmatchings/code_36A8D0/func_E0068148.s b/ver/us/asm/nonmatchings/36A8D0/func_E0068148.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36A8D0/func_E0068148.s rename to ver/us/asm/nonmatchings/36A8D0/func_E0068148.s diff --git a/ver/us/asm/nonmatchings/code_36A8D0/func_E00681D8.s b/ver/us/asm/nonmatchings/36A8D0/func_E00681D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36A8D0/func_E00681D8.s rename to ver/us/asm/nonmatchings/36A8D0/func_E00681D8.s diff --git a/ver/us/asm/nonmatchings/code_36A8D0/func_E0068234.s b/ver/us/asm/nonmatchings/36A8D0/func_E0068234.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36A8D0/func_E0068234.s rename to ver/us/asm/nonmatchings/36A8D0/func_E0068234.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A000.s b/ver/us/asm/nonmatchings/36D020/func_E006A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A000.s rename to ver/us/asm/nonmatchings/36D020/func_E006A000.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A0BC.s b/ver/us/asm/nonmatchings/36D020/func_E006A0BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A0BC.s rename to ver/us/asm/nonmatchings/36D020/func_E006A0BC.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A1E8.s b/ver/us/asm/nonmatchings/36D020/func_E006A1E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A1E8.s rename to ver/us/asm/nonmatchings/36D020/func_E006A1E8.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A464.s b/ver/us/asm/nonmatchings/36D020/func_E006A464.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A464.s rename to ver/us/asm/nonmatchings/36D020/func_E006A464.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A580.s b/ver/us/asm/nonmatchings/36D020/func_E006A580.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A580.s rename to ver/us/asm/nonmatchings/36D020/func_E006A580.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A814.s b/ver/us/asm/nonmatchings/36D020/func_E006A814.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A814.s rename to ver/us/asm/nonmatchings/36D020/func_E006A814.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A85C.s b/ver/us/asm/nonmatchings/36D020/func_E006A85C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A85C.s rename to ver/us/asm/nonmatchings/36D020/func_E006A85C.s diff --git a/ver/us/asm/nonmatchings/code_36D020/func_E006A94C.s b/ver/us/asm/nonmatchings/36D020/func_E006A94C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36D020/func_E006A94C.s rename to ver/us/asm/nonmatchings/36D020/func_E006A94C.s diff --git a/ver/us/asm/nonmatchings/code_36E1D0/func_E006C000.s b/ver/us/asm/nonmatchings/36E1D0/func_E006C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36E1D0/func_E006C000.s rename to ver/us/asm/nonmatchings/36E1D0/func_E006C000.s diff --git a/ver/us/asm/nonmatchings/code_36E1D0/func_E006C2A0.s b/ver/us/asm/nonmatchings/36E1D0/func_E006C2A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36E1D0/func_E006C2A0.s rename to ver/us/asm/nonmatchings/36E1D0/func_E006C2A0.s diff --git a/ver/us/asm/nonmatchings/code_36E1D0/func_E006C5A0.s b/ver/us/asm/nonmatchings/36E1D0/func_E006C5A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36E1D0/func_E006C5A0.s rename to ver/us/asm/nonmatchings/36E1D0/func_E006C5A0.s diff --git a/ver/us/asm/nonmatchings/code_36E1D0/func_E006C5E8.s b/ver/us/asm/nonmatchings/36E1D0/func_E006C5E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_36E1D0/func_E006C5E8.s rename to ver/us/asm/nonmatchings/36E1D0/func_E006C5E8.s diff --git a/ver/us/asm/nonmatchings/code_372790/func_E006E000.s b/ver/us/asm/nonmatchings/372790/func_E006E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_372790/func_E006E000.s rename to ver/us/asm/nonmatchings/372790/func_E006E000.s diff --git a/ver/us/asm/nonmatchings/code_372790/func_E006E35C.s b/ver/us/asm/nonmatchings/372790/func_E006E35C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_372790/func_E006E35C.s rename to ver/us/asm/nonmatchings/372790/func_E006E35C.s diff --git a/ver/us/asm/nonmatchings/code_372790/func_E006E6E4.s b/ver/us/asm/nonmatchings/372790/func_E006E6E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_372790/func_E006E6E4.s rename to ver/us/asm/nonmatchings/372790/func_E006E6E4.s diff --git a/ver/us/asm/nonmatchings/code_372790/func_E006E764.s b/ver/us/asm/nonmatchings/372790/func_E006E764.s similarity index 100% rename from ver/us/asm/nonmatchings/code_372790/func_E006E764.s rename to ver/us/asm/nonmatchings/372790/func_E006E764.s diff --git a/ver/us/asm/nonmatchings/code_3740B0/func_E0070000.s b/ver/us/asm/nonmatchings/3740B0/func_E0070000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3740B0/func_E0070000.s rename to ver/us/asm/nonmatchings/3740B0/func_E0070000.s diff --git a/ver/us/asm/nonmatchings/code_3740B0/func_E00701F4.s b/ver/us/asm/nonmatchings/3740B0/func_E00701F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3740B0/func_E00701F4.s rename to ver/us/asm/nonmatchings/3740B0/func_E00701F4.s diff --git a/ver/us/asm/nonmatchings/code_3740B0/func_E00706F0.s b/ver/us/asm/nonmatchings/3740B0/func_E00706F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3740B0/func_E00706F0.s rename to ver/us/asm/nonmatchings/3740B0/func_E00706F0.s diff --git a/ver/us/asm/nonmatchings/code_3740B0/func_E0070740.s b/ver/us/asm/nonmatchings/3740B0/func_E0070740.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3740B0/func_E0070740.s rename to ver/us/asm/nonmatchings/3740B0/func_E0070740.s diff --git a/ver/us/asm/nonmatchings/code_374E50/func_E0072000.s b/ver/us/asm/nonmatchings/374E50/func_E0072000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_374E50/func_E0072000.s rename to ver/us/asm/nonmatchings/374E50/func_E0072000.s diff --git a/ver/us/asm/nonmatchings/code_374E50/func_E0072150.s b/ver/us/asm/nonmatchings/374E50/func_E0072150.s similarity index 100% rename from ver/us/asm/nonmatchings/code_374E50/func_E0072150.s rename to ver/us/asm/nonmatchings/374E50/func_E0072150.s diff --git a/ver/us/asm/nonmatchings/code_374E50/func_E007238C.s b/ver/us/asm/nonmatchings/374E50/func_E007238C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_374E50/func_E007238C.s rename to ver/us/asm/nonmatchings/374E50/func_E007238C.s diff --git a/ver/us/asm/nonmatchings/code_374E50/func_E00723D4.s b/ver/us/asm/nonmatchings/374E50/func_E00723D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_374E50/func_E00723D4.s rename to ver/us/asm/nonmatchings/374E50/func_E00723D4.s diff --git a/ver/us/asm/nonmatchings/code_376460/func_E0074000.s b/ver/us/asm/nonmatchings/376460/func_E0074000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_376460/func_E0074000.s rename to ver/us/asm/nonmatchings/376460/func_E0074000.s diff --git a/ver/us/asm/nonmatchings/code_376460/func_E00741E8.s b/ver/us/asm/nonmatchings/376460/func_E00741E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_376460/func_E00741E8.s rename to ver/us/asm/nonmatchings/376460/func_E00741E8.s diff --git a/ver/us/asm/nonmatchings/code_376460/func_E0074598.s b/ver/us/asm/nonmatchings/376460/func_E0074598.s similarity index 100% rename from ver/us/asm/nonmatchings/code_376460/func_E0074598.s rename to ver/us/asm/nonmatchings/376460/func_E0074598.s diff --git a/ver/us/asm/nonmatchings/code_376460/func_E00745E0.s b/ver/us/asm/nonmatchings/376460/func_E00745E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_376460/func_E00745E0.s rename to ver/us/asm/nonmatchings/376460/func_E00745E0.s diff --git a/ver/us/asm/nonmatchings/code_377070/func_E0076000.s b/ver/us/asm/nonmatchings/377070/func_E0076000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_377070/func_E0076000.s rename to ver/us/asm/nonmatchings/377070/func_E0076000.s diff --git a/ver/us/asm/nonmatchings/code_377070/func_E0076378.s b/ver/us/asm/nonmatchings/377070/func_E0076378.s similarity index 100% rename from ver/us/asm/nonmatchings/code_377070/func_E0076378.s rename to ver/us/asm/nonmatchings/377070/func_E0076378.s diff --git a/ver/us/asm/nonmatchings/code_377070/func_E0076808.s b/ver/us/asm/nonmatchings/377070/func_E0076808.s similarity index 100% rename from ver/us/asm/nonmatchings/code_377070/func_E0076808.s rename to ver/us/asm/nonmatchings/377070/func_E0076808.s diff --git a/ver/us/asm/nonmatchings/code_377070/func_E007685C.s b/ver/us/asm/nonmatchings/377070/func_E007685C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_377070/func_E007685C.s rename to ver/us/asm/nonmatchings/377070/func_E007685C.s diff --git a/ver/us/asm/nonmatchings/code_37A3F0/func_E0078000.s b/ver/us/asm/nonmatchings/37A3F0/func_E0078000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37A3F0/func_E0078000.s rename to ver/us/asm/nonmatchings/37A3F0/func_E0078000.s diff --git a/ver/us/asm/nonmatchings/code_37A3F0/func_E007812C.s b/ver/us/asm/nonmatchings/37A3F0/func_E007812C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37A3F0/func_E007812C.s rename to ver/us/asm/nonmatchings/37A3F0/func_E007812C.s diff --git a/ver/us/asm/nonmatchings/code_37A3F0/func_E0078210.s b/ver/us/asm/nonmatchings/37A3F0/func_E0078210.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37A3F0/func_E0078210.s rename to ver/us/asm/nonmatchings/37A3F0/func_E0078210.s diff --git a/ver/us/asm/nonmatchings/code_37A3F0/func_E007827C.s b/ver/us/asm/nonmatchings/37A3F0/func_E007827C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37A3F0/func_E007827C.s rename to ver/us/asm/nonmatchings/37A3F0/func_E007827C.s diff --git a/ver/us/asm/nonmatchings/code_37C540/func_E007A000.s b/ver/us/asm/nonmatchings/37C540/func_E007A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37C540/func_E007A000.s rename to ver/us/asm/nonmatchings/37C540/func_E007A000.s diff --git a/ver/us/asm/nonmatchings/code_37C540/func_E007A50C.s b/ver/us/asm/nonmatchings/37C540/func_E007A50C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37C540/func_E007A50C.s rename to ver/us/asm/nonmatchings/37C540/func_E007A50C.s diff --git a/ver/us/asm/nonmatchings/code_37C540/func_E007A840.s b/ver/us/asm/nonmatchings/37C540/func_E007A840.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37C540/func_E007A840.s rename to ver/us/asm/nonmatchings/37C540/func_E007A840.s diff --git a/ver/us/asm/nonmatchings/code_37C540/func_E007A88C.s b/ver/us/asm/nonmatchings/37C540/func_E007A88C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37C540/func_E007A88C.s rename to ver/us/asm/nonmatchings/37C540/func_E007A88C.s diff --git a/ver/us/asm/nonmatchings/code_37D490/func_E007C000.s b/ver/us/asm/nonmatchings/37D490/func_E007C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37D490/func_E007C000.s rename to ver/us/asm/nonmatchings/37D490/func_E007C000.s diff --git a/ver/us/asm/nonmatchings/code_37D490/func_E007C130.s b/ver/us/asm/nonmatchings/37D490/func_E007C130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37D490/func_E007C130.s rename to ver/us/asm/nonmatchings/37D490/func_E007C130.s diff --git a/ver/us/asm/nonmatchings/code_37D490/func_E007C1B0.s b/ver/us/asm/nonmatchings/37D490/func_E007C1B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37D490/func_E007C1B0.s rename to ver/us/asm/nonmatchings/37D490/func_E007C1B0.s diff --git a/ver/us/asm/nonmatchings/code_37D490/func_E007C1F4.s b/ver/us/asm/nonmatchings/37D490/func_E007C1F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37D490/func_E007C1F4.s rename to ver/us/asm/nonmatchings/37D490/func_E007C1F4.s diff --git a/ver/us/asm/nonmatchings/code_37F720/func_E007E000.s b/ver/us/asm/nonmatchings/37F720/func_E007E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37F720/func_E007E000.s rename to ver/us/asm/nonmatchings/37F720/func_E007E000.s diff --git a/ver/us/asm/nonmatchings/code_37F720/func_E007E204.s b/ver/us/asm/nonmatchings/37F720/func_E007E204.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37F720/func_E007E204.s rename to ver/us/asm/nonmatchings/37F720/func_E007E204.s diff --git a/ver/us/asm/nonmatchings/code_37F720/func_E007E508.s b/ver/us/asm/nonmatchings/37F720/func_E007E508.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37F720/func_E007E508.s rename to ver/us/asm/nonmatchings/37F720/func_E007E508.s diff --git a/ver/us/asm/nonmatchings/code_37F720/func_E007E54C.s b/ver/us/asm/nonmatchings/37F720/func_E007E54C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_37F720/func_E007E54C.s rename to ver/us/asm/nonmatchings/37F720/func_E007E54C.s diff --git a/ver/us/asm/nonmatchings/code_3812C0/func_E0080000.s b/ver/us/asm/nonmatchings/3812C0/func_E0080000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3812C0/func_E0080000.s rename to ver/us/asm/nonmatchings/3812C0/func_E0080000.s diff --git a/ver/us/asm/nonmatchings/code_3812C0/func_E00801D0.s b/ver/us/asm/nonmatchings/3812C0/func_E00801D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3812C0/func_E00801D0.s rename to ver/us/asm/nonmatchings/3812C0/func_E00801D0.s diff --git a/ver/us/asm/nonmatchings/code_3812C0/func_E008042C.s b/ver/us/asm/nonmatchings/3812C0/func_E008042C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3812C0/func_E008042C.s rename to ver/us/asm/nonmatchings/3812C0/func_E008042C.s diff --git a/ver/us/asm/nonmatchings/code_3812C0/func_E0080448.s b/ver/us/asm/nonmatchings/3812C0/func_E0080448.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3812C0/func_E0080448.s rename to ver/us/asm/nonmatchings/3812C0/func_E0080448.s diff --git a/ver/us/asm/nonmatchings/code_385640/func_E0082000.s b/ver/us/asm/nonmatchings/385640/func_E0082000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_385640/func_E0082000.s rename to ver/us/asm/nonmatchings/385640/func_E0082000.s diff --git a/ver/us/asm/nonmatchings/code_385640/func_E00821B8.s b/ver/us/asm/nonmatchings/385640/func_E00821B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_385640/func_E00821B8.s rename to ver/us/asm/nonmatchings/385640/func_E00821B8.s diff --git a/ver/us/asm/nonmatchings/code_385640/func_E0082528.s b/ver/us/asm/nonmatchings/385640/func_E0082528.s similarity index 100% rename from ver/us/asm/nonmatchings/code_385640/func_E0082528.s rename to ver/us/asm/nonmatchings/385640/func_E0082528.s diff --git a/ver/us/asm/nonmatchings/code_385640/func_E0082580.s b/ver/us/asm/nonmatchings/385640/func_E0082580.s similarity index 100% rename from ver/us/asm/nonmatchings/code_385640/func_E0082580.s rename to ver/us/asm/nonmatchings/385640/func_E0082580.s diff --git a/ver/us/asm/nonmatchings/code_385640/func_E00826C4.s b/ver/us/asm/nonmatchings/385640/func_E00826C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_385640/func_E00826C4.s rename to ver/us/asm/nonmatchings/385640/func_E00826C4.s diff --git a/ver/us/asm/nonmatchings/code_385640/func_E00828B4.s b/ver/us/asm/nonmatchings/385640/func_E00828B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_385640/func_E00828B4.s rename to ver/us/asm/nonmatchings/385640/func_E00828B4.s diff --git a/ver/us/asm/nonmatchings/code_385640/func_E0082A84.s b/ver/us/asm/nonmatchings/385640/func_E0082A84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_385640/func_E0082A84.s rename to ver/us/asm/nonmatchings/385640/func_E0082A84.s diff --git a/ver/us/asm/nonmatchings/code_3889D0/func_E0084000.s b/ver/us/asm/nonmatchings/3889D0/func_E0084000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3889D0/func_E0084000.s rename to ver/us/asm/nonmatchings/3889D0/func_E0084000.s diff --git a/ver/us/asm/nonmatchings/code_3889D0/func_E008403C.s b/ver/us/asm/nonmatchings/3889D0/func_E008403C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3889D0/func_E008403C.s rename to ver/us/asm/nonmatchings/3889D0/func_E008403C.s diff --git a/ver/us/asm/nonmatchings/code_3889D0/func_E0084060.s b/ver/us/asm/nonmatchings/3889D0/func_E0084060.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3889D0/func_E0084060.s rename to ver/us/asm/nonmatchings/3889D0/func_E0084060.s diff --git a/ver/us/asm/nonmatchings/code_3889D0/func_E0084084.s b/ver/us/asm/nonmatchings/3889D0/func_E0084084.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3889D0/func_E0084084.s rename to ver/us/asm/nonmatchings/3889D0/func_E0084084.s diff --git a/ver/us/asm/nonmatchings/code_3889D0/func_E0084660.s b/ver/us/asm/nonmatchings/3889D0/func_E0084660.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3889D0/func_E0084660.s rename to ver/us/asm/nonmatchings/3889D0/func_E0084660.s diff --git a/ver/us/asm/nonmatchings/code_3889D0/func_E00848E4.s b/ver/us/asm/nonmatchings/3889D0/func_E00848E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3889D0/func_E00848E4.s rename to ver/us/asm/nonmatchings/3889D0/func_E00848E4.s diff --git a/ver/us/asm/nonmatchings/code_3889D0/func_E0084928.s b/ver/us/asm/nonmatchings/3889D0/func_E0084928.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3889D0/func_E0084928.s rename to ver/us/asm/nonmatchings/3889D0/func_E0084928.s diff --git a/ver/us/asm/nonmatchings/code_389850/func_E0086000.s b/ver/us/asm/nonmatchings/389850/func_E0086000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_389850/func_E0086000.s rename to ver/us/asm/nonmatchings/389850/func_E0086000.s diff --git a/ver/us/asm/nonmatchings/code_389850/func_E0086278.s b/ver/us/asm/nonmatchings/389850/func_E0086278.s similarity index 100% rename from ver/us/asm/nonmatchings/code_389850/func_E0086278.s rename to ver/us/asm/nonmatchings/389850/func_E0086278.s diff --git a/ver/us/asm/nonmatchings/code_389850/func_E0086398.s b/ver/us/asm/nonmatchings/389850/func_E0086398.s similarity index 100% rename from ver/us/asm/nonmatchings/code_389850/func_E0086398.s rename to ver/us/asm/nonmatchings/389850/func_E0086398.s diff --git a/ver/us/asm/nonmatchings/code_389850/func_E00863B4.s b/ver/us/asm/nonmatchings/389850/func_E00863B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_389850/func_E00863B4.s rename to ver/us/asm/nonmatchings/389850/func_E00863B4.s diff --git a/ver/us/asm/nonmatchings/code_38ADF0/func_E0088000.s b/ver/us/asm/nonmatchings/38ADF0/func_E0088000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38ADF0/func_E0088000.s rename to ver/us/asm/nonmatchings/38ADF0/func_E0088000.s diff --git a/ver/us/asm/nonmatchings/code_38ADF0/func_E008817C.s b/ver/us/asm/nonmatchings/38ADF0/func_E008817C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38ADF0/func_E008817C.s rename to ver/us/asm/nonmatchings/38ADF0/func_E008817C.s diff --git a/ver/us/asm/nonmatchings/code_38ADF0/func_E00885A8.s b/ver/us/asm/nonmatchings/38ADF0/func_E00885A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38ADF0/func_E00885A8.s rename to ver/us/asm/nonmatchings/38ADF0/func_E00885A8.s diff --git a/ver/us/asm/nonmatchings/code_38ADF0/func_E00887A8.s b/ver/us/asm/nonmatchings/38ADF0/func_E00887A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38ADF0/func_E00887A8.s rename to ver/us/asm/nonmatchings/38ADF0/func_E00887A8.s diff --git a/ver/us/asm/nonmatchings/code_38ADF0/func_E00887E0.s b/ver/us/asm/nonmatchings/38ADF0/func_E00887E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38ADF0/func_E00887E0.s rename to ver/us/asm/nonmatchings/38ADF0/func_E00887E0.s diff --git a/ver/us/asm/nonmatchings/code_38C5F0/func_E008A000.s b/ver/us/asm/nonmatchings/38C5F0/func_E008A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38C5F0/func_E008A000.s rename to ver/us/asm/nonmatchings/38C5F0/func_E008A000.s diff --git a/ver/us/asm/nonmatchings/code_38C5F0/func_E008A188.s b/ver/us/asm/nonmatchings/38C5F0/func_E008A188.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38C5F0/func_E008A188.s rename to ver/us/asm/nonmatchings/38C5F0/func_E008A188.s diff --git a/ver/us/asm/nonmatchings/code_38C5F0/func_E008A290.s b/ver/us/asm/nonmatchings/38C5F0/func_E008A290.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38C5F0/func_E008A290.s rename to ver/us/asm/nonmatchings/38C5F0/func_E008A290.s diff --git a/ver/us/asm/nonmatchings/code_38C5F0/func_E008A53C.s b/ver/us/asm/nonmatchings/38C5F0/func_E008A53C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38C5F0/func_E008A53C.s rename to ver/us/asm/nonmatchings/38C5F0/func_E008A53C.s diff --git a/ver/us/asm/nonmatchings/code_38C5F0/func_E008A6E4.s b/ver/us/asm/nonmatchings/38C5F0/func_E008A6E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38C5F0/func_E008A6E4.s rename to ver/us/asm/nonmatchings/38C5F0/func_E008A6E4.s diff --git a/ver/us/asm/nonmatchings/code_38C5F0/func_E008A728.s b/ver/us/asm/nonmatchings/38C5F0/func_E008A728.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38C5F0/func_E008A728.s rename to ver/us/asm/nonmatchings/38C5F0/func_E008A728.s diff --git a/ver/us/asm/nonmatchings/code_38DE00/func_E008C000.s b/ver/us/asm/nonmatchings/38DE00/func_E008C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38DE00/func_E008C000.s rename to ver/us/asm/nonmatchings/38DE00/func_E008C000.s diff --git a/ver/us/asm/nonmatchings/code_38DE00/func_E008C3FC.s b/ver/us/asm/nonmatchings/38DE00/func_E008C3FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38DE00/func_E008C3FC.s rename to ver/us/asm/nonmatchings/38DE00/func_E008C3FC.s diff --git a/ver/us/asm/nonmatchings/code_38DE00/func_E008C6B8.s b/ver/us/asm/nonmatchings/38DE00/func_E008C6B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38DE00/func_E008C6B8.s rename to ver/us/asm/nonmatchings/38DE00/func_E008C6B8.s diff --git a/ver/us/asm/nonmatchings/code_38DE00/func_E008C6FC.s b/ver/us/asm/nonmatchings/38DE00/func_E008C6FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38DE00/func_E008C6FC.s rename to ver/us/asm/nonmatchings/38DE00/func_E008C6FC.s diff --git a/ver/us/asm/nonmatchings/code_38EE60/func_E008E000.s b/ver/us/asm/nonmatchings/38EE60/func_E008E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38EE60/func_E008E000.s rename to ver/us/asm/nonmatchings/38EE60/func_E008E000.s diff --git a/ver/us/asm/nonmatchings/code_38EE60/func_E008E204.s b/ver/us/asm/nonmatchings/38EE60/func_E008E204.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38EE60/func_E008E204.s rename to ver/us/asm/nonmatchings/38EE60/func_E008E204.s diff --git a/ver/us/asm/nonmatchings/code_38EE60/func_E008E498.s b/ver/us/asm/nonmatchings/38EE60/func_E008E498.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38EE60/func_E008E498.s rename to ver/us/asm/nonmatchings/38EE60/func_E008E498.s diff --git a/ver/us/asm/nonmatchings/code_38EE60/func_E008E4E0.s b/ver/us/asm/nonmatchings/38EE60/func_E008E4E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38EE60/func_E008E4E0.s rename to ver/us/asm/nonmatchings/38EE60/func_E008E4E0.s diff --git a/ver/us/asm/nonmatchings/code_38F900/func_E0090000.s b/ver/us/asm/nonmatchings/38F900/func_E0090000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38F900/func_E0090000.s rename to ver/us/asm/nonmatchings/38F900/func_E0090000.s diff --git a/ver/us/asm/nonmatchings/code_38F900/func_E00901C8.s b/ver/us/asm/nonmatchings/38F900/func_E00901C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38F900/func_E00901C8.s rename to ver/us/asm/nonmatchings/38F900/func_E00901C8.s diff --git a/ver/us/asm/nonmatchings/code_38F900/func_E0090428.s b/ver/us/asm/nonmatchings/38F900/func_E0090428.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38F900/func_E0090428.s rename to ver/us/asm/nonmatchings/38F900/func_E0090428.s diff --git a/ver/us/asm/nonmatchings/code_38F900/func_E0090444.s b/ver/us/asm/nonmatchings/38F900/func_E0090444.s similarity index 100% rename from ver/us/asm/nonmatchings/code_38F900/func_E0090444.s rename to ver/us/asm/nonmatchings/38F900/func_E0090444.s diff --git a/ver/us/asm/nonmatchings/code_391D30/func_E0092000.s b/ver/us/asm/nonmatchings/391D30/func_E0092000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_391D30/func_E0092000.s rename to ver/us/asm/nonmatchings/391D30/func_E0092000.s diff --git a/ver/us/asm/nonmatchings/code_391D30/func_E00921B4.s b/ver/us/asm/nonmatchings/391D30/func_E00921B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_391D30/func_E00921B4.s rename to ver/us/asm/nonmatchings/391D30/func_E00921B4.s diff --git a/ver/us/asm/nonmatchings/code_391D30/func_E0092258.s b/ver/us/asm/nonmatchings/391D30/func_E0092258.s similarity index 100% rename from ver/us/asm/nonmatchings/code_391D30/func_E0092258.s rename to ver/us/asm/nonmatchings/391D30/func_E0092258.s diff --git a/ver/us/asm/nonmatchings/code_391D30/func_E00922A0.s b/ver/us/asm/nonmatchings/391D30/func_E00922A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_391D30/func_E00922A0.s rename to ver/us/asm/nonmatchings/391D30/func_E00922A0.s diff --git a/ver/us/asm/nonmatchings/code_39210_len_aa0/func_8005DECC.s b/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DECC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_39210_len_aa0/func_8005DECC.s rename to ver/us/asm/nonmatchings/39210_len_aa0/func_8005DECC.s diff --git a/ver/us/asm/nonmatchings/code_39210_len_aa0/func_8005DFD4.s b/ver/us/asm/nonmatchings/39210_len_aa0/func_8005DFD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_39210_len_aa0/func_8005DFD4.s rename to ver/us/asm/nonmatchings/39210_len_aa0/func_8005DFD4.s diff --git a/ver/us/asm/nonmatchings/code_39210_len_aa0/func_8005E12C.s b/ver/us/asm/nonmatchings/39210_len_aa0/func_8005E12C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_39210_len_aa0/func_8005E12C.s rename to ver/us/asm/nonmatchings/39210_len_aa0/func_8005E12C.s diff --git a/ver/us/asm/nonmatchings/code_3928D0/func_E0094000.s b/ver/us/asm/nonmatchings/3928D0/func_E0094000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3928D0/func_E0094000.s rename to ver/us/asm/nonmatchings/3928D0/func_E0094000.s diff --git a/ver/us/asm/nonmatchings/code_3928D0/func_E0094198.s b/ver/us/asm/nonmatchings/3928D0/func_E0094198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3928D0/func_E0094198.s rename to ver/us/asm/nonmatchings/3928D0/func_E0094198.s diff --git a/ver/us/asm/nonmatchings/code_3928D0/func_E00942C0.s b/ver/us/asm/nonmatchings/3928D0/func_E00942C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3928D0/func_E00942C0.s rename to ver/us/asm/nonmatchings/3928D0/func_E00942C0.s diff --git a/ver/us/asm/nonmatchings/code_3928D0/func_E00942FC.s b/ver/us/asm/nonmatchings/3928D0/func_E00942FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3928D0/func_E00942FC.s rename to ver/us/asm/nonmatchings/3928D0/func_E00942FC.s diff --git a/ver/us/asm/nonmatchings/code_394280/func_E0096000.s b/ver/us/asm/nonmatchings/394280/func_E0096000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_394280/func_E0096000.s rename to ver/us/asm/nonmatchings/394280/func_E0096000.s diff --git a/ver/us/asm/nonmatchings/code_394280/func_E00960F4.s b/ver/us/asm/nonmatchings/394280/func_E00960F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_394280/func_E00960F4.s rename to ver/us/asm/nonmatchings/394280/func_E00960F4.s diff --git a/ver/us/asm/nonmatchings/code_394280/func_E0096178.s b/ver/us/asm/nonmatchings/394280/func_E0096178.s similarity index 100% rename from ver/us/asm/nonmatchings/code_394280/func_E0096178.s rename to ver/us/asm/nonmatchings/394280/func_E0096178.s diff --git a/ver/us/asm/nonmatchings/code_394280/func_E00961BC.s b/ver/us/asm/nonmatchings/394280/func_E00961BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_394280/func_E00961BC.s rename to ver/us/asm/nonmatchings/394280/func_E00961BC.s diff --git a/ver/us/asm/nonmatchings/code_395BB0/func_E0098000.s b/ver/us/asm/nonmatchings/395BB0/func_E0098000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_395BB0/func_E0098000.s rename to ver/us/asm/nonmatchings/395BB0/func_E0098000.s diff --git a/ver/us/asm/nonmatchings/code_395BB0/func_E0098170.s b/ver/us/asm/nonmatchings/395BB0/func_E0098170.s similarity index 100% rename from ver/us/asm/nonmatchings/code_395BB0/func_E0098170.s rename to ver/us/asm/nonmatchings/395BB0/func_E0098170.s diff --git a/ver/us/asm/nonmatchings/code_395BB0/func_E009829C.s b/ver/us/asm/nonmatchings/395BB0/func_E009829C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_395BB0/func_E009829C.s rename to ver/us/asm/nonmatchings/395BB0/func_E009829C.s diff --git a/ver/us/asm/nonmatchings/code_395BB0/func_E00982EC.s b/ver/us/asm/nonmatchings/395BB0/func_E00982EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_395BB0/func_E00982EC.s rename to ver/us/asm/nonmatchings/395BB0/func_E00982EC.s diff --git a/ver/us/asm/nonmatchings/code_3965B0/func_E009A000.s b/ver/us/asm/nonmatchings/3965B0/func_E009A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3965B0/func_E009A000.s rename to ver/us/asm/nonmatchings/3965B0/func_E009A000.s diff --git a/ver/us/asm/nonmatchings/code_3965B0/func_E009A140.s b/ver/us/asm/nonmatchings/3965B0/func_E009A140.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3965B0/func_E009A140.s rename to ver/us/asm/nonmatchings/3965B0/func_E009A140.s diff --git a/ver/us/asm/nonmatchings/code_3965B0/func_E009A398.s b/ver/us/asm/nonmatchings/3965B0/func_E009A398.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3965B0/func_E009A398.s rename to ver/us/asm/nonmatchings/3965B0/func_E009A398.s diff --git a/ver/us/asm/nonmatchings/code_3965B0/func_E009A3E0.s b/ver/us/asm/nonmatchings/3965B0/func_E009A3E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3965B0/func_E009A3E0.s rename to ver/us/asm/nonmatchings/3965B0/func_E009A3E0.s diff --git a/ver/us/asm/nonmatchings/code_3981F0/func_E009C000.s b/ver/us/asm/nonmatchings/3981F0/func_E009C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3981F0/func_E009C000.s rename to ver/us/asm/nonmatchings/3981F0/func_E009C000.s diff --git a/ver/us/asm/nonmatchings/code_3981F0/func_E009C108.s b/ver/us/asm/nonmatchings/3981F0/func_E009C108.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3981F0/func_E009C108.s rename to ver/us/asm/nonmatchings/3981F0/func_E009C108.s diff --git a/ver/us/asm/nonmatchings/code_3981F0/func_E009C1DC.s b/ver/us/asm/nonmatchings/3981F0/func_E009C1DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3981F0/func_E009C1DC.s rename to ver/us/asm/nonmatchings/3981F0/func_E009C1DC.s diff --git a/ver/us/asm/nonmatchings/code_3981F0/func_E009C220.s b/ver/us/asm/nonmatchings/3981F0/func_E009C220.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3981F0/func_E009C220.s rename to ver/us/asm/nonmatchings/3981F0/func_E009C220.s diff --git a/ver/us/asm/nonmatchings/code_39FF20/func_E009E000.s b/ver/us/asm/nonmatchings/39FF20/func_E009E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_39FF20/func_E009E000.s rename to ver/us/asm/nonmatchings/39FF20/func_E009E000.s diff --git a/ver/us/asm/nonmatchings/code_39FF20/func_E009E1E4.s b/ver/us/asm/nonmatchings/39FF20/func_E009E1E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_39FF20/func_E009E1E4.s rename to ver/us/asm/nonmatchings/39FF20/func_E009E1E4.s diff --git a/ver/us/asm/nonmatchings/code_39FF20/func_E009E3DC.s b/ver/us/asm/nonmatchings/39FF20/func_E009E3DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_39FF20/func_E009E3DC.s rename to ver/us/asm/nonmatchings/39FF20/func_E009E3DC.s diff --git a/ver/us/asm/nonmatchings/code_39FF20/func_E009E424.s b/ver/us/asm/nonmatchings/39FF20/func_E009E424.s similarity index 100% rename from ver/us/asm/nonmatchings/code_39FF20/func_E009E424.s rename to ver/us/asm/nonmatchings/39FF20/func_E009E424.s diff --git a/ver/us/asm/nonmatchings/code_3A2290/func_E00A0000.s b/ver/us/asm/nonmatchings/3A2290/func_E00A0000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A2290/func_E00A0000.s rename to ver/us/asm/nonmatchings/3A2290/func_E00A0000.s diff --git a/ver/us/asm/nonmatchings/code_3A2990/func_E00A2000.s b/ver/us/asm/nonmatchings/3A2990/func_E00A2000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A2990/func_E00A2000.s rename to ver/us/asm/nonmatchings/3A2990/func_E00A2000.s diff --git a/ver/us/asm/nonmatchings/code_3A2990/func_E00A2120.s b/ver/us/asm/nonmatchings/3A2990/func_E00A2120.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A2990/func_E00A2120.s rename to ver/us/asm/nonmatchings/3A2990/func_E00A2120.s diff --git a/ver/us/asm/nonmatchings/code_3A2990/func_E00A21EC.s b/ver/us/asm/nonmatchings/3A2990/func_E00A21EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A2990/func_E00A21EC.s rename to ver/us/asm/nonmatchings/3A2990/func_E00A21EC.s diff --git a/ver/us/asm/nonmatchings/code_3A2990/func_E00A223C.s b/ver/us/asm/nonmatchings/3A2990/func_E00A223C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A2990/func_E00A223C.s rename to ver/us/asm/nonmatchings/3A2990/func_E00A223C.s diff --git a/ver/us/asm/nonmatchings/code_3A37E0/func_E00A4000.s b/ver/us/asm/nonmatchings/3A37E0/func_E00A4000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A37E0/func_E00A4000.s rename to ver/us/asm/nonmatchings/3A37E0/func_E00A4000.s diff --git a/ver/us/asm/nonmatchings/code_3A37E0/func_E00A41AC.s b/ver/us/asm/nonmatchings/3A37E0/func_E00A41AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A37E0/func_E00A41AC.s rename to ver/us/asm/nonmatchings/3A37E0/func_E00A41AC.s diff --git a/ver/us/asm/nonmatchings/code_3A37E0/func_E00A45DC.s b/ver/us/asm/nonmatchings/3A37E0/func_E00A45DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A37E0/func_E00A45DC.s rename to ver/us/asm/nonmatchings/3A37E0/func_E00A45DC.s diff --git a/ver/us/asm/nonmatchings/code_3A37E0/func_E00A4650.s b/ver/us/asm/nonmatchings/3A37E0/func_E00A4650.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A37E0/func_E00A4650.s rename to ver/us/asm/nonmatchings/3A37E0/func_E00A4650.s diff --git a/ver/us/asm/nonmatchings/code_3A5550/func_E00A6000.s b/ver/us/asm/nonmatchings/3A5550/func_E00A6000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A5550/func_E00A6000.s rename to ver/us/asm/nonmatchings/3A5550/func_E00A6000.s diff --git a/ver/us/asm/nonmatchings/code_3A5550/func_E00A6124.s b/ver/us/asm/nonmatchings/3A5550/func_E00A6124.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A5550/func_E00A6124.s rename to ver/us/asm/nonmatchings/3A5550/func_E00A6124.s diff --git a/ver/us/asm/nonmatchings/code_3A5550/func_E00A6358.s b/ver/us/asm/nonmatchings/3A5550/func_E00A6358.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A5550/func_E00A6358.s rename to ver/us/asm/nonmatchings/3A5550/func_E00A6358.s diff --git a/ver/us/asm/nonmatchings/code_3A5550/func_E00A63A4.s b/ver/us/asm/nonmatchings/3A5550/func_E00A63A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A5550/func_E00A63A4.s rename to ver/us/asm/nonmatchings/3A5550/func_E00A63A4.s diff --git a/ver/us/asm/nonmatchings/code_3A70F0/func_E00A8000.s b/ver/us/asm/nonmatchings/3A70F0/func_E00A8000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A70F0/func_E00A8000.s rename to ver/us/asm/nonmatchings/3A70F0/func_E00A8000.s diff --git a/ver/us/asm/nonmatchings/code_3A70F0/func_E00A8104.s b/ver/us/asm/nonmatchings/3A70F0/func_E00A8104.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A70F0/func_E00A8104.s rename to ver/us/asm/nonmatchings/3A70F0/func_E00A8104.s diff --git a/ver/us/asm/nonmatchings/code_3A70F0/func_E00A82D4.s b/ver/us/asm/nonmatchings/3A70F0/func_E00A82D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A70F0/func_E00A82D4.s rename to ver/us/asm/nonmatchings/3A70F0/func_E00A82D4.s diff --git a/ver/us/asm/nonmatchings/code_3A70F0/func_E00A8320.s b/ver/us/asm/nonmatchings/3A70F0/func_E00A8320.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3A70F0/func_E00A8320.s rename to ver/us/asm/nonmatchings/3A70F0/func_E00A8320.s diff --git a/ver/us/asm/nonmatchings/code_3AA920/func_E00AA000.s b/ver/us/asm/nonmatchings/3AA920/func_E00AA000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AA920/func_E00AA000.s rename to ver/us/asm/nonmatchings/3AA920/func_E00AA000.s diff --git a/ver/us/asm/nonmatchings/code_3AA920/func_E00AA10C.s b/ver/us/asm/nonmatchings/3AA920/func_E00AA10C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AA920/func_E00AA10C.s rename to ver/us/asm/nonmatchings/3AA920/func_E00AA10C.s diff --git a/ver/us/asm/nonmatchings/code_3AA920/func_E00AA3C0.s b/ver/us/asm/nonmatchings/3AA920/func_E00AA3C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AA920/func_E00AA3C0.s rename to ver/us/asm/nonmatchings/3AA920/func_E00AA3C0.s diff --git a/ver/us/asm/nonmatchings/code_3AA920/func_E00AA404.s b/ver/us/asm/nonmatchings/3AA920/func_E00AA404.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AA920/func_E00AA404.s rename to ver/us/asm/nonmatchings/3AA920/func_E00AA404.s diff --git a/ver/us/asm/nonmatchings/code_3AEE20/func_E00AC000.s b/ver/us/asm/nonmatchings/3AEE20/func_E00AC000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AEE20/func_E00AC000.s rename to ver/us/asm/nonmatchings/3AEE20/func_E00AC000.s diff --git a/ver/us/asm/nonmatchings/code_3AEE20/func_E00AC124.s b/ver/us/asm/nonmatchings/3AEE20/func_E00AC124.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AEE20/func_E00AC124.s rename to ver/us/asm/nonmatchings/3AEE20/func_E00AC124.s diff --git a/ver/us/asm/nonmatchings/code_3AEE20/func_E00AC288.s b/ver/us/asm/nonmatchings/3AEE20/func_E00AC288.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AEE20/func_E00AC288.s rename to ver/us/asm/nonmatchings/3AEE20/func_E00AC288.s diff --git a/ver/us/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s b/ver/us/asm/nonmatchings/3AEE20/func_E00AC2A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s rename to ver/us/asm/nonmatchings/3AEE20/func_E00AC2A4.s diff --git a/ver/us/asm/nonmatchings/code_3B2350/func_E00AE000.s b/ver/us/asm/nonmatchings/3B2350/func_E00AE000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B2350/func_E00AE000.s rename to ver/us/asm/nonmatchings/3B2350/func_E00AE000.s diff --git a/ver/us/asm/nonmatchings/code_3B2350/func_E00AE1B4.s b/ver/us/asm/nonmatchings/3B2350/func_E00AE1B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B2350/func_E00AE1B4.s rename to ver/us/asm/nonmatchings/3B2350/func_E00AE1B4.s diff --git a/ver/us/asm/nonmatchings/code_3B2350/func_E00AE4FC.s b/ver/us/asm/nonmatchings/3B2350/func_E00AE4FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B2350/func_E00AE4FC.s rename to ver/us/asm/nonmatchings/3B2350/func_E00AE4FC.s diff --git a/ver/us/asm/nonmatchings/code_3B2350/func_E00AE54C.s b/ver/us/asm/nonmatchings/3B2350/func_E00AE54C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B2350/func_E00AE54C.s rename to ver/us/asm/nonmatchings/3B2350/func_E00AE54C.s diff --git a/ver/us/asm/nonmatchings/code_3B3EB0/func_E00B0000.s b/ver/us/asm/nonmatchings/3B3EB0/func_E00B0000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B3EB0/func_E00B0000.s rename to ver/us/asm/nonmatchings/3B3EB0/func_E00B0000.s diff --git a/ver/us/asm/nonmatchings/code_3B3EB0/func_E00B0124.s b/ver/us/asm/nonmatchings/3B3EB0/func_E00B0124.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B3EB0/func_E00B0124.s rename to ver/us/asm/nonmatchings/3B3EB0/func_E00B0124.s diff --git a/ver/us/asm/nonmatchings/code_3B3EB0/func_E00B01F8.s b/ver/us/asm/nonmatchings/3B3EB0/func_E00B01F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B3EB0/func_E00B01F8.s rename to ver/us/asm/nonmatchings/3B3EB0/func_E00B01F8.s diff --git a/ver/us/asm/nonmatchings/code_3B3EB0/func_E00B0234.s b/ver/us/asm/nonmatchings/3B3EB0/func_E00B0234.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B3EB0/func_E00B0234.s rename to ver/us/asm/nonmatchings/3B3EB0/func_E00B0234.s diff --git a/ver/us/asm/nonmatchings/code_3B4790/func_E00B2000.s b/ver/us/asm/nonmatchings/3B4790/func_E00B2000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B4790/func_E00B2000.s rename to ver/us/asm/nonmatchings/3B4790/func_E00B2000.s diff --git a/ver/us/asm/nonmatchings/code_3B4790/func_E00B21E4.s b/ver/us/asm/nonmatchings/3B4790/func_E00B21E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B4790/func_E00B21E4.s rename to ver/us/asm/nonmatchings/3B4790/func_E00B21E4.s diff --git a/ver/us/asm/nonmatchings/code_3B4790/func_E00B2460.s b/ver/us/asm/nonmatchings/3B4790/func_E00B2460.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B4790/func_E00B2460.s rename to ver/us/asm/nonmatchings/3B4790/func_E00B2460.s diff --git a/ver/us/asm/nonmatchings/code_3B4790/func_E00B24B0.s b/ver/us/asm/nonmatchings/3B4790/func_E00B24B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B4790/func_E00B24B0.s rename to ver/us/asm/nonmatchings/3B4790/func_E00B24B0.s diff --git a/ver/us/asm/nonmatchings/code_3B5CF0/func_E00B4000.s b/ver/us/asm/nonmatchings/3B5CF0/func_E00B4000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B5CF0/func_E00B4000.s rename to ver/us/asm/nonmatchings/3B5CF0/func_E00B4000.s diff --git a/ver/us/asm/nonmatchings/code_3B5CF0/func_E00B413C.s b/ver/us/asm/nonmatchings/3B5CF0/func_E00B413C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B5CF0/func_E00B413C.s rename to ver/us/asm/nonmatchings/3B5CF0/func_E00B413C.s diff --git a/ver/us/asm/nonmatchings/code_3B5CF0/func_E00B452C.s b/ver/us/asm/nonmatchings/3B5CF0/func_E00B452C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B5CF0/func_E00B452C.s rename to ver/us/asm/nonmatchings/3B5CF0/func_E00B452C.s diff --git a/ver/us/asm/nonmatchings/code_3B5CF0/func_E00B457C.s b/ver/us/asm/nonmatchings/3B5CF0/func_E00B457C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B5CF0/func_E00B457C.s rename to ver/us/asm/nonmatchings/3B5CF0/func_E00B457C.s diff --git a/ver/us/asm/nonmatchings/code_3B7160/func_E00B6000.s b/ver/us/asm/nonmatchings/3B7160/func_E00B6000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7160/func_E00B6000.s rename to ver/us/asm/nonmatchings/3B7160/func_E00B6000.s diff --git a/ver/us/asm/nonmatchings/code_3B7160/func_E00B6180.s b/ver/us/asm/nonmatchings/3B7160/func_E00B6180.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7160/func_E00B6180.s rename to ver/us/asm/nonmatchings/3B7160/func_E00B6180.s diff --git a/ver/us/asm/nonmatchings/code_3B7160/func_E00B629C.s b/ver/us/asm/nonmatchings/3B7160/func_E00B629C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7160/func_E00B629C.s rename to ver/us/asm/nonmatchings/3B7160/func_E00B629C.s diff --git a/ver/us/asm/nonmatchings/code_3B7160/func_E00B62E0.s b/ver/us/asm/nonmatchings/3B7160/func_E00B62E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7160/func_E00B62E0.s rename to ver/us/asm/nonmatchings/3B7160/func_E00B62E0.s diff --git a/ver/us/asm/nonmatchings/code_3B7B80/func_E00B8000.s b/ver/us/asm/nonmatchings/3B7B80/func_E00B8000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7B80/func_E00B8000.s rename to ver/us/asm/nonmatchings/3B7B80/func_E00B8000.s diff --git a/ver/us/asm/nonmatchings/code_3B7B80/func_E00B8134.s b/ver/us/asm/nonmatchings/3B7B80/func_E00B8134.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7B80/func_E00B8134.s rename to ver/us/asm/nonmatchings/3B7B80/func_E00B8134.s diff --git a/ver/us/asm/nonmatchings/code_3B7B80/func_E00B81B8.s b/ver/us/asm/nonmatchings/3B7B80/func_E00B81B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7B80/func_E00B81B8.s rename to ver/us/asm/nonmatchings/3B7B80/func_E00B81B8.s diff --git a/ver/us/asm/nonmatchings/code_3B7B80/func_E00B8208.s b/ver/us/asm/nonmatchings/3B7B80/func_E00B8208.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B7B80/func_E00B8208.s rename to ver/us/asm/nonmatchings/3B7B80/func_E00B8208.s diff --git a/ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA000.s b/ver/us/asm/nonmatchings/3B8BD0/func_E00BA000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA000.s rename to ver/us/asm/nonmatchings/3B8BD0/func_E00BA000.s diff --git a/ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA174.s b/ver/us/asm/nonmatchings/3B8BD0/func_E00BA174.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA174.s rename to ver/us/asm/nonmatchings/3B8BD0/func_E00BA174.s diff --git a/ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA5DC.s b/ver/us/asm/nonmatchings/3B8BD0/func_E00BA5DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA5DC.s rename to ver/us/asm/nonmatchings/3B8BD0/func_E00BA5DC.s diff --git a/ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA620.s b/ver/us/asm/nonmatchings/3B8BD0/func_E00BA620.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3B8BD0/func_E00BA620.s rename to ver/us/asm/nonmatchings/3B8BD0/func_E00BA620.s diff --git a/ver/us/asm/nonmatchings/code_3BA030/func_E00BC000.s b/ver/us/asm/nonmatchings/3BA030/func_E00BC000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BA030/func_E00BC000.s rename to ver/us/asm/nonmatchings/3BA030/func_E00BC000.s diff --git a/ver/us/asm/nonmatchings/code_3BA030/func_E00BC1D8.s b/ver/us/asm/nonmatchings/3BA030/func_E00BC1D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BA030/func_E00BC1D8.s rename to ver/us/asm/nonmatchings/3BA030/func_E00BC1D8.s diff --git a/ver/us/asm/nonmatchings/code_3BA030/func_E00BC238.s b/ver/us/asm/nonmatchings/3BA030/func_E00BC238.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BA030/func_E00BC238.s rename to ver/us/asm/nonmatchings/3BA030/func_E00BC238.s diff --git a/ver/us/asm/nonmatchings/code_3BA030/func_E00BC2E8.s b/ver/us/asm/nonmatchings/3BA030/func_E00BC2E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BA030/func_E00BC2E8.s rename to ver/us/asm/nonmatchings/3BA030/func_E00BC2E8.s diff --git a/ver/us/asm/nonmatchings/code_3BA030/func_E00BC374.s b/ver/us/asm/nonmatchings/3BA030/func_E00BC374.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BA030/func_E00BC374.s rename to ver/us/asm/nonmatchings/3BA030/func_E00BC374.s diff --git a/ver/us/asm/nonmatchings/code_3BBF60/func_E00BE000.s b/ver/us/asm/nonmatchings/3BBF60/func_E00BE000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BBF60/func_E00BE000.s rename to ver/us/asm/nonmatchings/3BBF60/func_E00BE000.s diff --git a/ver/us/asm/nonmatchings/code_3BBF60/func_E00BE3A4.s b/ver/us/asm/nonmatchings/3BBF60/func_E00BE3A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BBF60/func_E00BE3A4.s rename to ver/us/asm/nonmatchings/3BBF60/func_E00BE3A4.s diff --git a/ver/us/asm/nonmatchings/code_3BBF60/func_E00BE578.s b/ver/us/asm/nonmatchings/3BBF60/func_E00BE578.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BBF60/func_E00BE578.s rename to ver/us/asm/nonmatchings/3BBF60/func_E00BE578.s diff --git a/ver/us/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s b/ver/us/asm/nonmatchings/3BBF60/func_E00BE5BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BBF60/func_E00BE5BC.s rename to ver/us/asm/nonmatchings/3BBF60/func_E00BE5BC.s diff --git a/ver/us/asm/nonmatchings/code_3BCD60/func_E00C0000.s b/ver/us/asm/nonmatchings/3BCD60/func_E00C0000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BCD60/func_E00C0000.s rename to ver/us/asm/nonmatchings/3BCD60/func_E00C0000.s diff --git a/ver/us/asm/nonmatchings/code_3BCD60/func_E00C0160.s b/ver/us/asm/nonmatchings/3BCD60/func_E00C0160.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BCD60/func_E00C0160.s rename to ver/us/asm/nonmatchings/3BCD60/func_E00C0160.s diff --git a/ver/us/asm/nonmatchings/code_3BCD60/func_E00C0710.s b/ver/us/asm/nonmatchings/3BCD60/func_E00C0710.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BCD60/func_E00C0710.s rename to ver/us/asm/nonmatchings/3BCD60/func_E00C0710.s diff --git a/ver/us/asm/nonmatchings/code_3BCD60/func_E00C0760.s b/ver/us/asm/nonmatchings/3BCD60/func_E00C0760.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3BCD60/func_E00C0760.s rename to ver/us/asm/nonmatchings/3BCD60/func_E00C0760.s diff --git a/ver/us/asm/nonmatchings/code_3C11D0/func_E00C2000.s b/ver/us/asm/nonmatchings/3C11D0/func_E00C2000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3C11D0/func_E00C2000.s rename to ver/us/asm/nonmatchings/3C11D0/func_E00C2000.s diff --git a/ver/us/asm/nonmatchings/code_3C11D0/func_E00C212C.s b/ver/us/asm/nonmatchings/3C11D0/func_E00C212C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3C11D0/func_E00C212C.s rename to ver/us/asm/nonmatchings/3C11D0/func_E00C212C.s diff --git a/ver/us/asm/nonmatchings/code_3C11D0/func_E00C21CC.s b/ver/us/asm/nonmatchings/3C11D0/func_E00C21CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3C11D0/func_E00C21CC.s rename to ver/us/asm/nonmatchings/3C11D0/func_E00C21CC.s diff --git a/ver/us/asm/nonmatchings/code_3C11D0/func_E00C221C.s b/ver/us/asm/nonmatchings/3C11D0/func_E00C221C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3C11D0/func_E00C221C.s rename to ver/us/asm/nonmatchings/3C11D0/func_E00C221C.s diff --git a/ver/us/asm/nonmatchings/code_3CADF0/func_E00C4000.s b/ver/us/asm/nonmatchings/3CADF0/func_E00C4000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CADF0/func_E00C4000.s rename to ver/us/asm/nonmatchings/3CADF0/func_E00C4000.s diff --git a/ver/us/asm/nonmatchings/code_3CADF0/func_E00C4178.s b/ver/us/asm/nonmatchings/3CADF0/func_E00C4178.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CADF0/func_E00C4178.s rename to ver/us/asm/nonmatchings/3CADF0/func_E00C4178.s diff --git a/ver/us/asm/nonmatchings/code_3CADF0/func_E00C42C4.s b/ver/us/asm/nonmatchings/3CADF0/func_E00C42C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CADF0/func_E00C42C4.s rename to ver/us/asm/nonmatchings/3CADF0/func_E00C42C4.s diff --git a/ver/us/asm/nonmatchings/code_3CADF0/func_E00C4308.s b/ver/us/asm/nonmatchings/3CADF0/func_E00C4308.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CADF0/func_E00C4308.s rename to ver/us/asm/nonmatchings/3CADF0/func_E00C4308.s diff --git a/ver/us/asm/nonmatchings/code_3CC9E0/func_E00C6000.s b/ver/us/asm/nonmatchings/3CC9E0/func_E00C6000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CC9E0/func_E00C6000.s rename to ver/us/asm/nonmatchings/3CC9E0/func_E00C6000.s diff --git a/ver/us/asm/nonmatchings/code_3CC9E0/func_E00C639C.s b/ver/us/asm/nonmatchings/3CC9E0/func_E00C639C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CC9E0/func_E00C639C.s rename to ver/us/asm/nonmatchings/3CC9E0/func_E00C639C.s diff --git a/ver/us/asm/nonmatchings/code_3CC9E0/func_E00C6768.s b/ver/us/asm/nonmatchings/3CC9E0/func_E00C6768.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CC9E0/func_E00C6768.s rename to ver/us/asm/nonmatchings/3CC9E0/func_E00C6768.s diff --git a/ver/us/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s b/ver/us/asm/nonmatchings/3CC9E0/func_E00C67B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CC9E0/func_E00C67B0.s rename to ver/us/asm/nonmatchings/3CC9E0/func_E00C67B0.s diff --git a/ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8000.s b/ver/us/asm/nonmatchings/3CF3A0/func_E00C8000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8000.s rename to ver/us/asm/nonmatchings/3CF3A0/func_E00C8000.s diff --git a/ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8220.s b/ver/us/asm/nonmatchings/3CF3A0/func_E00C8220.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8220.s rename to ver/us/asm/nonmatchings/3CF3A0/func_E00C8220.s diff --git a/ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8404.s b/ver/us/asm/nonmatchings/3CF3A0/func_E00C8404.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8404.s rename to ver/us/asm/nonmatchings/3CF3A0/func_E00C8404.s diff --git a/ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8454.s b/ver/us/asm/nonmatchings/3CF3A0/func_E00C8454.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3CF3A0/func_E00C8454.s rename to ver/us/asm/nonmatchings/3CF3A0/func_E00C8454.s diff --git a/ver/us/asm/nonmatchings/code_3D0500/func_E00CA000.s b/ver/us/asm/nonmatchings/3D0500/func_E00CA000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D0500/func_E00CA000.s rename to ver/us/asm/nonmatchings/3D0500/func_E00CA000.s diff --git a/ver/us/asm/nonmatchings/code_3D0500/func_E00CA248.s b/ver/us/asm/nonmatchings/3D0500/func_E00CA248.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D0500/func_E00CA248.s rename to ver/us/asm/nonmatchings/3D0500/func_E00CA248.s diff --git a/ver/us/asm/nonmatchings/code_3D0500/func_E00CA484.s b/ver/us/asm/nonmatchings/3D0500/func_E00CA484.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D0500/func_E00CA484.s rename to ver/us/asm/nonmatchings/3D0500/func_E00CA484.s diff --git a/ver/us/asm/nonmatchings/code_3D0500/func_E00CA4CC.s b/ver/us/asm/nonmatchings/3D0500/func_E00CA4CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D0500/func_E00CA4CC.s rename to ver/us/asm/nonmatchings/3D0500/func_E00CA4CC.s diff --git a/ver/us/asm/nonmatchings/code_3D1690/func_E00CC000.s b/ver/us/asm/nonmatchings/3D1690/func_E00CC000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D1690/func_E00CC000.s rename to ver/us/asm/nonmatchings/3D1690/func_E00CC000.s diff --git a/ver/us/asm/nonmatchings/code_3D1690/func_E00CC258.s b/ver/us/asm/nonmatchings/3D1690/func_E00CC258.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D1690/func_E00CC258.s rename to ver/us/asm/nonmatchings/3D1690/func_E00CC258.s diff --git a/ver/us/asm/nonmatchings/code_3D1690/func_E00CC980.s b/ver/us/asm/nonmatchings/3D1690/func_E00CC980.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D1690/func_E00CC980.s rename to ver/us/asm/nonmatchings/3D1690/func_E00CC980.s diff --git a/ver/us/asm/nonmatchings/code_3D1690/func_E00CC9D0.s b/ver/us/asm/nonmatchings/3D1690/func_E00CC9D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D1690/func_E00CC9D0.s rename to ver/us/asm/nonmatchings/3D1690/func_E00CC9D0.s diff --git a/ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE000.s b/ver/us/asm/nonmatchings/3D2AC0/func_E00CE000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE000.s rename to ver/us/asm/nonmatchings/3D2AC0/func_E00CE000.s diff --git a/ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE224.s b/ver/us/asm/nonmatchings/3D2AC0/func_E00CE224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE224.s rename to ver/us/asm/nonmatchings/3D2AC0/func_E00CE224.s diff --git a/ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE428.s b/ver/us/asm/nonmatchings/3D2AC0/func_E00CE428.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE428.s rename to ver/us/asm/nonmatchings/3D2AC0/func_E00CE428.s diff --git a/ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE478.s b/ver/us/asm/nonmatchings/3D2AC0/func_E00CE478.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D2AC0/func_E00CE478.s rename to ver/us/asm/nonmatchings/3D2AC0/func_E00CE478.s diff --git a/ver/us/asm/nonmatchings/code_3D3E20/func_E00D0000.s b/ver/us/asm/nonmatchings/3D3E20/func_E00D0000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D3E20/func_E00D0000.s rename to ver/us/asm/nonmatchings/3D3E20/func_E00D0000.s diff --git a/ver/us/asm/nonmatchings/code_3D3E20/func_E00D0194.s b/ver/us/asm/nonmatchings/3D3E20/func_E00D0194.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D3E20/func_E00D0194.s rename to ver/us/asm/nonmatchings/3D3E20/func_E00D0194.s diff --git a/ver/us/asm/nonmatchings/code_3D3E20/func_E00D0448.s b/ver/us/asm/nonmatchings/3D3E20/func_E00D0448.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D3E20/func_E00D0448.s rename to ver/us/asm/nonmatchings/3D3E20/func_E00D0448.s diff --git a/ver/us/asm/nonmatchings/code_3D3E20/func_E00D048C.s b/ver/us/asm/nonmatchings/3D3E20/func_E00D048C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D3E20/func_E00D048C.s rename to ver/us/asm/nonmatchings/3D3E20/func_E00D048C.s diff --git a/ver/us/asm/nonmatchings/code_3D4970/func_E00D2000.s b/ver/us/asm/nonmatchings/3D4970/func_E00D2000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D4970/func_E00D2000.s rename to ver/us/asm/nonmatchings/3D4970/func_E00D2000.s diff --git a/ver/us/asm/nonmatchings/code_3D4970/func_E00D2120.s b/ver/us/asm/nonmatchings/3D4970/func_E00D2120.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D4970/func_E00D2120.s rename to ver/us/asm/nonmatchings/3D4970/func_E00D2120.s diff --git a/ver/us/asm/nonmatchings/code_3D4970/func_E00D2234.s b/ver/us/asm/nonmatchings/3D4970/func_E00D2234.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D4970/func_E00D2234.s rename to ver/us/asm/nonmatchings/3D4970/func_E00D2234.s diff --git a/ver/us/asm/nonmatchings/code_3D4970/func_E00D2284.s b/ver/us/asm/nonmatchings/3D4970/func_E00D2284.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D4970/func_E00D2284.s rename to ver/us/asm/nonmatchings/3D4970/func_E00D2284.s diff --git a/ver/us/asm/nonmatchings/code_3D5020/func_E00D6000.s b/ver/us/asm/nonmatchings/3D5020/func_E00D6000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D5020/func_E00D6000.s rename to ver/us/asm/nonmatchings/3D5020/func_E00D6000.s diff --git a/ver/us/asm/nonmatchings/code_3D5020/func_E00D6720.s b/ver/us/asm/nonmatchings/3D5020/func_E00D6720.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D5020/func_E00D6720.s rename to ver/us/asm/nonmatchings/3D5020/func_E00D6720.s diff --git a/ver/us/asm/nonmatchings/code_3D5020/func_E00D693C.s b/ver/us/asm/nonmatchings/3D5020/func_E00D693C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D5020/func_E00D693C.s rename to ver/us/asm/nonmatchings/3D5020/func_E00D693C.s diff --git a/ver/us/asm/nonmatchings/code_3D5020/func_E00D6980.s b/ver/us/asm/nonmatchings/3D5020/func_E00D6980.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D5020/func_E00D6980.s rename to ver/us/asm/nonmatchings/3D5020/func_E00D6980.s diff --git a/ver/us/asm/nonmatchings/code_3D67C0/func_E00D8000.s b/ver/us/asm/nonmatchings/3D67C0/func_E00D8000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D67C0/func_E00D8000.s rename to ver/us/asm/nonmatchings/3D67C0/func_E00D8000.s diff --git a/ver/us/asm/nonmatchings/code_3D67C0/func_E00D8128.s b/ver/us/asm/nonmatchings/3D67C0/func_E00D8128.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D67C0/func_E00D8128.s rename to ver/us/asm/nonmatchings/3D67C0/func_E00D8128.s diff --git a/ver/us/asm/nonmatchings/code_3D67C0/func_E00D8264.s b/ver/us/asm/nonmatchings/3D67C0/func_E00D8264.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D67C0/func_E00D8264.s rename to ver/us/asm/nonmatchings/3D67C0/func_E00D8264.s diff --git a/ver/us/asm/nonmatchings/code_3D67C0/func_E00D8334.s b/ver/us/asm/nonmatchings/3D67C0/func_E00D8334.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D67C0/func_E00D8334.s rename to ver/us/asm/nonmatchings/3D67C0/func_E00D8334.s diff --git a/ver/us/asm/nonmatchings/code_3D67C0/func_E00D8630.s b/ver/us/asm/nonmatchings/3D67C0/func_E00D8630.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D67C0/func_E00D8630.s rename to ver/us/asm/nonmatchings/3D67C0/func_E00D8630.s diff --git a/ver/us/asm/nonmatchings/code_3D7240/func_E00DA000.s b/ver/us/asm/nonmatchings/3D7240/func_E00DA000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7240/func_E00DA000.s rename to ver/us/asm/nonmatchings/3D7240/func_E00DA000.s diff --git a/ver/us/asm/nonmatchings/code_3D7240/func_E00DA104.s b/ver/us/asm/nonmatchings/3D7240/func_E00DA104.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7240/func_E00DA104.s rename to ver/us/asm/nonmatchings/3D7240/func_E00DA104.s diff --git a/ver/us/asm/nonmatchings/code_3D7240/func_E00DA1E0.s b/ver/us/asm/nonmatchings/3D7240/func_E00DA1E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7240/func_E00DA1E0.s rename to ver/us/asm/nonmatchings/3D7240/func_E00DA1E0.s diff --git a/ver/us/asm/nonmatchings/code_3D7240/func_E00DA230.s b/ver/us/asm/nonmatchings/3D7240/func_E00DA230.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7240/func_E00DA230.s rename to ver/us/asm/nonmatchings/3D7240/func_E00DA230.s diff --git a/ver/us/asm/nonmatchings/code_3D7A70/func_E00DC000.s b/ver/us/asm/nonmatchings/3D7A70/func_E00DC000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7A70/func_E00DC000.s rename to ver/us/asm/nonmatchings/3D7A70/func_E00DC000.s diff --git a/ver/us/asm/nonmatchings/code_3D7A70/func_E00DC198.s b/ver/us/asm/nonmatchings/3D7A70/func_E00DC198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7A70/func_E00DC198.s rename to ver/us/asm/nonmatchings/3D7A70/func_E00DC198.s diff --git a/ver/us/asm/nonmatchings/code_3D7A70/func_E00DC2C0.s b/ver/us/asm/nonmatchings/3D7A70/func_E00DC2C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7A70/func_E00DC2C0.s rename to ver/us/asm/nonmatchings/3D7A70/func_E00DC2C0.s diff --git a/ver/us/asm/nonmatchings/code_3D7A70/func_E00DC304.s b/ver/us/asm/nonmatchings/3D7A70/func_E00DC304.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D7A70/func_E00DC304.s rename to ver/us/asm/nonmatchings/3D7A70/func_E00DC304.s diff --git a/ver/us/asm/nonmatchings/code_3D8720/func_E00DE000.s b/ver/us/asm/nonmatchings/3D8720/func_E00DE000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D8720/func_E00DE000.s rename to ver/us/asm/nonmatchings/3D8720/func_E00DE000.s diff --git a/ver/us/asm/nonmatchings/code_3D8720/func_E00DE124.s b/ver/us/asm/nonmatchings/3D8720/func_E00DE124.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D8720/func_E00DE124.s rename to ver/us/asm/nonmatchings/3D8720/func_E00DE124.s diff --git a/ver/us/asm/nonmatchings/code_3D8720/func_E00DE260.s b/ver/us/asm/nonmatchings/3D8720/func_E00DE260.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D8720/func_E00DE260.s rename to ver/us/asm/nonmatchings/3D8720/func_E00DE260.s diff --git a/ver/us/asm/nonmatchings/code_3D8720/func_E00DE2A8.s b/ver/us/asm/nonmatchings/3D8720/func_E00DE2A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3D8720/func_E00DE2A8.s rename to ver/us/asm/nonmatchings/3D8720/func_E00DE2A8.s diff --git a/ver/us/asm/nonmatchings/code_3DB460/func_E00E0000.s b/ver/us/asm/nonmatchings/3DB460/func_E00E0000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DB460/func_E00E0000.s rename to ver/us/asm/nonmatchings/3DB460/func_E00E0000.s diff --git a/ver/us/asm/nonmatchings/code_3DB460/func_E00E01D8.s b/ver/us/asm/nonmatchings/3DB460/func_E00E01D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DB460/func_E00E01D8.s rename to ver/us/asm/nonmatchings/3DB460/func_E00E01D8.s diff --git a/ver/us/asm/nonmatchings/code_3DB460/func_E00E05B0.s b/ver/us/asm/nonmatchings/3DB460/func_E00E05B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DB460/func_E00E05B0.s rename to ver/us/asm/nonmatchings/3DB460/func_E00E05B0.s diff --git a/ver/us/asm/nonmatchings/code_3DB460/func_E00E0600.s b/ver/us/asm/nonmatchings/3DB460/func_E00E0600.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DB460/func_E00E0600.s rename to ver/us/asm/nonmatchings/3DB460/func_E00E0600.s diff --git a/ver/us/asm/nonmatchings/code_3DC310/func_E00E2000.s b/ver/us/asm/nonmatchings/3DC310/func_E00E2000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DC310/func_E00E2000.s rename to ver/us/asm/nonmatchings/3DC310/func_E00E2000.s diff --git a/ver/us/asm/nonmatchings/code_3DC310/func_E00E2134.s b/ver/us/asm/nonmatchings/3DC310/func_E00E2134.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DC310/func_E00E2134.s rename to ver/us/asm/nonmatchings/3DC310/func_E00E2134.s diff --git a/ver/us/asm/nonmatchings/code_3DC310/func_E00E21C8.s b/ver/us/asm/nonmatchings/3DC310/func_E00E21C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DC310/func_E00E21C8.s rename to ver/us/asm/nonmatchings/3DC310/func_E00E21C8.s diff --git a/ver/us/asm/nonmatchings/code_3DC310/func_E00E2218.s b/ver/us/asm/nonmatchings/3DC310/func_E00E2218.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DC310/func_E00E2218.s rename to ver/us/asm/nonmatchings/3DC310/func_E00E2218.s diff --git a/ver/us/asm/nonmatchings/code_3DE000/func_E00E4000.s b/ver/us/asm/nonmatchings/3DE000/func_E00E4000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DE000/func_E00E4000.s rename to ver/us/asm/nonmatchings/3DE000/func_E00E4000.s diff --git a/ver/us/asm/nonmatchings/code_3DE000/func_E00E4290.s b/ver/us/asm/nonmatchings/3DE000/func_E00E4290.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DE000/func_E00E4290.s rename to ver/us/asm/nonmatchings/3DE000/func_E00E4290.s diff --git a/ver/us/asm/nonmatchings/code_3DE000/func_E00E490C.s b/ver/us/asm/nonmatchings/3DE000/func_E00E490C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DE000/func_E00E490C.s rename to ver/us/asm/nonmatchings/3DE000/func_E00E490C.s diff --git a/ver/us/asm/nonmatchings/code_3DE000/func_E00E495C.s b/ver/us/asm/nonmatchings/3DE000/func_E00E495C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3DE000/func_E00E495C.s rename to ver/us/asm/nonmatchings/3DE000/func_E00E495C.s diff --git a/ver/us/asm/nonmatchings/code_3E0930/func_E00E6000.s b/ver/us/asm/nonmatchings/3E0930/func_E00E6000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E0930/func_E00E6000.s rename to ver/us/asm/nonmatchings/3E0930/func_E00E6000.s diff --git a/ver/us/asm/nonmatchings/code_3E0930/func_E00E6184.s b/ver/us/asm/nonmatchings/3E0930/func_E00E6184.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E0930/func_E00E6184.s rename to ver/us/asm/nonmatchings/3E0930/func_E00E6184.s diff --git a/ver/us/asm/nonmatchings/code_3E0930/func_E00E64D4.s b/ver/us/asm/nonmatchings/3E0930/func_E00E64D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E0930/func_E00E64D4.s rename to ver/us/asm/nonmatchings/3E0930/func_E00E64D4.s diff --git a/ver/us/asm/nonmatchings/code_3E0930/func_E00E6524.s b/ver/us/asm/nonmatchings/3E0930/func_E00E6524.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E0930/func_E00E6524.s rename to ver/us/asm/nonmatchings/3E0930/func_E00E6524.s diff --git a/ver/us/asm/nonmatchings/code_3E1690/func_E00E8000.s b/ver/us/asm/nonmatchings/3E1690/func_E00E8000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1690/func_E00E8000.s rename to ver/us/asm/nonmatchings/3E1690/func_E00E8000.s diff --git a/ver/us/asm/nonmatchings/code_3E1690/func_E00E8264.s b/ver/us/asm/nonmatchings/3E1690/func_E00E8264.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1690/func_E00E8264.s rename to ver/us/asm/nonmatchings/3E1690/func_E00E8264.s diff --git a/ver/us/asm/nonmatchings/code_3E1690/func_E00E8374.s b/ver/us/asm/nonmatchings/3E1690/func_E00E8374.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1690/func_E00E8374.s rename to ver/us/asm/nonmatchings/3E1690/func_E00E8374.s diff --git a/ver/us/asm/nonmatchings/code_3E1690/func_E00E83BC.s b/ver/us/asm/nonmatchings/3E1690/func_E00E83BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1690/func_E00E83BC.s rename to ver/us/asm/nonmatchings/3E1690/func_E00E83BC.s diff --git a/ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA000.s b/ver/us/asm/nonmatchings/3E1EE0/func_E00EA000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA000.s rename to ver/us/asm/nonmatchings/3E1EE0/func_E00EA000.s diff --git a/ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA198.s b/ver/us/asm/nonmatchings/3E1EE0/func_E00EA198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA198.s rename to ver/us/asm/nonmatchings/3E1EE0/func_E00EA198.s diff --git a/ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA520.s b/ver/us/asm/nonmatchings/3E1EE0/func_E00EA520.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA520.s rename to ver/us/asm/nonmatchings/3E1EE0/func_E00EA520.s diff --git a/ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s b/ver/us/asm/nonmatchings/3E1EE0/func_E00EA66C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E1EE0/func_E00EA66C.s rename to ver/us/asm/nonmatchings/3E1EE0/func_E00EA66C.s diff --git a/ver/us/asm/nonmatchings/code_3E43A0/func_E010A000.s b/ver/us/asm/nonmatchings/3E43A0/func_E010A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E43A0/func_E010A000.s rename to ver/us/asm/nonmatchings/3E43A0/func_E010A000.s diff --git a/ver/us/asm/nonmatchings/code_3E43A0/func_E010A18C.s b/ver/us/asm/nonmatchings/3E43A0/func_E010A18C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E43A0/func_E010A18C.s rename to ver/us/asm/nonmatchings/3E43A0/func_E010A18C.s diff --git a/ver/us/asm/nonmatchings/code_3E43A0/func_E010A4A0.s b/ver/us/asm/nonmatchings/3E43A0/func_E010A4A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E43A0/func_E010A4A0.s rename to ver/us/asm/nonmatchings/3E43A0/func_E010A4A0.s diff --git a/ver/us/asm/nonmatchings/code_3E43A0/func_E010A4E8.s b/ver/us/asm/nonmatchings/3E43A0/func_E010A4E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E43A0/func_E010A4E8.s rename to ver/us/asm/nonmatchings/3E43A0/func_E010A4E8.s diff --git a/ver/us/asm/nonmatchings/code_3E54C0/func_E010C000.s b/ver/us/asm/nonmatchings/3E54C0/func_E010C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E54C0/func_E010C000.s rename to ver/us/asm/nonmatchings/3E54C0/func_E010C000.s diff --git a/ver/us/asm/nonmatchings/code_3E54C0/func_E010C198.s b/ver/us/asm/nonmatchings/3E54C0/func_E010C198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E54C0/func_E010C198.s rename to ver/us/asm/nonmatchings/3E54C0/func_E010C198.s diff --git a/ver/us/asm/nonmatchings/code_3E54C0/func_E010C354.s b/ver/us/asm/nonmatchings/3E54C0/func_E010C354.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E54C0/func_E010C354.s rename to ver/us/asm/nonmatchings/3E54C0/func_E010C354.s diff --git a/ver/us/asm/nonmatchings/code_3E54C0/func_E010C39C.s b/ver/us/asm/nonmatchings/3E54C0/func_E010C39C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3E54C0/func_E010C39C.s rename to ver/us/asm/nonmatchings/3E54C0/func_E010C39C.s diff --git a/ver/us/asm/nonmatchings/code_3EB4E0/func_E010E000.s b/ver/us/asm/nonmatchings/3EB4E0/func_E010E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3EB4E0/func_E010E000.s rename to ver/us/asm/nonmatchings/3EB4E0/func_E010E000.s diff --git a/ver/us/asm/nonmatchings/code_3EB4E0/func_E010E32C.s b/ver/us/asm/nonmatchings/3EB4E0/func_E010E32C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3EB4E0/func_E010E32C.s rename to ver/us/asm/nonmatchings/3EB4E0/func_E010E32C.s diff --git a/ver/us/asm/nonmatchings/code_3EB4E0/func_E010E4A8.s b/ver/us/asm/nonmatchings/3EB4E0/func_E010E4A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3EB4E0/func_E010E4A8.s rename to ver/us/asm/nonmatchings/3EB4E0/func_E010E4A8.s diff --git a/ver/us/asm/nonmatchings/code_3EB4E0/func_E010E510.s b/ver/us/asm/nonmatchings/3EB4E0/func_E010E510.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3EB4E0/func_E010E510.s rename to ver/us/asm/nonmatchings/3EB4E0/func_E010E510.s diff --git a/ver/us/asm/nonmatchings/code_3EB4E0/func_E010E558.s b/ver/us/asm/nonmatchings/3EB4E0/func_E010E558.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3EB4E0/func_E010E558.s rename to ver/us/asm/nonmatchings/3EB4E0/func_E010E558.s diff --git a/ver/us/asm/nonmatchings/code_3F83F0/func_E0110000.s b/ver/us/asm/nonmatchings/3F83F0/func_E0110000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F83F0/func_E0110000.s rename to ver/us/asm/nonmatchings/3F83F0/func_E0110000.s diff --git a/ver/us/asm/nonmatchings/code_3F83F0/func_E011022C.s b/ver/us/asm/nonmatchings/3F83F0/func_E011022C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F83F0/func_E011022C.s rename to ver/us/asm/nonmatchings/3F83F0/func_E011022C.s diff --git a/ver/us/asm/nonmatchings/code_3F83F0/func_E01103A4.s b/ver/us/asm/nonmatchings/3F83F0/func_E01103A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F83F0/func_E01103A4.s rename to ver/us/asm/nonmatchings/3F83F0/func_E01103A4.s diff --git a/ver/us/asm/nonmatchings/code_3F83F0/func_E01103EC.s b/ver/us/asm/nonmatchings/3F83F0/func_E01103EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F83F0/func_E01103EC.s rename to ver/us/asm/nonmatchings/3F83F0/func_E01103EC.s diff --git a/ver/us/asm/nonmatchings/code_3F9E50/func_E0112000.s b/ver/us/asm/nonmatchings/3F9E50/func_E0112000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F9E50/func_E0112000.s rename to ver/us/asm/nonmatchings/3F9E50/func_E0112000.s diff --git a/ver/us/asm/nonmatchings/code_3F9E50/func_E01121C0.s b/ver/us/asm/nonmatchings/3F9E50/func_E01121C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F9E50/func_E01121C0.s rename to ver/us/asm/nonmatchings/3F9E50/func_E01121C0.s diff --git a/ver/us/asm/nonmatchings/code_3F9E50/func_E01122E8.s b/ver/us/asm/nonmatchings/3F9E50/func_E01122E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F9E50/func_E01122E8.s rename to ver/us/asm/nonmatchings/3F9E50/func_E01122E8.s diff --git a/ver/us/asm/nonmatchings/code_3F9E50/func_E0112330.s b/ver/us/asm/nonmatchings/3F9E50/func_E0112330.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F9E50/func_E0112330.s rename to ver/us/asm/nonmatchings/3F9E50/func_E0112330.s diff --git a/ver/us/asm/nonmatchings/code_3F9E50/func_E01124CC.s b/ver/us/asm/nonmatchings/3F9E50/func_E01124CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3F9E50/func_E01124CC.s rename to ver/us/asm/nonmatchings/3F9E50/func_E01124CC.s diff --git a/ver/us/asm/nonmatchings/code_3FEAE0/func_E0114000.s b/ver/us/asm/nonmatchings/3FEAE0/func_E0114000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3FEAE0/func_E0114000.s rename to ver/us/asm/nonmatchings/3FEAE0/func_E0114000.s diff --git a/ver/us/asm/nonmatchings/code_3FEAE0/func_E01140DC.s b/ver/us/asm/nonmatchings/3FEAE0/func_E01140DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3FEAE0/func_E01140DC.s rename to ver/us/asm/nonmatchings/3FEAE0/func_E01140DC.s diff --git a/ver/us/asm/nonmatchings/code_3FEAE0/func_E0114340.s b/ver/us/asm/nonmatchings/3FEAE0/func_E0114340.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3FEAE0/func_E0114340.s rename to ver/us/asm/nonmatchings/3FEAE0/func_E0114340.s diff --git a/ver/us/asm/nonmatchings/code_3FEAE0/func_E0114388.s b/ver/us/asm/nonmatchings/3FEAE0/func_E0114388.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3FEAE0/func_E0114388.s rename to ver/us/asm/nonmatchings/3FEAE0/func_E0114388.s diff --git a/ver/us/asm/nonmatchings/code_3bf0_len_6f0/update_input.s b/ver/us/asm/nonmatchings/3bf0_len_6f0/update_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_3bf0_len_6f0/update_input.s rename to ver/us/asm/nonmatchings/3bf0_len_6f0/update_input.s diff --git a/ver/us/asm/nonmatchings/code_402640/func_E0116000.s b/ver/us/asm/nonmatchings/402640/func_E0116000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_402640/func_E0116000.s rename to ver/us/asm/nonmatchings/402640/func_E0116000.s diff --git a/ver/us/asm/nonmatchings/code_402640/func_E011618C.s b/ver/us/asm/nonmatchings/402640/func_E011618C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_402640/func_E011618C.s rename to ver/us/asm/nonmatchings/402640/func_E011618C.s diff --git a/ver/us/asm/nonmatchings/code_402640/func_E01166A0.s b/ver/us/asm/nonmatchings/402640/func_E01166A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_402640/func_E01166A0.s rename to ver/us/asm/nonmatchings/402640/func_E01166A0.s diff --git a/ver/us/asm/nonmatchings/code_402640/func_E01166E8.s b/ver/us/asm/nonmatchings/402640/func_E01166E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_402640/func_E01166E8.s rename to ver/us/asm/nonmatchings/402640/func_E01166E8.s diff --git a/ver/us/asm/nonmatchings/code_402640/func_E0116884.s b/ver/us/asm/nonmatchings/402640/func_E0116884.s similarity index 100% rename from ver/us/asm/nonmatchings/code_402640/func_E0116884.s rename to ver/us/asm/nonmatchings/402640/func_E0116884.s diff --git a/ver/us/asm/nonmatchings/code_403400/func_E0118000.s b/ver/us/asm/nonmatchings/403400/func_E0118000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_403400/func_E0118000.s rename to ver/us/asm/nonmatchings/403400/func_E0118000.s diff --git a/ver/us/asm/nonmatchings/code_403400/func_E01182F4.s b/ver/us/asm/nonmatchings/403400/func_E01182F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_403400/func_E01182F4.s rename to ver/us/asm/nonmatchings/403400/func_E01182F4.s diff --git a/ver/us/asm/nonmatchings/code_403400/func_E0118454.s b/ver/us/asm/nonmatchings/403400/func_E0118454.s similarity index 100% rename from ver/us/asm/nonmatchings/code_403400/func_E0118454.s rename to ver/us/asm/nonmatchings/403400/func_E0118454.s diff --git a/ver/us/asm/nonmatchings/code_403400/func_E011849C.s b/ver/us/asm/nonmatchings/403400/func_E011849C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_403400/func_E011849C.s rename to ver/us/asm/nonmatchings/403400/func_E011849C.s diff --git a/ver/us/asm/nonmatchings/code_404220/func_E011A000.s b/ver/us/asm/nonmatchings/404220/func_E011A000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_404220/func_E011A000.s rename to ver/us/asm/nonmatchings/404220/func_E011A000.s diff --git a/ver/us/asm/nonmatchings/code_404220/func_E011A104.s b/ver/us/asm/nonmatchings/404220/func_E011A104.s similarity index 100% rename from ver/us/asm/nonmatchings/code_404220/func_E011A104.s rename to ver/us/asm/nonmatchings/404220/func_E011A104.s diff --git a/ver/us/asm/nonmatchings/code_404220/func_E011A3A0.s b/ver/us/asm/nonmatchings/404220/func_E011A3A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_404220/func_E011A3A0.s rename to ver/us/asm/nonmatchings/404220/func_E011A3A0.s diff --git a/ver/us/asm/nonmatchings/code_404220/func_E011A3BC.s b/ver/us/asm/nonmatchings/404220/func_E011A3BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_404220/func_E011A3BC.s rename to ver/us/asm/nonmatchings/404220/func_E011A3BC.s diff --git a/ver/us/asm/nonmatchings/code_404220/func_E011A48C.s b/ver/us/asm/nonmatchings/404220/func_E011A48C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_404220/func_E011A48C.s rename to ver/us/asm/nonmatchings/404220/func_E011A48C.s diff --git a/ver/us/asm/nonmatchings/code_404220/func_E011A700.s b/ver/us/asm/nonmatchings/404220/func_E011A700.s similarity index 100% rename from ver/us/asm/nonmatchings/code_404220/func_E011A700.s rename to ver/us/asm/nonmatchings/404220/func_E011A700.s diff --git a/ver/us/asm/nonmatchings/code_406B40/func_E011C000.s b/ver/us/asm/nonmatchings/406B40/func_E011C000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_406B40/func_E011C000.s rename to ver/us/asm/nonmatchings/406B40/func_E011C000.s diff --git a/ver/us/asm/nonmatchings/code_406B40/func_E011C0FC.s b/ver/us/asm/nonmatchings/406B40/func_E011C0FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_406B40/func_E011C0FC.s rename to ver/us/asm/nonmatchings/406B40/func_E011C0FC.s diff --git a/ver/us/asm/nonmatchings/code_406B40/func_E011C17C.s b/ver/us/asm/nonmatchings/406B40/func_E011C17C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_406B40/func_E011C17C.s rename to ver/us/asm/nonmatchings/406B40/func_E011C17C.s diff --git a/ver/us/asm/nonmatchings/code_406B40/func_E011C1C4.s b/ver/us/asm/nonmatchings/406B40/func_E011C1C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_406B40/func_E011C1C4.s rename to ver/us/asm/nonmatchings/406B40/func_E011C1C4.s diff --git a/ver/us/asm/nonmatchings/code_409990/func_E011E000.s b/ver/us/asm/nonmatchings/409990/func_E011E000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_409990/func_E011E000.s rename to ver/us/asm/nonmatchings/409990/func_E011E000.s diff --git a/ver/us/asm/nonmatchings/code_409990/func_E011E194.s b/ver/us/asm/nonmatchings/409990/func_E011E194.s similarity index 100% rename from ver/us/asm/nonmatchings/code_409990/func_E011E194.s rename to ver/us/asm/nonmatchings/409990/func_E011E194.s diff --git a/ver/us/asm/nonmatchings/code_409990/func_E011E530.s b/ver/us/asm/nonmatchings/409990/func_E011E530.s similarity index 100% rename from ver/us/asm/nonmatchings/code_409990/func_E011E530.s rename to ver/us/asm/nonmatchings/409990/func_E011E530.s diff --git a/ver/us/asm/nonmatchings/code_409990/func_E011E578.s b/ver/us/asm/nonmatchings/409990/func_E011E578.s similarity index 100% rename from ver/us/asm/nonmatchings/code_409990/func_E011E578.s rename to ver/us/asm/nonmatchings/409990/func_E011E578.s diff --git a/ver/us/asm/nonmatchings/code_40B3F0/func_E0120000.s b/ver/us/asm/nonmatchings/40B3F0/func_E0120000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40B3F0/func_E0120000.s rename to ver/us/asm/nonmatchings/40B3F0/func_E0120000.s diff --git a/ver/us/asm/nonmatchings/code_40B3F0/func_E012013C.s b/ver/us/asm/nonmatchings/40B3F0/func_E012013C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40B3F0/func_E012013C.s rename to ver/us/asm/nonmatchings/40B3F0/func_E012013C.s diff --git a/ver/us/asm/nonmatchings/code_40B3F0/func_E012039C.s b/ver/us/asm/nonmatchings/40B3F0/func_E012039C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40B3F0/func_E012039C.s rename to ver/us/asm/nonmatchings/40B3F0/func_E012039C.s diff --git a/ver/us/asm/nonmatchings/code_40B3F0/func_E01203E4.s b/ver/us/asm/nonmatchings/40B3F0/func_E01203E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40B3F0/func_E01203E4.s rename to ver/us/asm/nonmatchings/40B3F0/func_E01203E4.s diff --git a/ver/us/asm/nonmatchings/code_40C5A0/func_E0122000.s b/ver/us/asm/nonmatchings/40C5A0/func_E0122000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40C5A0/func_E0122000.s rename to ver/us/asm/nonmatchings/40C5A0/func_E0122000.s diff --git a/ver/us/asm/nonmatchings/code_40C5A0/func_E012217C.s b/ver/us/asm/nonmatchings/40C5A0/func_E012217C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40C5A0/func_E012217C.s rename to ver/us/asm/nonmatchings/40C5A0/func_E012217C.s diff --git a/ver/us/asm/nonmatchings/code_40C5A0/func_E01226C4.s b/ver/us/asm/nonmatchings/40C5A0/func_E01226C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40C5A0/func_E01226C4.s rename to ver/us/asm/nonmatchings/40C5A0/func_E01226C4.s diff --git a/ver/us/asm/nonmatchings/code_40C5A0/func_E012270C.s b/ver/us/asm/nonmatchings/40C5A0/func_E012270C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_40C5A0/func_E012270C.s rename to ver/us/asm/nonmatchings/40C5A0/func_E012270C.s diff --git a/ver/us/asm/nonmatchings/code_412730/func_E0124000.s b/ver/us/asm/nonmatchings/412730/func_E0124000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_412730/func_E0124000.s rename to ver/us/asm/nonmatchings/412730/func_E0124000.s diff --git a/ver/us/asm/nonmatchings/code_412730/func_E0124304.s b/ver/us/asm/nonmatchings/412730/func_E0124304.s similarity index 100% rename from ver/us/asm/nonmatchings/code_412730/func_E0124304.s rename to ver/us/asm/nonmatchings/412730/func_E0124304.s diff --git a/ver/us/asm/nonmatchings/code_412730/func_E012448C.s b/ver/us/asm/nonmatchings/412730/func_E012448C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_412730/func_E012448C.s rename to ver/us/asm/nonmatchings/412730/func_E012448C.s diff --git a/ver/us/asm/nonmatchings/code_412730/func_E01244C4.s b/ver/us/asm/nonmatchings/412730/func_E01244C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_412730/func_E01244C4.s rename to ver/us/asm/nonmatchings/412730/func_E01244C4.s diff --git a/ver/us/asm/nonmatchings/code_413360/func_E0126000.s b/ver/us/asm/nonmatchings/413360/func_E0126000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_413360/func_E0126000.s rename to ver/us/asm/nonmatchings/413360/func_E0126000.s diff --git a/ver/us/asm/nonmatchings/code_413360/func_E0126134.s b/ver/us/asm/nonmatchings/413360/func_E0126134.s similarity index 100% rename from ver/us/asm/nonmatchings/code_413360/func_E0126134.s rename to ver/us/asm/nonmatchings/413360/func_E0126134.s diff --git a/ver/us/asm/nonmatchings/code_413360/func_E01264A4.s b/ver/us/asm/nonmatchings/413360/func_E01264A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_413360/func_E01264A4.s rename to ver/us/asm/nonmatchings/413360/func_E01264A4.s diff --git a/ver/us/asm/nonmatchings/code_413360/func_E01264EC.s b/ver/us/asm/nonmatchings/413360/func_E01264EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_413360/func_E01264EC.s rename to ver/us/asm/nonmatchings/413360/func_E01264EC.s diff --git a/ver/us/asm/nonmatchings/code_414BA0/func_E0128000.s b/ver/us/asm/nonmatchings/414BA0/func_E0128000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_414BA0/func_E0128000.s rename to ver/us/asm/nonmatchings/414BA0/func_E0128000.s diff --git a/ver/us/asm/nonmatchings/code_414BA0/func_E0128130.s b/ver/us/asm/nonmatchings/414BA0/func_E0128130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_414BA0/func_E0128130.s rename to ver/us/asm/nonmatchings/414BA0/func_E0128130.s diff --git a/ver/us/asm/nonmatchings/code_414BA0/func_E0128198.s b/ver/us/asm/nonmatchings/414BA0/func_E0128198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_414BA0/func_E0128198.s rename to ver/us/asm/nonmatchings/414BA0/func_E0128198.s diff --git a/ver/us/asm/nonmatchings/code_414BA0/func_E01281E0.s b/ver/us/asm/nonmatchings/414BA0/func_E01281E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_414BA0/func_E01281E0.s rename to ver/us/asm/nonmatchings/414BA0/func_E01281E0.s diff --git a/ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s b/ver/us/asm/nonmatchings/415D90/draw_battle_wheel.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/draw_battle_wheel.s rename to ver/us/asm/nonmatchings/415D90/draw_battle_wheel.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A11B0.s b/ver/us/asm/nonmatchings/415D90/func_802A11B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A11B0.s rename to ver/us/asm/nonmatchings/415D90/func_802A11B0.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A2684.s b/ver/us/asm/nonmatchings/415D90/func_802A2684.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A2684.s rename to ver/us/asm/nonmatchings/415D90/func_802A2684.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A27E4.s b/ver/us/asm/nonmatchings/415D90/func_802A27E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A27E4.s rename to ver/us/asm/nonmatchings/415D90/func_802A27E4.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s b/ver/us/asm/nonmatchings/415D90/func_802A2C84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A2C84.s rename to ver/us/asm/nonmatchings/415D90/func_802A2C84.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s b/ver/us/asm/nonmatchings/415D90/func_802A3C98.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A3C98.s rename to ver/us/asm/nonmatchings/415D90/func_802A3C98.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4494.s b/ver/us/asm/nonmatchings/415D90/func_802A4494.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A4494.s rename to ver/us/asm/nonmatchings/415D90/func_802A4494.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A45D8.s b/ver/us/asm/nonmatchings/415D90/func_802A45D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A45D8.s rename to ver/us/asm/nonmatchings/415D90/func_802A45D8.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A47E0.s b/ver/us/asm/nonmatchings/415D90/func_802A47E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A47E0.s rename to ver/us/asm/nonmatchings/415D90/func_802A47E0.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A48FC.s b/ver/us/asm/nonmatchings/415D90/func_802A48FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A48FC.s rename to ver/us/asm/nonmatchings/415D90/func_802A48FC.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s b/ver/us/asm/nonmatchings/415D90/func_802A4A54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A4A54.s rename to ver/us/asm/nonmatchings/415D90/func_802A4A54.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A5290.s b/ver/us/asm/nonmatchings/415D90/func_802A5290.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A5290.s rename to ver/us/asm/nonmatchings/415D90/func_802A5290.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A5738.s b/ver/us/asm/nonmatchings/415D90/func_802A5738.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A5738.s rename to ver/us/asm/nonmatchings/415D90/func_802A5738.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A57C8.s b/ver/us/asm/nonmatchings/415D90/func_802A57C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A57C8.s rename to ver/us/asm/nonmatchings/415D90/func_802A57C8.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A8180.s b/ver/us/asm/nonmatchings/415D90/func_802A8180.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A8180.s rename to ver/us/asm/nonmatchings/415D90/func_802A8180.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A9AE8.s b/ver/us/asm/nonmatchings/415D90/func_802A9AE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A9AE8.s rename to ver/us/asm/nonmatchings/415D90/func_802A9AE8.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s b/ver/us/asm/nonmatchings/415D90/func_802A9B44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802A9B44.s rename to ver/us/asm/nonmatchings/415D90/func_802A9B44.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AA05C.s b/ver/us/asm/nonmatchings/415D90/func_802AA05C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802AA05C.s rename to ver/us/asm/nonmatchings/415D90/func_802AA05C.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s b/ver/us/asm/nonmatchings/415D90/func_802AA0B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802AA0B8.s rename to ver/us/asm/nonmatchings/415D90/func_802AA0B8.s diff --git a/ver/us/asm/nonmatchings/code_415D90/func_802AACD8.s b/ver/us/asm/nonmatchings/415D90/func_802AACD8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/func_802AACD8.s rename to ver/us/asm/nonmatchings/415D90/func_802AACD8.s diff --git a/ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s b/ver/us/asm/nonmatchings/415D90/update_partner_menu.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/update_partner_menu.s rename to ver/us/asm/nonmatchings/415D90/update_partner_menu.s diff --git a/ver/us/asm/nonmatchings/code_415D90/update_player_menu.s b/ver/us/asm/nonmatchings/415D90/update_player_menu.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/update_player_menu.s rename to ver/us/asm/nonmatchings/415D90/update_player_menu.s diff --git a/ver/us/asm/nonmatchings/code_415D90/update_targeting_enemies.s b/ver/us/asm/nonmatchings/415D90/update_targeting_enemies.s similarity index 100% rename from ver/us/asm/nonmatchings/code_415D90/update_targeting_enemies.s rename to ver/us/asm/nonmatchings/415D90/update_targeting_enemies.s diff --git a/ver/us/asm/nonmatchings/code_4219F0/func_802A9000_4219F0.s b/ver/us/asm/nonmatchings/4219F0/func_802A9000_4219F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4219F0/func_802A9000_4219F0.s rename to ver/us/asm/nonmatchings/4219F0/func_802A9000_4219F0.s diff --git a/ver/us/asm/nonmatchings/code_4219F0/func_802A9120_421B10.s b/ver/us/asm/nonmatchings/4219F0/func_802A9120_421B10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4219F0/func_802A9120_421B10.s rename to ver/us/asm/nonmatchings/4219F0/func_802A9120_421B10.s diff --git a/ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s b/ver/us/asm/nonmatchings/4219F0/func_802A9234_421C24.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4219F0/func_802A9234_421C24.s rename to ver/us/asm/nonmatchings/4219F0/func_802A9234_421C24.s diff --git a/ver/us/asm/nonmatchings/code_4219F0/func_802A9544_421F34.s b/ver/us/asm/nonmatchings/4219F0/func_802A9544_421F34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4219F0/func_802A9544_421F34.s rename to ver/us/asm/nonmatchings/4219F0/func_802A9544_421F34.s diff --git a/ver/us/asm/nonmatchings/code_4219F0/func_802A9590_421F80.s b/ver/us/asm/nonmatchings/4219F0/func_802A9590_421F80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4219F0/func_802A9590_421F80.s rename to ver/us/asm/nonmatchings/4219F0/func_802A9590_421F80.s diff --git a/ver/us/asm/nonmatchings/code_422000/func_802A9000_422000.s b/ver/us/asm/nonmatchings/422000/func_802A9000_422000.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422000/func_802A9000_422000.s rename to ver/us/asm/nonmatchings/422000/func_802A9000_422000.s diff --git a/ver/us/asm/nonmatchings/code_422000/func_802A9258_422258.s b/ver/us/asm/nonmatchings/422000/func_802A9258_422258.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422000/func_802A9258_422258.s rename to ver/us/asm/nonmatchings/422000/func_802A9258_422258.s diff --git a/ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s b/ver/us/asm/nonmatchings/422000/func_802A936C_42236C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422000/func_802A936C_42236C.s rename to ver/us/asm/nonmatchings/422000/func_802A936C_42236C.s diff --git a/ver/us/asm/nonmatchings/code_422000/func_802A99D4_4229D4.s b/ver/us/asm/nonmatchings/422000/func_802A99D4_4229D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422000/func_802A99D4_4229D4.s rename to ver/us/asm/nonmatchings/422000/func_802A99D4_4229D4.s diff --git a/ver/us/asm/nonmatchings/code_422000/func_802A9A30_422A30.s b/ver/us/asm/nonmatchings/422000/func_802A9A30_422A30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422000/func_802A9A30_422A30.s rename to ver/us/asm/nonmatchings/422000/func_802A9A30_422A30.s diff --git a/ver/us/asm/nonmatchings/code_422AD0/func_802A9000_422AD0.s b/ver/us/asm/nonmatchings/422AD0/func_802A9000_422AD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422AD0/func_802A9000_422AD0.s rename to ver/us/asm/nonmatchings/422AD0/func_802A9000_422AD0.s diff --git a/ver/us/asm/nonmatchings/code_422AD0/func_802A92A0_422D70.s b/ver/us/asm/nonmatchings/422AD0/func_802A92A0_422D70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422AD0/func_802A92A0_422D70.s rename to ver/us/asm/nonmatchings/422AD0/func_802A92A0_422D70.s diff --git a/ver/us/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s b/ver/us/asm/nonmatchings/422AD0/func_802A9378_422E48.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s rename to ver/us/asm/nonmatchings/422AD0/func_802A9378_422E48.s diff --git a/ver/us/asm/nonmatchings/code_422AD0/func_802A96F4_4231C4.s b/ver/us/asm/nonmatchings/422AD0/func_802A96F4_4231C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422AD0/func_802A96F4_4231C4.s rename to ver/us/asm/nonmatchings/422AD0/func_802A96F4_4231C4.s diff --git a/ver/us/asm/nonmatchings/code_422AD0/func_802A9894_423364.s b/ver/us/asm/nonmatchings/422AD0/func_802A9894_423364.s similarity index 100% rename from ver/us/asm/nonmatchings/code_422AD0/func_802A9894_423364.s rename to ver/us/asm/nonmatchings/422AD0/func_802A9894_423364.s diff --git a/ver/us/asm/nonmatchings/code_4233F0/func_802A9000_4233F0.s b/ver/us/asm/nonmatchings/4233F0/func_802A9000_4233F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4233F0/func_802A9000_4233F0.s rename to ver/us/asm/nonmatchings/4233F0/func_802A9000_4233F0.s diff --git a/ver/us/asm/nonmatchings/code_4233F0/func_802A91B0_4235A0.s b/ver/us/asm/nonmatchings/4233F0/func_802A91B0_4235A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4233F0/func_802A91B0_4235A0.s rename to ver/us/asm/nonmatchings/4233F0/func_802A91B0_4235A0.s diff --git a/ver/us/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s b/ver/us/asm/nonmatchings/4233F0/func_802A92DC_4236CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4233F0/func_802A92DC_4236CC.s rename to ver/us/asm/nonmatchings/4233F0/func_802A92DC_4236CC.s diff --git a/ver/us/asm/nonmatchings/code_4233F0/func_802A96B8_423AA8.s b/ver/us/asm/nonmatchings/4233F0/func_802A96B8_423AA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4233F0/func_802A96B8_423AA8.s rename to ver/us/asm/nonmatchings/4233F0/func_802A96B8_423AA8.s diff --git a/ver/us/asm/nonmatchings/code_4233F0/func_802A97FC_423BEC.s b/ver/us/asm/nonmatchings/4233F0/func_802A97FC_423BEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4233F0/func_802A97FC_423BEC.s rename to ver/us/asm/nonmatchings/4233F0/func_802A97FC_423BEC.s diff --git a/ver/us/asm/nonmatchings/code_423C70/func_802A9000_423C70.s b/ver/us/asm/nonmatchings/423C70/func_802A9000_423C70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_423C70/func_802A9000_423C70.s rename to ver/us/asm/nonmatchings/423C70/func_802A9000_423C70.s diff --git a/ver/us/asm/nonmatchings/code_423C70/func_802A91E0_423E50.s b/ver/us/asm/nonmatchings/423C70/func_802A91E0_423E50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_423C70/func_802A91E0_423E50.s rename to ver/us/asm/nonmatchings/423C70/func_802A91E0_423E50.s diff --git a/ver/us/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s b/ver/us/asm/nonmatchings/423C70/func_802A92F0_423F60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_423C70/func_802A92F0_423F60.s rename to ver/us/asm/nonmatchings/423C70/func_802A92F0_423F60.s diff --git a/ver/us/asm/nonmatchings/code_423C70/func_802A9744_4243B4.s b/ver/us/asm/nonmatchings/423C70/func_802A9744_4243B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_423C70/func_802A9744_4243B4.s rename to ver/us/asm/nonmatchings/423C70/func_802A9744_4243B4.s diff --git a/ver/us/asm/nonmatchings/code_423C70/func_802A9898_424508.s b/ver/us/asm/nonmatchings/423C70/func_802A9898_424508.s similarity index 100% rename from ver/us/asm/nonmatchings/code_423C70/func_802A9898_424508.s rename to ver/us/asm/nonmatchings/423C70/func_802A9898_424508.s diff --git a/ver/us/asm/nonmatchings/code_425590/func_802A9000_425590.s b/ver/us/asm/nonmatchings/425590/func_802A9000_425590.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425590/func_802A9000_425590.s rename to ver/us/asm/nonmatchings/425590/func_802A9000_425590.s diff --git a/ver/us/asm/nonmatchings/code_425590/func_802A9110_4256A0.s b/ver/us/asm/nonmatchings/425590/func_802A9110_4256A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425590/func_802A9110_4256A0.s rename to ver/us/asm/nonmatchings/425590/func_802A9110_4256A0.s diff --git a/ver/us/asm/nonmatchings/code_425590/func_802A91F8_425788.s b/ver/us/asm/nonmatchings/425590/func_802A91F8_425788.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425590/func_802A91F8_425788.s rename to ver/us/asm/nonmatchings/425590/func_802A91F8_425788.s diff --git a/ver/us/asm/nonmatchings/code_425590/func_802A94A4_425A34.s b/ver/us/asm/nonmatchings/425590/func_802A94A4_425A34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425590/func_802A94A4_425A34.s rename to ver/us/asm/nonmatchings/425590/func_802A94A4_425A34.s diff --git a/ver/us/asm/nonmatchings/code_425590/func_802A9544_425AD4.s b/ver/us/asm/nonmatchings/425590/func_802A9544_425AD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425590/func_802A9544_425AD4.s rename to ver/us/asm/nonmatchings/425590/func_802A9544_425AD4.s diff --git a/ver/us/asm/nonmatchings/code_425B50/func_802A9000_425B50.s b/ver/us/asm/nonmatchings/425B50/func_802A9000_425B50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425B50/func_802A9000_425B50.s rename to ver/us/asm/nonmatchings/425B50/func_802A9000_425B50.s diff --git a/ver/us/asm/nonmatchings/code_425B50/func_802A916C_425CBC.s b/ver/us/asm/nonmatchings/425B50/func_802A916C_425CBC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425B50/func_802A916C_425CBC.s rename to ver/us/asm/nonmatchings/425B50/func_802A916C_425CBC.s diff --git a/ver/us/asm/nonmatchings/code_425B50/func_802A9228_425D78.s b/ver/us/asm/nonmatchings/425B50/func_802A9228_425D78.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425B50/func_802A9228_425D78.s rename to ver/us/asm/nonmatchings/425B50/func_802A9228_425D78.s diff --git a/ver/us/asm/nonmatchings/code_425B50/func_802A94D8_426028.s b/ver/us/asm/nonmatchings/425B50/func_802A94D8_426028.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425B50/func_802A94D8_426028.s rename to ver/us/asm/nonmatchings/425B50/func_802A94D8_426028.s diff --git a/ver/us/asm/nonmatchings/code_425B50/func_802A959C_4260EC.s b/ver/us/asm/nonmatchings/425B50/func_802A959C_4260EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_425B50/func_802A959C_4260EC.s rename to ver/us/asm/nonmatchings/425B50/func_802A959C_4260EC.s diff --git a/ver/us/asm/nonmatchings/code_426170/func_802A9000_426170.s b/ver/us/asm/nonmatchings/426170/func_802A9000_426170.s similarity index 100% rename from ver/us/asm/nonmatchings/code_426170/func_802A9000_426170.s rename to ver/us/asm/nonmatchings/426170/func_802A9000_426170.s diff --git a/ver/us/asm/nonmatchings/code_426170/func_802A9170_4262E0.s b/ver/us/asm/nonmatchings/426170/func_802A9170_4262E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_426170/func_802A9170_4262E0.s rename to ver/us/asm/nonmatchings/426170/func_802A9170_4262E0.s diff --git a/ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s b/ver/us/asm/nonmatchings/426170/func_802A928C_4263FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_426170/func_802A928C_4263FC.s rename to ver/us/asm/nonmatchings/426170/func_802A928C_4263FC.s diff --git a/ver/us/asm/nonmatchings/code_426170/func_802A96DC_42684C.s b/ver/us/asm/nonmatchings/426170/func_802A96DC_42684C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_426170/func_802A96DC_42684C.s rename to ver/us/asm/nonmatchings/426170/func_802A96DC_42684C.s diff --git a/ver/us/asm/nonmatchings/code_426170/func_802A97BC_42692C.s b/ver/us/asm/nonmatchings/426170/func_802A97BC_42692C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_426170/func_802A97BC_42692C.s rename to ver/us/asm/nonmatchings/426170/func_802A97BC_42692C.s diff --git a/ver/us/asm/nonmatchings/code_4269D0/func_802A9000_4269D0.s b/ver/us/asm/nonmatchings/4269D0/func_802A9000_4269D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4269D0/func_802A9000_4269D0.s rename to ver/us/asm/nonmatchings/4269D0/func_802A9000_4269D0.s diff --git a/ver/us/asm/nonmatchings/code_4269D0/func_802A9178_426B48.s b/ver/us/asm/nonmatchings/4269D0/func_802A9178_426B48.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4269D0/func_802A9178_426B48.s rename to ver/us/asm/nonmatchings/4269D0/func_802A9178_426B48.s diff --git a/ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s b/ver/us/asm/nonmatchings/4269D0/func_802A9294_426C64.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4269D0/func_802A9294_426C64.s rename to ver/us/asm/nonmatchings/4269D0/func_802A9294_426C64.s diff --git a/ver/us/asm/nonmatchings/code_4269D0/func_802A9834_427204.s b/ver/us/asm/nonmatchings/4269D0/func_802A9834_427204.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4269D0/func_802A9834_427204.s rename to ver/us/asm/nonmatchings/4269D0/func_802A9834_427204.s diff --git a/ver/us/asm/nonmatchings/code_4269D0/func_802A9914_4272E4.s b/ver/us/asm/nonmatchings/4269D0/func_802A9914_4272E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4269D0/func_802A9914_4272E4.s rename to ver/us/asm/nonmatchings/4269D0/func_802A9914_4272E4.s diff --git a/ver/us/asm/nonmatchings/code_4273B0/func_802A9000_4273B0.s b/ver/us/asm/nonmatchings/4273B0/func_802A9000_4273B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4273B0/func_802A9000_4273B0.s rename to ver/us/asm/nonmatchings/4273B0/func_802A9000_4273B0.s diff --git a/ver/us/asm/nonmatchings/code_4273B0/func_802A9170_427520.s b/ver/us/asm/nonmatchings/4273B0/func_802A9170_427520.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4273B0/func_802A9170_427520.s rename to ver/us/asm/nonmatchings/4273B0/func_802A9170_427520.s diff --git a/ver/us/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s b/ver/us/asm/nonmatchings/4273B0/func_802A928C_42763C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s rename to ver/us/asm/nonmatchings/4273B0/func_802A928C_42763C.s diff --git a/ver/us/asm/nonmatchings/code_4273B0/func_802A955C_42790C.s b/ver/us/asm/nonmatchings/4273B0/func_802A955C_42790C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4273B0/func_802A955C_42790C.s rename to ver/us/asm/nonmatchings/4273B0/func_802A955C_42790C.s diff --git a/ver/us/asm/nonmatchings/code_4273B0/func_802A963C_4279EC.s b/ver/us/asm/nonmatchings/4273B0/func_802A963C_4279EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4273B0/func_802A963C_4279EC.s rename to ver/us/asm/nonmatchings/4273B0/func_802A963C_4279EC.s diff --git a/ver/us/asm/nonmatchings/code_427A70/func_802A9000_427A70.s b/ver/us/asm/nonmatchings/427A70/func_802A9000_427A70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_427A70/func_802A9000_427A70.s rename to ver/us/asm/nonmatchings/427A70/func_802A9000_427A70.s diff --git a/ver/us/asm/nonmatchings/code_427A70/func_802A9170_427BE0.s b/ver/us/asm/nonmatchings/427A70/func_802A9170_427BE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_427A70/func_802A9170_427BE0.s rename to ver/us/asm/nonmatchings/427A70/func_802A9170_427BE0.s diff --git a/ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s b/ver/us/asm/nonmatchings/427A70/func_802A928C_427CFC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_427A70/func_802A928C_427CFC.s rename to ver/us/asm/nonmatchings/427A70/func_802A928C_427CFC.s diff --git a/ver/us/asm/nonmatchings/code_427A70/func_802A96EC_42815C.s b/ver/us/asm/nonmatchings/427A70/func_802A96EC_42815C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_427A70/func_802A96EC_42815C.s rename to ver/us/asm/nonmatchings/427A70/func_802A96EC_42815C.s diff --git a/ver/us/asm/nonmatchings/code_427A70/func_802A97CC_42823C.s b/ver/us/asm/nonmatchings/427A70/func_802A97CC_42823C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_427A70/func_802A97CC_42823C.s rename to ver/us/asm/nonmatchings/427A70/func_802A97CC_42823C.s diff --git a/ver/us/asm/nonmatchings/code_4282E0/func_802A9000_4282E0.s b/ver/us/asm/nonmatchings/4282E0/func_802A9000_4282E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4282E0/func_802A9000_4282E0.s rename to ver/us/asm/nonmatchings/4282E0/func_802A9000_4282E0.s diff --git a/ver/us/asm/nonmatchings/code_4282E0/func_802A91B8_428498.s b/ver/us/asm/nonmatchings/4282E0/func_802A91B8_428498.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4282E0/func_802A91B8_428498.s rename to ver/us/asm/nonmatchings/4282E0/func_802A91B8_428498.s diff --git a/ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s b/ver/us/asm/nonmatchings/4282E0/func_802A92D4_4285B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4282E0/func_802A92D4_4285B4.s rename to ver/us/asm/nonmatchings/4282E0/func_802A92D4_4285B4.s diff --git a/ver/us/asm/nonmatchings/code_4282E0/func_802A9664_428944.s b/ver/us/asm/nonmatchings/4282E0/func_802A9664_428944.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4282E0/func_802A9664_428944.s rename to ver/us/asm/nonmatchings/4282E0/func_802A9664_428944.s diff --git a/ver/us/asm/nonmatchings/code_4282E0/func_802A9708_4289E8.s b/ver/us/asm/nonmatchings/4282E0/func_802A9708_4289E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4282E0/func_802A9708_4289E8.s rename to ver/us/asm/nonmatchings/4282E0/func_802A9708_4289E8.s diff --git a/ver/us/asm/nonmatchings/code_428A70/func_802A9000_428A70.s b/ver/us/asm/nonmatchings/428A70/func_802A9000_428A70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_428A70/func_802A9000_428A70.s rename to ver/us/asm/nonmatchings/428A70/func_802A9000_428A70.s diff --git a/ver/us/asm/nonmatchings/code_428A70/func_802A9184_428BF4.s b/ver/us/asm/nonmatchings/428A70/func_802A9184_428BF4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_428A70/func_802A9184_428BF4.s rename to ver/us/asm/nonmatchings/428A70/func_802A9184_428BF4.s diff --git a/ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s b/ver/us/asm/nonmatchings/428A70/func_802A9278_428CE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_428A70/func_802A9278_428CE8.s rename to ver/us/asm/nonmatchings/428A70/func_802A9278_428CE8.s diff --git a/ver/us/asm/nonmatchings/code_428A70/func_802A96EC_42915C.s b/ver/us/asm/nonmatchings/428A70/func_802A96EC_42915C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_428A70/func_802A96EC_42915C.s rename to ver/us/asm/nonmatchings/428A70/func_802A96EC_42915C.s diff --git a/ver/us/asm/nonmatchings/code_428A70/func_802A9810_429280.s b/ver/us/asm/nonmatchings/428A70/func_802A9810_429280.s similarity index 100% rename from ver/us/asm/nonmatchings/code_428A70/func_802A9810_429280.s rename to ver/us/asm/nonmatchings/428A70/func_802A9810_429280.s diff --git a/ver/us/asm/nonmatchings/code_429320/func_802A9000_429320.s b/ver/us/asm/nonmatchings/429320/func_802A9000_429320.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429320/func_802A9000_429320.s rename to ver/us/asm/nonmatchings/429320/func_802A9000_429320.s diff --git a/ver/us/asm/nonmatchings/code_429320/func_802A9178_429498.s b/ver/us/asm/nonmatchings/429320/func_802A9178_429498.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429320/func_802A9178_429498.s rename to ver/us/asm/nonmatchings/429320/func_802A9178_429498.s diff --git a/ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s b/ver/us/asm/nonmatchings/429320/func_802A9294_4295B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429320/func_802A9294_4295B4.s rename to ver/us/asm/nonmatchings/429320/func_802A9294_4295B4.s diff --git a/ver/us/asm/nonmatchings/code_429320/func_802A984C_429B6C.s b/ver/us/asm/nonmatchings/429320/func_802A984C_429B6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429320/func_802A984C_429B6C.s rename to ver/us/asm/nonmatchings/429320/func_802A984C_429B6C.s diff --git a/ver/us/asm/nonmatchings/code_429320/func_802A992C_429C4C.s b/ver/us/asm/nonmatchings/429320/func_802A992C_429C4C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429320/func_802A992C_429C4C.s rename to ver/us/asm/nonmatchings/429320/func_802A992C_429C4C.s diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A9000_429D20.s b/ver/us/asm/nonmatchings/429D20/func_802A9000_429D20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429D20/func_802A9000_429D20.s rename to ver/us/asm/nonmatchings/429D20/func_802A9000_429D20.s diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A911C_429E3C.s b/ver/us/asm/nonmatchings/429D20/func_802A911C_429E3C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429D20/func_802A911C_429E3C.s rename to ver/us/asm/nonmatchings/429D20/func_802A911C_429E3C.s diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s b/ver/us/asm/nonmatchings/429D20/func_802A9208_429F28.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429D20/func_802A9208_429F28.s rename to ver/us/asm/nonmatchings/429D20/func_802A9208_429F28.s diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A9634_42A354.s b/ver/us/asm/nonmatchings/429D20/func_802A9634_42A354.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429D20/func_802A9634_42A354.s rename to ver/us/asm/nonmatchings/429D20/func_802A9634_42A354.s diff --git a/ver/us/asm/nonmatchings/code_429D20/func_802A9720_42A440.s b/ver/us/asm/nonmatchings/429D20/func_802A9720_42A440.s similarity index 100% rename from ver/us/asm/nonmatchings/code_429D20/func_802A9720_42A440.s rename to ver/us/asm/nonmatchings/429D20/func_802A9720_42A440.s diff --git a/ver/us/asm/nonmatchings/code_42A4F0/func_802A9000_42A4F0.s b/ver/us/asm/nonmatchings/42A4F0/func_802A9000_42A4F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42A4F0/func_802A9000_42A4F0.s rename to ver/us/asm/nonmatchings/42A4F0/func_802A9000_42A4F0.s diff --git a/ver/us/asm/nonmatchings/code_42A4F0/func_802A9398_42A888.s b/ver/us/asm/nonmatchings/42A4F0/func_802A9398_42A888.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42A4F0/func_802A9398_42A888.s rename to ver/us/asm/nonmatchings/42A4F0/func_802A9398_42A888.s diff --git a/ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s b/ver/us/asm/nonmatchings/42A4F0/func_802A948C_42A97C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s rename to ver/us/asm/nonmatchings/42A4F0/func_802A948C_42A97C.s diff --git a/ver/us/asm/nonmatchings/code_42A4F0/func_802AA014_42B504.s b/ver/us/asm/nonmatchings/42A4F0/func_802AA014_42B504.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42A4F0/func_802AA014_42B504.s rename to ver/us/asm/nonmatchings/42A4F0/func_802AA014_42B504.s diff --git a/ver/us/asm/nonmatchings/code_42A4F0/func_802AA0D8_42B5C8.s b/ver/us/asm/nonmatchings/42A4F0/func_802AA0D8_42B5C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42A4F0/func_802AA0D8_42B5C8.s rename to ver/us/asm/nonmatchings/42A4F0/func_802AA0D8_42B5C8.s diff --git a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9000_42C6F0.s b/ver/us/asm/nonmatchings/42C6F0/func_802A9000_42C6F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42C6F0/func_802A9000_42C6F0.s rename to ver/us/asm/nonmatchings/42C6F0/func_802A9000_42C6F0.s diff --git a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9138_42C828.s b/ver/us/asm/nonmatchings/42C6F0/func_802A9138_42C828.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42C6F0/func_802A9138_42C828.s rename to ver/us/asm/nonmatchings/42C6F0/func_802A9138_42C828.s diff --git a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s b/ver/us/asm/nonmatchings/42C6F0/func_802A9228_42C918.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s rename to ver/us/asm/nonmatchings/42C6F0/func_802A9228_42C918.s diff --git a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9718_42CE08.s b/ver/us/asm/nonmatchings/42C6F0/func_802A9718_42CE08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42C6F0/func_802A9718_42CE08.s rename to ver/us/asm/nonmatchings/42C6F0/func_802A9718_42CE08.s diff --git a/ver/us/asm/nonmatchings/code_42C6F0/func_802A9764_42CE54.s b/ver/us/asm/nonmatchings/42C6F0/func_802A9764_42CE54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42C6F0/func_802A9764_42CE54.s rename to ver/us/asm/nonmatchings/42C6F0/func_802A9764_42CE54.s diff --git a/ver/us/asm/nonmatchings/code_42CF10/func_802A9000_42CF10.s b/ver/us/asm/nonmatchings/42CF10/func_802A9000_42CF10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42CF10/func_802A9000_42CF10.s rename to ver/us/asm/nonmatchings/42CF10/func_802A9000_42CF10.s diff --git a/ver/us/asm/nonmatchings/code_42CF10/func_802A9210_42D120.s b/ver/us/asm/nonmatchings/42CF10/func_802A9210_42D120.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42CF10/func_802A9210_42D120.s rename to ver/us/asm/nonmatchings/42CF10/func_802A9210_42D120.s diff --git a/ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s b/ver/us/asm/nonmatchings/42CF10/func_802A9310_42D220.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42CF10/func_802A9310_42D220.s rename to ver/us/asm/nonmatchings/42CF10/func_802A9310_42D220.s diff --git a/ver/us/asm/nonmatchings/code_42CF10/func_802A98D0_42D7E0.s b/ver/us/asm/nonmatchings/42CF10/func_802A98D0_42D7E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42CF10/func_802A98D0_42D7E0.s rename to ver/us/asm/nonmatchings/42CF10/func_802A98D0_42D7E0.s diff --git a/ver/us/asm/nonmatchings/code_42CF10/func_802A9A54_42D964.s b/ver/us/asm/nonmatchings/42CF10/func_802A9A54_42D964.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42CF10/func_802A9A54_42D964.s rename to ver/us/asm/nonmatchings/42CF10/func_802A9A54_42D964.s diff --git a/ver/us/asm/nonmatchings/code_42DA10/func_802A9000_42DA10.s b/ver/us/asm/nonmatchings/42DA10/func_802A9000_42DA10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42DA10/func_802A9000_42DA10.s rename to ver/us/asm/nonmatchings/42DA10/func_802A9000_42DA10.s diff --git a/ver/us/asm/nonmatchings/code_42DA10/func_802A91A0_42DBB0.s b/ver/us/asm/nonmatchings/42DA10/func_802A91A0_42DBB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42DA10/func_802A91A0_42DBB0.s rename to ver/us/asm/nonmatchings/42DA10/func_802A91A0_42DBB0.s diff --git a/ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s b/ver/us/asm/nonmatchings/42DA10/func_802A92A0_42DCB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42DA10/func_802A92A0_42DCB0.s rename to ver/us/asm/nonmatchings/42DA10/func_802A92A0_42DCB0.s diff --git a/ver/us/asm/nonmatchings/code_42DA10/func_802A97F8_42E208.s b/ver/us/asm/nonmatchings/42DA10/func_802A97F8_42E208.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42DA10/func_802A97F8_42E208.s rename to ver/us/asm/nonmatchings/42DA10/func_802A97F8_42E208.s diff --git a/ver/us/asm/nonmatchings/code_42DA10/func_802A98E0_42E2F0.s b/ver/us/asm/nonmatchings/42DA10/func_802A98E0_42E2F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42DA10/func_802A98E0_42E2F0.s rename to ver/us/asm/nonmatchings/42DA10/func_802A98E0_42E2F0.s diff --git a/ver/us/asm/nonmatchings/code_42E3A0/func_802A9000_42E3A0.s b/ver/us/asm/nonmatchings/42E3A0/func_802A9000_42E3A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42E3A0/func_802A9000_42E3A0.s rename to ver/us/asm/nonmatchings/42E3A0/func_802A9000_42E3A0.s diff --git a/ver/us/asm/nonmatchings/code_42E3A0/func_802A917C_42E51C.s b/ver/us/asm/nonmatchings/42E3A0/func_802A917C_42E51C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42E3A0/func_802A917C_42E51C.s rename to ver/us/asm/nonmatchings/42E3A0/func_802A917C_42E51C.s diff --git a/ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s b/ver/us/asm/nonmatchings/42E3A0/func_802A9298_42E638.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s rename to ver/us/asm/nonmatchings/42E3A0/func_802A9298_42E638.s diff --git a/ver/us/asm/nonmatchings/code_42E3A0/func_802A98B0_42EC50.s b/ver/us/asm/nonmatchings/42E3A0/func_802A98B0_42EC50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42E3A0/func_802A98B0_42EC50.s rename to ver/us/asm/nonmatchings/42E3A0/func_802A98B0_42EC50.s diff --git a/ver/us/asm/nonmatchings/code_42E3A0/func_802A9990_42ED30.s b/ver/us/asm/nonmatchings/42E3A0/func_802A9990_42ED30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42E3A0/func_802A9990_42ED30.s rename to ver/us/asm/nonmatchings/42E3A0/func_802A9990_42ED30.s diff --git a/ver/us/asm/nonmatchings/code_42EE20/func_802A9000_42EE20.s b/ver/us/asm/nonmatchings/42EE20/func_802A9000_42EE20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42EE20/func_802A9000_42EE20.s rename to ver/us/asm/nonmatchings/42EE20/func_802A9000_42EE20.s diff --git a/ver/us/asm/nonmatchings/code_42EE20/func_802A916C_42EF8C.s b/ver/us/asm/nonmatchings/42EE20/func_802A916C_42EF8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42EE20/func_802A916C_42EF8C.s rename to ver/us/asm/nonmatchings/42EE20/func_802A916C_42EF8C.s diff --git a/ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s b/ver/us/asm/nonmatchings/42EE20/func_802A9254_42F074.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s rename to ver/us/asm/nonmatchings/42EE20/func_802A9254_42F074.s diff --git a/ver/us/asm/nonmatchings/code_42EE20/func_802A973C_42F55C.s b/ver/us/asm/nonmatchings/42EE20/func_802A973C_42F55C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42EE20/func_802A973C_42F55C.s rename to ver/us/asm/nonmatchings/42EE20/func_802A973C_42F55C.s diff --git a/ver/us/asm/nonmatchings/code_42EE20/func_802A981C_42F63C.s b/ver/us/asm/nonmatchings/42EE20/func_802A981C_42F63C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42EE20/func_802A981C_42F63C.s rename to ver/us/asm/nonmatchings/42EE20/func_802A981C_42F63C.s diff --git a/ver/us/asm/nonmatchings/code_42F6E0/func_802A9000_42F6E0.s b/ver/us/asm/nonmatchings/42F6E0/func_802A9000_42F6E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42F6E0/func_802A9000_42F6E0.s rename to ver/us/asm/nonmatchings/42F6E0/func_802A9000_42F6E0.s diff --git a/ver/us/asm/nonmatchings/code_42F6E0/func_802A91A0_42F880.s b/ver/us/asm/nonmatchings/42F6E0/func_802A91A0_42F880.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42F6E0/func_802A91A0_42F880.s rename to ver/us/asm/nonmatchings/42F6E0/func_802A91A0_42F880.s diff --git a/ver/us/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s b/ver/us/asm/nonmatchings/42F6E0/func_802A92A0_42F980.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42F6E0/func_802A92A0_42F980.s rename to ver/us/asm/nonmatchings/42F6E0/func_802A92A0_42F980.s diff --git a/ver/us/asm/nonmatchings/code_42F6E0/func_802A97AC_42FE8C.s b/ver/us/asm/nonmatchings/42F6E0/func_802A97AC_42FE8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42F6E0/func_802A97AC_42FE8C.s rename to ver/us/asm/nonmatchings/42F6E0/func_802A97AC_42FE8C.s diff --git a/ver/us/asm/nonmatchings/code_42F6E0/func_802A9894_42FF74.s b/ver/us/asm/nonmatchings/42F6E0/func_802A9894_42FF74.s similarity index 100% rename from ver/us/asm/nonmatchings/code_42F6E0/func_802A9894_42FF74.s rename to ver/us/asm/nonmatchings/42F6E0/func_802A9894_42FF74.s diff --git a/ver/us/asm/nonmatchings/code_430020/func_802A9000_430020.s b/ver/us/asm/nonmatchings/430020/func_802A9000_430020.s similarity index 100% rename from ver/us/asm/nonmatchings/code_430020/func_802A9000_430020.s rename to ver/us/asm/nonmatchings/430020/func_802A9000_430020.s diff --git a/ver/us/asm/nonmatchings/code_430020/func_802A917C_43019C.s b/ver/us/asm/nonmatchings/430020/func_802A917C_43019C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_430020/func_802A917C_43019C.s rename to ver/us/asm/nonmatchings/430020/func_802A917C_43019C.s diff --git a/ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s b/ver/us/asm/nonmatchings/430020/func_802A9298_4302B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_430020/func_802A9298_4302B8.s rename to ver/us/asm/nonmatchings/430020/func_802A9298_4302B8.s diff --git a/ver/us/asm/nonmatchings/code_430020/func_802A97FC_43081C.s b/ver/us/asm/nonmatchings/430020/func_802A97FC_43081C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_430020/func_802A97FC_43081C.s rename to ver/us/asm/nonmatchings/430020/func_802A97FC_43081C.s diff --git a/ver/us/asm/nonmatchings/code_430020/func_802A98DC_4308FC.s b/ver/us/asm/nonmatchings/430020/func_802A98DC_4308FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_430020/func_802A98DC_4308FC.s rename to ver/us/asm/nonmatchings/430020/func_802A98DC_4308FC.s diff --git a/ver/us/asm/nonmatchings/code_43F0/_heap_free.s b/ver/us/asm/nonmatchings/43F0/_heap_free.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/_heap_free.s rename to ver/us/asm/nonmatchings/43F0/_heap_free.s diff --git a/ver/us/asm/nonmatchings/code_43F0/_heap_malloc.s b/ver/us/asm/nonmatchings/43F0/_heap_malloc.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/_heap_malloc.s rename to ver/us/asm/nonmatchings/43F0/_heap_malloc.s diff --git a/ver/us/asm/nonmatchings/code_43F0/_heap_malloc_tail.s b/ver/us/asm/nonmatchings/43F0/_heap_malloc_tail.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/_heap_malloc_tail.s rename to ver/us/asm/nonmatchings/43F0/_heap_malloc_tail.s diff --git a/ver/us/asm/nonmatchings/code_43F0/_heap_realloc.s b/ver/us/asm/nonmatchings/43F0/_heap_realloc.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/_heap_realloc.s rename to ver/us/asm/nonmatchings/43F0/_heap_realloc.s diff --git a/ver/us/asm/nonmatchings/code_43F0/atan2.s b/ver/us/asm/nonmatchings/43F0/atan2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/atan2.s rename to ver/us/asm/nonmatchings/43F0/atan2.s diff --git a/ver/us/asm/nonmatchings/code_43F0/func_8002A904.s b/ver/us/asm/nonmatchings/43F0/func_8002A904.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/func_8002A904.s rename to ver/us/asm/nonmatchings/43F0/func_8002A904.s diff --git a/ver/us/asm/nonmatchings/code_43F0/func_8002AAC4.s b/ver/us/asm/nonmatchings/43F0/func_8002AAC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/func_8002AAC4.s rename to ver/us/asm/nonmatchings/43F0/func_8002AAC4.s diff --git a/ver/us/asm/nonmatchings/code_43F0/func_8002AB5C.s b/ver/us/asm/nonmatchings/43F0/func_8002AB5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/func_8002AB5C.s rename to ver/us/asm/nonmatchings/43F0/func_8002AB5C.s diff --git a/ver/us/asm/nonmatchings/code_43F0/int_to_string.s b/ver/us/asm/nonmatchings/43F0/int_to_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/int_to_string.s rename to ver/us/asm/nonmatchings/43F0/int_to_string.s diff --git a/ver/us/asm/nonmatchings/code_43F0/update_lerp.s b/ver/us/asm/nonmatchings/43F0/update_lerp.s similarity index 100% rename from ver/us/asm/nonmatchings/code_43F0/update_lerp.s rename to ver/us/asm/nonmatchings/43F0/update_lerp.s diff --git a/ver/us/asm/nonmatchings/code_4DF30/func_80072B30.s b/ver/us/asm/nonmatchings/4DF30/func_80072B30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4DF30/func_80072B30.s rename to ver/us/asm/nonmatchings/4DF30/func_80072B30.s diff --git a/ver/us/asm/nonmatchings/code_4DF30/load_battle.s b/ver/us/asm/nonmatchings/4DF30/load_battle.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4DF30/load_battle.s rename to ver/us/asm/nonmatchings/4DF30/load_battle.s diff --git a/ver/us/asm/nonmatchings/code_4DF30/load_battle_section.s b/ver/us/asm/nonmatchings/4DF30/load_battle_section.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4DF30/load_battle_section.s rename to ver/us/asm/nonmatchings/4DF30/load_battle_section.s diff --git a/ver/us/asm/nonmatchings/code_4DF30/load_demo_battle.s b/ver/us/asm/nonmatchings/4DF30/load_demo_battle.s similarity index 99% rename from ver/us/asm/nonmatchings/code_4DF30/load_demo_battle.s rename to ver/us/asm/nonmatchings/4DF30/load_demo_battle.s index e7786a33b2..688dc661fa 100644 --- a/ver/us/asm/nonmatchings/code_4DF30/load_demo_battle.s +++ b/ver/us/asm/nonmatchings/4DF30/load_demo_battle.s @@ -28,7 +28,7 @@ glabel load_demo_battle /* 4E270 80072E70 00000000 */ nop /* 4E274 80072E74 0C0482EC */ jal clear_entity_models /* 4E278 80072E78 00000000 */ nop -/* 4E27C 80072E7C 0C00E12F */ jal clear_npcs +/* 4E27C 80072E7C 0C00E12F */ jal npc_list_clear /* 4E280 80072E80 00000000 */ nop /* 4E284 80072E84 0C050440 */ jal func_80141100 /* 4E288 80072E88 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_4DF30/setup_demo_player.s b/ver/us/asm/nonmatchings/4DF30/setup_demo_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4DF30/setup_demo_player.s rename to ver/us/asm/nonmatchings/4DF30/setup_demo_player.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F890.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F890.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F890.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F8F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F8F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F8F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F950.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F950.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F950.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F9B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006F9B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006F9B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FA10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA10.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FA10.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FA70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FA70.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FA70.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FB90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FB90.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FB90.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FBF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FBF0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FBF0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FC50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FC50.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FC50.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FCB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FCB0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FCB0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FD10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD10.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FD10.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FD70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FD70.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FD70.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FDD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FDD0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FDD0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FE30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FE30.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FE30.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FEF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FEF0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FEF0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FF50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FF50.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FF50.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FFB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_8006FFB0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_8006FFB0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070010.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070010.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070010.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070070.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070070.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070070.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800700D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800700D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800700D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070130.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070130.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070190.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070190.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070190.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800701F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800701F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800701F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070250.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070250.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070250.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800702B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800702B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800702B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070310.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070310.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070370.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070370.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070370.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800703D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800703D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800703D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070430.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070430.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070430.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070490.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070490.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070490.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800704F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800704F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800704F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070550.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070550.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070550.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800705B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800705B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800705B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070610.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070610.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070610.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070670.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070670.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070670.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800706D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800706D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800706D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070730.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070730.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070730.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070850.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070850.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070850.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800708B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800708B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800708B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070910.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070910.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070910.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070970.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070970.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070970.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800709D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800709D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800709D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070A30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A30.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070A30.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070A90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070A90.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070A90.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070AF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070AF0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070AF0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070B50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070B50.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070B50.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070BB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070BB0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070BB0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070C10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C10.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070C10.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070C70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070C70.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070C70.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070CD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070CD0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070CD0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070D30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D30.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070D30.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070D90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070D90.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070D90.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070DF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070DF0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070DF0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070E50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070E50.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070E50.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070EB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070EB0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070EB0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070F10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F10.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070F10.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070F70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070F70.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070F70.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80070FD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80070FD0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80070FD0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071030.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071030.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071030.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071090.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071090.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071090.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800710F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800710F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800710F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071150.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071150.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071150.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800711B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800711B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800711B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071210.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071210.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071210.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071270.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071270.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071270.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800712D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800712D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800712D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071330.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071330.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071330.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071390.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071390.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071390.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800713F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800713F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800713F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071450.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071450.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071450.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800714B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800714B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800714B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071510.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071510.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071510.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071570.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071570.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071570.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800715D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800715D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800715D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071630.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071630.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071630.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071690.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071690.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071690.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800716F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800716F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800716F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071750.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071750.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071750.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800717B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800717B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800717B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071810.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071810.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071810.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071870.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071870.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071870.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800718D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800718D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800718D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071930.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071930.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071930.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071990.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071990.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071990.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800719F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800719F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800719F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071A50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071A50.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071A50.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071AB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071AB0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071AB0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071B10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B10.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071B10.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071B70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071B70.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071B70.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071BD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071BD0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071BD0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071C30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C30.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071C30.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071C90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071C90.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071C90.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071CF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071CF0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071CF0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071D50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071D50.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071D50.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071DB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071DB0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071DB0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071E10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E10.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071E10.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071E70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071E70.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071E70.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071ED0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071ED0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071ED0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071F30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F30.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071F30.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071F90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071F90.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071F90.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80071FF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80071FF0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80071FF0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072050.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072050.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072050.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800720B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800720B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800720B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072110.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072110.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072110.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072170.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072170.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072170.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800721D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800721D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800721D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072230.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072230.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072230.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072290.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072290.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072290.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800722F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800722F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800722F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072350.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072350.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072350.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800723B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800723B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800723B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072410.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072410.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072410.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072470.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072470.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072470.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800724D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800724D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800724D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072530.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072530.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072530.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072590.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072590.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072590.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800725F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800725F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800725F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072650.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072650.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072650.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800726B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800726B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800726B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072710.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072710.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072710.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072770.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072770.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072770.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800727D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800727D0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800727D0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072830.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072830.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072830.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072890.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072890.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072890.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800728F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800728F0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800728F0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072950.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072950.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072950.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_800729B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_800729B0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_800729B0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072A10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A10.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072A10.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072A70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072A70.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072A70.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s b/ver/us/asm/nonmatchings/4ac90_len_3910/func_80072AD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/func_80072AD0.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/func_80072AD0.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_emote.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_emote.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/fx_emote.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sleep_bubble.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sleep_bubble.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/fx_sleep_bubble.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_sweat.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_sweat.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/fx_sweat.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk_large.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_large.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk_large.s diff --git a/ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s b/ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk_normal.s similarity index 100% rename from ver/us/asm/nonmatchings/code_4ac90_len_3910/fx_walk_normal.s rename to ver/us/asm/nonmatchings/4ac90_len_3910/fx_walk_normal.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_calc_file_checksum.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_calc_file_checksum.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_calc_file_checksum.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_calc_file_checksum.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_calc_header_checksum.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_calc_header_checksum.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_calc_header_checksum.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_calc_header_checksum.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_deserialize_state.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_deserialize_state.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_erase_game.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_erase_game.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_erase_game.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_erase_game.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_fetch_saved_file_info.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_fetch_saved_file_info.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_flush_backups.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_flush_backups.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_flush_backups.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_flush_backups.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_has_valid_backup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_has_valid_backup.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_load_game.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_load_game.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_load_game.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_load_game.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_read_flash.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_read_flash.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_read_flash.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_read_flash.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_save_game.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_save_game.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_save_game.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_save_game.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_serialize_state.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_serialize_state.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_validate_file_checksum.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_validate_file_checksum.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_validate_file_checksum.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_validate_file_checksum.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_validate_header_checksums.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_validate_header_checksums.s diff --git a/ver/us/asm/nonmatchings/code_6240_len_c00/fio_write_flash.s b/ver/us/asm/nonmatchings/6240_len_c00/fio_write_flash.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6240_len_c00/fio_write_flash.s rename to ver/us/asm/nonmatchings/6240_len_c00/fio_write_flash.s diff --git a/ver/us/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/ver/us/asm/nonmatchings/6e40_len_500/render_curtains.s similarity index 100% rename from ver/us/asm/nonmatchings/code_6e40_len_500/render_curtains.s rename to ver/us/asm/nonmatchings/6e40_len_500/render_curtains.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s b/ver/us/asm/nonmatchings/7340_len_b00/crash_create_monitor.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/crash_create_monitor.s rename to ver/us/asm/nonmatchings/7340_len_b00/crash_create_monitor.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s b/ver/us/asm/nonmatchings/7340_len_b00/crash_delay_msec.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/crash_delay_msec.s rename to ver/us/asm/nonmatchings/7340_len_b00/crash_delay_msec.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s b/ver/us/asm/nonmatchings/7340_len_b00/crash_monitor_thread.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/crash_monitor_thread.s rename to ver/us/asm/nonmatchings/7340_len_b00/crash_monitor_thread.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s b/ver/us/asm/nonmatchings/7340_len_b00/crash_print_fpr.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/crash_print_fpr.s rename to ver/us/asm/nonmatchings/7340_len_b00/crash_print_fpr.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s b/ver/us/asm/nonmatchings/7340_len_b00/crash_printf_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/crash_printf_string.s rename to ver/us/asm/nonmatchings/7340_len_b00/crash_printf_string.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s b/ver/us/asm/nonmatchings/7340_len_b00/crash_show_handler.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/crash_show_handler.s rename to ver/us/asm/nonmatchings/7340_len_b00/crash_show_handler.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002BFB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/func_8002BFB0.s rename to ver/us/asm/nonmatchings/7340_len_b00/func_8002BFB0.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C054.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002C054.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C054.s rename to ver/us/asm/nonmatchings/7340_len_b00/func_8002C054.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C1D4.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002C1D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C1D4.s rename to ver/us/asm/nonmatchings/7340_len_b00/func_8002C1D4.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C324.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002C324.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C324.s rename to ver/us/asm/nonmatchings/7340_len_b00/func_8002C324.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002C7B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C7B0.s rename to ver/us/asm/nonmatchings/7340_len_b00/func_8002C7B0.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C890.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002C890.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C890.s rename to ver/us/asm/nonmatchings/7340_len_b00/func_8002C890.s diff --git a/ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s b/ver/us/asm/nonmatchings/7340_len_b00/func_8002C94C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7340_len_b00/func_8002C94C.s rename to ver/us/asm/nonmatchings/7340_len_b00/func_8002C94C.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DC500.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DC500.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DC500.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DC778.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DC778.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DC778.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DCB7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DCB7C.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DCB7C.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DCE70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DCE70.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DCE70.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD04C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD04C.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD04C.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD228.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD228.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD228.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD228.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD44C.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD44C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD44C.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD44C.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD618.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD618.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD618.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD8FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DD8FC.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DD8FC.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDAE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDAE4.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDAE4.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDC44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDC44.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDC44.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDCEC.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDCEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDCEC.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDCEC.s diff --git a/ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s b/ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDD94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_759b0_len_61b0/func_800DDD94.s rename to ver/us/asm/nonmatchings/759b0_len_61b0/func_800DDD94.s diff --git a/ver/us/asm/nonmatchings/code_77480/appendGfx_player.s b/ver/us/asm/nonmatchings/77480/appendGfx_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/appendGfx_player.s rename to ver/us/asm/nonmatchings/77480/appendGfx_player.s diff --git a/ver/us/asm/nonmatchings/code_77480/appendGfx_player_spin.s b/ver/us/asm/nonmatchings/77480/appendGfx_player_spin.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/appendGfx_player_spin.s rename to ver/us/asm/nonmatchings/77480/appendGfx_player_spin.s diff --git a/ver/us/asm/nonmatchings/code_77480/check_for_interactables.s b/ver/us/asm/nonmatchings/77480/check_for_interactables.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/check_for_interactables.s rename to ver/us/asm/nonmatchings/77480/check_for_interactables.s diff --git a/ver/us/asm/nonmatchings/code_77480/check_input_use_partner.s b/ver/us/asm/nonmatchings/77480/check_input_use_partner.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/check_input_use_partner.s rename to ver/us/asm/nonmatchings/77480/check_input_use_partner.s diff --git a/ver/us/asm/nonmatchings/code_77480/collision_check_above.s b/ver/us/asm/nonmatchings/77480/collision_check_above.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/collision_check_above.s rename to ver/us/asm/nonmatchings/77480/collision_check_above.s diff --git a/ver/us/asm/nonmatchings/code_77480/do_lateral_collision.s b/ver/us/asm/nonmatchings/77480/do_lateral_collision.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/do_lateral_collision.s rename to ver/us/asm/nonmatchings/77480/do_lateral_collision.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800DE46C.s b/ver/us/asm/nonmatchings/77480/func_800DE46C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800DE46C.s rename to ver/us/asm/nonmatchings/77480/func_800DE46C.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800DEE5C.s b/ver/us/asm/nonmatchings/77480/func_800DEE5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800DEE5C.s rename to ver/us/asm/nonmatchings/77480/func_800DEE5C.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800DF15C.s b/ver/us/asm/nonmatchings/77480/func_800DF15C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800DF15C.s rename to ver/us/asm/nonmatchings/77480/func_800DF15C.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800DFD48.s b/ver/us/asm/nonmatchings/77480/func_800DFD48.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800DFD48.s rename to ver/us/asm/nonmatchings/77480/func_800DFD48.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800DFFCC.s b/ver/us/asm/nonmatchings/77480/func_800DFFCC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800DFFCC.s rename to ver/us/asm/nonmatchings/77480/func_800DFFCC.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800E0294.s b/ver/us/asm/nonmatchings/77480/func_800E0294.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800E0294.s rename to ver/us/asm/nonmatchings/77480/func_800E0294.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800E0398.s b/ver/us/asm/nonmatchings/77480/func_800E0398.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800E0398.s rename to ver/us/asm/nonmatchings/77480/func_800E0398.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800E0580.s b/ver/us/asm/nonmatchings/77480/func_800E0580.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800E0580.s rename to ver/us/asm/nonmatchings/77480/func_800E0580.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800E06D8.s b/ver/us/asm/nonmatchings/77480/func_800E06D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800E06D8.s rename to ver/us/asm/nonmatchings/77480/func_800E06D8.s diff --git a/ver/us/asm/nonmatchings/code_77480/func_800E0B90.s b/ver/us/asm/nonmatchings/77480/func_800E0B90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/func_800E0B90.s rename to ver/us/asm/nonmatchings/77480/func_800E0B90.s diff --git a/ver/us/asm/nonmatchings/code_77480/get_player_back_anim.s b/ver/us/asm/nonmatchings/77480/get_player_back_anim.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/get_player_back_anim.s rename to ver/us/asm/nonmatchings/77480/get_player_back_anim.s diff --git a/ver/us/asm/nonmatchings/code_77480/render_player_model.s b/ver/us/asm/nonmatchings/77480/render_player_model.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/render_player_model.s rename to ver/us/asm/nonmatchings/77480/render_player_model.s diff --git a/ver/us/asm/nonmatchings/code_77480/test_below_player.s b/ver/us/asm/nonmatchings/77480/test_below_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/test_below_player.s rename to ver/us/asm/nonmatchings/77480/test_below_player.s diff --git a/ver/us/asm/nonmatchings/code_77480/test_player_lateral.s b/ver/us/asm/nonmatchings/77480/test_player_lateral.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/test_player_lateral.s rename to ver/us/asm/nonmatchings/77480/test_player_lateral.s diff --git a/ver/us/asm/nonmatchings/code_77480/trace_above_player.s b/ver/us/asm/nonmatchings/77480/trace_above_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/trace_above_player.s rename to ver/us/asm/nonmatchings/77480/trace_above_player.s diff --git a/ver/us/asm/nonmatchings/code_77480/trace_below_player.s b/ver/us/asm/nonmatchings/77480/trace_below_player.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/trace_below_player.s rename to ver/us/asm/nonmatchings/77480/trace_below_player.s diff --git a/ver/us/asm/nonmatchings/code_77480/update_player_shadow.s b/ver/us/asm/nonmatchings/77480/update_player_shadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_77480/update_player_shadow.s rename to ver/us/asm/nonmatchings/77480/update_player_shadow.s diff --git a/ver/us/asm/nonmatchings/code_7B440/func_800E205C.s b/ver/us/asm/nonmatchings/7B440/func_800E205C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7B440/func_800E205C.s rename to ver/us/asm/nonmatchings/7B440/func_800E205C.s diff --git a/ver/us/asm/nonmatchings/code_7B440/func_800E23FC.s b/ver/us/asm/nonmatchings/7B440/func_800E23FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7B440/func_800E23FC.s rename to ver/us/asm/nonmatchings/7B440/func_800E23FC.s diff --git a/ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s b/ver/us/asm/nonmatchings/7B440/func_800E24F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7B440/func_800E24F8.s rename to ver/us/asm/nonmatchings/7B440/func_800E24F8.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/can_player_interact.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/can_player_interact.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/can_player_interact.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/can_player_interact.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/check_input_jump.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/check_input_jump.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_check_player_intersecting_world.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/collision_check_player_intersecting_world.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_check_player_intersecting_world.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/collision_check_player_intersecting_world.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/collision_main_above.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/collision_main_above.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/collision_main_lateral.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/collision_main_lateral.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E29C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E29C8.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E2BB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E2BB0.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E2F60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E2F60.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E315C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E315C.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E3514.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E3514.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E45E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E45E0.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E46C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E46C8.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E4744.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E4744.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E4BB8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E4BB8.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5174.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5174.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5348.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5348.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5530.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5530.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E58F0.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E58F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E58F0.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E58F0.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5938.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5938.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E59A0.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E59A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E59A0.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E59A0.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5A2C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5A2C.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5C78.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E5C78.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E66C4.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E66C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/func_800E66C4.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/func_800E66C4.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/make_disguise_npc.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/make_disguise_npc.s similarity index 98% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/make_disguise_npc.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/make_disguise_npc.s index 99dacff01b..15f5196414 100644 --- a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/make_disguise_npc.s +++ b/ver/us/asm/nonmatchings/7bb60_len_41b0/make_disguise_npc.s @@ -39,7 +39,7 @@ glabel make_disguise_npc /* 7FAB0 800E6600 3C05800F */ lui $a1, %hi(D_800F7C7C) /* 7FAB4 800E6604 00A32821 */ addu $a1, $a1, $v1 /* 7FAB8 800E6608 8CA57C7C */ lw $a1, %lo(D_800F7C7C)($a1) -/* 7FABC 800E660C 0C00E219 */ jal create_standard_npc +/* 7FABC 800E660C 0C00E219 */ jal npc_create_standard /* 7FAC0 800E6610 00C0202D */ daddu $a0, $a2, $zero /* 7FAC4 800E6614 0040202D */ daddu $a0, $v0, $zero /* 7FAC8 800E6618 3C018011 */ lui $at, %hi(D_8010C96C) diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/phys_player_land.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/phys_player_land.s diff --git a/ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s b/ver/us/asm/nonmatchings/7bb60_len_41b0/update_fall_state.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s rename to ver/us/asm/nonmatchings/7bb60_len_41b0/update_fall_state.s diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/can_pause.s b/ver/us/asm/nonmatchings/7fd10_len_b40/can_pause.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7fd10_len_b40/can_pause.s rename to ver/us/asm/nonmatchings/7fd10_len_b40/can_pause.s diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s b/ver/us/asm/nonmatchings/7fd10_len_b40/check_input_open_menus.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s rename to ver/us/asm/nonmatchings/7fd10_len_b40/check_input_open_menus.s diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s b/ver/us/asm/nonmatchings/7fd10_len_b40/func_800E6904.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s rename to ver/us/asm/nonmatchings/7fd10_len_b40/func_800E6904.s diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/setup_item_popup.s b/ver/us/asm/nonmatchings/7fd10_len_b40/setup_item_popup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7fd10_len_b40/setup_item_popup.s rename to ver/us/asm/nonmatchings/7fd10_len_b40/setup_item_popup.s diff --git a/ver/us/asm/nonmatchings/code_7fd10_len_b40/setup_partner_popup.s b/ver/us/asm/nonmatchings/7fd10_len_b40/setup_partner_popup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_7fd10_len_b40/setup_partner_popup.s rename to ver/us/asm/nonmatchings/7fd10_len_b40/setup_partner_popup.s diff --git a/ver/us/asm/nonmatchings/code_80850_len_3060/is_ability_active.s b/ver/us/asm/nonmatchings/80850_len_3060/is_ability_active.s similarity index 100% rename from ver/us/asm/nonmatchings/code_80850_len_3060/is_ability_active.s rename to ver/us/asm/nonmatchings/80850_len_3060/is_ability_active.s diff --git a/ver/us/asm/nonmatchings/code_80850_len_3060/status_menu_draw_number.s b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s similarity index 100% rename from ver/us/asm/nonmatchings/code_80850_len_3060/status_menu_draw_number.s rename to ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_number.s diff --git a/ver/us/asm/nonmatchings/code_80850_len_3060/status_menu_draw_stat.s b/ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s similarity index 100% rename from ver/us/asm/nonmatchings/code_80850_len_3060/status_menu_draw_stat.s rename to ver/us/asm/nonmatchings/80850_len_3060/status_menu_draw_stat.s diff --git a/ver/us/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s similarity index 100% rename from ver/us/asm/nonmatchings/code_80850_len_3060/update_status_menu.s rename to ver/us/asm/nonmatchings/80850_len_3060/update_status_menu.s diff --git a/ver/us/asm/nonmatchings/code_8560/func_8002D160.s b/ver/us/asm/nonmatchings/8560/func_8002D160.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8560/func_8002D160.s rename to ver/us/asm/nonmatchings/8560/func_8002D160.s diff --git a/ver/us/asm/nonmatchings/code_8800/create_cameras_a.s b/ver/us/asm/nonmatchings/8800/create_cameras_a.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8800/create_cameras_a.s rename to ver/us/asm/nonmatchings/8800/create_cameras_a.s diff --git a/ver/us/asm/nonmatchings/code_8800/create_cameras_b.s b/ver/us/asm/nonmatchings/8800/create_cameras_b.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8800/create_cameras_b.s rename to ver/us/asm/nonmatchings/8800/create_cameras_b.s diff --git a/ver/us/asm/nonmatchings/code_8800/func_8002E82C.s b/ver/us/asm/nonmatchings/8800/func_8002E82C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8800/func_8002E82C.s rename to ver/us/asm/nonmatchings/8800/func_8002E82C.s diff --git a/ver/us/asm/nonmatchings/code_8800/get_screen_coords.s b/ver/us/asm/nonmatchings/8800/get_screen_coords.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8800/get_screen_coords.s rename to ver/us/asm/nonmatchings/8800/get_screen_coords.s diff --git a/ver/us/asm/nonmatchings/code_8800/initialize_next_camera.s b/ver/us/asm/nonmatchings/8800/initialize_next_camera.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8800/initialize_next_camera.s rename to ver/us/asm/nonmatchings/8800/initialize_next_camera.s diff --git a/ver/us/asm/nonmatchings/code_8800/render_frame.s b/ver/us/asm/nonmatchings/8800/render_frame.s similarity index 99% rename from ver/us/asm/nonmatchings/code_8800/render_frame.s rename to ver/us/asm/nonmatchings/8800/render_frame.s index a92a3e3806..a737062af8 100644 --- a/ver/us/asm/nonmatchings/code_8800/render_frame.s +++ b/ver/us/asm/nonmatchings/8800/render_frame.s @@ -400,7 +400,7 @@ glabel render_frame .L8002DD2C: /* 912C 8002DD2C 0C03844E */ jal render_player /* 9130 8002DD30 00000000 */ nop -/* 9134 8002DD34 0C00E9FC */ jal render_npcs +/* 9134 8002DD34 0C00E9FC */ jal npc_list_render /* 9138 8002DD38 00000000 */ nop /* 913C 8002DD3C 0C048D1C */ jal render_dynamic_entities /* 9140 8002DD40 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_8800/set_cam_viewport.s b/ver/us/asm/nonmatchings/8800/set_cam_viewport.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8800/set_cam_viewport.s rename to ver/us/asm/nonmatchings/8800/set_cam_viewport.s diff --git a/ver/us/asm/nonmatchings/code_8800/update_cameras.s b/ver/us/asm/nonmatchings/8800/update_cameras.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8800/update_cameras.s rename to ver/us/asm/nonmatchings/8800/update_cameras.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFD08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFD08.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800EFE2C.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0248.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0248.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0490.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0864.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0864.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F09EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800F09EC.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0B3C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0B3C.s diff --git a/ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s b/ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0C9C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s rename to ver/us/asm/nonmatchings/891b0_len_fb0/func_800F0C9C.s diff --git a/ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s b/ver/us/asm/nonmatchings/8a160_len_700/func_800F0CB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0CB0.s rename to ver/us/asm/nonmatchings/8a160_len_700/func_800F0CB0.s diff --git a/ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s b/ver/us/asm/nonmatchings/8a160_len_700/func_800F0D80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a160_len_700/func_800F0D80.s rename to ver/us/asm/nonmatchings/8a160_len_700/func_800F0D80.s diff --git a/ver/us/asm/nonmatchings/code_8a160_len_700/func_800F102C.s b/ver/us/asm/nonmatchings/8a160_len_700/func_800F102C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a160_len_700/func_800F102C.s rename to ver/us/asm/nonmatchings/8a160_len_700/func_800F102C.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s b/ver/us/asm/nonmatchings/8a860_len_3f30/draw_submenu_title.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/draw_submenu_title.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/draw_submenu_title.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F13B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F13B0.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F13B0.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F1538.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1538.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F1538.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F16CC.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F16CC.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F1A10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F1A10.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F1A10.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F3680.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F3680.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F3680.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F48F4.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F48F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F48F4.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F48F4.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4944.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4944.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4C1C.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C1C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4C1C.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C1C.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4C6C.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4C6C.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4C6C.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4CF0.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4CF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4CF0.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4CF0.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4D28.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4D28.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4D28.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4D28.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4E40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4E40.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4E40.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4FC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F4FC4.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F4FC4.s diff --git a/ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s b/ver/us/asm/nonmatchings/8a860_len_3f30/func_800F513C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8a860_len_3f30/func_800F513C.s rename to ver/us/asm/nonmatchings/8a860_len_3f30/func_800F513C.s diff --git a/ver/us/asm/nonmatchings/code_8e790_len_2850/draw_box.s b/ver/us/asm/nonmatchings/8e790_len_2850/draw_box.s similarity index 100% rename from ver/us/asm/nonmatchings/code_8e790_len_2850/draw_box.s rename to ver/us/asm/nonmatchings/8e790_len_2850/draw_box.s diff --git a/ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s b/ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_0.s rename to ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_0.s diff --git a/ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s b/ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_1.s similarity index 100% rename from ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_1.s rename to ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_1.s diff --git a/ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s b/ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_2.s rename to ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_2.s diff --git a/ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s b/ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_9d10_len_1080/do_camera_type_4.s rename to ver/us/asm/nonmatchings/9d10_len_1080/do_camera_type_4.s diff --git a/ver/us/asm/nonmatchings/code_B0E0/do_camera_type_3.s b/ver/us/asm/nonmatchings/B0E0/do_camera_type_3.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B0E0/do_camera_type_3.s rename to ver/us/asm/nonmatchings/B0E0/do_camera_type_3.s diff --git a/ver/us/asm/nonmatchings/code_B0E0/do_camera_type_5.s b/ver/us/asm/nonmatchings/B0E0/do_camera_type_5.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B0E0/do_camera_type_5.s rename to ver/us/asm/nonmatchings/B0E0/do_camera_type_5.s diff --git a/ver/us/asm/nonmatchings/code_B0E0/do_camera_type_unused.s b/ver/us/asm/nonmatchings/B0E0/do_camera_type_unused.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B0E0/do_camera_type_unused.s rename to ver/us/asm/nonmatchings/B0E0/do_camera_type_unused.s diff --git a/ver/us/asm/nonmatchings/code_B0E0/func_80030210.s b/ver/us/asm/nonmatchings/B0E0/func_80030210.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B0E0/func_80030210.s rename to ver/us/asm/nonmatchings/B0E0/func_80030210.s diff --git a/ver/us/asm/nonmatchings/code_B0E0/func_8003034C.s b/ver/us/asm/nonmatchings/B0E0/func_8003034C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B0E0/func_8003034C.s rename to ver/us/asm/nonmatchings/B0E0/func_8003034C.s diff --git a/ver/us/asm/nonmatchings/code_B0E0/test_ray_zone_aabb.s b/ver/us/asm/nonmatchings/B0E0/test_ray_zone_aabb.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B0E0/test_ray_zone_aabb.s rename to ver/us/asm/nonmatchings/B0E0/test_ray_zone_aabb.s diff --git a/ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s b/ver/us/asm/nonmatchings/B0E0/update_camera_from_zone.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B0E0/update_camera_from_zone.s rename to ver/us/asm/nonmatchings/B0E0/update_camera_from_zone.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011DE80.s b/ver/us/asm/nonmatchings/B4580/func_8011DE80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011DE80.s rename to ver/us/asm/nonmatchings/B4580/func_8011DE80.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011DFD0.s b/ver/us/asm/nonmatchings/B4580/func_8011DFD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011DFD0.s rename to ver/us/asm/nonmatchings/B4580/func_8011DFD0.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E014.s b/ver/us/asm/nonmatchings/B4580/func_8011E014.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E014.s rename to ver/us/asm/nonmatchings/B4580/func_8011E014.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E058.s b/ver/us/asm/nonmatchings/B4580/func_8011E058.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E058.s rename to ver/us/asm/nonmatchings/B4580/func_8011E058.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E09C.s b/ver/us/asm/nonmatchings/B4580/func_8011E09C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E09C.s rename to ver/us/asm/nonmatchings/B4580/func_8011E09C.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E0DC.s b/ver/us/asm/nonmatchings/B4580/func_8011E0DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E0DC.s rename to ver/us/asm/nonmatchings/B4580/func_8011E0DC.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E150.s b/ver/us/asm/nonmatchings/B4580/func_8011E150.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E150.s rename to ver/us/asm/nonmatchings/B4580/func_8011E150.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E1C4.s b/ver/us/asm/nonmatchings/B4580/func_8011E1C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E1C4.s rename to ver/us/asm/nonmatchings/B4580/func_8011E1C4.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E224.s b/ver/us/asm/nonmatchings/B4580/func_8011E224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E224.s rename to ver/us/asm/nonmatchings/B4580/func_8011E224.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E310.s b/ver/us/asm/nonmatchings/B4580/func_8011E310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E310.s rename to ver/us/asm/nonmatchings/B4580/func_8011E310.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E398.s b/ver/us/asm/nonmatchings/B4580/func_8011E398.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E398.s rename to ver/us/asm/nonmatchings/B4580/func_8011E398.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E400.s b/ver/us/asm/nonmatchings/B4580/func_8011E400.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E400.s rename to ver/us/asm/nonmatchings/B4580/func_8011E400.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E438.s b/ver/us/asm/nonmatchings/B4580/func_8011E438.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E438.s rename to ver/us/asm/nonmatchings/B4580/func_8011E438.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E4B8.s b/ver/us/asm/nonmatchings/B4580/func_8011E4B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E4B8.s rename to ver/us/asm/nonmatchings/B4580/func_8011E4B8.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E5E0.s b/ver/us/asm/nonmatchings/B4580/func_8011E5E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E5E0.s rename to ver/us/asm/nonmatchings/B4580/func_8011E5E0.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E718.s b/ver/us/asm/nonmatchings/B4580/func_8011E718.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E718.s rename to ver/us/asm/nonmatchings/B4580/func_8011E718.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011E8BC.s b/ver/us/asm/nonmatchings/B4580/func_8011E8BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011E8BC.s rename to ver/us/asm/nonmatchings/B4580/func_8011E8BC.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011EA54.s b/ver/us/asm/nonmatchings/B4580/func_8011EA54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011EA54.s rename to ver/us/asm/nonmatchings/B4580/func_8011EA54.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s b/ver/us/asm/nonmatchings/B4580/func_8011EBF0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011EBF0.s rename to ver/us/asm/nonmatchings/B4580/func_8011EBF0.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011F058.s b/ver/us/asm/nonmatchings/B4580/func_8011F058.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011F058.s rename to ver/us/asm/nonmatchings/B4580/func_8011F058.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011F118.s b/ver/us/asm/nonmatchings/B4580/func_8011F118.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011F118.s rename to ver/us/asm/nonmatchings/B4580/func_8011F118.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011F304.s b/ver/us/asm/nonmatchings/B4580/func_8011F304.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011F304.s rename to ver/us/asm/nonmatchings/B4580/func_8011F304.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011F3E8.s b/ver/us/asm/nonmatchings/B4580/func_8011F3E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011F3E8.s rename to ver/us/asm/nonmatchings/B4580/func_8011F3E8.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s b/ver/us/asm/nonmatchings/B4580/func_8011F4D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011F4D4.s rename to ver/us/asm/nonmatchings/B4580/func_8011F4D4.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011FA54.s b/ver/us/asm/nonmatchings/B4580/func_8011FA54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011FA54.s rename to ver/us/asm/nonmatchings/B4580/func_8011FA54.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011FF74.s b/ver/us/asm/nonmatchings/B4580/func_8011FF74.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011FF74.s rename to ver/us/asm/nonmatchings/B4580/func_8011FF74.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011FF98.s b/ver/us/asm/nonmatchings/B4580/func_8011FF98.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011FF98.s rename to ver/us/asm/nonmatchings/B4580/func_8011FF98.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8011FFB4.s b/ver/us/asm/nonmatchings/B4580/func_8011FFB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8011FFB4.s rename to ver/us/asm/nonmatchings/B4580/func_8011FFB4.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120028.s b/ver/us/asm/nonmatchings/B4580/func_80120028.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120028.s rename to ver/us/asm/nonmatchings/B4580/func_80120028.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8012003C.s b/ver/us/asm/nonmatchings/B4580/func_8012003C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8012003C.s rename to ver/us/asm/nonmatchings/B4580/func_8012003C.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8012004C.s b/ver/us/asm/nonmatchings/B4580/func_8012004C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8012004C.s rename to ver/us/asm/nonmatchings/B4580/func_8012004C.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120064.s b/ver/us/asm/nonmatchings/B4580/func_80120064.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120064.s rename to ver/us/asm/nonmatchings/B4580/func_80120064.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8012008C.s b/ver/us/asm/nonmatchings/B4580/func_8012008C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8012008C.s rename to ver/us/asm/nonmatchings/B4580/func_8012008C.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_8012009C.s b/ver/us/asm/nonmatchings/B4580/func_8012009C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_8012009C.s rename to ver/us/asm/nonmatchings/B4580/func_8012009C.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_801200B8.s b/ver/us/asm/nonmatchings/B4580/func_801200B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_801200B8.s rename to ver/us/asm/nonmatchings/B4580/func_801200B8.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_801200EC.s b/ver/us/asm/nonmatchings/B4580/func_801200EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_801200EC.s rename to ver/us/asm/nonmatchings/B4580/func_801200EC.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120118.s b/ver/us/asm/nonmatchings/B4580/func_80120118.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120118.s rename to ver/us/asm/nonmatchings/B4580/func_80120118.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120198.s b/ver/us/asm/nonmatchings/B4580/func_80120198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120198.s rename to ver/us/asm/nonmatchings/B4580/func_80120198.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120234.s b/ver/us/asm/nonmatchings/B4580/func_80120234.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120234.s rename to ver/us/asm/nonmatchings/B4580/func_80120234.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_801203AC.s b/ver/us/asm/nonmatchings/B4580/func_801203AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_801203AC.s rename to ver/us/asm/nonmatchings/B4580/func_801203AC.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120420.s b/ver/us/asm/nonmatchings/B4580/func_80120420.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120420.s rename to ver/us/asm/nonmatchings/B4580/func_80120420.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120474.s b/ver/us/asm/nonmatchings/B4580/func_80120474.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120474.s rename to ver/us/asm/nonmatchings/B4580/func_80120474.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120530.s b/ver/us/asm/nonmatchings/B4580/func_80120530.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120530.s rename to ver/us/asm/nonmatchings/B4580/func_80120530.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_80120678.s b/ver/us/asm/nonmatchings/B4580/func_80120678.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_80120678.s rename to ver/us/asm/nonmatchings/B4580/func_80120678.s diff --git a/ver/us/asm/nonmatchings/code_B4580/func_801206F8.s b/ver/us/asm/nonmatchings/B4580/func_801206F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/func_801206F8.s rename to ver/us/asm/nonmatchings/B4580/func_801206F8.s diff --git a/ver/us/asm/nonmatchings/code_B4580/play_model_animation.s b/ver/us/asm/nonmatchings/B4580/play_model_animation.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B4580/play_model_animation.s rename to ver/us/asm/nonmatchings/B4580/play_model_animation.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/_draw_message_box.s b/ver/us/asm/nonmatchings/B9D60/_draw_message_box.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/_draw_message_box.s rename to ver/us/asm/nonmatchings/B9D60/_draw_message_box.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/_load_string.s b/ver/us/asm/nonmatchings/B9D60/_load_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/_load_string.s rename to ver/us/asm/nonmatchings/B9D60/_load_string.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/_update_message.s b/ver/us/asm/nonmatchings/B9D60/_update_message.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/_update_message.s rename to ver/us/asm/nonmatchings/B9D60/_update_message.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/clamp_printer_coords.s b/ver/us/asm/nonmatchings/B9D60/clamp_printer_coords.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/clamp_printer_coords.s rename to ver/us/asm/nonmatchings/B9D60/clamp_printer_coords.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/clear_printers.s b/ver/us/asm/nonmatchings/B9D60/clear_printers.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/clear_printers.s rename to ver/us/asm/nonmatchings/B9D60/clear_printers.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/dma_load_string.s b/ver/us/asm/nonmatchings/B9D60/dma_load_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/dma_load_string.s rename to ver/us/asm/nonmatchings/B9D60/dma_load_string.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/draw_digit.s b/ver/us/asm/nonmatchings/B9D60/draw_digit.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/draw_digit.s rename to ver/us/asm/nonmatchings/B9D60/draw_digit.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/draw_msg.s b/ver/us/asm/nonmatchings/B9D60/draw_msg.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/draw_msg.s rename to ver/us/asm/nonmatchings/B9D60/draw_msg.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/draw_number.s b/ver/us/asm/nonmatchings/B9D60/draw_number.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/draw_number.s rename to ver/us/asm/nonmatchings/B9D60/draw_number.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80124434.s b/ver/us/asm/nonmatchings/B9D60/func_80124434.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80124434.s rename to ver/us/asm/nonmatchings/B9D60/func_80124434.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80124570.s b/ver/us/asm/nonmatchings/B9D60/func_80124570.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80124570.s rename to ver/us/asm/nonmatchings/B9D60/func_80124570.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80125C84.s b/ver/us/asm/nonmatchings/B9D60/func_80125C84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80125C84.s rename to ver/us/asm/nonmatchings/B9D60/func_80125C84.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80126790.s b/ver/us/asm/nonmatchings/B9D60/func_80126790.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80126790.s rename to ver/us/asm/nonmatchings/B9D60/func_80126790.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80126EAC.s b/ver/us/asm/nonmatchings/B9D60/func_80126EAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80126EAC.s rename to ver/us/asm/nonmatchings/B9D60/func_80126EAC.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80126F78.s b/ver/us/asm/nonmatchings/B9D60/func_80126F78.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80126F78.s rename to ver/us/asm/nonmatchings/B9D60/func_80126F78.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80127BA4.s b/ver/us/asm/nonmatchings/B9D60/func_80127BA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80127BA4.s rename to ver/us/asm/nonmatchings/B9D60/func_80127BA4.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s b/ver/us/asm/nonmatchings/B9D60/func_80127D90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_80127D90.s rename to ver/us/asm/nonmatchings/B9D60/func_80127D90.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_8012C324.s b/ver/us/asm/nonmatchings/B9D60/func_8012C324.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_8012C324.s rename to ver/us/asm/nonmatchings/B9D60/func_8012C324.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_8012C9A8.s b/ver/us/asm/nonmatchings/B9D60/func_8012C9A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_8012C9A8.s rename to ver/us/asm/nonmatchings/B9D60/func_8012C9A8.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_8012CA08.s b/ver/us/asm/nonmatchings/B9D60/func_8012CA08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_8012CA08.s rename to ver/us/asm/nonmatchings/B9D60/func_8012CA08.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_8012D3DC.s b/ver/us/asm/nonmatchings/B9D60/func_8012D3DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_8012D3DC.s rename to ver/us/asm/nonmatchings/B9D60/func_8012D3DC.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_8012DB58.s b/ver/us/asm/nonmatchings/B9D60/func_8012DB58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_8012DB58.s rename to ver/us/asm/nonmatchings/B9D60/func_8012DB58.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/func_8012E8E0.s b/ver/us/asm/nonmatchings/B9D60/func_8012E8E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/func_8012E8E0.s rename to ver/us/asm/nonmatchings/B9D60/func_8012E8E0.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/get_char_width.s b/ver/us/asm/nonmatchings/B9D60/get_char_width.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/get_char_width.s rename to ver/us/asm/nonmatchings/B9D60/get_char_width.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/get_msg_lines.s b/ver/us/asm/nonmatchings/B9D60/get_msg_lines.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/get_msg_lines.s rename to ver/us/asm/nonmatchings/B9D60/get_msg_lines.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s b/ver/us/asm/nonmatchings/B9D60/get_string_properties.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/get_string_properties.s rename to ver/us/asm/nonmatchings/B9D60/get_string_properties.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/get_string_width.s b/ver/us/asm/nonmatchings/B9D60/get_string_width.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/get_string_width.s rename to ver/us/asm/nonmatchings/B9D60/get_string_width.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/initialize_printer.s b/ver/us/asm/nonmatchings/B9D60/initialize_printer.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/initialize_printer.s rename to ver/us/asm/nonmatchings/B9D60/initialize_printer.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/load_font.s b/ver/us/asm/nonmatchings/B9D60/load_font.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/load_font.s rename to ver/us/asm/nonmatchings/B9D60/load_font.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/load_font_data.s b/ver/us/asm/nonmatchings/B9D60/load_font_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/load_font_data.s rename to ver/us/asm/nonmatchings/B9D60/load_font_data.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/load_message_to_buffer.s b/ver/us/asm/nonmatchings/B9D60/load_message_to_buffer.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/load_message_to_buffer.s rename to ver/us/asm/nonmatchings/B9D60/load_message_to_buffer.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/load_message_to_printer.s b/ver/us/asm/nonmatchings/B9D60/load_message_to_printer.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/load_message_to_printer.s rename to ver/us/asm/nonmatchings/B9D60/load_message_to_printer.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/render_messages.s b/ver/us/asm/nonmatchings/B9D60/render_messages.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/render_messages.s rename to ver/us/asm/nonmatchings/B9D60/render_messages.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/set_message_string.s b/ver/us/asm/nonmatchings/B9D60/set_message_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/set_message_string.s rename to ver/us/asm/nonmatchings/B9D60/set_message_string.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/set_message_value.s b/ver/us/asm/nonmatchings/B9D60/set_message_value.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/set_message_value.s rename to ver/us/asm/nonmatchings/B9D60/set_message_value.s diff --git a/ver/us/asm/nonmatchings/code_B9D60/update_messages.s b/ver/us/asm/nonmatchings/B9D60/update_messages.s similarity index 100% rename from ver/us/asm/nonmatchings/code_B9D60/update_messages.s rename to ver/us/asm/nonmatchings/B9D60/update_messages.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/appendGfx_item_entity.s b/ver/us/asm/nonmatchings/C50A0/appendGfx_item_entity.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/appendGfx_item_entity.s rename to ver/us/asm/nonmatchings/C50A0/appendGfx_item_entity.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/clear_item_entity_data.s b/ver/us/asm/nonmatchings/C50A0/clear_item_entity_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/clear_item_entity_data.s rename to ver/us/asm/nonmatchings/C50A0/clear_item_entity_data.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/draw_coin_sparkles.s b/ver/us/asm/nonmatchings/C50A0/draw_coin_sparkles.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/draw_coin_sparkles.s rename to ver/us/asm/nonmatchings/C50A0/draw_coin_sparkles.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/draw_item_entities.s b/ver/us/asm/nonmatchings/C50A0/draw_item_entities.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/draw_item_entities.s rename to ver/us/asm/nonmatchings/C50A0/draw_item_entities.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8012E9A0.s b/ver/us/asm/nonmatchings/C50A0/func_8012E9A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_8012E9A0.s rename to ver/us/asm/nonmatchings/C50A0/func_8012E9A0.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8012EC94.s b/ver/us/asm/nonmatchings/C50A0/func_8012EC94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_8012EC94.s rename to ver/us/asm/nonmatchings/C50A0/func_8012EC94.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8012F500.s b/ver/us/asm/nonmatchings/C50A0/func_8012F500.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_8012F500.s rename to ver/us/asm/nonmatchings/C50A0/func_8012F500.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8012FE10.s b/ver/us/asm/nonmatchings/C50A0/func_8012FE10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_8012FE10.s rename to ver/us/asm/nonmatchings/C50A0/func_8012FE10.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8012FE78.s b/ver/us/asm/nonmatchings/C50A0/func_8012FE78.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_8012FE78.s rename to ver/us/asm/nonmatchings/C50A0/func_8012FE78.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_801309F0.s b/ver/us/asm/nonmatchings/C50A0/func_801309F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_801309F0.s rename to ver/us/asm/nonmatchings/C50A0/func_801309F0.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s b/ver/us/asm/nonmatchings/C50A0/func_80130A04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80130A04.s rename to ver/us/asm/nonmatchings/C50A0/func_80130A04.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80130ACC.s b/ver/us/asm/nonmatchings/C50A0/func_80130ACC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80130ACC.s rename to ver/us/asm/nonmatchings/C50A0/func_80130ACC.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80130F70.s b/ver/us/asm/nonmatchings/C50A0/func_80130F70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80130F70.s rename to ver/us/asm/nonmatchings/C50A0/func_80130F70.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80130FAC.s b/ver/us/asm/nonmatchings/C50A0/func_80130FAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80130FAC.s rename to ver/us/asm/nonmatchings/C50A0/func_80130FAC.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80131128.s b/ver/us/asm/nonmatchings/C50A0/func_80131128.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80131128.s rename to ver/us/asm/nonmatchings/C50A0/func_80131128.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80131DD4.s b/ver/us/asm/nonmatchings/C50A0/func_80131DD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80131DD4.s rename to ver/us/asm/nonmatchings/C50A0/func_80131DD4.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80132D94.s b/ver/us/asm/nonmatchings/C50A0/func_80132D94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80132D94.s rename to ver/us/asm/nonmatchings/C50A0/func_80132D94.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80133A94.s b/ver/us/asm/nonmatchings/C50A0/func_80133A94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80133A94.s rename to ver/us/asm/nonmatchings/C50A0/func_80133A94.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80133FC8.s b/ver/us/asm/nonmatchings/C50A0/func_80133FC8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80133FC8.s rename to ver/us/asm/nonmatchings/C50A0/func_80133FC8.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8013559C.s b/ver/us/asm/nonmatchings/C50A0/func_8013559C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_8013559C.s rename to ver/us/asm/nonmatchings/C50A0/func_8013559C.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_801363A0.s b/ver/us/asm/nonmatchings/C50A0/func_801363A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_801363A0.s rename to ver/us/asm/nonmatchings/C50A0/func_801363A0.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s b/ver/us/asm/nonmatchings/C50A0/func_8013673C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_8013673C.s rename to ver/us/asm/nonmatchings/C50A0/func_8013673C.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_801369D0.s b/ver/us/asm/nonmatchings/C50A0/func_801369D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_801369D0.s rename to ver/us/asm/nonmatchings/C50A0/func_801369D0.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/func_80136A08.s b/ver/us/asm/nonmatchings/C50A0/func_80136A08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/func_80136A08.s rename to ver/us/asm/nonmatchings/C50A0/func_80136A08.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/init_got_item.s b/ver/us/asm/nonmatchings/C50A0/init_got_item.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/init_got_item.s rename to ver/us/asm/nonmatchings/C50A0/init_got_item.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/init_item_entity_list.s b/ver/us/asm/nonmatchings/C50A0/init_item_entity_list.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/init_item_entity_list.s rename to ver/us/asm/nonmatchings/C50A0/init_item_entity_list.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s b/ver/us/asm/nonmatchings/C50A0/make_item_entity.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/make_item_entity.s rename to ver/us/asm/nonmatchings/C50A0/make_item_entity.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s b/ver/us/asm/nonmatchings/C50A0/remove_item_entity_by_index.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_index.s rename to ver/us/asm/nonmatchings/C50A0/remove_item_entity_by_index.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s b/ver/us/asm/nonmatchings/C50A0/remove_item_entity_by_reference.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/remove_item_entity_by_reference.s rename to ver/us/asm/nonmatchings/C50A0/remove_item_entity_by_reference.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/render_item_entities.s b/ver/us/asm/nonmatchings/C50A0/render_item_entities.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/render_item_entities.s rename to ver/us/asm/nonmatchings/C50A0/render_item_entities.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/test_item_player_collision.s b/ver/us/asm/nonmatchings/C50A0/test_item_player_collision.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/test_item_player_collision.s rename to ver/us/asm/nonmatchings/C50A0/test_item_player_collision.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s b/ver/us/asm/nonmatchings/C50A0/update_item_entities.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/update_item_entities.s rename to ver/us/asm/nonmatchings/C50A0/update_item_entities.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_collectable.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/update_item_entity_collectable.s rename to ver/us/asm/nonmatchings/C50A0/update_item_entity_collectable.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_static.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_static.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/update_item_entity_static.s rename to ver/us/asm/nonmatchings/C50A0/update_item_entity_static.s diff --git a/ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s b/ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s similarity index 100% rename from ver/us/asm/nonmatchings/code_C50A0/update_item_entity_temp.s rename to ver/us/asm/nonmatchings/C50A0/update_item_entity_temp.s diff --git a/ver/us/asm/nonmatchings/code_CEE40/func_80138740.s b/ver/us/asm/nonmatchings/CEE40/func_80138740.s similarity index 100% rename from ver/us/asm/nonmatchings/code_CEE40/func_80138740.s rename to ver/us/asm/nonmatchings/CEE40/func_80138740.s diff --git a/ver/us/asm/nonmatchings/code_CEE40/func_80138D88.s b/ver/us/asm/nonmatchings/CEE40/func_80138D88.s similarity index 100% rename from ver/us/asm/nonmatchings/code_CEE40/func_80138D88.s rename to ver/us/asm/nonmatchings/CEE40/func_80138D88.s diff --git a/ver/us/asm/nonmatchings/code_CEE40/func_80138E54.s b/ver/us/asm/nonmatchings/CEE40/func_80138E54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_CEE40/func_80138E54.s rename to ver/us/asm/nonmatchings/CEE40/func_80138E54.s diff --git a/ver/us/asm/nonmatchings/code_CEE40/func_80139F10.s b/ver/us/asm/nonmatchings/CEE40/func_80139F10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_CEE40/func_80139F10.s rename to ver/us/asm/nonmatchings/CEE40/func_80139F10.s diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149670.s b/ver/us/asm/nonmatchings/DF950/func_80149670.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/func_80149670.s rename to ver/us/asm/nonmatchings/DF950/func_80149670.s diff --git a/ver/us/asm/nonmatchings/code_DF950/func_80149A6C.s b/ver/us/asm/nonmatchings/DF950/func_80149A6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/func_80149A6C.s rename to ver/us/asm/nonmatchings/DF950/func_80149A6C.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_params.s b/ver/us/asm/nonmatchings/DF950/sfx_adjust_env_sound_params.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_params.s rename to ver/us/asm/nonmatchings/DF950/sfx_adjust_env_sound_params.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_pos.s b/ver/us/asm/nonmatchings/DF950/sfx_adjust_env_sound_pos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_adjust_env_sound_pos.s rename to ver/us/asm/nonmatchings/DF950/sfx_adjust_env_sound_pos.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_clear_sounds.s b/ver/us/asm/nonmatchings/DF950/sfx_clear_sounds.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_clear_sounds.s rename to ver/us/asm/nonmatchings/DF950/sfx_clear_sounds.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_0.s b/ver/us/asm/nonmatchings/DF950/sfx_compute_spatialized_sound_params_0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_0.s rename to ver/us/asm/nonmatchings/DF950/sfx_compute_spatialized_sound_params_0.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_1.s b/ver/us/asm/nonmatchings/DF950/sfx_compute_spatialized_sound_params_1.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_1.s rename to ver/us/asm/nonmatchings/DF950/sfx_compute_spatialized_sound_params_1.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_2.s b/ver/us/asm/nonmatchings/DF950/sfx_compute_spatialized_sound_params_2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_compute_spatialized_sound_params_2.s rename to ver/us/asm/nonmatchings/DF950/sfx_compute_spatialized_sound_params_2.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_get_env_sound_instance.s b/ver/us/asm/nonmatchings/DF950/sfx_get_env_sound_instance.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_get_env_sound_instance.s rename to ver/us/asm/nonmatchings/DF950/sfx_get_env_sound_instance.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_get_spatialized_sound_params.s b/ver/us/asm/nonmatchings/DF950/sfx_get_spatialized_sound_params.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_get_spatialized_sound_params.s rename to ver/us/asm/nonmatchings/DF950/sfx_get_spatialized_sound_params.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_at_position.s b/ver/us/asm/nonmatchings/DF950/sfx_play_sound_at_position.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_at_position.s rename to ver/us/asm/nonmatchings/DF950/sfx_play_sound_at_position.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_looping.s b/ver/us/asm/nonmatchings/DF950/sfx_play_sound_looping.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_looping.s rename to ver/us/asm/nonmatchings/DF950/sfx_play_sound_looping.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_with_params.s b/ver/us/asm/nonmatchings/DF950/sfx_play_sound_with_params.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_play_sound_with_params.s rename to ver/us/asm/nonmatchings/DF950/sfx_play_sound_with_params.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_register_looping_sound_at_position.s b/ver/us/asm/nonmatchings/DF950/sfx_register_looping_sound_at_position.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_register_looping_sound_at_position.s rename to ver/us/asm/nonmatchings/DF950/sfx_register_looping_sound_at_position.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_stop_env_sounds.s b/ver/us/asm/nonmatchings/DF950/sfx_stop_env_sounds.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_stop_env_sounds.s rename to ver/us/asm/nonmatchings/DF950/sfx_stop_env_sounds.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_stop_sound.s b/ver/us/asm/nonmatchings/DF950/sfx_stop_sound.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_stop_sound.s rename to ver/us/asm/nonmatchings/DF950/sfx_stop_sound.s diff --git a/ver/us/asm/nonmatchings/code_DF950/sfx_update_looping_sound_params.s b/ver/us/asm/nonmatchings/DF950/sfx_update_looping_sound_params.s similarity index 100% rename from ver/us/asm/nonmatchings/code_DF950/sfx_update_looping_sound_params.s rename to ver/us/asm/nonmatchings/DF950/sfx_update_looping_sound_params.s diff --git a/ver/us/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s b/ver/us/asm/nonmatchings/E20110/func_802B70B4_E201C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E20110/func_802B70B4_E201C4.s rename to ver/us/asm/nonmatchings/E20110/func_802B70B4_E201C4.s diff --git a/ver/us/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s b/ver/us/asm/nonmatchings/E20110/func_802B71E8_E202F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E20110/func_802B71E8_E202F8.s rename to ver/us/asm/nonmatchings/E20110/func_802B71E8_E202F8.s diff --git a/ver/us/asm/nonmatchings/code_E20110/func_802B7450_E20560.s b/ver/us/asm/nonmatchings/E20110/func_802B7450_E20560.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E20110/func_802B7450_E20560.s rename to ver/us/asm/nonmatchings/E20110/func_802B7450_E20560.s diff --git a/ver/us/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s b/ver/us/asm/nonmatchings/E20110/func_802B75E8_E206F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E20110/func_802B75E8_E206F8.s rename to ver/us/asm/nonmatchings/E20110/func_802B75E8_E206F8.s diff --git a/ver/us/asm/nonmatchings/code_E20110/func_802B7728_E20838.s b/ver/us/asm/nonmatchings/E20110/func_802B7728_E20838.s similarity index 99% rename from ver/us/asm/nonmatchings/code_E20110/func_802B7728_E20838.s rename to ver/us/asm/nonmatchings/E20110/func_802B7728_E20838.s index 33f6fd86e6..fe131df0c4 100644 --- a/ver/us/asm/nonmatchings/code_E20110/func_802B7728_E20838.s +++ b/ver/us/asm/nonmatchings/E20110/func_802B7728_E20838.s @@ -148,7 +148,7 @@ glabel func_802B7728_E20838 /* E20A24 802B7914 3C018011 */ lui $at, %hi(D_8010C958) /* E20A28 802B7918 AC22C958 */ sw $v0, %lo(D_8010C958)($at) .L802B791C: -/* E20A2C 802B791C 0C0ADC00 */ jal code_E20110_UnkAngleFunc1 +/* E20A2C 802B791C 0C0ADC00 */ jal E20110_UnkAngleFunc1 /* E20A30 802B7920 00000000 */ nop /* E20A34 802B7924 0040802D */ daddu $s0, $v0, $zero .L802B7928: diff --git a/ver/us/asm/nonmatchings/code_E21870/func_802B704C.s b/ver/us/asm/nonmatchings/E21870/func_802B704C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E21870/func_802B704C.s rename to ver/us/asm/nonmatchings/E21870/func_802B704C.s diff --git a/ver/us/asm/nonmatchings/code_E21870/func_802B7140.s b/ver/us/asm/nonmatchings/E21870/func_802B7140.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E21870/func_802B7140.s rename to ver/us/asm/nonmatchings/E21870/func_802B7140.s diff --git a/ver/us/asm/nonmatchings/code_E21870/func_802B71D4.s b/ver/us/asm/nonmatchings/E21870/func_802B71D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E21870/func_802B71D4.s rename to ver/us/asm/nonmatchings/E21870/func_802B71D4.s diff --git a/ver/us/asm/nonmatchings/code_E21870/func_802B74F0.s b/ver/us/asm/nonmatchings/E21870/func_802B74F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E21870/func_802B74F0.s rename to ver/us/asm/nonmatchings/E21870/func_802B74F0.s diff --git a/ver/us/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s b/ver/us/asm/nonmatchings/E225B0/func_802B7000_E225B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E225B0/func_802B7000_E225B0.s rename to ver/us/asm/nonmatchings/E225B0/func_802B7000_E225B0.s diff --git a/ver/us/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s b/ver/us/asm/nonmatchings/E225B0/func_802B72C0_E22870.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E225B0/func_802B72C0_E22870.s rename to ver/us/asm/nonmatchings/E225B0/func_802B72C0_E22870.s diff --git a/ver/us/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s b/ver/us/asm/nonmatchings/E225B0/func_802B735C_E2290C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E225B0/func_802B735C_E2290C.s rename to ver/us/asm/nonmatchings/E225B0/func_802B735C_E2290C.s diff --git a/ver/us/asm/nonmatchings/code_E23260/func_802B6000_E23260.s b/ver/us/asm/nonmatchings/E23260/func_802B6000_E23260.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E23260/func_802B6000_E23260.s rename to ver/us/asm/nonmatchings/E23260/func_802B6000_E23260.s diff --git a/ver/us/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s b/ver/us/asm/nonmatchings/E23260/func_802B61E4_E23444.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s rename to ver/us/asm/nonmatchings/E23260/func_802B61E4_E23444.s diff --git a/ver/us/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s b/ver/us/asm/nonmatchings/E236E0/func_802B6000_E236E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E236E0/func_802B6000_E236E0.s rename to ver/us/asm/nonmatchings/E236E0/func_802B6000_E236E0.s diff --git a/ver/us/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s b/ver/us/asm/nonmatchings/E236E0/func_802B6288_E23968.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E236E0/func_802B6288_E23968.s rename to ver/us/asm/nonmatchings/E236E0/func_802B6288_E23968.s diff --git a/ver/us/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s b/ver/us/asm/nonmatchings/E236E0/func_802B6550_E23C30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E236E0/func_802B6550_E23C30.s rename to ver/us/asm/nonmatchings/E236E0/func_802B6550_E23C30.s diff --git a/ver/us/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s b/ver/us/asm/nonmatchings/E236E0/func_802B65E8_E23CC8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E236E0/func_802B65E8_E23CC8.s rename to ver/us/asm/nonmatchings/E236E0/func_802B65E8_E23CC8.s diff --git a/ver/us/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s b/ver/us/asm/nonmatchings/E236E0/func_802B6738_E23E18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E236E0/func_802B6738_E23E18.s rename to ver/us/asm/nonmatchings/E236E0/func_802B6738_E23E18.s diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B6000_E24040.s b/ver/us/asm/nonmatchings/E24040/func_802B6000_E24040.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24040/func_802B6000_E24040.s rename to ver/us/asm/nonmatchings/E24040/func_802B6000_E24040.s diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s b/ver/us/asm/nonmatchings/E24040/func_802B60B4_E240F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24040/func_802B60B4_E240F4.s rename to ver/us/asm/nonmatchings/E24040/func_802B60B4_E240F4.s diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s b/ver/us/asm/nonmatchings/E24040/func_802B6198_E241D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24040/func_802B6198_E241D8.s rename to ver/us/asm/nonmatchings/E24040/func_802B6198_E241D8.s diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s b/ver/us/asm/nonmatchings/E24040/func_802B6294_E242D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24040/func_802B6294_E242D4.s rename to ver/us/asm/nonmatchings/E24040/func_802B6294_E242D4.s diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B6348_E24388.s b/ver/us/asm/nonmatchings/E24040/func_802B6348_E24388.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24040/func_802B6348_E24388.s rename to ver/us/asm/nonmatchings/E24040/func_802B6348_E24388.s diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s b/ver/us/asm/nonmatchings/E24040/func_802B647C_E244BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24040/func_802B647C_E244BC.s rename to ver/us/asm/nonmatchings/E24040/func_802B647C_E244BC.s diff --git a/ver/us/asm/nonmatchings/code_E24040/func_802B6508_E24548.s b/ver/us/asm/nonmatchings/E24040/func_802B6508_E24548.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24040/func_802B6508_E24548.s rename to ver/us/asm/nonmatchings/E24040/func_802B6508_E24548.s diff --git a/ver/us/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s b/ver/us/asm/nonmatchings/E245D0/func_802B6000_E245D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E245D0/func_802B6000_E245D0.s rename to ver/us/asm/nonmatchings/E245D0/func_802B6000_E245D0.s diff --git a/ver/us/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s b/ver/us/asm/nonmatchings/E245D0/func_802B6198_E24768.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E245D0/func_802B6198_E24768.s rename to ver/us/asm/nonmatchings/E245D0/func_802B6198_E24768.s diff --git a/ver/us/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s b/ver/us/asm/nonmatchings/E245D0/func_802B6230_E24800.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E245D0/func_802B6230_E24800.s rename to ver/us/asm/nonmatchings/E245D0/func_802B6230_E24800.s diff --git a/ver/us/asm/nonmatchings/code_E24920/func_802B6000_E24920.s b/ver/us/asm/nonmatchings/E24920/func_802B6000_E24920.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24920/func_802B6000_E24920.s rename to ver/us/asm/nonmatchings/E24920/func_802B6000_E24920.s diff --git a/ver/us/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s b/ver/us/asm/nonmatchings/E24920/func_802B61C0_E24AE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24920/func_802B61C0_E24AE0.s rename to ver/us/asm/nonmatchings/E24920/func_802B61C0_E24AE0.s diff --git a/ver/us/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s b/ver/us/asm/nonmatchings/E24920/func_802B62CC_E24BEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24920/func_802B62CC_E24BEC.s rename to ver/us/asm/nonmatchings/E24920/func_802B62CC_E24BEC.s diff --git a/ver/us/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s b/ver/us/asm/nonmatchings/E24920/func_802B644C_E24D6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24920/func_802B644C_E24D6C.s rename to ver/us/asm/nonmatchings/E24920/func_802B644C_E24D6C.s diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s b/ver/us/asm/nonmatchings/E24ED0/func_802B6000_E24ED0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24ED0/func_802B6000_E24ED0.s rename to ver/us/asm/nonmatchings/E24ED0/func_802B6000_E24ED0.s diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s b/ver/us/asm/nonmatchings/E24ED0/func_802B6048_E24F18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24ED0/func_802B6048_E24F18.s rename to ver/us/asm/nonmatchings/E24ED0/func_802B6048_E24F18.s diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s b/ver/us/asm/nonmatchings/E24ED0/func_802B62A4_E25174.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24ED0/func_802B62A4_E25174.s rename to ver/us/asm/nonmatchings/E24ED0/func_802B62A4_E25174.s diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s b/ver/us/asm/nonmatchings/E24ED0/func_802B66A8_E25578.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24ED0/func_802B66A8_E25578.s rename to ver/us/asm/nonmatchings/E24ED0/func_802B66A8_E25578.s diff --git a/ver/us/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s b/ver/us/asm/nonmatchings/E24ED0/func_802B6820_E256F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E24ED0/func_802B6820_E256F0.s rename to ver/us/asm/nonmatchings/E24ED0/func_802B6820_E256F0.s diff --git a/ver/us/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s b/ver/us/asm/nonmatchings/E25D60/func_802B6000_E25D60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s rename to ver/us/asm/nonmatchings/E25D60/func_802B6000_E25D60.s diff --git a/ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s b/ver/us/asm/nonmatchings/E26710/func_802B6000_E26710.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E26710/func_802B6000_E26710.s rename to ver/us/asm/nonmatchings/E26710/func_802B6000_E26710.s diff --git a/ver/us/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s b/ver/us/asm/nonmatchings/E26710/func_802B65F8_E26D08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E26710/func_802B65F8_E26D08.s rename to ver/us/asm/nonmatchings/E26710/func_802B65F8_E26D08.s diff --git a/ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s b/ver/us/asm/nonmatchings/E26DE0/func_802B6000_E26DE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E26DE0/func_802B6000_E26DE0.s rename to ver/us/asm/nonmatchings/E26DE0/func_802B6000_E26DE0.s diff --git a/ver/us/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s b/ver/us/asm/nonmatchings/E26DE0/func_802B6648_E27428.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E26DE0/func_802B6648_E27428.s rename to ver/us/asm/nonmatchings/E26DE0/func_802B6648_E27428.s diff --git a/ver/us/asm/nonmatchings/code_E27510/func_802B6000_E27510.s b/ver/us/asm/nonmatchings/E27510/func_802B6000_E27510.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E27510/func_802B6000_E27510.s rename to ver/us/asm/nonmatchings/E27510/func_802B6000_E27510.s diff --git a/ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s b/ver/us/asm/nonmatchings/E27510/func_802B6060_E27570.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E27510/func_802B6060_E27570.s rename to ver/us/asm/nonmatchings/E27510/func_802B6060_E27570.s diff --git a/ver/us/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s b/ver/us/asm/nonmatchings/E27C90/func_802B6000_E27C90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s rename to ver/us/asm/nonmatchings/E27C90/func_802B6000_E27C90.s diff --git a/ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s b/ver/us/asm/nonmatchings/E27F40/func_802B6000_E27F40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E27F40/func_802B6000_E27F40.s rename to ver/us/asm/nonmatchings/E27F40/func_802B6000_E27F40.s diff --git a/ver/us/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s b/ver/us/asm/nonmatchings/E287F0/func_802B6000_E287F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s rename to ver/us/asm/nonmatchings/E287F0/func_802B6000_E287F0.s diff --git a/ver/us/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s b/ver/us/asm/nonmatchings/E28A30/func_802B6000_E28A30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E28A30/func_802B6000_E28A30.s rename to ver/us/asm/nonmatchings/E28A30/func_802B6000_E28A30.s diff --git a/ver/us/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s b/ver/us/asm/nonmatchings/E28A30/func_802B609C_E28ACC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E28A30/func_802B609C_E28ACC.s rename to ver/us/asm/nonmatchings/E28A30/func_802B609C_E28ACC.s diff --git a/ver/us/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s b/ver/us/asm/nonmatchings/E28A30/func_802B6350_E28D80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E28A30/func_802B6350_E28D80.s rename to ver/us/asm/nonmatchings/E28A30/func_802B6350_E28D80.s diff --git a/ver/us/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s b/ver/us/asm/nonmatchings/E28A30/func_802B63D4_E28E04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E28A30/func_802B63D4_E28E04.s rename to ver/us/asm/nonmatchings/E28A30/func_802B63D4_E28E04.s diff --git a/ver/us/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s b/ver/us/asm/nonmatchings/E28A30/func_802B6478_E28EA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E28A30/func_802B6478_E28EA8.s rename to ver/us/asm/nonmatchings/E28A30/func_802B6478_E28EA8.s diff --git a/ver/us/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s b/ver/us/asm/nonmatchings/E28A30/func_802B6508_E28F38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E28A30/func_802B6508_E28F38.s rename to ver/us/asm/nonmatchings/E28A30/func_802B6508_E28F38.s diff --git a/ver/us/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s b/ver/us/asm/nonmatchings/E28A30/func_802B6638_E29068.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E28A30/func_802B6638_E29068.s rename to ver/us/asm/nonmatchings/E28A30/func_802B6638_E29068.s diff --git a/ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s b/ver/us/asm/nonmatchings/E291A0/func_802B6000_E291A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E291A0/func_802B6000_E291A0.s rename to ver/us/asm/nonmatchings/E291A0/func_802B6000_E291A0.s diff --git a/ver/us/asm/nonmatchings/code_E29470/func_802B6000_E29470.s b/ver/us/asm/nonmatchings/E29470/func_802B6000_E29470.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E29470/func_802B6000_E29470.s rename to ver/us/asm/nonmatchings/E29470/func_802B6000_E29470.s diff --git a/ver/us/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s b/ver/us/asm/nonmatchings/E29470/func_802B60A4_E29514.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s rename to ver/us/asm/nonmatchings/E29470/func_802B60A4_E29514.s diff --git a/ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s b/ver/us/asm/nonmatchings/E2A340/func_802B6000_E2A340.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s rename to ver/us/asm/nonmatchings/E2A340/func_802B6000_E2A340.s diff --git a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s b/ver/us/asm/nonmatchings/E2A6B0/func_802B6000_E2A6B0.s similarity index 98% rename from ver/us/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s rename to ver/us/asm/nonmatchings/E2A6B0/func_802B6000_E2A6B0.s index 427f52cf3f..1cccd58db6 100644 --- a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6000_E2A6B0.s +++ b/ver/us/asm/nonmatchings/E2A6B0/func_802B6000_E2A6B0.s @@ -26,7 +26,7 @@ glabel func_802B6000_E2A6B0 /* E2A700 802B6050 C62C0028 */ lwc1 $f12, 0x28($s1) /* E2A704 802B6054 C62E002C */ lwc1 $f14, 0x2c($s1) /* E2A708 802B6058 8E260030 */ lw $a2, 0x30($s1) -/* E2A70C 802B605C 0C00F3ED */ jal func_8003CFB4 +/* E2A70C 802B605C 0C00F3ED */ jal npc_find_near /* E2A710 802B6060 3C0742C8 */ lui $a3, 0x42c8 /* E2A714 802B6064 0040802D */ daddu $s0, $v0, $zero /* E2A718 802B6068 12000026 */ beqz $s0, .L802B6104 diff --git a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s b/ver/us/asm/nonmatchings/E2A6B0/func_802B6120_E2A7D0.s similarity index 99% rename from ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s rename to ver/us/asm/nonmatchings/E2A6B0/func_802B6120_E2A7D0.s index 0c50d43c49..6885939b30 100644 --- a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6120_E2A7D0.s +++ b/ver/us/asm/nonmatchings/E2A6B0/func_802B6120_E2A7D0.s @@ -473,7 +473,7 @@ glabel L802B66BC_E2AD6C /* E2AE74 802B67C4 A082007E */ sb $v0, 0x7e($a0) /* E2AE78 802B67C8 3C048011 */ lui $a0, %hi(D_8010C96C) /* E2AE7C 802B67CC 8C84C96C */ lw $a0, %lo(D_8010C96C)($a0) -/* E2AE80 802B67D0 0C00E228 */ jal free_npc_by_index +/* E2AE80 802B67D0 0C00E228 */ jal npc_free_by_index /* E2AE84 802B67D4 A220000C */ sb $zero, 0xc($s1) /* E2AE88 802B67D8 24020037 */ addiu $v0, $zero, 0x37 /* E2AE8C 802B67DC A62200B0 */ sh $v0, 0xb0($s1) diff --git a/ver/us/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s b/ver/us/asm/nonmatchings/E2A6B0/func_802B6CF0_E2B3A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2A6B0/func_802B6CF0_E2B3A0.s rename to ver/us/asm/nonmatchings/E2A6B0/func_802B6CF0_E2B3A0.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80240310_EA0C10.s b/ver/us/asm/nonmatchings/EA0C10/func_80240310_EA0C10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80240310_EA0C10.s rename to ver/us/asm/nonmatchings/EA0C10/func_80240310_EA0C10.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_8024037C_EA0C7C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024037C_EA0C7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_8024037C_EA0C7C.s rename to ver/us/asm/nonmatchings/EA0C10/func_8024037C_EA0C7C.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s b/ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802403EC_EA0CEC.s rename to ver/us/asm/nonmatchings/EA0C10/func_802403EC_EA0CEC.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802404C4_EA0DC4.s b/ver/us/asm/nonmatchings/EA0C10/func_802404C4_EA0DC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802404C4_EA0DC4.s rename to ver/us/asm/nonmatchings/EA0C10/func_802404C4_EA0DC4.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s b/ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80240518_EA0E18.s rename to ver/us/asm/nonmatchings/EA0C10/func_80240518_EA0E18.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s b/ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802406CC_EA0FCC.s rename to ver/us/asm/nonmatchings/EA0C10/func_802406CC_EA0FCC.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_8024097C_EA127C.s rename to ver/us/asm/nonmatchings/EA0C10/func_8024097C_EA127C.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80240C5C_EA155C.s b/ver/us/asm/nonmatchings/EA0C10/func_80240C5C_EA155C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80240C5C_EA155C.s rename to ver/us/asm/nonmatchings/EA0C10/func_80240C5C_EA155C.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s b/ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80240CC8_EA15C8.s rename to ver/us/asm/nonmatchings/EA0C10/func_80240CC8_EA15C8.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s b/ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80240DC4_EA16C4.s rename to ver/us/asm/nonmatchings/EA0C10/func_80240DC4_EA16C4.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s b/ver/us/asm/nonmatchings/EA0C10/func_80241804_EA2104.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80241804_EA2104.s rename to ver/us/asm/nonmatchings/EA0C10/func_80241804_EA2104.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s b/ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80241894_EA2194.s rename to ver/us/asm/nonmatchings/EA0C10/func_80241894_EA2194.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s b/ver/us/asm/nonmatchings/EA0C10/func_80241994_EA2294.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80241994_EA2294.s rename to ver/us/asm/nonmatchings/EA0C10/func_80241994_EA2294.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s b/ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802419F4_EA22F4.s rename to ver/us/asm/nonmatchings/EA0C10/func_802419F4_EA22F4.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s b/ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80241AE0_EA23E0.s rename to ver/us/asm/nonmatchings/EA0C10/func_80241AE0_EA23E0.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80241D68_EA2668.s b/ver/us/asm/nonmatchings/EA0C10/func_80241D68_EA2668.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80241D68_EA2668.s rename to ver/us/asm/nonmatchings/EA0C10/func_80241D68_EA2668.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s b/ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80241DE4_EA26E4.s rename to ver/us/asm/nonmatchings/EA0C10/func_80241DE4_EA26E4.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s b/ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80241F18_EA2818.s rename to ver/us/asm/nonmatchings/EA0C10/func_80241F18_EA2818.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024207C_EA297C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_8024207C_EA297C.s rename to ver/us/asm/nonmatchings/EA0C10/func_8024207C_EA297C.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s b/ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802420FC_EA29FC.s rename to ver/us/asm/nonmatchings/EA0C10/func_802420FC_EA29FC.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s b/ver/us/asm/nonmatchings/EA0C10/func_80242568_EA2E68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242568_EA2E68.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242568_EA2E68.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s b/ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802425B0_EA2EB0.s rename to ver/us/asm/nonmatchings/EA0C10/func_802425B0_EA2EB0.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242608_EA2F08.s b/ver/us/asm/nonmatchings/EA0C10/func_80242608_EA2F08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242608_EA2F08.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242608_EA2F08.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s b/ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_8024267C_EA2F7C.s rename to ver/us/asm/nonmatchings/EA0C10/func_8024267C_EA2F7C.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242730_EA3030.s b/ver/us/asm/nonmatchings/EA0C10/func_80242730_EA3030.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242730_EA3030.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242730_EA3030.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s b/ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242794_EA3094.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242794_EA3094.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s b/ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802427F0_EA30F0.s rename to ver/us/asm/nonmatchings/EA0C10/func_802427F0_EA30F0.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_802429C0_EA32C0.s b/ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_802429C0_EA32C0.s rename to ver/us/asm/nonmatchings/EA0C10/func_802429C0_EA32C0.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242A14_EA3314.s b/ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242A14_EA3314.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242A14_EA3314.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s b/ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242A4C_EA334C.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242A4C_EA334C.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242AE8_EA33E8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242AE8_EA33E8.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242AE8_EA33E8.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242BD8_EA34D8.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242BD8_EA34D8.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242D64_EA3664.s b/ver/us/asm/nonmatchings/EA0C10/func_80242D64_EA3664.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242D64_EA3664.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242D64_EA3664.s diff --git a/ver/us/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s b/ver/us/asm/nonmatchings/EA0C10/func_80242DA8_EA36A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA0C10/func_80242DA8_EA36A8.s rename to ver/us/asm/nonmatchings/EA0C10/func_80242DA8_EA36A8.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_80242DE0_EA36E0.s b/ver/us/asm/nonmatchings/EA36E0/func_80242DE0_EA36E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_80242DE0_EA36E0.s rename to ver/us/asm/nonmatchings/EA36E0/func_80242DE0_EA36E0.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_80242E00_EA3700.s b/ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_80242E00_EA3700.s rename to ver/us/asm/nonmatchings/EA36E0/func_80242E00_EA3700.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s b/ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_80242E2C_EA372C.s rename to ver/us/asm/nonmatchings/EA36E0/func_80242E2C_EA372C.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s b/ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_80242EC4_EA37C4.s rename to ver/us/asm/nonmatchings/EA36E0/func_80242EC4_EA37C4.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s b/ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_80242F64_EA3864.s rename to ver/us/asm/nonmatchings/EA36E0/func_80242F64_EA3864.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s b/ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_80242F9C_EA389C.s rename to ver/us/asm/nonmatchings/EA36E0/func_80242F9C_EA389C.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s b/ver/us/asm/nonmatchings/EA36E0/func_80243054_EA3954.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_80243054_EA3954.s rename to ver/us/asm/nonmatchings/EA36E0/func_80243054_EA3954.s diff --git a/ver/us/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s b/ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA36E0/func_802430E4_EA39E4.s rename to ver/us/asm/nonmatchings/EA36E0/func_802430E4_EA39E4.s diff --git a/ver/us/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s b/ver/us/asm/nonmatchings/EA6FD0/func_80240000_EA6FD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s rename to ver/us/asm/nonmatchings/EA6FD0/func_80240000_EA6FD0.s diff --git a/ver/us/asm/nonmatchings/code_EA7010/func_80240040_EA7010.s b/ver/us/asm/nonmatchings/EA7010/func_80240040_EA7010.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA7010/func_80240040_EA7010.s rename to ver/us/asm/nonmatchings/EA7010/func_80240040_EA7010.s diff --git a/ver/us/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s b/ver/us/asm/nonmatchings/EA7010/func_80240164_EA7134.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA7010/func_80240164_EA7134.s rename to ver/us/asm/nonmatchings/EA7010/func_80240164_EA7134.s diff --git a/ver/us/asm/nonmatchings/code_EA7320/func_80240350_EA7320.s b/ver/us/asm/nonmatchings/EA7320/func_80240350_EA7320.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA7320/func_80240350_EA7320.s rename to ver/us/asm/nonmatchings/EA7320/func_80240350_EA7320.s diff --git a/ver/us/asm/nonmatchings/code_EA7320/func_8024036C_EA733C.s b/ver/us/asm/nonmatchings/EA7320/func_8024036C_EA733C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA7320/func_8024036C_EA733C.s rename to ver/us/asm/nonmatchings/EA7320/func_8024036C_EA733C.s diff --git a/ver/us/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s b/ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA7320/func_80240388_EA7358.s rename to ver/us/asm/nonmatchings/EA7320/func_80240388_EA7358.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_8024030C_EA8DEC.s b/ver/us/asm/nonmatchings/EA8AE0/func_8024030C_EA8DEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_8024030C_EA8DEC.s rename to ver/us/asm/nonmatchings/EA8AE0/func_8024030C_EA8DEC.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240358_EA8E38.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240358_EA8E38.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240358_EA8E38.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s b/ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802404B8_EA8F98.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802404B8_EA8F98.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802408C8_EA93A8.s b/ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802408C8_EA93A8.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802408C8_EA93A8.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240908_EA93E8.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240908_EA93E8.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240908_EA93E8.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240A14_EA94F4.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240A14_EA94F4.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240B00_EA95E0.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240B00_EA95E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240B00_EA95E0.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240B00_EA95E0.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240BD4_EA96B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240BD4_EA96B4.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240BD4_EA96B4.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240CD8_EA97B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240CD8_EA97B8.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240CD8_EA97B8.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240DA4_EA9884.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240DA4_EA9884.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240DA4_EA9884.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240DA4_EA9884.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s b/ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80240E2C_EA990C.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80240E2C_EA990C.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802413C0_EA9EA0.s b/ver/us/asm/nonmatchings/EA8AE0/func_802413C0_EA9EA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802413C0_EA9EA0.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802413C0_EA9EA0.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802413FC_EA9EDC.s b/ver/us/asm/nonmatchings/EA8AE0/func_802413FC_EA9EDC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802413FC_EA9EDC.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802413FC_EA9EDC.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_8024140C_EA9EEC.s b/ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_8024140C_EA9EEC.s rename to ver/us/asm/nonmatchings/EA8AE0/func_8024140C_EA9EEC.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80241468_EA9F48.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80241468_EA9F48.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_8024151C_EA9FFC.s b/ver/us/asm/nonmatchings/EA8AE0/func_8024151C_EA9FFC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_8024151C_EA9FFC.s rename to ver/us/asm/nonmatchings/EA8AE0/func_8024151C_EA9FFC.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80241580_EAA060.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80241580_EAA060.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s b/ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802415DC_EAA0BC.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802415DC_EAA0BC.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802417AC_EAA28C.s b/ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802417AC_EAA28C.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802417AC_EAA28C.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80241800_EAA2E0.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80241800_EAA2E0.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80241800_EAA2E0.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80241838_EAA318.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80241838_EAA318.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802418D4_EAA3B4.s b/ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802418D4_EAA3B4.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802418D4_EAA3B4.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s b/ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_802419C4_EAA4A4.s rename to ver/us/asm/nonmatchings/EA8AE0/func_802419C4_EAA4A4.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80241B50_EAA630.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241B50_EAA630.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80241B50_EAA630.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80241B50_EAA630.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80241B94_EAA674.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241B94_EAA674.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80241B94_EAA674.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80241B94_EAA674.s diff --git a/ver/us/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s b/ver/us/asm/nonmatchings/EA8AE0/func_80241BC0_EAA6A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EA8AE0/func_80241BC0_EAA6A0.s rename to ver/us/asm/nonmatchings/EA8AE0/func_80241BC0_EAA6A0.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s b/ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_80240310_EB1170.s rename to ver/us/asm/nonmatchings/EB1170/func_80240310_EB1170.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_802403C4_EB1224.s b/ver/us/asm/nonmatchings/EB1170/func_802403C4_EB1224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_802403C4_EB1224.s rename to ver/us/asm/nonmatchings/EB1170/func_802403C4_EB1224.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s b/ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_80240428_EB1288.s rename to ver/us/asm/nonmatchings/EB1170/func_80240428_EB1288.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s b/ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_80240484_EB12E4.s rename to ver/us/asm/nonmatchings/EB1170/func_80240484_EB12E4.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_80240654_EB14B4.s b/ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_80240654_EB14B4.s rename to ver/us/asm/nonmatchings/EB1170/func_80240654_EB14B4.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_802406A8_EB1508.s b/ver/us/asm/nonmatchings/EB1170/func_802406A8_EB1508.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_802406A8_EB1508.s rename to ver/us/asm/nonmatchings/EB1170/func_802406A8_EB1508.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s b/ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_802406E0_EB1540.s rename to ver/us/asm/nonmatchings/EB1170/func_802406E0_EB1540.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_8024077C_EB15DC.s b/ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_8024077C_EB15DC.s rename to ver/us/asm/nonmatchings/EB1170/func_8024077C_EB15DC.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s b/ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_8024086C_EB16CC.s rename to ver/us/asm/nonmatchings/EB1170/func_8024086C_EB16CC.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_802409F8_EB1858.s b/ver/us/asm/nonmatchings/EB1170/func_802409F8_EB1858.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_802409F8_EB1858.s rename to ver/us/asm/nonmatchings/EB1170/func_802409F8_EB1858.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_80240A3C_EB189C.s b/ver/us/asm/nonmatchings/EB1170/func_80240A3C_EB189C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_80240A3C_EB189C.s rename to ver/us/asm/nonmatchings/EB1170/func_80240A3C_EB189C.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_80240A68_EB18C8.s b/ver/us/asm/nonmatchings/EB1170/func_80240A68_EB18C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_80240A68_EB18C8.s rename to ver/us/asm/nonmatchings/EB1170/func_80240A68_EB18C8.s diff --git a/ver/us/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s b/ver/us/asm/nonmatchings/EB1170/func_80240A8C_EB18EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB1170/func_80240A8C_EB18EC.s rename to ver/us/asm/nonmatchings/EB1170/func_80240A8C_EB18EC.s diff --git a/ver/us/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s b/ver/us/asm/nonmatchings/EB5130/func_8024030C_EB543C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s rename to ver/us/asm/nonmatchings/EB5130/func_8024030C_EB543C.s diff --git a/ver/us/asm/nonmatchings/code_EB5470/func_80240340_EB5470.s b/ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB5470/func_80240340_EB5470.s rename to ver/us/asm/nonmatchings/EB5470/func_80240340_EB5470.s diff --git a/ver/us/asm/nonmatchings/code_EB5470/func_8024036C_EB549C.s b/ver/us/asm/nonmatchings/EB5470/func_8024036C_EB549C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB5470/func_8024036C_EB549C.s rename to ver/us/asm/nonmatchings/EB5470/func_8024036C_EB549C.s diff --git a/ver/us/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s b/ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB7540/func_80240310_EB7540.s rename to ver/us/asm/nonmatchings/EB7540/func_80240310_EB7540.s diff --git a/ver/us/asm/nonmatchings/code_EB7540/func_802403D8_EB7608.s b/ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB7540/func_802403D8_EB7608.s rename to ver/us/asm/nonmatchings/EB7540/func_802403D8_EB7608.s diff --git a/ver/us/asm/nonmatchings/code_EB7540/func_80240478_EB76A8.s b/ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB7540/func_80240478_EB76A8.s rename to ver/us/asm/nonmatchings/EB7540/func_80240478_EB76A8.s diff --git a/ver/us/asm/nonmatchings/code_EB7540/func_80240504_EB7734.s b/ver/us/asm/nonmatchings/EB7540/func_80240504_EB7734.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB7540/func_80240504_EB7734.s rename to ver/us/asm/nonmatchings/EB7540/func_80240504_EB7734.s diff --git a/ver/us/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s b/ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB7540/func_80240520_EB7750.s rename to ver/us/asm/nonmatchings/EB7540/func_80240520_EB7750.s diff --git a/ver/us/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s b/ver/us/asm/nonmatchings/EB8E50/func_80240000_EB8E50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s rename to ver/us/asm/nonmatchings/EB8E50/func_80240000_EB8E50.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s b/ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240040_EB8E90.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240040_EB8E90.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s b/ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240198_EB8FE8.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240198_EB8FE8.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s b/ver/us/asm/nonmatchings/EB8E90/func_80240440_EB9290.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240440_EB9290.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240440_EB9290.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s b/ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240500_EB9350.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240500_EB9350.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s b/ver/us/asm/nonmatchings/EB8E90/func_802406BC_EB950C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_802406BC_EB950C.s rename to ver/us/asm/nonmatchings/EB8E90/func_802406BC_EB950C.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240770_EB95C0.s b/ver/us/asm/nonmatchings/EB8E90/func_80240770_EB95C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240770_EB95C0.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240770_EB95C0.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_802407E4_EB9634.s b/ver/us/asm/nonmatchings/EB8E90/func_802407E4_EB9634.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_802407E4_EB9634.s rename to ver/us/asm/nonmatchings/EB8E90/func_802407E4_EB9634.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s b/ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_8024085C_EB96AC.s rename to ver/us/asm/nonmatchings/EB8E90/func_8024085C_EB96AC.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s b/ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_8024098C_EB97DC.s rename to ver/us/asm/nonmatchings/EB8E90/func_8024098C_EB97DC.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s b/ver/us/asm/nonmatchings/EB8E90/func_80240AAC_EB98FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240AAC_EB98FC.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240AAC_EB98FC.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s b/ver/us/asm/nonmatchings/EB8E90/func_80240B14_EB9964.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240B14_EB9964.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240B14_EB9964.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s b/ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240BD4_EB9A24.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240BD4_EB9A24.s diff --git a/ver/us/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s b/ver/us/asm/nonmatchings/EB8E90/func_80240EFC_EB9D4C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB8E90/func_80240EFC_EB9D4C.s rename to ver/us/asm/nonmatchings/EB8E90/func_80240EFC_EB9D4C.s diff --git a/ver/us/asm/nonmatchings/code_EB9D90/func_80240F40_EB9D90.s b/ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB9D90/func_80240F40_EB9D90.s rename to ver/us/asm/nonmatchings/EB9D90/func_80240F40_EB9D90.s diff --git a/ver/us/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s b/ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB9D90/func_80240FB0_EB9E00.s rename to ver/us/asm/nonmatchings/EB9D90/func_80240FB0_EB9E00.s diff --git a/ver/us/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s b/ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB9D90/func_802410E4_EB9F34.s rename to ver/us/asm/nonmatchings/EB9D90/func_802410E4_EB9F34.s diff --git a/ver/us/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s b/ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB9D90/func_8024121C_EBA06C.s rename to ver/us/asm/nonmatchings/EB9D90/func_8024121C_EBA06C.s diff --git a/ver/us/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s b/ver/us/asm/nonmatchings/EB9D90/func_802413AC_EBA1FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB9D90/func_802413AC_EBA1FC.s rename to ver/us/asm/nonmatchings/EB9D90/func_802413AC_EBA1FC.s diff --git a/ver/us/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s b/ver/us/asm/nonmatchings/EB9D90/func_802413CC_EBA21C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB9D90/func_802413CC_EBA21C.s rename to ver/us/asm/nonmatchings/EB9D90/func_802413CC_EBA21C.s diff --git a/ver/us/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s b/ver/us/asm/nonmatchings/EB9D90/func_802413EC_EBA23C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EB9D90/func_802413EC_EBA23C.s rename to ver/us/asm/nonmatchings/EB9D90/func_802413EC_EBA23C.s diff --git a/ver/us/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s b/ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC2240/func_80240040_EC2240.s rename to ver/us/asm/nonmatchings/EC2240/func_80240040_EC2240.s diff --git a/ver/us/asm/nonmatchings/code_EC2240/func_802400F4_EC22F4.s b/ver/us/asm/nonmatchings/EC2240/func_802400F4_EC22F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC2240/func_802400F4_EC22F4.s rename to ver/us/asm/nonmatchings/EC2240/func_802400F4_EC22F4.s diff --git a/ver/us/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s b/ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC2240/func_80240158_EC2358.s rename to ver/us/asm/nonmatchings/EC2240/func_80240158_EC2358.s diff --git a/ver/us/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s b/ver/us/asm/nonmatchings/EC2610/func_80240410_EC2610.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s rename to ver/us/asm/nonmatchings/EC2610/func_80240410_EC2610.s diff --git a/ver/us/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s b/ver/us/asm/nonmatchings/EC2610/func_80240480_EC2680.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s rename to ver/us/asm/nonmatchings/EC2610/func_80240480_EC2680.s diff --git a/ver/us/asm/nonmatchings/code_EC71B0/func_8024030C_EC74BC.s b/ver/us/asm/nonmatchings/EC71B0/func_8024030C_EC74BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC71B0/func_8024030C_EC74BC.s rename to ver/us/asm/nonmatchings/EC71B0/func_8024030C_EC74BC.s diff --git a/ver/us/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s b/ver/us/asm/nonmatchings/EC71B0/func_80240344_EC74F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC71B0/func_80240344_EC74F4.s rename to ver/us/asm/nonmatchings/EC71B0/func_80240344_EC74F4.s diff --git a/ver/us/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s b/ver/us/asm/nonmatchings/EC7590/func_802403E0_EC7590.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC7590/func_802403E0_EC7590.s rename to ver/us/asm/nonmatchings/EC7590/func_802403E0_EC7590.s diff --git a/ver/us/asm/nonmatchings/code_EC7590/func_80240450_EC7600.s b/ver/us/asm/nonmatchings/EC7590/func_80240450_EC7600.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC7590/func_80240450_EC7600.s rename to ver/us/asm/nonmatchings/EC7590/func_80240450_EC7600.s diff --git a/ver/us/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s b/ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC7590/func_8024061C_EC77CC.s rename to ver/us/asm/nonmatchings/EC7590/func_8024061C_EC77CC.s diff --git a/ver/us/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s b/ver/us/asm/nonmatchings/EC7590/func_802406D0_EC7880.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC7590/func_802406D0_EC7880.s rename to ver/us/asm/nonmatchings/EC7590/func_802406D0_EC7880.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240000_EC9D00.s b/ver/us/asm/nonmatchings/EC9D00/func_80240000_EC9D00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240000_EC9D00.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240000_EC9D00.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_8024001C_EC9D1C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024001C_EC9D1C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_8024001C_EC9D1C.s rename to ver/us/asm/nonmatchings/EC9D00/func_8024001C_EC9D1C.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_8024003C_EC9D3C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_8024003C_EC9D3C.s rename to ver/us/asm/nonmatchings/EC9D00/func_8024003C_EC9D3C.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240068_EC9D68.s b/ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240068_EC9D68.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240068_EC9D68.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s b/ver/us/asm/nonmatchings/EC9D00/func_802400D4_EC9DD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_802400D4_EC9DD4.s rename to ver/us/asm/nonmatchings/EC9D00/func_802400D4_EC9DD4.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240120_EC9E20.s b/ver/us/asm/nonmatchings/EC9D00/func_80240120_EC9E20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240120_EC9E20.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240120_EC9E20.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s b/ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_802401CC_EC9ECC.s rename to ver/us/asm/nonmatchings/EC9D00/func_802401CC_EC9ECC.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_8024041C_ECA11C.s b/ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_8024041C_ECA11C.s rename to ver/us/asm/nonmatchings/EC9D00/func_8024041C_ECA11C.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240448_ECA148.s b/ver/us/asm/nonmatchings/EC9D00/func_80240448_ECA148.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240448_ECA148.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240448_ECA148.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240480_ECA180.s b/ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240480_ECA180.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240480_ECA180.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240510_ECA210.s b/ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240510_ECA210.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240510_ECA210.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240544_ECA244.s b/ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240544_ECA244.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240544_ECA244.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_802405A8_ECA2A8.s b/ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_802405A8_ECA2A8.s rename to ver/us/asm/nonmatchings/EC9D00/func_802405A8_ECA2A8.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s b/ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240600_ECA300.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240600_ECA300.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s b/ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240B38_ECA838.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240B38_ECA838.s diff --git a/ver/us/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s b/ver/us/asm/nonmatchings/EC9D00/func_80240D08_ECAA08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EC9D00/func_80240D08_ECAA08.s rename to ver/us/asm/nonmatchings/EC9D00/func_80240D08_ECAA08.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s b/ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s rename to ver/us/asm/nonmatchings/ECAA80/func_80240D80_ECAA80.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s b/ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s rename to ver/us/asm/nonmatchings/ECAA80/func_80241364_ECB064.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_802414C8_ECB1C8.s b/ver/us/asm/nonmatchings/ECAA80/func_802414C8_ECB1C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_802414C8_ECB1C8.s rename to ver/us/asm/nonmatchings/ECAA80/func_802414C8_ECB1C8.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s b/ver/us/asm/nonmatchings/ECAA80/func_8024150C_ECB20C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s rename to ver/us/asm/nonmatchings/ECAA80/func_8024150C_ECB20C.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s b/ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s rename to ver/us/asm/nonmatchings/ECAA80/func_80241770_ECB470.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s b/ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s rename to ver/us/asm/nonmatchings/ECAA80/func_802417CC_ECB4CC.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_8024199C_ECB69C.s b/ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_8024199C_ECB69C.s rename to ver/us/asm/nonmatchings/ECAA80/func_8024199C_ECB69C.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_802419F0_ECB6F0.s b/ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_802419F0_ECB6F0.s rename to ver/us/asm/nonmatchings/ECAA80/func_802419F0_ECB6F0.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s b/ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s rename to ver/us/asm/nonmatchings/ECAA80/func_80241A28_ECB728.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s b/ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s rename to ver/us/asm/nonmatchings/ECAA80/func_80241AC4_ECB7C4.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_80241B88_ECB888.s b/ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_80241B88_ECB888.s rename to ver/us/asm/nonmatchings/ECAA80/func_80241B88_ECB888.s diff --git a/ver/us/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s b/ver/us/asm/nonmatchings/ECAA80/func_80241BF8_ECB8F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s rename to ver/us/asm/nonmatchings/ECAA80/func_80241BF8_ECB8F8.s diff --git a/ver/us/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s b/ver/us/asm/nonmatchings/ECB930/func_80241C30_ECB930.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECB930/func_80241C30_ECB930.s rename to ver/us/asm/nonmatchings/ECB930/func_80241C30_ECB930.s diff --git a/ver/us/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s b/ver/us/asm/nonmatchings/ECB930/func_80241CA0_ECB9A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECB930/func_80241CA0_ECB9A0.s rename to ver/us/asm/nonmatchings/ECB930/func_80241CA0_ECB9A0.s diff --git a/ver/us/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s b/ver/us/asm/nonmatchings/ECBB70/func_80241E70_ECBB70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s rename to ver/us/asm/nonmatchings/ECBB70/func_80241E70_ECBB70.s diff --git a/ver/us/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s b/ver/us/asm/nonmatchings/ED0030/func_80240040_ED0030.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0030/func_80240040_ED0030.s rename to ver/us/asm/nonmatchings/ED0030/func_80240040_ED0030.s diff --git a/ver/us/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s b/ver/us/asm/nonmatchings/ED00D0/func_802400E0_ED00D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED00D0/func_802400E0_ED00D0.s rename to ver/us/asm/nonmatchings/ED00D0/func_802400E0_ED00D0.s diff --git a/ver/us/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s b/ver/us/asm/nonmatchings/ED00D0/func_80240150_ED0140.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED00D0/func_80240150_ED0140.s rename to ver/us/asm/nonmatchings/ED00D0/func_80240150_ED0140.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s b/ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80240320_ED0310.s rename to ver/us/asm/nonmatchings/ED0310/func_80240320_ED0310.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s b/ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_802404D0_ED04C0.s rename to ver/us/asm/nonmatchings/ED0310/func_802404D0_ED04C0.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s b/ver/us/asm/nonmatchings/ED0310/func_80240AF8_ED0AE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80240AF8_ED0AE8.s rename to ver/us/asm/nonmatchings/ED0310/func_80240AF8_ED0AE8.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s b/ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80240BB8_ED0BA8.s rename to ver/us/asm/nonmatchings/ED0310/func_80240BB8_ED0BA8.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80240EFC_ED0EEC.s b/ver/us/asm/nonmatchings/ED0310/func_80240EFC_ED0EEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80240EFC_ED0EEC.s rename to ver/us/asm/nonmatchings/ED0310/func_80240EFC_ED0EEC.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80240F74_ED0F64.s b/ver/us/asm/nonmatchings/ED0310/func_80240F74_ED0F64.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80240F74_ED0F64.s rename to ver/us/asm/nonmatchings/ED0310/func_80240F74_ED0F64.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s b/ver/us/asm/nonmatchings/ED0310/func_80241114_ED1104.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80241114_ED1104.s rename to ver/us/asm/nonmatchings/ED0310/func_80241114_ED1104.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s b/ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80241178_ED1168.s rename to ver/us/asm/nonmatchings/ED0310/func_80241178_ED1168.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s b/ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED0310/func_80241508_ED14F8.s rename to ver/us/asm/nonmatchings/ED0310/func_80241508_ED14F8.s diff --git a/ver/us/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s similarity index 99% rename from ver/us/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s rename to ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s index 0ebd5553a4..c1816de473 100644 --- a/ver/us/asm/nonmatchings/code_ED0310/func_8024162C_ED161C.s +++ b/ver/us/asm/nonmatchings/ED0310/func_8024162C_ED161C.s @@ -128,7 +128,7 @@ glabel L802417C4_ED17B4 glabel L802417DC_ED17CC /* ED17CC 802417DC 02A0202D */ daddu $a0, $s5, $zero /* ED17D0 802417E0 0200282D */ daddu $a1, $s0, $zero -/* ED17D4 802417E4 0C0903F8 */ jal code_ED0310_DeadUnkNpcAIFunc14 +/* ED17D4 802417E4 0C0903F8 */ jal ED0310_DeadUnkNpcAIFunc14 /* ED17D8 802417E8 0260302D */ daddu $a2, $s3, $zero /* ED17DC 802417EC 08090608 */ j .L80241820 /* ED17E0 802417F0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s b/ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED4220/func_80240000_ED4220.s rename to ver/us/asm/nonmatchings/ED4220/func_80240000_ED4220.s diff --git a/ver/us/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s b/ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED42A0/func_80240080_ED42A0.s rename to ver/us/asm/nonmatchings/ED42A0/func_80240080_ED42A0.s diff --git a/ver/us/asm/nonmatchings/code_ED42A0/func_80240134_ED4354.s b/ver/us/asm/nonmatchings/ED42A0/func_80240134_ED4354.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED42A0/func_80240134_ED4354.s rename to ver/us/asm/nonmatchings/ED42A0/func_80240134_ED4354.s diff --git a/ver/us/asm/nonmatchings/code_ED42A0/func_80240198_ED43B8.s b/ver/us/asm/nonmatchings/ED42A0/func_80240198_ED43B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED42A0/func_80240198_ED43B8.s rename to ver/us/asm/nonmatchings/ED42A0/func_80240198_ED43B8.s diff --git a/ver/us/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s b/ver/us/asm/nonmatchings/ED42A0/func_802402BC_ED44DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED42A0/func_802402BC_ED44DC.s rename to ver/us/asm/nonmatchings/ED42A0/func_802402BC_ED44DC.s diff --git a/ver/us/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s b/ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED46D0/func_802404B0_ED46D0.s rename to ver/us/asm/nonmatchings/ED46D0/func_802404B0_ED46D0.s diff --git a/ver/us/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s b/ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED46D0/func_80240B10_ED4D30.s rename to ver/us/asm/nonmatchings/ED46D0/func_80240B10_ED4D30.s diff --git a/ver/us/asm/nonmatchings/code_ED510/EnableGroup.s b/ver/us/asm/nonmatchings/ED510/EnableGroup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/EnableGroup.s rename to ver/us/asm/nonmatchings/ED510/EnableGroup.s diff --git a/ver/us/asm/nonmatchings/code_ED510/ModifyColliderFlags.s b/ver/us/asm/nonmatchings/ED510/ModifyColliderFlags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/ModifyColliderFlags.s rename to ver/us/asm/nonmatchings/ED510/ModifyColliderFlags.s diff --git a/ver/us/asm/nonmatchings/code_ED510/ResetFromLava.s b/ver/us/asm/nonmatchings/ED510/ResetFromLava.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/ResetFromLava.s rename to ver/us/asm/nonmatchings/ED510/ResetFromLava.s diff --git a/ver/us/asm/nonmatchings/code_ED510/RotateGroup.s b/ver/us/asm/nonmatchings/ED510/RotateGroup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/RotateGroup.s rename to ver/us/asm/nonmatchings/ED510/RotateGroup.s diff --git a/ver/us/asm/nonmatchings/code_ED510/ScaleGroup.s b/ver/us/asm/nonmatchings/ED510/ScaleGroup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/ScaleGroup.s rename to ver/us/asm/nonmatchings/ED510/ScaleGroup.s diff --git a/ver/us/asm/nonmatchings/code_ED510/ScaleModel.s b/ver/us/asm/nonmatchings/ED510/ScaleModel.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/ScaleModel.s rename to ver/us/asm/nonmatchings/ED510/ScaleModel.s diff --git a/ver/us/asm/nonmatchings/code_ED510/SetModelFlags.s b/ver/us/asm/nonmatchings/ED510/SetModelFlags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/SetModelFlags.s rename to ver/us/asm/nonmatchings/ED510/SetModelFlags.s diff --git a/ver/us/asm/nonmatchings/code_ED510/SetZoneEnabled.s b/ver/us/asm/nonmatchings/ED510/SetZoneEnabled.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/SetZoneEnabled.s rename to ver/us/asm/nonmatchings/ED510/SetZoneEnabled.s diff --git a/ver/us/asm/nonmatchings/code_ED510/TranslateGroup.s b/ver/us/asm/nonmatchings/ED510/TranslateGroup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/TranslateGroup.s rename to ver/us/asm/nonmatchings/ED510/TranslateGroup.s diff --git a/ver/us/asm/nonmatchings/code_ED510/TranslateModel.s b/ver/us/asm/nonmatchings/ED510/TranslateModel.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/TranslateModel.s rename to ver/us/asm/nonmatchings/ED510/TranslateModel.s diff --git a/ver/us/asm/nonmatchings/code_ED510/func_802C90FC.s b/ver/us/asm/nonmatchings/ED510/func_802C90FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/func_802C90FC.s rename to ver/us/asm/nonmatchings/ED510/func_802C90FC.s diff --git a/ver/us/asm/nonmatchings/code_ED510/func_802C95A0.s b/ver/us/asm/nonmatchings/ED510/func_802C95A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/func_802C95A0.s rename to ver/us/asm/nonmatchings/ED510/func_802C95A0.s diff --git a/ver/us/asm/nonmatchings/code_ED510/func_802C9FD4.s b/ver/us/asm/nonmatchings/ED510/func_802C9FD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/func_802C9FD4.s rename to ver/us/asm/nonmatchings/ED510/func_802C9FD4.s diff --git a/ver/us/asm/nonmatchings/code_ED510/goto_map.s b/ver/us/asm/nonmatchings/ED510/goto_map.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/goto_map.s rename to ver/us/asm/nonmatchings/ED510/goto_map.s diff --git a/ver/us/asm/nonmatchings/code_ED510/modify_collider_family_flags.s b/ver/us/asm/nonmatchings/ED510/modify_collider_family_flags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/modify_collider_family_flags.s rename to ver/us/asm/nonmatchings/ED510/modify_collider_family_flags.s diff --git a/ver/us/asm/nonmatchings/code_ED510/set_zone_enabled.s b/ver/us/asm/nonmatchings/ED510/set_zone_enabled.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED510/set_zone_enabled.s rename to ver/us/asm/nonmatchings/ED510/set_zone_enabled.s diff --git a/ver/us/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s b/ver/us/asm/nonmatchings/ED5540/func_80241320_ED5540.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s rename to ver/us/asm/nonmatchings/ED5540/func_80241320_ED5540.s diff --git a/ver/us/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s b/ver/us/asm/nonmatchings/ED5540/func_80241390_ED55B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s rename to ver/us/asm/nonmatchings/ED5540/func_80241390_ED55B0.s diff --git a/ver/us/asm/nonmatchings/code_ED8E20/func_80240000_ED8E20.s b/ver/us/asm/nonmatchings/ED8E20/func_80240000_ED8E20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED8E20/func_80240000_ED8E20.s rename to ver/us/asm/nonmatchings/ED8E20/func_80240000_ED8E20.s diff --git a/ver/us/asm/nonmatchings/code_ED8E20/func_80240020_ED8E40.s b/ver/us/asm/nonmatchings/ED8E20/func_80240020_ED8E40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED8E20/func_80240020_ED8E40.s rename to ver/us/asm/nonmatchings/ED8E20/func_80240020_ED8E40.s diff --git a/ver/us/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s b/ver/us/asm/nonmatchings/ED8E20/func_80240034_ED8E54.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED8E20/func_80240034_ED8E54.s rename to ver/us/asm/nonmatchings/ED8E20/func_80240034_ED8E54.s diff --git a/ver/us/asm/nonmatchings/code_ED8E20/func_802400F0_ED8F10.s b/ver/us/asm/nonmatchings/ED8E20/func_802400F0_ED8F10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED8E20/func_802400F0_ED8F10.s rename to ver/us/asm/nonmatchings/ED8E20/func_802400F0_ED8F10.s diff --git a/ver/us/asm/nonmatchings/code_ED8E20/func_80240208_ED9028.s b/ver/us/asm/nonmatchings/ED8E20/func_80240208_ED9028.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED8E20/func_80240208_ED9028.s rename to ver/us/asm/nonmatchings/ED8E20/func_80240208_ED9028.s diff --git a/ver/us/asm/nonmatchings/code_ED8E20/func_80240274_ED9094.s b/ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED8E20/func_80240274_ED9094.s rename to ver/us/asm/nonmatchings/ED8E20/func_80240274_ED9094.s diff --git a/ver/us/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s b/ver/us/asm/nonmatchings/ED8E20/func_80240318_ED9138.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ED8E20/func_80240318_ED9138.s rename to ver/us/asm/nonmatchings/ED8E20/func_80240318_ED9138.s diff --git a/ver/us/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s b/ver/us/asm/nonmatchings/EDBFE0/func_80240000_EDBFE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s rename to ver/us/asm/nonmatchings/EDBFE0/func_80240000_EDBFE0.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s b/ver/us/asm/nonmatchings/EDC020/func_80240040_EDC020.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s rename to ver/us/asm/nonmatchings/EDC020/func_80240040_EDC020.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_802400B0_EDC090.s b/ver/us/asm/nonmatchings/EDC020/func_802400B0_EDC090.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_802400B0_EDC090.s rename to ver/us/asm/nonmatchings/EDC020/func_802400B0_EDC090.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s b/ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s rename to ver/us/asm/nonmatchings/EDC020/func_8024027C_EDC25C.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_80240330_EDC310.s b/ver/us/asm/nonmatchings/EDC020/func_80240330_EDC310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_80240330_EDC310.s rename to ver/us/asm/nonmatchings/EDC020/func_80240330_EDC310.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s b/ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s rename to ver/us/asm/nonmatchings/EDC020/func_80240394_EDC374.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s b/ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s rename to ver/us/asm/nonmatchings/EDC020/func_802403F0_EDC3D0.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_802405C0_EDC5A0.s b/ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_802405C0_EDC5A0.s rename to ver/us/asm/nonmatchings/EDC020/func_802405C0_EDC5A0.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_80240614_EDC5F4.s b/ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_80240614_EDC5F4.s rename to ver/us/asm/nonmatchings/EDC020/func_80240614_EDC5F4.s diff --git a/ver/us/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s b/ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s rename to ver/us/asm/nonmatchings/EDC020/func_8024064C_EDC62C.s diff --git a/ver/us/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s b/ver/us/asm/nonmatchings/EDE9C0/func_80240000_EDE9C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDE9C0/func_80240000_EDE9C0.s rename to ver/us/asm/nonmatchings/EDE9C0/func_80240000_EDE9C0.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s b/ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80240040_EDEA00.s rename to ver/us/asm/nonmatchings/EDEA00/func_80240040_EDEA00.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s b/ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_802401C4_EDEB84.s rename to ver/us/asm/nonmatchings/EDEA00/func_802401C4_EDEB84.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s b/ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80240374_EDED34.s rename to ver/us/asm/nonmatchings/EDEA00/func_80240374_EDED34.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s b/ver/us/asm/nonmatchings/EDEA00/func_8024099C_EDF35C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_8024099C_EDF35C.s rename to ver/us/asm/nonmatchings/EDEA00/func_8024099C_EDF35C.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s b/ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80240A5C_EDF41C.s rename to ver/us/asm/nonmatchings/EDEA00/func_80240A5C_EDF41C.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80240DA0_EDF760.s b/ver/us/asm/nonmatchings/EDEA00/func_80240DA0_EDF760.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80240DA0_EDF760.s rename to ver/us/asm/nonmatchings/EDEA00/func_80240DA0_EDF760.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80240E18_EDF7D8.s b/ver/us/asm/nonmatchings/EDEA00/func_80240E18_EDF7D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80240E18_EDF7D8.s rename to ver/us/asm/nonmatchings/EDEA00/func_80240E18_EDF7D8.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s b/ver/us/asm/nonmatchings/EDEA00/func_80240FB8_EDF978.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80240FB8_EDF978.s rename to ver/us/asm/nonmatchings/EDEA00/func_80240FB8_EDF978.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s b/ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_8024101C_EDF9DC.s rename to ver/us/asm/nonmatchings/EDEA00/func_8024101C_EDF9DC.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s b/ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_802413AC_EDFD6C.s rename to ver/us/asm/nonmatchings/EDEA00/func_802413AC_EDFD6C.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s similarity index 99% rename from ver/us/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s rename to ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s index f678835e5d..c59c3e912e 100644 --- a/ver/us/asm/nonmatchings/code_EDEA00/func_802414D0_EDFE90.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_802414D0_EDFE90.s @@ -128,7 +128,7 @@ glabel L80241668_EE0028 glabel L80241680_EE0040 /* EE0040 80241680 02A0202D */ daddu $a0, $s5, $zero /* EE0044 80241684 0200282D */ daddu $a1, $s0, $zero -/* EE0048 80241688 0C0903A1 */ jal code_EDEA00_DeadUnkNpcAIFunc14 +/* EE0048 80241688 0C0903A1 */ jal EDEA00_DeadUnkNpcAIFunc14 /* EE004C 8024168C 0260302D */ daddu $a2, $s3, $zero /* EE0050 80241690 080905B1 */ j .L802416C4 /* EE0054 80241694 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_802416E8_EE00A8.s b/ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_802416E8_EE00A8.s rename to ver/us/asm/nonmatchings/EDEA00/func_802416E8_EE00A8.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s b/ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80241730_EE00F0.s rename to ver/us/asm/nonmatchings/EDEA00/func_80241730_EE00F0.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s b/ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80241B94_EE0554.s rename to ver/us/asm/nonmatchings/EDEA00/func_80241B94_EE0554.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s similarity index 99% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s rename to ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s index f8db65861e..bee425d4a8 100644 --- a/ver/us/asm/nonmatchings/code_EDEA00/func_80241DE4_EE07A4.s +++ b/ver/us/asm/nonmatchings/EDEA00/func_80241DE4_EE07A4.s @@ -166,7 +166,7 @@ glabel func_80241DE4_EE07A4 .L8024203C: /* EE09FC 8024203C 0280202D */ daddu $a0, $s4, $zero /* EE0A00 80242040 02C0282D */ daddu $a1, $s6, $zero -/* EE0A04 80242044 0C0903A1 */ jal code_EDEA00_DeadUnkNpcAIFunc14 +/* EE0A04 80242044 0C0903A1 */ jal EDEA00_DeadUnkNpcAIFunc14 /* EE0A08 80242048 02A0302D */ daddu $a2, $s5, $zero .L8024204C: /* EE0A0C 8024204C 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_802422F0_EE0CB0.s b/ver/us/asm/nonmatchings/EDEA00/func_802422F0_EE0CB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_802422F0_EE0CB0.s rename to ver/us/asm/nonmatchings/EDEA00/func_802422F0_EE0CB0.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s b/ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_8024236C_EE0D2C.s rename to ver/us/asm/nonmatchings/EDEA00/func_8024236C_EE0D2C.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s b/ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_802424A0_EE0E60.s rename to ver/us/asm/nonmatchings/EDEA00/func_802424A0_EE0E60.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s b/ver/us/asm/nonmatchings/EDEA00/func_80242604_EE0FC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80242604_EE0FC4.s rename to ver/us/asm/nonmatchings/EDEA00/func_80242604_EE0FC4.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s b/ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80242684_EE1044.s rename to ver/us/asm/nonmatchings/EDEA00/func_80242684_EE1044.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s b/ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80242AF0_EE14B0.s rename to ver/us/asm/nonmatchings/EDEA00/func_80242AF0_EE14B0.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s b/ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80243470_EE1E30.s rename to ver/us/asm/nonmatchings/EDEA00/func_80243470_EE1E30.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s b/ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/func_80243584_EE1F44.s rename to ver/us/asm/nonmatchings/EDEA00/func_80243584_EE1F44.s diff --git a/ver/us/asm/nonmatchings/code_EDEA00/pause_interp_text_scroll_EE1DD8.s b/ver/us/asm/nonmatchings/EDEA00/pause_interp_text_scroll_EE1DD8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EDEA00/pause_interp_text_scroll_EE1DD8.s rename to ver/us/asm/nonmatchings/EDEA00/pause_interp_text_scroll_EE1DD8.s diff --git a/ver/us/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s b/ver/us/asm/nonmatchings/EE2040/func_80243680_EE2040.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE2040/func_80243680_EE2040.s rename to ver/us/asm/nonmatchings/EE2040/func_80243680_EE2040.s diff --git a/ver/us/asm/nonmatchings/code_EE65B0/func_8024030C_EE68BC.s b/ver/us/asm/nonmatchings/EE65B0/func_8024030C_EE68BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE65B0/func_8024030C_EE68BC.s rename to ver/us/asm/nonmatchings/EE65B0/func_8024030C_EE68BC.s diff --git a/ver/us/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s b/ver/us/asm/nonmatchings/EE65B0/func_80240340_EE68F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE65B0/func_80240340_EE68F0.s rename to ver/us/asm/nonmatchings/EE65B0/func_80240340_EE68F0.s diff --git a/ver/us/asm/nonmatchings/code_EE65B0/func_802403D4_EE6984.s b/ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE65B0/func_802403D4_EE6984.s rename to ver/us/asm/nonmatchings/EE65B0/func_802403D4_EE6984.s diff --git a/ver/us/asm/nonmatchings/code_EE65B0/func_8024042C_EE69DC.s b/ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE65B0/func_8024042C_EE69DC.s rename to ver/us/asm/nonmatchings/EE65B0/func_8024042C_EE69DC.s diff --git a/ver/us/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s b/ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE65B0/func_8024046C_EE6A1C.s rename to ver/us/asm/nonmatchings/EE65B0/func_8024046C_EE6A1C.s diff --git a/ver/us/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s b/ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE65B0/func_80240504_EE6AB4.s rename to ver/us/asm/nonmatchings/EE65B0/func_80240504_EE6AB4.s diff --git a/ver/us/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s b/ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE65B0/func_802407D4_EE6D84.s rename to ver/us/asm/nonmatchings/EE65B0/func_802407D4_EE6D84.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s b/ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80240B10_EE70C0.s rename to ver/us/asm/nonmatchings/EE70C0/func_80240B10_EE70C0.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s b/ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80240CC0_EE7270.s rename to ver/us/asm/nonmatchings/EE70C0/func_80240CC0_EE7270.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s b/ver/us/asm/nonmatchings/EE70C0/func_802412E8_EE7898.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_802412E8_EE7898.s rename to ver/us/asm/nonmatchings/EE70C0/func_802412E8_EE7898.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s b/ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_802413A8_EE7958.s rename to ver/us/asm/nonmatchings/EE70C0/func_802413A8_EE7958.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_802416EC_EE7C9C.s b/ver/us/asm/nonmatchings/EE70C0/func_802416EC_EE7C9C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_802416EC_EE7C9C.s rename to ver/us/asm/nonmatchings/EE70C0/func_802416EC_EE7C9C.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80241764_EE7D14.s b/ver/us/asm/nonmatchings/EE70C0/func_80241764_EE7D14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80241764_EE7D14.s rename to ver/us/asm/nonmatchings/EE70C0/func_80241764_EE7D14.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s b/ver/us/asm/nonmatchings/EE70C0/func_80241904_EE7EB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80241904_EE7EB4.s rename to ver/us/asm/nonmatchings/EE70C0/func_80241904_EE7EB4.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s b/ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80241968_EE7F18.s rename to ver/us/asm/nonmatchings/EE70C0/func_80241968_EE7F18.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s b/ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80241CF8_EE82A8.s rename to ver/us/asm/nonmatchings/EE70C0/func_80241CF8_EE82A8.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s similarity index 99% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s rename to ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s index a3c5c36a68..50232f5a29 100644 --- a/ver/us/asm/nonmatchings/code_EE70C0/func_80241E1C_EE83CC.s +++ b/ver/us/asm/nonmatchings/EE70C0/func_80241E1C_EE83CC.s @@ -121,7 +121,7 @@ glabel L80241FB4_EE8564 glabel L80241FCC_EE857C /* EE857C 80241FCC 02A0202D */ daddu $a0, $s5, $zero /* EE8580 80241FD0 0200282D */ daddu $a1, $s0, $zero -/* EE8584 80241FD4 0C0905F4 */ jal code_EE70C0_DeadUnkNpcAIFunc14 +/* EE8584 80241FD4 0C0905F4 */ jal EE70C0_DeadUnkNpcAIFunc14 /* EE8588 80241FD8 0260302D */ daddu $a2, $s3, $zero /* EE858C 80241FDC 08090804 */ j .L80242010 /* EE8590 80241FE0 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s b/ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80242034_EE85E4.s rename to ver/us/asm/nonmatchings/EE70C0/func_80242034_EE85E4.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s b/ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80242090_EE8640.s rename to ver/us/asm/nonmatchings/EE70C0/func_80242090_EE8640.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_80242260_EE8810.s b/ver/us/asm/nonmatchings/EE70C0/func_80242260_EE8810.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_80242260_EE8810.s rename to ver/us/asm/nonmatchings/EE70C0/func_80242260_EE8810.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_802422B4_EE8864.s b/ver/us/asm/nonmatchings/EE70C0/func_802422B4_EE8864.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_802422B4_EE8864.s rename to ver/us/asm/nonmatchings/EE70C0/func_802422B4_EE8864.s diff --git a/ver/us/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s b/ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE70C0/func_802422EC_EE889C.s rename to ver/us/asm/nonmatchings/EE70C0/func_802422EC_EE889C.s diff --git a/ver/us/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s b/ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EE8940/func_80242390_EE8940.s rename to ver/us/asm/nonmatchings/EE8940/func_80242390_EE8940.s diff --git a/ver/us/asm/nonmatchings/code_EED140/func_80240040_EED140.s b/ver/us/asm/nonmatchings/EED140/func_80240040_EED140.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED140/func_80240040_EED140.s rename to ver/us/asm/nonmatchings/EED140/func_80240040_EED140.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_802400E0_EED1E0.s b/ver/us/asm/nonmatchings/EED1E0/func_802400E0_EED1E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_802400E0_EED1E0.s rename to ver/us/asm/nonmatchings/EED1E0/func_802400E0_EED1E0.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_802400FC_EED1FC.s b/ver/us/asm/nonmatchings/EED1E0/func_802400FC_EED1FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_802400FC_EED1FC.s rename to ver/us/asm/nonmatchings/EED1E0/func_802400FC_EED1FC.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_8024011C_EED21C.s b/ver/us/asm/nonmatchings/EED1E0/func_8024011C_EED21C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_8024011C_EED21C.s rename to ver/us/asm/nonmatchings/EED1E0/func_8024011C_EED21C.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240148_EED248.s b/ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240148_EED248.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240148_EED248.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s b/ver/us/asm/nonmatchings/EED1E0/func_802401B4_EED2B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_802401B4_EED2B4.s rename to ver/us/asm/nonmatchings/EED1E0/func_802401B4_EED2B4.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240200_EED300.s b/ver/us/asm/nonmatchings/EED1E0/func_80240200_EED300.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240200_EED300.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240200_EED300.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s b/ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_802402AC_EED3AC.s rename to ver/us/asm/nonmatchings/EED1E0/func_802402AC_EED3AC.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_802404FC_EED5FC.s b/ver/us/asm/nonmatchings/EED1E0/func_802404FC_EED5FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_802404FC_EED5FC.s rename to ver/us/asm/nonmatchings/EED1E0/func_802404FC_EED5FC.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240528_EED628.s b/ver/us/asm/nonmatchings/EED1E0/func_80240528_EED628.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240528_EED628.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240528_EED628.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240560_EED660.s b/ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240560_EED660.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240560_EED660.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_802405F0_EED6F0.s b/ver/us/asm/nonmatchings/EED1E0/func_802405F0_EED6F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_802405F0_EED6F0.s rename to ver/us/asm/nonmatchings/EED1E0/func_802405F0_EED6F0.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240624_EED724.s b/ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240624_EED724.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240624_EED724.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240688_EED788.s b/ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240688_EED788.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240688_EED788.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s b/ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_802406E0_EED7E0.s rename to ver/us/asm/nonmatchings/EED1E0/func_802406E0_EED7E0.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s b/ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240C18_EEDD18.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240C18_EEDD18.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240DE8_EEDEE8.s b/ver/us/asm/nonmatchings/EED1E0/func_80240DE8_EEDEE8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240DE8_EEDEE8.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240DE8_EEDEE8.s diff --git a/ver/us/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s b/ver/us/asm/nonmatchings/EED1E0/func_80240E18_EEDF18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EED1E0/func_80240E18_EEDF18.s rename to ver/us/asm/nonmatchings/EED1E0/func_80240E18_EEDF18.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s b/ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s rename to ver/us/asm/nonmatchings/EEDF50/func_80240E50_EEDF50.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s b/ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s rename to ver/us/asm/nonmatchings/EEDF50/func_80241000_EEE100.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s b/ver/us/asm/nonmatchings/EEDF50/func_80241628_EEE728.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s rename to ver/us/asm/nonmatchings/EEDF50/func_80241628_EEE728.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s b/ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s rename to ver/us/asm/nonmatchings/EEDF50/func_802416E8_EEE7E8.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80241A2C_EEEB2C.s b/ver/us/asm/nonmatchings/EEDF50/func_80241A2C_EEEB2C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80241A2C_EEEB2C.s rename to ver/us/asm/nonmatchings/EEDF50/func_80241A2C_EEEB2C.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80241AA4_EEEBA4.s b/ver/us/asm/nonmatchings/EEDF50/func_80241AA4_EEEBA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80241AA4_EEEBA4.s rename to ver/us/asm/nonmatchings/EEDF50/func_80241AA4_EEEBA4.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s b/ver/us/asm/nonmatchings/EEDF50/func_80241C44_EEED44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s rename to ver/us/asm/nonmatchings/EEDF50/func_80241C44_EEED44.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s b/ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s rename to ver/us/asm/nonmatchings/EEDF50/func_80241CA8_EEEDA8.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s b/ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s rename to ver/us/asm/nonmatchings/EEDF50/func_80242038_EEF138.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s similarity index 99% rename from ver/us/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s rename to ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s index a2555c734d..e25d8e6a1d 100644 --- a/ver/us/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s +++ b/ver/us/asm/nonmatchings/EEDF50/func_8024215C_EEF25C.s @@ -128,7 +128,7 @@ glabel L802422F4_EEF3F4 glabel L8024230C_EEF40C /* EEF40C 8024230C 02A0202D */ daddu $a0, $s5, $zero /* EEF410 80242310 0200282D */ daddu $a1, $s0, $zero -/* EEF414 80242314 0C0906C4 */ jal code_EEDF50_DeadUnkNpcAIFunc14 +/* EEF414 80242314 0C0906C4 */ jal EEDF50_DeadUnkNpcAIFunc14 /* EEF418 80242318 0260302D */ daddu $a2, $s3, $zero /* EEF41C 8024231C 080908D4 */ j .L80242350 /* EEF420 80242320 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s b/ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s rename to ver/us/asm/nonmatchings/EEDF50/func_80242374_EEF474.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s b/ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s rename to ver/us/asm/nonmatchings/EEDF50/func_802424A4_EEF5A4.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s b/ver/us/asm/nonmatchings/EEDF50/func_80242724_EEF824.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s rename to ver/us/asm/nonmatchings/EEDF50/func_80242724_EEF824.s diff --git a/ver/us/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s b/ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s rename to ver/us/asm/nonmatchings/EEDF50/func_80242780_EEF880.s diff --git a/ver/us/asm/nonmatchings/code_EEFAA0/func_802429A0_EEFAA0.s b/ver/us/asm/nonmatchings/EEFAA0/func_802429A0_EEFAA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EEFAA0/func_802429A0_EEFAA0.s rename to ver/us/asm/nonmatchings/EEFAA0/func_802429A0_EEFAA0.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s b/ver/us/asm/nonmatchings/EF2680/func_80240070_EF2680.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s rename to ver/us/asm/nonmatchings/EF2680/func_80240070_EF2680.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s b/ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s rename to ver/us/asm/nonmatchings/EF2680/func_80240220_EF2830.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s b/ver/us/asm/nonmatchings/EF2680/func_80240848_EF2E58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240848_EF2E58.s rename to ver/us/asm/nonmatchings/EF2680/func_80240848_EF2E58.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s b/ver/us/asm/nonmatchings/EF2680/func_80240908_EF2F18.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240908_EF2F18.s rename to ver/us/asm/nonmatchings/EF2680/func_80240908_EF2F18.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240C4C_EF325C.s b/ver/us/asm/nonmatchings/EF2680/func_80240C4C_EF325C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240C4C_EF325C.s rename to ver/us/asm/nonmatchings/EF2680/func_80240C4C_EF325C.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240CC4_EF32D4.s b/ver/us/asm/nonmatchings/EF2680/func_80240CC4_EF32D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240CC4_EF32D4.s rename to ver/us/asm/nonmatchings/EF2680/func_80240CC4_EF32D4.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s b/ver/us/asm/nonmatchings/EF2680/func_80240E64_EF3474.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s rename to ver/us/asm/nonmatchings/EF2680/func_80240E64_EF3474.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s b/ver/us/asm/nonmatchings/EF2680/func_80240EC8_EF34D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80240EC8_EF34D8.s rename to ver/us/asm/nonmatchings/EF2680/func_80240EC8_EF34D8.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s b/ver/us/asm/nonmatchings/EF2680/func_80241258_EF3868.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s rename to ver/us/asm/nonmatchings/EF2680/func_80241258_EF3868.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s similarity index 99% rename from ver/us/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s rename to ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s index c43795a964..ee5546deb5 100644 --- a/ver/us/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s +++ b/ver/us/asm/nonmatchings/EF2680/func_8024137C_EF398C.s @@ -128,7 +128,7 @@ glabel L80241514_EF3B24 glabel L8024152C_EF3B3C /* EF3B3C 8024152C 02A0202D */ daddu $a0, $s5, $zero /* EF3B40 80241530 0200282D */ daddu $a1, $s0, $zero -/* EF3B44 80241534 0C09034C */ jal code_EF2680_DeadUnkNpcAIFunc14 +/* EF3B44 80241534 0C09034C */ jal EF2680_DeadUnkNpcAIFunc14 /* EF3B48 80241538 0260302D */ daddu $a2, $s3, $zero /* EF3B4C 8024153C 0809055C */ j .L80241570 /* EF3B50 80241540 0000102D */ daddu $v0, $zero, $zero diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80241594_EF3BA4.s b/ver/us/asm/nonmatchings/EF2680/func_80241594_EF3BA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80241594_EF3BA4.s rename to ver/us/asm/nonmatchings/EF2680/func_80241594_EF3BA4.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s b/ver/us/asm/nonmatchings/EF2680/func_802415DC_EF3BEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s rename to ver/us/asm/nonmatchings/EF2680/func_802415DC_EF3BEC.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s b/ver/us/asm/nonmatchings/EF2680/func_80241A40_EF4050.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s rename to ver/us/asm/nonmatchings/EF2680/func_80241A40_EF4050.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s similarity index 99% rename from ver/us/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s rename to ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s index 84dfb179f0..a8bbe9ff28 100644 --- a/ver/us/asm/nonmatchings/code_EF2680/func_80241C90_EF42A0.s +++ b/ver/us/asm/nonmatchings/EF2680/func_80241C90_EF42A0.s @@ -166,7 +166,7 @@ glabel func_80241C90_EF42A0 .L80241EE8: /* EF44F8 80241EE8 0280202D */ daddu $a0, $s4, $zero /* EF44FC 80241EEC 02C0282D */ daddu $a1, $s6, $zero -/* EF4500 80241EF0 0C09034C */ jal code_EF2680_DeadUnkNpcAIFunc14 +/* EF4500 80241EF0 0C09034C */ jal EF2680_DeadUnkNpcAIFunc14 /* EF4504 80241EF4 02A0302D */ daddu $a2, $s5, $zero .L80241EF8: /* EF4508 80241EF8 0280202D */ daddu $a0, $s4, $zero diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_8024219C_EF47AC.s b/ver/us/asm/nonmatchings/EF2680/func_8024219C_EF47AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_8024219C_EF47AC.s rename to ver/us/asm/nonmatchings/EF2680/func_8024219C_EF47AC.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s b/ver/us/asm/nonmatchings/EF2680/func_80242218_EF4828.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80242218_EF4828.s rename to ver/us/asm/nonmatchings/EF2680/func_80242218_EF4828.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s b/ver/us/asm/nonmatchings/EF2680/func_8024234C_EF495C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s rename to ver/us/asm/nonmatchings/EF2680/func_8024234C_EF495C.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s b/ver/us/asm/nonmatchings/EF2680/func_802424B0_EF4AC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s rename to ver/us/asm/nonmatchings/EF2680/func_802424B0_EF4AC0.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s b/ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s rename to ver/us/asm/nonmatchings/EF2680/func_80242530_EF4B40.s diff --git a/ver/us/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s b/ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s rename to ver/us/asm/nonmatchings/EF2680/func_8024299C_EF4FAC.s diff --git a/ver/us/asm/nonmatchings/code_EF7A80/func_80240340_EF7DC0.s b/ver/us/asm/nonmatchings/EF7A80/func_80240340_EF7DC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF7A80/func_80240340_EF7DC0.s rename to ver/us/asm/nonmatchings/EF7A80/func_80240340_EF7DC0.s diff --git a/ver/us/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s b/ver/us/asm/nonmatchings/EF7FB0/func_80240530_EF7FB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF7FB0/func_80240530_EF7FB0.s rename to ver/us/asm/nonmatchings/EF7FB0/func_80240530_EF7FB0.s diff --git a/ver/us/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s b/ver/us/asm/nonmatchings/EF8010/func_80240590_EF8010.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF8010/func_80240590_EF8010.s rename to ver/us/asm/nonmatchings/EF8010/func_80240590_EF8010.s diff --git a/ver/us/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s b/ver/us/asm/nonmatchings/EF8010/func_80240600_EF8080.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EF8010/func_80240600_EF8080.s rename to ver/us/asm/nonmatchings/EF8010/func_80240600_EF8080.s diff --git a/ver/us/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s b/ver/us/asm/nonmatchings/EFEB00/func_80240340_EFEE40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EFEB00/func_80240340_EFEE40.s rename to ver/us/asm/nonmatchings/EFEB00/func_80240340_EFEE40.s diff --git a/ver/us/asm/nonmatchings/code_EFEB00/func_802404D0_EFEFD0.s b/ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EFEB00/func_802404D0_EFEFD0.s rename to ver/us/asm/nonmatchings/EFEB00/func_802404D0_EFEFD0.s diff --git a/ver/us/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s b/ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EFEB00/func_80240540_EFF040.s rename to ver/us/asm/nonmatchings/EFEB00/func_80240540_EFF040.s diff --git a/ver/us/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s b/ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EFEB00/func_80240660_EFF160.s rename to ver/us/asm/nonmatchings/EFEB00/func_80240660_EFF160.s diff --git a/ver/us/asm/nonmatchings/code_EFEB00/func_80240784_EFF284.s b/ver/us/asm/nonmatchings/EFEB00/func_80240784_EFF284.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EFEB00/func_80240784_EFF284.s rename to ver/us/asm/nonmatchings/EFEB00/func_80240784_EFF284.s diff --git a/ver/us/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s b/ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_EFEB00/func_802407B0_EFF2B0.s rename to ver/us/asm/nonmatchings/EFEB00/func_802407B0_EFF2B0.s diff --git a/ver/us/asm/nonmatchings/code_F5750/PlayerFaceNpc.s b/ver/us/asm/nonmatchings/F5750/PlayerFaceNpc.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/PlayerFaceNpc.s rename to ver/us/asm/nonmatchings/F5750/PlayerFaceNpc.s diff --git a/ver/us/asm/nonmatchings/code_F5750/SetPlayerAnimation.s b/ver/us/asm/nonmatchings/F5750/SetPlayerAnimation.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/SetPlayerAnimation.s rename to ver/us/asm/nonmatchings/F5750/SetPlayerAnimation.s diff --git a/ver/us/asm/nonmatchings/code_F5750/UseEntryHeading.s b/ver/us/asm/nonmatchings/F5750/UseEntryHeading.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/UseEntryHeading.s rename to ver/us/asm/nonmatchings/F5750/UseEntryHeading.s diff --git a/ver/us/asm/nonmatchings/code_F5750/UseExitHeading.s b/ver/us/asm/nonmatchings/F5750/UseExitHeading.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/UseExitHeading.s rename to ver/us/asm/nonmatchings/F5750/UseExitHeading.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D1270.s b/ver/us/asm/nonmatchings/F5750/func_802D1270.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D1270.s rename to ver/us/asm/nonmatchings/F5750/func_802D1270.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D1380.s b/ver/us/asm/nonmatchings/F5750/func_802D1380.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D1380.s rename to ver/us/asm/nonmatchings/F5750/func_802D1380.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D23F8.s b/ver/us/asm/nonmatchings/F5750/func_802D23F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D23F8.s rename to ver/us/asm/nonmatchings/F5750/func_802D23F8.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2520.s b/ver/us/asm/nonmatchings/F5750/func_802D2520.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D2520.s rename to ver/us/asm/nonmatchings/F5750/func_802D2520.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2884.s b/ver/us/asm/nonmatchings/F5750/func_802D2884.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D2884.s rename to ver/us/asm/nonmatchings/F5750/func_802D2884.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2D30.s b/ver/us/asm/nonmatchings/F5750/func_802D2D30.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D2D30.s rename to ver/us/asm/nonmatchings/F5750/func_802D2D30.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2ED4.s b/ver/us/asm/nonmatchings/F5750/func_802D2ED4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D2ED4.s rename to ver/us/asm/nonmatchings/F5750/func_802D2ED4.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2F34.s b/ver/us/asm/nonmatchings/F5750/func_802D2F34.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D2F34.s rename to ver/us/asm/nonmatchings/F5750/func_802D2F34.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D2FCC.s b/ver/us/asm/nonmatchings/F5750/func_802D2FCC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D2FCC.s rename to ver/us/asm/nonmatchings/F5750/func_802D2FCC.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3028.s b/ver/us/asm/nonmatchings/F5750/func_802D3028.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3028.s rename to ver/us/asm/nonmatchings/F5750/func_802D3028.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D31E0.s b/ver/us/asm/nonmatchings/F5750/func_802D31E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D31E0.s rename to ver/us/asm/nonmatchings/F5750/func_802D31E0.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3398.s b/ver/us/asm/nonmatchings/F5750/func_802D3398.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3398.s rename to ver/us/asm/nonmatchings/F5750/func_802D3398.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D33D4.s b/ver/us/asm/nonmatchings/F5750/func_802D33D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D33D4.s rename to ver/us/asm/nonmatchings/F5750/func_802D33D4.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3624.s b/ver/us/asm/nonmatchings/F5750/func_802D3624.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3624.s rename to ver/us/asm/nonmatchings/F5750/func_802D3624.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3674.s b/ver/us/asm/nonmatchings/F5750/func_802D3674.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3674.s rename to ver/us/asm/nonmatchings/F5750/func_802D3674.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D36E0.s b/ver/us/asm/nonmatchings/F5750/func_802D36E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D36E0.s rename to ver/us/asm/nonmatchings/F5750/func_802D36E0.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D378C.s b/ver/us/asm/nonmatchings/F5750/func_802D378C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D378C.s rename to ver/us/asm/nonmatchings/F5750/func_802D378C.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3840.s b/ver/us/asm/nonmatchings/F5750/func_802D3840.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3840.s rename to ver/us/asm/nonmatchings/F5750/func_802D3840.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D38EC.s b/ver/us/asm/nonmatchings/F5750/func_802D38EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D38EC.s rename to ver/us/asm/nonmatchings/F5750/func_802D38EC.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3998.s b/ver/us/asm/nonmatchings/F5750/func_802D3998.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3998.s rename to ver/us/asm/nonmatchings/F5750/func_802D3998.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D39FC.s b/ver/us/asm/nonmatchings/F5750/func_802D39FC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D39FC.s rename to ver/us/asm/nonmatchings/F5750/func_802D39FC.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3A60.s b/ver/us/asm/nonmatchings/F5750/func_802D3A60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3A60.s rename to ver/us/asm/nonmatchings/F5750/func_802D3A60.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3C58.s b/ver/us/asm/nonmatchings/F5750/func_802D3C58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3C58.s rename to ver/us/asm/nonmatchings/F5750/func_802D3C58.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3EB8.s b/ver/us/asm/nonmatchings/F5750/func_802D3EB8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3EB8.s rename to ver/us/asm/nonmatchings/F5750/func_802D3EB8.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3F74.s b/ver/us/asm/nonmatchings/F5750/func_802D3F74.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3F74.s rename to ver/us/asm/nonmatchings/F5750/func_802D3F74.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D3FC8.s b/ver/us/asm/nonmatchings/F5750/func_802D3FC8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D3FC8.s rename to ver/us/asm/nonmatchings/F5750/func_802D3FC8.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D4050.s b/ver/us/asm/nonmatchings/F5750/func_802D4050.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D4050.s rename to ver/us/asm/nonmatchings/F5750/func_802D4050.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D417C.s b/ver/us/asm/nonmatchings/F5750/func_802D417C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D417C.s rename to ver/us/asm/nonmatchings/F5750/func_802D417C.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D420C.s b/ver/us/asm/nonmatchings/F5750/func_802D420C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D420C.s rename to ver/us/asm/nonmatchings/F5750/func_802D420C.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D42AC.s b/ver/us/asm/nonmatchings/F5750/func_802D42AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D42AC.s rename to ver/us/asm/nonmatchings/F5750/func_802D42AC.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D4364.s b/ver/us/asm/nonmatchings/F5750/func_802D4364.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D4364.s rename to ver/us/asm/nonmatchings/F5750/func_802D4364.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D43F4.s b/ver/us/asm/nonmatchings/F5750/func_802D43F4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D43F4.s rename to ver/us/asm/nonmatchings/F5750/func_802D43F4.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D4434.s b/ver/us/asm/nonmatchings/F5750/func_802D4434.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D4434.s rename to ver/us/asm/nonmatchings/F5750/func_802D4434.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D4488.s b/ver/us/asm/nonmatchings/F5750/func_802D4488.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D4488.s rename to ver/us/asm/nonmatchings/F5750/func_802D4488.s diff --git a/ver/us/asm/nonmatchings/code_F5750/func_802D4560.s b/ver/us/asm/nonmatchings/F5750/func_802D4560.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/func_802D4560.s rename to ver/us/asm/nonmatchings/F5750/func_802D4560.s diff --git a/ver/us/asm/nonmatchings/code_F5750/player_jump.s b/ver/us/asm/nonmatchings/F5750/player_jump.s similarity index 100% rename from ver/us/asm/nonmatchings/code_F5750/player_jump.s rename to ver/us/asm/nonmatchings/F5750/player_jump.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s b/ver/us/asm/nonmatchings/FBE10/PlayEffect.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/PlayEffect.s rename to ver/us/asm/nonmatchings/FBE10/PlayEffect.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/ShowEmote.s b/ver/us/asm/nonmatchings/FBE10/ShowEmote.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/ShowEmote.s rename to ver/us/asm/nonmatchings/FBE10/ShowEmote.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/ShowSleepBubble.s b/ver/us/asm/nonmatchings/FBE10/ShowSleepBubble.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/ShowSleepBubble.s rename to ver/us/asm/nonmatchings/FBE10/ShowSleepBubble.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/func_802D7460.s b/ver/us/asm/nonmatchings/FBE10/func_802D7460.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/func_802D7460.s rename to ver/us/asm/nonmatchings/FBE10/func_802D7460.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/func_802D74C0.s b/ver/us/asm/nonmatchings/FBE10/func_802D74C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/func_802D74C0.s rename to ver/us/asm/nonmatchings/FBE10/func_802D74C0.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/func_802D7690.s b/ver/us/asm/nonmatchings/FBE10/func_802D7690.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/func_802D7690.s rename to ver/us/asm/nonmatchings/FBE10/func_802D7690.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/func_802D7E08.s b/ver/us/asm/nonmatchings/FBE10/func_802D7E08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/func_802D7E08.s rename to ver/us/asm/nonmatchings/FBE10/func_802D7E08.s diff --git a/ver/us/asm/nonmatchings/code_FBE10/func_802D8248.s b/ver/us/asm/nonmatchings/FBE10/func_802D8248.s similarity index 100% rename from ver/us/asm/nonmatchings/code_FBE10/func_802D8248.s rename to ver/us/asm/nonmatchings/FBE10/func_802D8248.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignAreaFlag.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignAreaFlag.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignAreaFlag.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignBlockFlag.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignBlockFlag.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignCrateFlag.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignCrateFlag.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignPanelFlag.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignPanelFlag.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignScript.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/AssignScript.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignScript.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/MakeEntity.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/MakeEntity.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/MakeEntity.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/UseDynamicShadow.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/UseDynamicShadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/UseDynamicShadow.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/UseDynamicShadow.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/_load_model_textures.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/_load_model_textures.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model_group.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/appendGfx_model_group.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/appendGfx_model_group.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/calculate_model_sizes.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/calculate_model_sizes.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/calculate_model_sizes.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/clear_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/clear_entity_data.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_entity_data.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_model_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/clear_model_data.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/clear_model_data.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity_shadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_entity_shadow.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/create_entity_shadow.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_from_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_from_data.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_from_data.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_type.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/create_shadow_type.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/create_shadow_type.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_get_collision_flags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/entity_get_collision_flags.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/entity_get_collision_flags.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/exec_entity_updatecmd.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/exec_entity_updatecmd.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/exec_entity_updatecmd.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/exec_entity_updatecmd.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801109DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801109DC.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801109DC.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80110E58.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110E58.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80110F10.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80110F10.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801110B4.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801110B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801110B4.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801110B4.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111790.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80111790.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111790.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801117DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801117DC.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801117DC.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111E9C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80111E9C.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80111E9C.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112328.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112328.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112328.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112344.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112344.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112344.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801125E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801125E8.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801125E8.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112B20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B20.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112B20.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112B98.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112B98.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112B98.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112EEC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112EEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112EEC.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112EEC.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112FC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80112FC4.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112FC4.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80114B58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80114B58.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80114B58.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80115498.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80115498.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80115498.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116674.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80116674.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116674.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116698.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80116698.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80116698.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117D00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80117D00.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117D00.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117E74.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_80117E74.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80117E74.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011800C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011800C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011800C.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011800C.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801180E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_801180E8.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_801180E8.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B090.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B090.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B090.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B090.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1C0.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1C0.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1C0.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B1D8.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1D8.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B37C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B37C.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B37C.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B5D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B5D0.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B5D0.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B660.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B660.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B660.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B7C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B7C0.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B7C0.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B950.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011B950.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B950.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BC7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BC7C.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BC7C.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCB4.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BCB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCB4.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BCB4.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCD0.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BCD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCD0.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BCD0.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BCEC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BCEC.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BCEC.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BEB4.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BEB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BEB4.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BEB4.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BF14.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BF14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BF14.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BF14.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BF98.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BF98.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BF98.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BF98.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BFD4.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BFD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011BFD4.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011BFD4.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C028.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C028.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C028.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C0DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C0DC.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C0DC.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C130.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C130.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C164.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C164.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C164.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2B0.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C2B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2B0.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C2B0.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2EC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C2EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C2EC.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C2EC.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C32C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C32C.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C32C.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C80C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011C80C.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011C80C.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011CFBC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011CFBC.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011CFBC.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D7E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D7E4.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D7E4.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D82C.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D82C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D82C.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D82C.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D890.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D890.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D890.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D8D0.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D8D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D8D0.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D8D0.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D9B8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/func_8011D9B8.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011D9B8.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_background_color_blend.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_background_color_blend.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_background_color_blend.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/get_background_color_blend.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_center_and_size.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_model_center_and_size.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_center_and_size.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_model_list_index_from_tree_index.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_list_index_from_tree_index.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_model_list_index_from_tree_index.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_list_index_from_tree_index.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_model_property.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_property.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/get_model_property.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/get_model_property.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/init_model_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/init_model_data.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/init_model_data.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/is_entity_data_loaded.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/is_entity_data_loaded.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/is_entity_data_loaded.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/is_identity_fixed_mtx.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/is_identity_fixed_mtx.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/is_identity_fixed_mtx.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/is_identity_fixed_mtx.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_data_for_models.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_data_for_models.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_data_for_models.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/load_data_for_models.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_textures.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_model_textures.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_textures.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_transforms.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_model_transforms.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/load_model_transforms.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_simple_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_simple_entity_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_simple_entity_data.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/load_simple_entity_data.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_split_entity_data.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/load_split_entity_data.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/load_tile_header.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/load_tile_header.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/load_tile_header.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/mdl_create_model.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/mdl_create_model.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_create_model.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/mdl_get_child_count.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_child_count.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/mdl_get_child_count.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/mdl_get_child_count.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_entities.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_entities.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/render_entities.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_models.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/render_models.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_shadows.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_shadows.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/render_shadows.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/render_ui.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/render_ui.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/render_ui.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_background_color_blend.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_background_color_blend.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_background_color_blend.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/set_background_color_blend.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_entity_updatecmd.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_entity_updatecmd.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_entity_updatecmd.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/set_entity_updatecmd.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_next_game_mode.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_next_game_mode.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_next_game_mode.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/set_next_game_mode.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_npc_shadow_scale.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_npc_shadow_scale.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/set_npc_shadow_scale.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_peach_shadow_scale.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_peach_shadow_scale.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/set_peach_shadow_scale.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/set_standard_shadow_scale.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/set_standard_shadow_scale.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/set_standard_shadow_scale.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_current_game_mode.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_current_game_mode.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_current_game_mode.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/step_current_game_mode.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/step_entity_updatecmd.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/step_entity_updatecmd.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/step_entity_updatecmd.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/test_player_entity_aabb.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/test_player_entity_aabb.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/test_player_entity_aabb.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entities.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_entities.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entities.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_inverse_rotation_matrix.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_transform_matrix.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_transform_matrix.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_entity_transform_matrix.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/update_entity_transform_matrix.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_shadow_transform_matrix.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_shadow_transform_matrix.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_shadow_transform_matrix.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/update_shadow_transform_matrix.s diff --git a/ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s b/ver/us/asm/nonmatchings/a5dd0_len_114e0/update_shadows.s similarity index 100% rename from ver/us/asm/nonmatchings/code_a5dd0_len_114e0/update_shadows.s rename to ver/us/asm/nonmatchings/a5dd0_len_114e0/update_shadows.s diff --git a/ver/us/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s b/ver/us/asm/nonmatchings/ad90_len_2880/do_camera_type_6.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s rename to ver/us/asm/nonmatchings/ad90_len_2880/do_camera_type_6.s diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s b/ver/us/asm/nonmatchings/b72b0_len_15ed0/appendGfx_entity_model.s similarity index 100% rename from ver/us/asm/nonmatchings/code_b72b0_len_15ed0/appendGfx_entity_model.s rename to ver/us/asm/nonmatchings/b72b0_len_15ed0/appendGfx_entity_model.s diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra1.s b/ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_extra1.s similarity index 100% rename from ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra1.s rename to ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_extra1.s diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra2.s b/ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_extra2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra2.s rename to ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_extra2.s diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s b/ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_extra3.s similarity index 100% rename from ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_extra3.s rename to ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_extra3.s diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_main.s b/ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_main.s similarity index 100% rename from ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_main.s rename to ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_main.s diff --git a/ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_shadow.s b/ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_shadow.s similarity index 100% rename from ver/us/asm/nonmatchings/code_b72b0_len_15ed0/draw_entity_model_shadow.s rename to ver/us/asm/nonmatchings/b72b0_len_15ed0/draw_entity_model_shadow.s diff --git a/ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A10E4_743ED4.s b/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A10E4_743ED4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A10E4_743ED4.s rename to ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A10E4_743ED4.s diff --git a/ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A1194_743F84.s b/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A1194_743F84.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A1194_743F84.s rename to ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A1194_743F84.s diff --git a/ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A11A4_743F94.s b/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11A4_743F94.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A11A4_743F94.s rename to ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11A4_743F94.s diff --git a/ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A11C0_743FB0.s b/ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/move/power_bounce_743DF0/func_802A11C0_743FB0.s rename to ver/us/asm/nonmatchings/battle/move/power_bounce/743DF0/func_802A11C0_743FB0.s diff --git a/ver/us/asm/nonmatchings/battle/move/shell_crack_77F240/func_802A10A4_77F2E4.s b/ver/us/asm/nonmatchings/battle/move/shell_crack/77F240/func_802A10A4_77F2E4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/move/shell_crack_77F240/func_802A10A4_77F2E4.s rename to ver/us/asm/nonmatchings/battle/move/shell_crack/77F240/func_802A10A4_77F2E4.s diff --git a/ver/us/asm/nonmatchings/battle/move/unknown_move_779C90/func_802A10E4_779D74.s b/ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/move/unknown_move_779C90/func_802A10E4_779D74.s rename to ver/us/asm/nonmatchings/battle/move/unknown_move/779C90/func_802A10E4_779D74.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_802380E4_6F11C4.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_802380E4_6F11C4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_802380E4_6F11C4.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_802380E4_6F11C4.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_8023817C_6F125C.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_8023817C_6F125C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_8023817C_6F125C.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_8023817C_6F125C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238BCC_6F1CAC.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238BCC_6F1CAC.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238BCC_6F1CAC.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238BCC_6F1CAC.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238E04_6F1EE4.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238E04_6F1EE4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238E04_6F1EE4.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238E04_6F1EE4.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238E48_6F1F28.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238E48_6F1F28.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238E48_6F1F28.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238E48_6F1F28.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238E74_6F1F54.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238E74_6F1F54.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238E74_6F1F54.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238E74_6F1F54.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238EDC_6F1FBC.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238EDC_6F1FBC.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238EDC_6F1FBC.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_80238EDC_6F1FBC.s diff --git a/ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_802390C8_6F21A8.s b/ver/us/asm/nonmatchings/battle/partner/6F10E0/func_802390C8_6F21A8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/goombario_6F10E0/func_802390C8_6F21A8.s rename to ver/us/asm/nonmatchings/battle/partner/6F10E0/func_802390C8_6F21A8.s diff --git a/ver/us/asm/nonmatchings/battle/partner/kooper_6F5E80/func_80238114_6F5F94.s b/ver/us/asm/nonmatchings/battle/partner/6F5E80/func_80238114_6F5F94.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/kooper_6F5E80/func_80238114_6F5F94.s rename to ver/us/asm/nonmatchings/battle/partner/6F5E80/func_80238114_6F5F94.s diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238000_6FAD10.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238000_6FAD10.s new file mode 100644 index 0000000000..9e2ab06b72 --- /dev/null +++ b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238000_6FAD10.s @@ -0,0 +1,161 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80238000_6FAD10 +/* 6FAD10 80238000 27BDFFC8 */ addiu $sp, $sp, -0x38 +/* 6FAD14 80238004 AFB10014 */ sw $s1, 0x14($sp) +/* 6FAD18 80238008 0080882D */ daddu $s1, $a0, $zero +/* 6FAD1C 8023800C AFBF0020 */ sw $ra, 0x20($sp) +/* 6FAD20 80238010 AFB3001C */ sw $s3, 0x1c($sp) +/* 6FAD24 80238014 AFB20018 */ sw $s2, 0x18($sp) +/* 6FAD28 80238018 AFB00010 */ sw $s0, 0x10($sp) +/* 6FAD2C 8023801C F7B60030 */ sdc1 $f22, 0x30($sp) +/* 6FAD30 80238020 F7B40028 */ sdc1 $f20, 0x28($sp) +/* 6FAD34 80238024 8E30000C */ lw $s0, 0xc($s1) +/* 6FAD38 80238028 8E050000 */ lw $a1, ($s0) +/* 6FAD3C 8023802C 0C0B1EAF */ jal get_variable +/* 6FAD40 80238030 26100004 */ addiu $s0, $s0, 4 +/* 6FAD44 80238034 8E050000 */ lw $a1, ($s0) +/* 6FAD48 80238038 26100004 */ addiu $s0, $s0, 4 +/* 6FAD4C 8023803C 0220202D */ daddu $a0, $s1, $zero +/* 6FAD50 80238040 0C0B1EAF */ jal get_variable +/* 6FAD54 80238044 0040982D */ daddu $s3, $v0, $zero +/* 6FAD58 80238048 0220202D */ daddu $a0, $s1, $zero +/* 6FAD5C 8023804C 8E050000 */ lw $a1, ($s0) +/* 6FAD60 80238050 0C0B1EAF */ jal get_variable +/* 6FAD64 80238054 0040802D */ daddu $s0, $v0, $zero +/* 6FAD68 80238058 4493A000 */ mtc1 $s3, $f20 +/* 6FAD6C 8023805C 00000000 */ nop +/* 6FAD70 80238060 4680A520 */ cvt.s.w $f20, $f20 +/* 6FAD74 80238064 0040902D */ daddu $s2, $v0, $zero +/* 6FAD78 80238068 4492B000 */ mtc1 $s2, $f22 +/* 6FAD7C 8023806C 00000000 */ nop +/* 6FAD80 80238070 4680B5A0 */ cvt.s.w $f22, $f22 +/* 6FAD84 80238074 44900000 */ mtc1 $s0, $f0 +/* 6FAD88 80238078 00000000 */ nop +/* 6FAD8C 8023807C 46800020 */ cvt.s.w $f0, $f0 +/* 6FAD90 80238080 4405A000 */ mfc1 $a1, $f20 +/* 6FAD94 80238084 4407B000 */ mfc1 $a3, $f22 +/* 6FAD98 80238088 44060000 */ mfc1 $a2, $f0 +/* 6FAD9C 8023808C 0C01C04C */ jal func_80070130 +/* 6FADA0 80238090 0000202D */ daddu $a0, $zero, $zero +/* 6FADA4 80238094 3C03800E */ lui $v1, %hi(gBattleStatus+0x17C) +/* 6FADA8 80238098 8463C1EC */ lh $v1, %lo(gBattleStatus+0x17C)($v1) +/* 6FADAC 8023809C 24020093 */ addiu $v0, $zero, 0x93 +/* 6FADB0 802380A0 1062001F */ beq $v1, $v0, .L80238120 +/* 6FADB4 802380A4 28620094 */ slti $v0, $v1, 0x94 +/* 6FADB8 802380A8 10400005 */ beqz $v0, .L802380C0 +/* 6FADBC 802380AC 24020092 */ addiu $v0, $zero, 0x92 +/* 6FADC0 802380B0 10620008 */ beq $v1, $v0, .L802380D4 +/* 6FADC4 802380B4 00000000 */ nop +/* 6FADC8 802380B8 0808E074 */ j .L802381D0 +/* 6FADCC 802380BC 00000000 */ nop +.L802380C0: +/* 6FADD0 802380C0 24020094 */ addiu $v0, $zero, 0x94 +/* 6FADD4 802380C4 1062002C */ beq $v1, $v0, .L80238178 +/* 6FADD8 802380C8 00000000 */ nop +/* 6FADDC 802380CC 0808E074 */ j .L802381D0 +/* 6FADE0 802380D0 00000000 */ nop +.L802380D4: +/* 6FADE4 802380D4 8E2200AC */ lw $v0, 0xac($s1) +/* 6FADE8 802380D8 18400009 */ blez $v0, .L80238100 +/* 6FADEC 802380DC 26020014 */ addiu $v0, $s0, 0x14 +/* 6FADF0 802380E0 44820000 */ mtc1 $v0, $f0 +/* 6FADF4 802380E4 00000000 */ nop +/* 6FADF8 802380E8 46800020 */ cvt.s.w $f0, $f0 +/* 6FADFC 802380EC 4405A000 */ mfc1 $a1, $f20 +/* 6FAE00 802380F0 4407B000 */ mfc1 $a3, $f22 +/* 6FAE04 802380F4 44060000 */ mfc1 $a2, $f0 +/* 6FAE08 802380F8 0808E082 */ j .L80238208 +/* 6FAE0C 802380FC 24040001 */ addiu $a0, $zero, 1 +.L80238100: +/* 6FAE10 80238100 44820000 */ mtc1 $v0, $f0 +/* 6FAE14 80238104 00000000 */ nop +/* 6FAE18 80238108 46800020 */ cvt.s.w $f0, $f0 +/* 6FAE1C 8023810C 4405A000 */ mfc1 $a1, $f20 +/* 6FAE20 80238110 4407B000 */ mfc1 $a3, $f22 +/* 6FAE24 80238114 44060000 */ mfc1 $a2, $f0 +/* 6FAE28 80238118 0808E082 */ j .L80238208 +/* 6FAE2C 8023811C 0000202D */ daddu $a0, $zero, $zero +.L80238120: +/* 6FAE30 80238120 8E2200AC */ lw $v0, 0xac($s1) +/* 6FAE34 80238124 18400009 */ blez $v0, .L8023814C +/* 6FAE38 80238128 26020014 */ addiu $v0, $s0, 0x14 +/* 6FAE3C 8023812C 44820000 */ mtc1 $v0, $f0 +/* 6FAE40 80238130 00000000 */ nop +/* 6FAE44 80238134 46800020 */ cvt.s.w $f0, $f0 +/* 6FAE48 80238138 4405A000 */ mfc1 $a1, $f20 +/* 6FAE4C 8023813C 4407B000 */ mfc1 $a3, $f22 +/* 6FAE50 80238140 44060000 */ mfc1 $a2, $f0 +/* 6FAE54 80238144 0808E05A */ j .L80238168 +/* 6FAE58 80238148 24040001 */ addiu $a0, $zero, 1 +.L8023814C: +/* 6FAE5C 8023814C 44820000 */ mtc1 $v0, $f0 +/* 6FAE60 80238150 00000000 */ nop +/* 6FAE64 80238154 46800020 */ cvt.s.w $f0, $f0 +/* 6FAE68 80238158 4405A000 */ mfc1 $a1, $f20 +/* 6FAE6C 8023815C 4407B000 */ mfc1 $a3, $f22 +/* 6FAE70 80238160 44060000 */ mfc1 $a2, $f0 +/* 6FAE74 80238164 0000202D */ daddu $a0, $zero, $zero +.L80238168: +/* 6FAE78 80238168 0C01C07C */ jal func_800701F0 +/* 6FAE7C 8023816C 00000000 */ nop +/* 6FAE80 80238170 0808E085 */ j .L80238214 +/* 6FAE84 80238174 24042017 */ addiu $a0, $zero, 0x2017 +.L80238178: +/* 6FAE88 80238178 8E2200AC */ lw $v0, 0xac($s1) +/* 6FAE8C 8023817C 18400009 */ blez $v0, .L802381A4 +/* 6FAE90 80238180 26020014 */ addiu $v0, $s0, 0x14 +/* 6FAE94 80238184 44820000 */ mtc1 $v0, $f0 +/* 6FAE98 80238188 00000000 */ nop +/* 6FAE9C 8023818C 46800020 */ cvt.s.w $f0, $f0 +/* 6FAEA0 80238190 4405A000 */ mfc1 $a1, $f20 +/* 6FAEA4 80238194 4407B000 */ mfc1 $a3, $f22 +/* 6FAEA8 80238198 44060000 */ mfc1 $a2, $f0 +/* 6FAEAC 8023819C 0808E070 */ j .L802381C0 +/* 6FAEB0 802381A0 24040002 */ addiu $a0, $zero, 2 +.L802381A4: +/* 6FAEB4 802381A4 44820000 */ mtc1 $v0, $f0 +/* 6FAEB8 802381A8 00000000 */ nop +/* 6FAEBC 802381AC 46800020 */ cvt.s.w $f0, $f0 +/* 6FAEC0 802381B0 4405A000 */ mfc1 $a1, $f20 +/* 6FAEC4 802381B4 4407B000 */ mfc1 $a3, $f22 +/* 6FAEC8 802381B8 44060000 */ mfc1 $a2, $f0 +/* 6FAECC 802381BC 24040001 */ addiu $a0, $zero, 1 +.L802381C0: +/* 6FAED0 802381C0 0C01C07C */ jal func_800701F0 +/* 6FAED4 802381C4 00000000 */ nop +/* 6FAED8 802381C8 0808E085 */ j .L80238214 +/* 6FAEDC 802381CC 24042017 */ addiu $a0, $zero, 0x2017 +.L802381D0: +/* 6FAEE0 802381D0 44930000 */ mtc1 $s3, $f0 +/* 6FAEE4 802381D4 00000000 */ nop +/* 6FAEE8 802381D8 46800020 */ cvt.s.w $f0, $f0 +/* 6FAEEC 802381DC 26020014 */ addiu $v0, $s0, 0x14 +/* 6FAEF0 802381E0 44050000 */ mfc1 $a1, $f0 +/* 6FAEF4 802381E4 44820000 */ mtc1 $v0, $f0 +/* 6FAEF8 802381E8 00000000 */ nop +/* 6FAEFC 802381EC 46800020 */ cvt.s.w $f0, $f0 +/* 6FAF00 802381F0 44060000 */ mfc1 $a2, $f0 +/* 6FAF04 802381F4 44920000 */ mtc1 $s2, $f0 +/* 6FAF08 802381F8 00000000 */ nop +/* 6FAF0C 802381FC 46800020 */ cvt.s.w $f0, $f0 +/* 6FAF10 80238200 44070000 */ mfc1 $a3, $f0 +/* 6FAF14 80238204 0000202D */ daddu $a0, $zero, $zero +.L80238208: +/* 6FAF18 80238208 0C01C07C */ jal func_800701F0 +/* 6FAF1C 8023820C 00000000 */ nop +/* 6FAF20 80238210 24042016 */ addiu $a0, $zero, 0x2016 +.L80238214: +/* 6FAF24 80238214 0C05272D */ jal sfx_play_sound +/* 6FAF28 80238218 00000000 */ nop +/* 6FAF2C 8023821C 8FBF0020 */ lw $ra, 0x20($sp) +/* 6FAF30 80238220 8FB3001C */ lw $s3, 0x1c($sp) +/* 6FAF34 80238224 8FB20018 */ lw $s2, 0x18($sp) +/* 6FAF38 80238228 8FB10014 */ lw $s1, 0x14($sp) +/* 6FAF3C 8023822C 8FB00010 */ lw $s0, 0x10($sp) +/* 6FAF40 80238230 D7B60030 */ ldc1 $f22, 0x30($sp) +/* 6FAF44 80238234 D7B40028 */ ldc1 $f20, 0x28($sp) +/* 6FAF48 80238238 24020002 */ addiu $v0, $zero, 2 +/* 6FAF4C 8023823C 03E00008 */ jr $ra +/* 6FAF50 80238240 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238244_6FAF54.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238244_6FAF54.s new file mode 100644 index 0000000000..04add46a90 --- /dev/null +++ b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238244_6FAF54.s @@ -0,0 +1,77 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80238244_6FAF54 +/* 6FAF54 80238244 27BDFFD8 */ addiu $sp, $sp, -0x28 +/* 6FAF58 80238248 AFB00018 */ sw $s0, 0x18($sp) +/* 6FAF5C 8023824C 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) +/* 6FAF60 80238250 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) +/* 6FAF64 80238254 AFBF0020 */ sw $ra, 0x20($sp) +/* 6FAF68 80238258 AFB1001C */ sw $s1, 0x1c($sp) +/* 6FAF6C 8023825C 10A00007 */ beqz $a1, .L8023827C +/* 6FAF70 80238260 2611000C */ addiu $s1, $s0, 0xc +/* 6FAF74 80238264 C6000144 */ lwc1 $f0, 0x144($s0) +/* 6FAF78 80238268 C6020148 */ lwc1 $f2, 0x148($s0) +/* 6FAF7C 8023826C C604014C */ lwc1 $f4, 0x14c($s0) +/* 6FAF80 80238270 E600000C */ swc1 $f0, 0xc($s0) +/* 6FAF84 80238274 E6020010 */ swc1 $f2, 0x10($s0) +/* 6FAF88 80238278 E6040014 */ swc1 $f4, 0x14($s0) +.L8023827C: +/* 6FAF8C 8023827C 8E05004C */ lw $a1, 0x4c($s0) +/* 6FAF90 80238280 8E060054 */ lw $a2, 0x54($s0) +/* 6FAF94 80238284 0C09904A */ jal add_xz_vec3f +/* 6FAF98 80238288 0220202D */ daddu $a0, $s1, $zero +/* 6FAF9C 8023828C C602004C */ lwc1 $f2, 0x4c($s0) +/* 6FAFA0 80238290 3C014080 */ lui $at, 0x4080 +/* 6FAFA4 80238294 44810000 */ mtc1 $at, $f0 +/* 6FAFA8 80238298 00000000 */ nop +/* 6FAFAC 8023829C 4600103C */ c.lt.s $f2, $f0 +/* 6FAFB0 802382A0 00000000 */ nop +/* 6FAFB4 802382A4 45000007 */ bc1f .L802382C4 +/* 6FAFB8 802382A8 0000202D */ daddu $a0, $zero, $zero +/* 6FAFBC 802382AC C6000054 */ lwc1 $f0, 0x54($s0) +/* 6FAFC0 802382B0 E7A00010 */ swc1 $f0, 0x10($sp) +/* 6FAFC4 802382B4 8E05000C */ lw $a1, 0xc($s0) +/* 6FAFC8 802382B8 8E060010 */ lw $a2, 0x10($s0) +/* 6FAFCC 802382BC 0808E0B7 */ j .L802382DC +/* 6FAFD0 802382C0 8E070014 */ lw $a3, 0x14($s0) +.L802382C4: +/* 6FAFD4 802382C4 C6000054 */ lwc1 $f0, 0x54($s0) +/* 6FAFD8 802382C8 E7A00010 */ swc1 $f0, 0x10($sp) +/* 6FAFDC 802382CC 8E05000C */ lw $a1, 0xc($s0) +/* 6FAFE0 802382D0 8E060010 */ lw $a2, 0x10($s0) +/* 6FAFE4 802382D4 8E070014 */ lw $a3, 0x14($s0) +/* 6FAFE8 802382D8 24040001 */ addiu $a0, $zero, 1 +.L802382DC: +/* 6FAFEC 802382DC 0C0990BC */ jal play_movement_dust_effects +/* 6FAFF0 802382E0 00000000 */ nop +/* 6FAFF4 802382E4 C6200040 */ lwc1 $f0, 0x40($s1) +/* 6FAFF8 802382E8 3C013FF8 */ lui $at, 0x3ff8 +/* 6FAFFC 802382EC 44811800 */ mtc1 $at, $f3 +/* 6FB000 802382F0 44801000 */ mtc1 $zero, $f2 +/* 6FB004 802382F4 46000021 */ cvt.d.s $f0, $f0 +/* 6FB008 802382F8 46220003 */ div.d $f0, $f0, $f2 +/* 6FB00C 802382FC C6220000 */ lwc1 $f2, ($s1) +/* 6FB010 80238300 46200020 */ cvt.s.d $f0, $f0 +/* 6FB014 80238304 E6200040 */ swc1 $f0, 0x40($s1) +/* 6FB018 80238308 E6020144 */ swc1 $f2, 0x144($s0) +/* 6FB01C 8023830C C6200004 */ lwc1 $f0, 4($s1) +/* 6FB020 80238310 E6000148 */ swc1 $f0, 0x148($s0) +/* 6FB024 80238314 C6200008 */ lwc1 $f0, 8($s1) +/* 6FB028 80238318 E600014C */ swc1 $f0, 0x14c($s0) +/* 6FB02C 8023831C C6200040 */ lwc1 $f0, 0x40($s1) +/* 6FB030 80238320 3C013FF0 */ lui $at, 0x3ff0 +/* 6FB034 80238324 44811800 */ mtc1 $at, $f3 +/* 6FB038 80238328 44801000 */ mtc1 $zero, $f2 +/* 6FB03C 8023832C 46000021 */ cvt.d.s $f0, $f0 +/* 6FB040 80238330 4622003C */ c.lt.d $f0, $f2 +/* 6FB044 80238334 00000000 */ nop +/* 6FB048 80238338 45010002 */ bc1t .L80238344 +/* 6FB04C 8023833C 24020002 */ addiu $v0, $zero, 2 +/* 6FB050 80238340 0000102D */ daddu $v0, $zero, $zero +.L80238344: +/* 6FB054 80238344 8FBF0020 */ lw $ra, 0x20($sp) +/* 6FB058 80238348 8FB1001C */ lw $s1, 0x1c($sp) +/* 6FB05C 8023834C 8FB00018 */ lw $s0, 0x18($sp) +/* 6FB060 80238350 03E00008 */ jr $ra +/* 6FB064 80238354 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238358_6FB068.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238358_6FB068.s new file mode 100644 index 0000000000..8de2cef08f --- /dev/null +++ b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238358_6FB068.s @@ -0,0 +1,92 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80238358_6FB068 +/* 6FB068 80238358 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 6FB06C 8023835C AFB10014 */ sw $s1, 0x14($sp) +/* 6FB070 80238360 0080882D */ daddu $s1, $a0, $zero +/* 6FB074 80238364 AFBF0018 */ sw $ra, 0x18($sp) +/* 6FB078 80238368 AFB00010 */ sw $s0, 0x10($sp) +/* 6FB07C 8023836C 8E22000C */ lw $v0, 0xc($s1) +/* 6FB080 80238370 8C450000 */ lw $a1, ($v0) +/* 6FB084 80238374 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) +/* 6FB088 80238378 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) +/* 6FB08C 8023837C 0C0B1EAF */ jal get_variable +/* 6FB090 80238380 00000000 */ nop +/* 6FB094 80238384 8E030008 */ lw $v1, 8($s0) +/* 6FB098 80238388 0040282D */ daddu $a1, $v0, $zero +/* 6FB09C 8023838C 90630006 */ lbu $v1, 6($v1) +/* 6FB0A0 80238390 24020001 */ addiu $v0, $zero, 1 +/* 6FB0A4 80238394 1062001A */ beq $v1, $v0, .L80238400 +/* 6FB0A8 80238398 0000202D */ daddu $a0, $zero, $zero +/* 6FB0AC 8023839C 28620002 */ slti $v0, $v1, 2 +/* 6FB0B0 802383A0 10400005 */ beqz $v0, .L802383B8 +/* 6FB0B4 802383A4 24020002 */ addiu $v0, $zero, 2 +/* 6FB0B8 802383A8 10600007 */ beqz $v1, .L802383C8 +/* 6FB0BC 802383AC 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB0C0 802383B0 0808E11C */ j .L80238470 +/* 6FB0C4 802383B4 00000000 */ nop +.L802383B8: +/* 6FB0C8 802383B8 1062001F */ beq $v1, $v0, .L80238438 +/* 6FB0CC 802383BC 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB0D0 802383C0 0808E11C */ j .L80238470 +/* 6FB0D4 802383C4 00000000 */ nop +.L802383C8: +/* 6FB0D8 802383C8 28A20024 */ slti $v0, $a1, 0x24 +/* 6FB0DC 802383CC 14400027 */ bnez $v0, .L8023846C +/* 6FB0E0 802383D0 24040001 */ addiu $a0, $zero, 1 +/* 6FB0E4 802383D4 28A2003D */ slti $v0, $a1, 0x3d +/* 6FB0E8 802383D8 14400024 */ bnez $v0, .L8023846C +/* 6FB0EC 802383DC 24040002 */ addiu $a0, $zero, 2 +/* 6FB0F0 802383E0 28A20051 */ slti $v0, $a1, 0x51 +/* 6FB0F4 802383E4 14400021 */ bnez $v0, .L8023846C +/* 6FB0F8 802383E8 24040003 */ addiu $a0, $zero, 3 +/* 6FB0FC 802383EC 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB100 802383F0 1040001F */ beqz $v0, .L80238470 +/* 6FB104 802383F4 24040005 */ addiu $a0, $zero, 5 +/* 6FB108 802383F8 0808E11C */ j .L80238470 +/* 6FB10C 802383FC 24040004 */ addiu $a0, $zero, 4 +.L80238400: +/* 6FB110 80238400 28A20024 */ slti $v0, $a1, 0x24 +/* 6FB114 80238404 14400019 */ bnez $v0, .L8023846C +/* 6FB118 80238408 24040001 */ addiu $a0, $zero, 1 +/* 6FB11C 8023840C 28A2003D */ slti $v0, $a1, 0x3d +/* 6FB120 80238410 14400016 */ bnez $v0, .L8023846C +/* 6FB124 80238414 24040003 */ addiu $a0, $zero, 3 +/* 6FB128 80238418 28A20051 */ slti $v0, $a1, 0x51 +/* 6FB12C 8023841C 14400013 */ bnez $v0, .L8023846C +/* 6FB130 80238420 24040004 */ addiu $a0, $zero, 4 +/* 6FB134 80238424 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB138 80238428 10400011 */ beqz $v0, .L80238470 +/* 6FB13C 8023842C 24040006 */ addiu $a0, $zero, 6 +/* 6FB140 80238430 0808E11C */ j .L80238470 +/* 6FB144 80238434 24040005 */ addiu $a0, $zero, 5 +.L80238438: +/* 6FB148 80238438 28A20024 */ slti $v0, $a1, 0x24 +/* 6FB14C 8023843C 1440000B */ bnez $v0, .L8023846C +/* 6FB150 80238440 24040001 */ addiu $a0, $zero, 1 +/* 6FB154 80238444 28A2003D */ slti $v0, $a1, 0x3d +/* 6FB158 80238448 14400008 */ bnez $v0, .L8023846C +/* 6FB15C 8023844C 24040003 */ addiu $a0, $zero, 3 +/* 6FB160 80238450 28A20051 */ slti $v0, $a1, 0x51 +/* 6FB164 80238454 14400005 */ bnez $v0, .L8023846C +/* 6FB168 80238458 24040005 */ addiu $a0, $zero, 5 +/* 6FB16C 8023845C 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB170 80238460 10400003 */ beqz $v0, .L80238470 +/* 6FB174 80238464 24040007 */ addiu $a0, $zero, 7 +/* 6FB178 80238468 24040006 */ addiu $a0, $zero, 6 +.L8023846C: +/* 6FB17C 8023846C 28A20064 */ slti $v0, $a1, 0x64 +.L80238470: +/* 6FB180 80238470 54400003 */ bnel $v0, $zero, .L80238480 +/* 6FB184 80238474 AE200084 */ sw $zero, 0x84($s1) +/* 6FB188 80238478 24020001 */ addiu $v0, $zero, 1 +/* 6FB18C 8023847C AE220084 */ sw $v0, 0x84($s1) +.L80238480: +/* 6FB190 80238480 AE2400C0 */ sw $a0, 0xc0($s1) +/* 6FB194 80238484 8FBF0018 */ lw $ra, 0x18($sp) +/* 6FB198 80238488 8FB10014 */ lw $s1, 0x14($sp) +/* 6FB19C 8023848C 8FB00010 */ lw $s0, 0x10($sp) +/* 6FB1A0 80238490 24020002 */ addiu $v0, $zero, 2 +/* 6FB1A4 80238494 03E00008 */ jr $ra +/* 6FB1A8 80238498 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_8023849C_6FB1AC.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_8023849C_6FB1AC.s new file mode 100644 index 0000000000..63672f379b --- /dev/null +++ b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_8023849C_6FB1AC.s @@ -0,0 +1,70 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_8023849C_6FB1AC +/* 6FB1AC 8023849C 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 6FB1B0 802384A0 AFB10014 */ sw $s1, 0x14($sp) +/* 6FB1B4 802384A4 0080882D */ daddu $s1, $a0, $zero +/* 6FB1B8 802384A8 AFBF0018 */ sw $ra, 0x18($sp) +/* 6FB1BC 802384AC AFB00010 */ sw $s0, 0x10($sp) +/* 6FB1C0 802384B0 8E22000C */ lw $v0, 0xc($s1) +/* 6FB1C4 802384B4 8C450000 */ lw $a1, ($v0) +/* 6FB1C8 802384B8 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) +/* 6FB1CC 802384BC 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) +/* 6FB1D0 802384C0 0C0B1EAF */ jal get_variable +/* 6FB1D4 802384C4 00000000 */ nop +/* 6FB1D8 802384C8 8E030008 */ lw $v1, 8($s0) +/* 6FB1DC 802384CC 0040282D */ daddu $a1, $v0, $zero +/* 6FB1E0 802384D0 90630006 */ lbu $v1, 6($v1) +/* 6FB1E4 802384D4 24020001 */ addiu $v0, $zero, 1 +/* 6FB1E8 802384D8 10620006 */ beq $v1, $v0, .L802384F4 +/* 6FB1EC 802384DC 0000202D */ daddu $a0, $zero, $zero +/* 6FB1F0 802384E0 24020002 */ addiu $v0, $zero, 2 +/* 6FB1F4 802384E4 10620011 */ beq $v1, $v0, .L8023852C +/* 6FB1F8 802384E8 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB1FC 802384EC 0808E159 */ j .L80238564 +/* 6FB200 802384F0 00000000 */ nop +.L802384F4: +/* 6FB204 802384F4 28A20024 */ slti $v0, $a1, 0x24 +/* 6FB208 802384F8 14400019 */ bnez $v0, .L80238560 +/* 6FB20C 802384FC 24040001 */ addiu $a0, $zero, 1 +/* 6FB210 80238500 28A2003D */ slti $v0, $a1, 0x3d +/* 6FB214 80238504 14400016 */ bnez $v0, .L80238560 +/* 6FB218 80238508 24040003 */ addiu $a0, $zero, 3 +/* 6FB21C 8023850C 28A20051 */ slti $v0, $a1, 0x51 +/* 6FB220 80238510 14400013 */ bnez $v0, .L80238560 +/* 6FB224 80238514 24040004 */ addiu $a0, $zero, 4 +/* 6FB228 80238518 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB22C 8023851C 10400011 */ beqz $v0, .L80238564 +/* 6FB230 80238520 24040006 */ addiu $a0, $zero, 6 +/* 6FB234 80238524 0808E159 */ j .L80238564 +/* 6FB238 80238528 24040005 */ addiu $a0, $zero, 5 +.L8023852C: +/* 6FB23C 8023852C 28A20024 */ slti $v0, $a1, 0x24 +/* 6FB240 80238530 1440000B */ bnez $v0, .L80238560 +/* 6FB244 80238534 24040001 */ addiu $a0, $zero, 1 +/* 6FB248 80238538 28A2003D */ slti $v0, $a1, 0x3d +/* 6FB24C 8023853C 14400008 */ bnez $v0, .L80238560 +/* 6FB250 80238540 24040003 */ addiu $a0, $zero, 3 +/* 6FB254 80238544 28A20051 */ slti $v0, $a1, 0x51 +/* 6FB258 80238548 14400005 */ bnez $v0, .L80238560 +/* 6FB25C 8023854C 24040005 */ addiu $a0, $zero, 5 +/* 6FB260 80238550 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB264 80238554 10400003 */ beqz $v0, .L80238564 +/* 6FB268 80238558 24040007 */ addiu $a0, $zero, 7 +/* 6FB26C 8023855C 24040006 */ addiu $a0, $zero, 6 +.L80238560: +/* 6FB270 80238560 28A20064 */ slti $v0, $a1, 0x64 +.L80238564: +/* 6FB274 80238564 54400003 */ bnel $v0, $zero, .L80238574 +/* 6FB278 80238568 AE200084 */ sw $zero, 0x84($s1) +/* 6FB27C 8023856C 24020001 */ addiu $v0, $zero, 1 +/* 6FB280 80238570 AE220084 */ sw $v0, 0x84($s1) +.L80238574: +/* 6FB284 80238574 AE2400C0 */ sw $a0, 0xc0($s1) +/* 6FB288 80238578 8FBF0018 */ lw $ra, 0x18($sp) +/* 6FB28C 8023857C 8FB10014 */ lw $s1, 0x14($sp) +/* 6FB290 80238580 8FB00010 */ lw $s0, 0x10($sp) +/* 6FB294 80238584 24020002 */ addiu $v0, $zero, 2 +/* 6FB298 80238588 03E00008 */ jr $ra +/* 6FB29C 8023858C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238590_6FB2A0.s b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238590_6FB2A0.s new file mode 100644 index 0000000000..158527a857 --- /dev/null +++ b/ver/us/asm/nonmatchings/battle/partner/6FAD10/func_80238590_6FB2A0.s @@ -0,0 +1,51 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80238590_6FB2A0 +/* 6FB2A0 80238590 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* 6FB2A4 80238594 AFB10014 */ sw $s1, 0x14($sp) +/* 6FB2A8 80238598 0080882D */ daddu $s1, $a0, $zero +/* 6FB2AC 8023859C AFBF0018 */ sw $ra, 0x18($sp) +/* 6FB2B0 802385A0 AFB00010 */ sw $s0, 0x10($sp) +/* 6FB2B4 802385A4 8E22000C */ lw $v0, 0xc($s1) +/* 6FB2B8 802385A8 8C450000 */ lw $a1, ($v0) +/* 6FB2BC 802385AC 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) +/* 6FB2C0 802385B0 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) +/* 6FB2C4 802385B4 0C0B1EAF */ jal get_variable +/* 6FB2C8 802385B8 00000000 */ nop +/* 6FB2CC 802385BC 8E030008 */ lw $v1, 8($s0) +/* 6FB2D0 802385C0 0040282D */ daddu $a1, $v0, $zero +/* 6FB2D4 802385C4 90630006 */ lbu $v1, 6($v1) +/* 6FB2D8 802385C8 24020002 */ addiu $v0, $zero, 2 +/* 6FB2DC 802385CC 1462000E */ bne $v1, $v0, .L80238608 +/* 6FB2E0 802385D0 0000202D */ daddu $a0, $zero, $zero +/* 6FB2E4 802385D4 28A20024 */ slti $v0, $a1, 0x24 +/* 6FB2E8 802385D8 1440000B */ bnez $v0, .L80238608 +/* 6FB2EC 802385DC 24040001 */ addiu $a0, $zero, 1 +/* 6FB2F0 802385E0 28A2003D */ slti $v0, $a1, 0x3d +/* 6FB2F4 802385E4 14400008 */ bnez $v0, .L80238608 +/* 6FB2F8 802385E8 24040003 */ addiu $a0, $zero, 3 +/* 6FB2FC 802385EC 28A20051 */ slti $v0, $a1, 0x51 +/* 6FB300 802385F0 14400005 */ bnez $v0, .L80238608 +/* 6FB304 802385F4 24040005 */ addiu $a0, $zero, 5 +/* 6FB308 802385F8 28A20064 */ slti $v0, $a1, 0x64 +/* 6FB30C 802385FC 10400003 */ beqz $v0, .L8023860C +/* 6FB310 80238600 24040007 */ addiu $a0, $zero, 7 +/* 6FB314 80238604 24040006 */ addiu $a0, $zero, 6 +.L80238608: +/* 6FB318 80238608 28A20064 */ slti $v0, $a1, 0x64 +.L8023860C: +/* 6FB31C 8023860C 54400003 */ bnel $v0, $zero, .L8023861C +/* 6FB320 80238610 AE200084 */ sw $zero, 0x84($s1) +/* 6FB324 80238614 24020001 */ addiu $v0, $zero, 1 +/* 6FB328 80238618 AE220084 */ sw $v0, 0x84($s1) +.L8023861C: +/* 6FB32C 8023861C AE2400C0 */ sw $a0, 0xc0($s1) +/* 6FB330 80238620 8FBF0018 */ lw $ra, 0x18($sp) +/* 6FB334 80238624 8FB10014 */ lw $s1, 0x14($sp) +/* 6FB338 80238628 8FB00010 */ lw $s0, 0x10($sp) +/* 6FB33C 8023862C 24020002 */ addiu $v0, $zero, 2 +/* 6FB340 80238630 03E00008 */ jr $ra +/* 6FB344 80238634 27BD0020 */ addiu $sp, $sp, 0x20 +/* 6FB348 80238638 00000000 */ nop +/* 6FB34C 8023863C 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238000_6FFD80.s b/ver/us/asm/nonmatchings/battle/partner/6FFD80/func_80238000_6FFD80.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238000_6FFD80.s rename to ver/us/asm/nonmatchings/battle/partner/6FFD80/func_80238000_6FFD80.s diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238E24_700BA4.s b/ver/us/asm/nonmatchings/battle/partner/6FFD80/func_80238E24_700BA4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_80238E24_700BA4.s rename to ver/us/asm/nonmatchings/battle/partner/6FFD80/func_80238E24_700BA4.s diff --git a/ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_802390B4_700E34.s b/ver/us/asm/nonmatchings/battle/partner/6FFD80/func_802390B4_700E34.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/parakarry_6FFD80/func_802390B4_700E34.s rename to ver/us/asm/nonmatchings/battle/partner/6FFD80/func_802390B4_700E34.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238000_703AF0.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238000_703AF0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238000_703AF0.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238000_703AF0.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238370_703E60.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238370_703E60.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238370_703E60.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238370_703E60.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383C0_703EB0.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383C0_703EB0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383C0_703EB0.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383C0_703EB0.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383D4_703EC4.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383D4_703EC4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383D4_703EC4.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383D4_703EC4.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383E4_703ED4.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383E4_703ED4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383E4_703ED4.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383E4_703ED4.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383F8_703EE8.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383F8_703EE8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802383F8_703EE8.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_802383F8_703EE8.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238408_703EF8.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238408_703EF8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238408_703EF8.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238408_703EF8.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238434_703F24.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238434_703F24.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238434_703F24.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238434_703F24.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238478_703F68.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238478_703F68.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238478_703F68.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238478_703F68.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802384B0_703FA0.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_802384B0_703FA0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_802384B0_703FA0.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_802384B0_703FA0.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238570_704060.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238570_704060.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238570_704060.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238570_704060.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_8023859C_70408C.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_8023859C_70408C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_8023859C_70408C.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_8023859C_70408C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238668_704158.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238668_704158.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238668_704158.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238668_704158.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238784_704274.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238784_704274.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238784_704274.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238784_704274.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238810_704300.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238810_704300.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238810_704300.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238810_704300.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238B3C_70462C.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238B3C_70462C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238B3C_70462C.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238B3C_70462C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238C08_7046F8.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238C08_7046F8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238C08_7046F8.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238C08_7046F8.s diff --git a/ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238C84_704774.s b/ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238C84_704774.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/watt_703AF0/func_80238C84_704774.s rename to ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238C84_704774.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238000_707CA0.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238000_707CA0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238000_707CA0.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238000_707CA0.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238114_707DB4.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238114_707DB4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238114_707DB4.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238114_707DB4.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_802381EC_707E8C.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_802381EC_707E8C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_802381EC_707E8C.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_802381EC_707E8C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_802382A4_707F44.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_802382A4_707F44.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_802382A4_707F44.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_802382A4_707F44.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238328_707FC8.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238328_707FC8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238328_707FC8.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238328_707FC8.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238388_708028.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238388_708028.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238388_708028.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238388_708028.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238480_708120.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238480_708120.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238480_708120.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238480_708120.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238540_7081E0.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238540_7081E0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238540_7081E0.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238540_7081E0.s diff --git a/ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238E30_708AD0.s b/ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238E30_708AD0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/sushie_707CA0/func_80238E30_708AD0.s rename to ver/us/asm/nonmatchings/battle/partner/707CA0/func_80238E30_708AD0.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238000_70BD10.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238000_70BD10.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238000_70BD10.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238000_70BD10.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023803C_70BD4C.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023803C_70BD4C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023803C_70BD4C.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023803C_70BD4C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238A6C_70C77C.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238A6C_70C77C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238A6C_70C77C.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238A6C_70C77C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238B50_70C860.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238B50_70C860.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238B50_70C860.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238B50_70C860.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238C14_70C924.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238C14_70C924.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238C14_70C924.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238C14_70C924.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238C58_70C968.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238C58_70C968.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238C58_70C968.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238C58_70C968.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238D48_70CA58.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238D48_70CA58.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238D48_70CA58.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238D48_70CA58.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238D8C_70CA9C.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238D8C_70CA9C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80238D8C_70CA9C.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80238D8C_70CA9C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023906C_70CD7C.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023906C_70CD7C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023906C_70CD7C.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023906C_70CD7C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239140_70CE50.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80239140_70CE50.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239140_70CE50.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80239140_70CE50.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239F84_70DC94.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_80239F84_70DC94.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_80239F84_70DC94.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_80239F84_70DC94.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023A19C_70DEAC.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023A19C_70DEAC.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023A19C_70DEAC.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023A19C_70DEAC.s diff --git a/ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023A1B0_70DEC0.s b/ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023A1B0_70DEC0.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/lakilester_70BD10/func_8023A1B0_70DEC0.s rename to ver/us/asm/nonmatchings/battle/partner/70BD10/func_8023A1B0_70DEC0.s diff --git a/ver/us/asm/nonmatchings/battle/partner/bow_710EF0/func_8023808C_710F7C.s b/ver/us/asm/nonmatchings/battle/partner/710EF0/func_8023808C_710F7C.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/bow_710EF0/func_8023808C_710F7C.s rename to ver/us/asm/nonmatchings/battle/partner/710EF0/func_8023808C_710F7C.s diff --git a/ver/us/asm/nonmatchings/battle/partner/twink_714CF0/func_80238028_714D18.s b/ver/us/asm/nonmatchings/battle/partner/714CF0/func_80238028_714D18.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/partner/twink_714CF0/func_80238028_714D18.s rename to ver/us/asm/nonmatchings/battle/partner/714CF0/func_80238028_714D18.s diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1494_790564.s b/ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A1494_790564.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A1494_790564.s rename to ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A1494_790564.s diff --git a/ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A16F4_7907C4.s b/ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A16F4_7907C4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/chill_out_7900D0/func_802A16F4_7907C4.s rename to ver/us/asm/nonmatchings/battle/star/chill_out/7900D0/func_802A16F4_7907C4.s diff --git a/ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1494_78A2F4.s b/ver/us/asm/nonmatchings/battle/star/focus/789E60/func_802A1494_78A2F4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/focus_789E60/func_802A1494_78A2F4.s rename to ver/us/asm/nonmatchings/battle/star/focus/789E60/func_802A1494_78A2F4.s diff --git a/ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1494_78D5E4.s b/ver/us/asm/nonmatchings/battle/star/lullaby/78D150/func_802A1494_78D5E4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/lullaby_78D150/func_802A1494_78D5E4.s rename to ver/us/asm/nonmatchings/battle/star/lullaby/78D150/func_802A1494_78D5E4.s diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1494_799C44.s b/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1494_799C44.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1494_799C44.s rename to ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1494_799C44.s diff --git a/ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s b/ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/peach_beam_7997B0/func_802A1518_799CC8.s rename to ver/us/asm/nonmatchings/battle/star/peach_beam/7997B0/func_802A1518_799CC8.s diff --git a/ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1494_79DD34.s b/ver/us/asm/nonmatchings/battle/star/peach_dash/79D8A0/func_802A1494_79DD34.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/peach_dash_79D8A0/func_802A1494_79DD34.s rename to ver/us/asm/nonmatchings/battle/star/peach_dash/79D8A0/func_802A1494_79DD34.s diff --git a/ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1494_79C434.s b/ver/us/asm/nonmatchings/battle/star/peach_focus/79BFA0/func_802A1494_79C434.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/peach_focus_79BFA0/func_802A1494_79C434.s rename to ver/us/asm/nonmatchings/battle/star/peach_focus/79BFA0/func_802A1494_79C434.s diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1494_78BA94.s b/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1494_78BA94.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1494_78BA94.s rename to ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1494_78BA94.s diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1518_78BB18.s b/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1518_78BB18.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A1518_78BB18.s rename to ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A1518_78BB18.s diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A18E8_78BEE8.s b/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A18E8_78BEE8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A18E8_78BEE8.s rename to ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A18E8_78BEE8.s diff --git a/ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A19A8_78BFA8.s b/ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A19A8_78BFA8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/refresh_78B600/func_802A19A8_78BFA8.s rename to ver/us/asm/nonmatchings/battle/star/refresh/78B600/func_802A19A8_78BFA8.s diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1494_792224.s b/ver/us/asm/nonmatchings/battle/star/smooch/791D90/func_802A1494_792224.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A1494_792224.s rename to ver/us/asm/nonmatchings/battle/star/smooch/791D90/func_802A1494_792224.s diff --git a/ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A156C_7922FC.s b/ver/us/asm/nonmatchings/battle/star/smooch/791D90/func_802A156C_7922FC.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/smooch_791D90/func_802A156C_7922FC.s rename to ver/us/asm/nonmatchings/battle/star/smooch/791D90/func_802A156C_7922FC.s diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1494_797454.s b/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1494_797454.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1494_797454.s rename to ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1494_797454.s diff --git a/ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s b/ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/star_beam_796FC0/func_802A1518_7974D8.s rename to ver/us/asm/nonmatchings/battle/star/star_beam/796FC0/func_802A1518_7974D8.s diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1494_78EC64.s b/ver/us/asm/nonmatchings/battle/star/star_storm/78E7D0/func_802A1494_78EC64.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1494_78EC64.s rename to ver/us/asm/nonmatchings/battle/star/star_storm/78E7D0/func_802A1494_78EC64.s diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1518_78ECE8.s b/ver/us/asm/nonmatchings/battle/star/star_storm/78E7D0/func_802A1518_78ECE8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1518_78ECE8.s rename to ver/us/asm/nonmatchings/battle/star/star_storm/78E7D0/func_802A1518_78ECE8.s diff --git a/ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1628_78EDF8.s b/ver/us/asm/nonmatchings/battle/star/star_storm/78E7D0/func_802A1628_78EDF8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/star_storm_78E7D0/func_802A1628_78EDF8.s rename to ver/us/asm/nonmatchings/battle/star/star_storm/78E7D0/func_802A1628_78EDF8.s diff --git a/ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1494_7941B4.s b/ver/us/asm/nonmatchings/battle/star/time_out/793D20/func_802A1494_7941B4.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/time_out_793D20/func_802A1494_7941B4.s rename to ver/us/asm/nonmatchings/battle/star/time_out/793D20/func_802A1494_7941B4.s diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1494_795774.s b/ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A1494_795774.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1494_795774.s rename to ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A1494_795774.s diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1518_7957F8.s b/ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A1518_7957F8.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1518_7957F8.s rename to ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A1518_7957F8.s diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A15B4_795894.s b/ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A15B4_795894.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A15B4_795894.s rename to ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A15B4_795894.s diff --git a/ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1628_795908.s b/ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A1628_795908.s similarity index 100% rename from ver/us/asm/nonmatchings/battle/star/up_and_away_7952E0/func_802A1628_795908.s rename to ver/us/asm/nonmatchings/battle/star/up_and_away/7952E0/func_802A1628_795908.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s b/ver/us/asm/nonmatchings/cd180_len_38f0/_render_transition_stencil.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/_render_transition_stencil.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/_render_transition_stencil.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/clear_transition_stencil.s b/ver/us/asm/nonmatchings/cd180_len_38f0/clear_transition_stencil.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/clear_transition_stencil.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/clear_transition_stencil.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s b/ver/us/asm/nonmatchings/cd180_len_38f0/func_80137DC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/func_80137DC0.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/func_80137DC0.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s b/ver/us/asm/nonmatchings/cd180_len_38f0/func_80138188.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/func_80138188.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/func_80138188.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s b/ver/us/asm/nonmatchings/cd180_len_38f0/func_801382AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801382AC.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/func_801382AC.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s b/ver/us/asm/nonmatchings/cd180_len_38f0/func_801385D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/func_801385D4.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/func_801385D4.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_lower.s b/ver/us/asm/nonmatchings/cd180_len_38f0/render_transition_stencil_lower.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_lower.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/render_transition_stencil_lower.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_upper.s b/ver/us/asm/nonmatchings/cd180_len_38f0/render_transition_stencil_upper.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/render_transition_stencil_upper.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/render_transition_stencil_upper.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/set_map_transition_effect.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_map_transition_effect.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/set_map_transition_effect.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/set_map_transition_effect.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_alpha.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_alpha.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_alpha.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_alpha.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_center.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_center.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center_worldpos.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_center_worldpos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_center_worldpos.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_center_worldpos.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_color.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_color.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_color.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_color.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_0.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_zoom_0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_0.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_zoom_0.s diff --git a/ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_1.s b/ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_zoom_1.s similarity index 100% rename from ver/us/asm/nonmatchings/code_cd180_len_38f0/set_transition_stencil_zoom_1.s rename to ver/us/asm/nonmatchings/cd180_len_38f0/set_transition_stencil_zoom_1.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CFB4.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CFB4.s deleted file mode 100644 index ed90a84458..0000000000 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CFB4.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8003CFB4 -/* 183B4 8003CFB4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 183B8 8003CFB8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 183BC 8003CFBC 4486D000 */ mtc1 $a2, $f26 -/* 183C0 8003CFC0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 183C4 8003CFC4 46006606 */ mov.s $f24, $f12 -/* 183C8 8003CFC8 AFB20018 */ sw $s2, 0x18($sp) -/* 183CC 8003CFCC 0000902D */ daddu $s2, $zero, $zero -/* 183D0 8003CFD0 AFB10014 */ sw $s1, 0x14($sp) -/* 183D4 8003CFD4 0240882D */ daddu $s1, $s2, $zero -/* 183D8 8003CFD8 AFB40020 */ sw $s4, 0x20($sp) -/* 183DC 8003CFDC 3C140400 */ lui $s4, 0x400 -/* 183E0 8003CFE0 AFB3001C */ sw $s3, 0x1c($sp) -/* 183E4 8003CFE4 3C138000 */ lui $s3, 0x8000 -/* 183E8 8003CFE8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 183EC 8003CFEC 4487A000 */ mtc1 $a3, $f20 -/* 183F0 8003CFF0 36730004 */ ori $s3, $s3, 4 -/* 183F4 8003CFF4 AFBF0024 */ sw $ra, 0x24($sp) -/* 183F8 8003CFF8 AFB00010 */ sw $s0, 0x10($sp) -/* 183FC 8003CFFC F7B60030 */ sdc1 $f22, 0x30($sp) -/* 18400 8003D000 4600A586 */ mov.s $f22, $f20 -.L8003D004: -/* 18404 8003D004 3C03800A */ lui $v1, %hi(gCurrentNpcListPtr) -/* 18408 8003D008 8C630B90 */ lw $v1, %lo(gCurrentNpcListPtr)($v1) -/* 1840C 8003D00C 00111080 */ sll $v0, $s1, 2 -/* 18410 8003D010 00431021 */ addu $v0, $v0, $v1 -/* 18414 8003D014 8C500000 */ lw $s0, ($v0) -/* 18418 8003D018 5200001B */ beql $s0, $zero, .L8003D088 -/* 1841C 8003D01C 26310001 */ addiu $s1, $s1, 1 -/* 18420 8003D020 8E030000 */ lw $v1, ($s0) -/* 18424 8003D024 50600018 */ beql $v1, $zero, .L8003D088 -/* 18428 8003D028 26310001 */ addiu $s1, $s1, 1 -/* 1842C 8003D02C 00741024 */ and $v0, $v1, $s4 -/* 18430 8003D030 54400015 */ bnel $v0, $zero, .L8003D088 -/* 18434 8003D034 26310001 */ addiu $s1, $s1, 1 -/* 18438 8003D038 00731024 */ and $v0, $v1, $s3 -/* 1843C 8003D03C 54400012 */ bnel $v0, $zero, .L8003D088 -/* 18440 8003D040 26310001 */ addiu $s1, $s1, 1 -/* 18444 8003D044 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 18448 8003D048 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 1844C 8003D04C 4406C000 */ mfc1 $a2, $f24 -/* 18450 8003D050 4407D000 */ mfc1 $a3, $f26 -/* 18454 8003D054 0C00A7B5 */ jal dist2D -/* 18458 8003D058 00000000 */ nop -/* 1845C 8003D05C 46000005 */ abs.s $f0, $f0 -/* 18460 8003D060 4616003E */ c.le.s $f0, $f22 -/* 18464 8003D064 00000000 */ nop -/* 18468 8003D068 45000007 */ bc1f .L8003D088 -/* 1846C 8003D06C 26310001 */ addiu $s1, $s1, 1 -/* 18470 8003D070 4614003C */ c.lt.s $f0, $f20 -/* 18474 8003D074 00000000 */ nop -/* 18478 8003D078 45000003 */ bc1f .L8003D088 -/* 1847C 8003D07C 00000000 */ nop -/* 18480 8003D080 46000506 */ mov.s $f20, $f0 -/* 18484 8003D084 0200902D */ daddu $s2, $s0, $zero -.L8003D088: -/* 18488 8003D088 2A220040 */ slti $v0, $s1, 0x40 -/* 1848C 8003D08C 1440FFDD */ bnez $v0, .L8003D004 -/* 18490 8003D090 0240102D */ daddu $v0, $s2, $zero -/* 18494 8003D094 8FBF0024 */ lw $ra, 0x24($sp) -/* 18498 8003D098 8FB40020 */ lw $s4, 0x20($sp) -/* 1849C 8003D09C 8FB3001C */ lw $s3, 0x1c($sp) -/* 184A0 8003D0A0 8FB20018 */ lw $s2, 0x18($sp) -/* 184A4 8003D0A4 8FB10014 */ lw $s1, 0x14($sp) -/* 184A8 8003D0A8 8FB00010 */ lw $s0, 0x10($sp) -/* 184AC 8003D0AC D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 184B0 8003D0B0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 184B4 8003D0B4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 184B8 8003D0B8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 184BC 8003D0BC 03E00008 */ jr $ra -/* 184C0 8003D0C0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D0C4.s b/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D0C4.s deleted file mode 100644 index 60adde59ab..0000000000 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D0C4.s +++ /dev/null @@ -1,74 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8003D0C4 -/* 184C4 8003D0C4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 184C8 8003D0C8 F7BA0040 */ sdc1 $f26, 0x40($sp) -/* 184CC 8003D0CC 4486D000 */ mtc1 $a2, $f26 -/* 184D0 8003D0D0 F7B80038 */ sdc1 $f24, 0x38($sp) -/* 184D4 8003D0D4 46006606 */ mov.s $f24, $f12 -/* 184D8 8003D0D8 AFB20018 */ sw $s2, 0x18($sp) -/* 184DC 8003D0DC 0000902D */ daddu $s2, $zero, $zero -/* 184E0 8003D0E0 AFB10014 */ sw $s1, 0x14($sp) -/* 184E4 8003D0E4 0240882D */ daddu $s1, $s2, $zero -/* 184E8 8003D0E8 AFB40020 */ sw $s4, 0x20($sp) -/* 184EC 8003D0EC 3C140400 */ lui $s4, 0x400 -/* 184F0 8003D0F0 AFB3001C */ sw $s3, 0x1c($sp) -/* 184F4 8003D0F4 3C138000 */ lui $s3, 0x8000 -/* 184F8 8003D0F8 F7B40028 */ sdc1 $f20, 0x28($sp) -/* 184FC 8003D0FC 4487A000 */ mtc1 $a3, $f20 -/* 18500 8003D100 36730004 */ ori $s3, $s3, 4 -/* 18504 8003D104 AFBF0024 */ sw $ra, 0x24($sp) -/* 18508 8003D108 AFB00010 */ sw $s0, 0x10($sp) -/* 1850C 8003D10C F7B60030 */ sdc1 $f22, 0x30($sp) -/* 18510 8003D110 4600A586 */ mov.s $f22, $f20 -.L8003D114: -/* 18514 8003D114 3C03800A */ lui $v1, %hi(gCurrentNpcListPtr) -/* 18518 8003D118 8C630B90 */ lw $v1, %lo(gCurrentNpcListPtr)($v1) -/* 1851C 8003D11C 00111080 */ sll $v0, $s1, 2 -/* 18520 8003D120 00431021 */ addu $v0, $v0, $v1 -/* 18524 8003D124 8C500000 */ lw $s0, ($v0) -/* 18528 8003D128 5200001B */ beql $s0, $zero, .L8003D198 -/* 1852C 8003D12C 26310001 */ addiu $s1, $s1, 1 -/* 18530 8003D130 8E030000 */ lw $v1, ($s0) -/* 18534 8003D134 50600018 */ beql $v1, $zero, .L8003D198 -/* 18538 8003D138 26310001 */ addiu $s1, $s1, 1 -/* 1853C 8003D13C 00741024 */ and $v0, $v1, $s4 -/* 18540 8003D140 50400015 */ beql $v0, $zero, .L8003D198 -/* 18544 8003D144 26310001 */ addiu $s1, $s1, 1 -/* 18548 8003D148 00731024 */ and $v0, $v1, $s3 -/* 1854C 8003D14C 54400012 */ bnel $v0, $zero, .L8003D198 -/* 18550 8003D150 26310001 */ addiu $s1, $s1, 1 -/* 18554 8003D154 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 18558 8003D158 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 1855C 8003D15C 4406C000 */ mfc1 $a2, $f24 -/* 18560 8003D160 4407D000 */ mfc1 $a3, $f26 -/* 18564 8003D164 0C00A7B5 */ jal dist2D -/* 18568 8003D168 00000000 */ nop -/* 1856C 8003D16C 46000005 */ abs.s $f0, $f0 -/* 18570 8003D170 4616003E */ c.le.s $f0, $f22 -/* 18574 8003D174 00000000 */ nop -/* 18578 8003D178 45000007 */ bc1f .L8003D198 -/* 1857C 8003D17C 26310001 */ addiu $s1, $s1, 1 -/* 18580 8003D180 4614003C */ c.lt.s $f0, $f20 -/* 18584 8003D184 00000000 */ nop -/* 18588 8003D188 45000003 */ bc1f .L8003D198 -/* 1858C 8003D18C 00000000 */ nop -/* 18590 8003D190 46000506 */ mov.s $f20, $f0 -/* 18594 8003D194 0200902D */ daddu $s2, $s0, $zero -.L8003D198: -/* 18598 8003D198 2A220040 */ slti $v0, $s1, 0x40 -/* 1859C 8003D19C 1440FFDD */ bnez $v0, .L8003D114 -/* 185A0 8003D1A0 0240102D */ daddu $v0, $s2, $zero -/* 185A4 8003D1A4 8FBF0024 */ lw $ra, 0x24($sp) -/* 185A8 8003D1A8 8FB40020 */ lw $s4, 0x20($sp) -/* 185AC 8003D1AC 8FB3001C */ lw $s3, 0x1c($sp) -/* 185B0 8003D1B0 8FB20018 */ lw $s2, 0x18($sp) -/* 185B4 8003D1B4 8FB10014 */ lw $s1, 0x14($sp) -/* 185B8 8003D1B8 8FB00010 */ lw $s0, 0x10($sp) -/* 185BC 8003D1BC D7BA0040 */ ldc1 $f26, 0x40($sp) -/* 185C0 8003D1C0 D7B80038 */ ldc1 $f24, 0x38($sp) -/* 185C4 8003D1C4 D7B60030 */ ldc1 $f22, 0x30($sp) -/* 185C8 8003D1C8 D7B40028 */ ldc1 $f20, 0x28($sp) -/* 185CC 8003D1CC 03E00008 */ jr $ra -/* 185D0 8003D1D0 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A370.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A370.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A370.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A370.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A37C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A37C.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A37C.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A4D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A4D0.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A610.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A610.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A650.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A650.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A6E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A6E8.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A704.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A704.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A888.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A888.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A888.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A888.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A8E0.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A8E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A8E0.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A8E0.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A920.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A920.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A920.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A920.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A93C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A93C.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9C8.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A9C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9C8.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A9C8.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A9E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013A9E8.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013AA9C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013AA9C.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013AF20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013AF20.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013AF70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013AF70.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013B0EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013B0EC.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013B1B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013B1B0.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013BC88.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013BC88.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013C048.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013C048.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013C220.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013C220.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013C3F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013C3F0.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013CFA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013CFA8.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013DAB4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013DAB4.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013E2F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013E2F0.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013E904.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013E904.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE48.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013EE48.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE48.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013EE48.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013EE68.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013EE68.s diff --git a/ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s b/ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013F1F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s rename to ver/us/asm/nonmatchings/d0a70_len_4fe0/func_8013F1F8.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/clear_icon_flags.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/clear_icon_flags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/clear_icon_flags.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/clear_icon_flags.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/create_icon.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/create_icon.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_0.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_icon_0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_0.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_icon_0.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_1.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_icon_1.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_1.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_icon_1.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_2.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_icon_2.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_icon_2.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_icon_2.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_menu_icon.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/draw_menu_icon.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/free_icon.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/free_icon.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_8013F350.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_8013F350.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_8013F704.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_8013F704.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80141100.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80141100.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801413F8.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801413F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801413F8.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801413F8.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80141704.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80141704.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80142210.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80142210.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_8014271C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_8014271C.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80143C48.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144218.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144218.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144218.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144218.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144238.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144238.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144238.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144238.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144258.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144258.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144258.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144258.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144278.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144278.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144278.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144278.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801449DC.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801449DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801449DC.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801449DC.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144A5C.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144A5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144A5C.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144A5C.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144C20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144C20.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144DF4.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144DF4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144DF4.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144DF4.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144E4C.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144E4C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144E4C.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144E4C.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144E74.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144E74.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144E74.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144E74.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144F28.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144F28.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144F28.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144F28.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144FD8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80144FD8.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145070.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145070.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145070.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145070.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145108.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145108.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145184.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145184.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801451D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801451D4.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145224.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145224.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145274.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_80145274.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801452B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801452B4.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801452E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/func_801452E8.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/get_icon_render_pos.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/get_icon_render_pos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/get_icon_render_pos.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/get_icon_render_pos.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/get_menu_icon.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/get_menu_icon.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon_script.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/get_menu_icon_script.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/get_menu_icon_script.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/get_menu_icon_script.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_opacity.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/icon_set_opacity.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_opacity.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/icon_set_opacity.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_tint.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/icon_set_tint.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_tint.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/icon_set_tint.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/init_menu_icon_list.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/init_menu_icon_list.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_menu_icon.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/render_menu_icon.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/render_menu_icons.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/render_menu_icons.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_flags.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_icon_flags.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_flags.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/set_icon_flags.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_render_pos.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_icon_render_pos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/set_icon_render_pos.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/set_icon_render_pos.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/set_menu_icon_script.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/set_menu_icon_script.s diff --git a/ver/us/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s b/ver/us/asm/nonmatchings/d5a50_len_5fd0/update_menu_icons.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s rename to ver/us/asm/nonmatchings/d5a50_len_5fd0/update_menu_icons.s diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/create_camera_lead_player_mtx.s b/ver/us/asm/nonmatchings/d610_len_1330/create_camera_lead_player_mtx.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d610_len_1330/create_camera_lead_player_mtx.s rename to ver/us/asm/nonmatchings/d610_len_1330/create_camera_lead_player_mtx.s diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/func_80032210.s b/ver/us/asm/nonmatchings/d610_len_1330/func_80032210.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d610_len_1330/func_80032210.s rename to ver/us/asm/nonmatchings/d610_len_1330/func_80032210.s diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/func_800322DC.s b/ver/us/asm/nonmatchings/d610_len_1330/func_800322DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d610_len_1330/func_800322DC.s rename to ver/us/asm/nonmatchings/d610_len_1330/func_800322DC.s diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/func_800325E4.s b/ver/us/asm/nonmatchings/d610_len_1330/func_800325E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d610_len_1330/func_800325E4.s rename to ver/us/asm/nonmatchings/d610_len_1330/func_800325E4.s diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/func_800328A4.s b/ver/us/asm/nonmatchings/d610_len_1330/func_800328A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d610_len_1330/func_800328A4.s rename to ver/us/asm/nonmatchings/d610_len_1330/func_800328A4.s diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/func_80032970.s b/ver/us/asm/nonmatchings/d610_len_1330/func_80032970.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d610_len_1330/func_80032970.s rename to ver/us/asm/nonmatchings/d610_len_1330/func_80032970.s diff --git a/ver/us/asm/nonmatchings/code_d610_len_1330/func_80032C64.s b/ver/us/asm/nonmatchings/d610_len_1330/func_80032C64.s similarity index 100% rename from ver/us/asm/nonmatchings/code_d610_len_1330/func_80032C64.s rename to ver/us/asm/nonmatchings/d610_len_1330/func_80032C64.s diff --git a/ver/us/asm/nonmatchings/code_dbd70_len_700/create_trigger.s b/ver/us/asm/nonmatchings/dbd70_len_700/create_trigger.s similarity index 100% rename from ver/us/asm/nonmatchings/code_dbd70_len_700/create_trigger.s rename to ver/us/asm/nonmatchings/dbd70_len_700/create_trigger.s diff --git a/ver/us/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s b/ver/us/asm/nonmatchings/dbd70_len_700/is_trigger_bound.s similarity index 100% rename from ver/us/asm/nonmatchings/code_dbd70_len_700/is_trigger_bound.s rename to ver/us/asm/nonmatchings/dbd70_len_700/is_trigger_bound.s diff --git a/ver/us/asm/nonmatchings/code_dbd70_len_700/update_triggers.s b/ver/us/asm/nonmatchings/dbd70_len_700/update_triggers.s similarity index 100% rename from ver/us/asm/nonmatchings/code_dbd70_len_700/update_triggers.s rename to ver/us/asm/nonmatchings/dbd70_len_700/update_triggers.s diff --git a/ver/us/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s b/ver/us/asm/nonmatchings/dc470_len_14c0/enable_background_wave.s similarity index 100% rename from ver/us/asm/nonmatchings/code_dc470_len_14c0/enable_background_wave.s rename to ver/us/asm/nonmatchings/dc470_len_14c0/enable_background_wave.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/basic_hidden_window_update.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_hidden_window_update.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/basic_hidden_window_update.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/basic_window_update.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/basic_window_update.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/basic_window_update.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/main_menu_window_update.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/main_menu_window_update.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/main_menu_window_update.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/main_menu_window_update.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/render_window_root.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/render_window_root.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/render_window_root.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/render_window_root.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/render_windows.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/render_windows.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/render_windows.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/render_windows.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/set_window_properties.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/set_window_properties.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/set_window_properties.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/set_window_properties.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/set_windows_visible.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/set_windows_visible.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/set_windows_visible.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/set_windows_visible.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/setup_pause_menu_tab.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/setup_pause_menu_tab.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/setup_pause_menu_tab.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/setup_pause_menu_tab.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/update_window_hierarchy.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/update_window_hierarchy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/update_window_hierarchy.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/update_window_hierarchy.s diff --git a/ver/us/asm/nonmatchings/code_ddaf0_len_c50/update_windows.s b/ver/us/asm/nonmatchings/ddaf0_len_c50/update_windows.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ddaf0_len_c50/update_windows.s rename to ver/us/asm/nonmatchings/ddaf0_len_c50/update_windows.s diff --git a/ver/us/asm/nonmatchings/code_de740_len_23f0/appendGfx_shaded_sprite.s b/ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shaded_sprite.s similarity index 100% rename from ver/us/asm/nonmatchings/code_de740_len_23f0/appendGfx_shaded_sprite.s rename to ver/us/asm/nonmatchings/de740_len_23f0/appendGfx_shaded_sprite.s diff --git a/ver/us/asm/nonmatchings/code_de740_len_23f0/func_80148040.s b/ver/us/asm/nonmatchings/de740_len_23f0/func_80148040.s similarity index 100% rename from ver/us/asm/nonmatchings/code_de740_len_23f0/func_80148040.s rename to ver/us/asm/nonmatchings/de740_len_23f0/func_80148040.s diff --git a/ver/us/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s b/ver/us/asm/nonmatchings/de740_len_23f0/func_801480F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s rename to ver/us/asm/nonmatchings/de740_len_23f0/func_801480F0.s diff --git a/ver/us/asm/nonmatchings/code_de740_len_23f0/func_80148154.s b/ver/us/asm/nonmatchings/de740_len_23f0/func_80148154.s similarity index 100% rename from ver/us/asm/nonmatchings/code_de740_len_23f0/func_80148154.s rename to ver/us/asm/nonmatchings/de740_len_23f0/func_80148154.s diff --git a/ver/us/asm/nonmatchings/code_de740_len_23f0/render_shaded_sprite.s b/ver/us/asm/nonmatchings/de740_len_23f0/render_shaded_sprite.s similarity index 100% rename from ver/us/asm/nonmatchings/code_de740_len_23f0/render_shaded_sprite.s rename to ver/us/asm/nonmatchings/de740_len_23f0/render_shaded_sprite.s diff --git a/ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_music_settings.s b/ver/us/asm/nonmatchings/e0b30_len_b80/bgm_update_music_settings.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_music_settings.s rename to ver/us/asm/nonmatchings/e0b30_len_b80/bgm_update_music_settings.s diff --git a/ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_volume.s b/ver/us/asm/nonmatchings/e0b30_len_b80/bgm_update_volume.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e0b30_len_b80/bgm_update_volume.s rename to ver/us/asm/nonmatchings/e0b30_len_b80/bgm_update_volume.s diff --git a/ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s b/ver/us/asm/nonmatchings/e0b30_len_b80/func_8014AD40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s rename to ver/us/asm/nonmatchings/e0b30_len_b80/func_8014AD40.s diff --git a/ver/us/asm/nonmatchings/code_e20eb0/func_802B70B4.s b/ver/us/asm/nonmatchings/e20eb0/func_802B70B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e20eb0/func_802B70B4.s rename to ver/us/asm/nonmatchings/e20eb0/func_802B70B4.s diff --git a/ver/us/asm/nonmatchings/code_e20eb0/func_802B71C8.s b/ver/us/asm/nonmatchings/e20eb0/func_802B71C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e20eb0/func_802B71C8.s rename to ver/us/asm/nonmatchings/e20eb0/func_802B71C8.s diff --git a/ver/us/asm/nonmatchings/code_e20eb0/func_802B742C.s b/ver/us/asm/nonmatchings/e20eb0/func_802B742C.s similarity index 99% rename from ver/us/asm/nonmatchings/code_e20eb0/func_802B742C.s rename to ver/us/asm/nonmatchings/e20eb0/func_802B742C.s index 5f1222a852..428202803b 100644 --- a/ver/us/asm/nonmatchings/code_e20eb0/func_802B742C.s +++ b/ver/us/asm/nonmatchings/e20eb0/func_802B742C.s @@ -170,7 +170,7 @@ glabel func_802B742C /* E2151C 802B766C 080ADDBE */ j .L802B76F8 /* E21520 802B7670 AE020004 */ sw $v0, 4($s0) .L802B7674: -/* E21524 802B7674 0C0ADC00 */ jal code_e20eb0_UnkAngleFunc1 +/* E21524 802B7674 0C0ADC00 */ jal e20eb0_UnkAngleFunc1 /* E21528 802B7678 00000000 */ nop /* E2152C 802B767C 0040302D */ daddu $a2, $v0, $zero .L802B7680: diff --git a/ver/us/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s b/ver/us/asm/nonmatchings/e79b0_len_1920/func_802C39F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e79b0_len_1920/func_802C39F8.s rename to ver/us/asm/nonmatchings/e79b0_len_1920/func_802C39F8.s diff --git a/ver/us/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s b/ver/us/asm/nonmatchings/e79b0_len_1920/func_802C3EE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e79b0_len_1920/func_802C3EE4.s rename to ver/us/asm/nonmatchings/e79b0_len_1920/func_802C3EE4.s diff --git a/ver/us/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s b/ver/us/asm/nonmatchings/e79b0_len_1920/start_child_script.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e79b0_len_1920/start_child_script.s rename to ver/us/asm/nonmatchings/e79b0_len_1920/start_child_script.s diff --git a/ver/us/asm/nonmatchings/code_e79b0_len_1920/start_script.s b/ver/us/asm/nonmatchings/e79b0_len_1920/start_script.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e79b0_len_1920/start_script.s rename to ver/us/asm/nonmatchings/e79b0_len_1920/start_script.s diff --git a/ver/us/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s b/ver/us/asm/nonmatchings/e79b0_len_1920/update_scripts.s similarity index 100% rename from ver/us/asm/nonmatchings/code_e79b0_len_1920/update_scripts.s rename to ver/us/asm/nonmatchings/e79b0_len_1920/update_scripts.s diff --git a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/ver/us/asm/nonmatchings/ebd0_len_6a0/func_80033BC0.s similarity index 99% rename from ver/us/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s rename to ver/us/asm/nonmatchings/ebd0_len_6a0/func_80033BC0.s index 6b62b74860..f59f21201a 100644 --- a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s +++ b/ver/us/asm/nonmatchings/ebd0_len_6a0/func_80033BC0.s @@ -83,7 +83,7 @@ glabel func_80033BC0 /* F0F8 80033CF8 00000000 */ nop /* F0FC 80033CFC 0C0B0CBB */ jal init_script_list /* F100 80033D00 00000000 */ nop -/* F104 80033D04 0C00E14B */ jal init_npc_list +/* F104 80033D04 0C00E14B */ jal npc_list_update_current /* F108 80033D08 00000000 */ nop /* F10C 80033D0C 0C044396 */ jal func_80110E58 /* F110 80033D10 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s b/ver/us/asm/nonmatchings/ebd0_len_6a0/step_battle.s similarity index 98% rename from ver/us/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s rename to ver/us/asm/nonmatchings/ebd0_len_6a0/step_battle.s index a3bb0cd3ea..d242ca8691 100644 --- a/ver/us/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s +++ b/ver/us/asm/nonmatchings/ebd0_len_6a0/step_battle.s @@ -102,7 +102,7 @@ glabel step_battle /* EE58 80033A58 00000000 */ nop /* EE5C 80033A5C 0C0B0C77 */ jal clear_script_list /* EE60 80033A60 00000000 */ nop -/* EE64 80033A64 0C00E12F */ jal clear_npcs +/* EE64 80033A64 0C00E12F */ jal npc_list_clear /* EE68 80033A68 00000000 */ nop /* EE6C 80033A6C 0C04432E */ jal clear_entity_data /* EE70 80033A70 24040001 */ addiu $a0, $zero, 1 @@ -149,7 +149,7 @@ glabel step_battle /* EF10 80033B10 00000000 */ nop /* EF14 80033B14 0C08F90E */ jal update_battle_state /* EF18 80033B18 00000000 */ nop -/* EF1C 80033B1C 0C00E64C */ jal update_npcs +/* EF1C 80033B1C 0C00E64C */ jal npc_list_update /* EF20 80033B20 00000000 */ nop /* EF24 80033B24 0C04C7BB */ jal update_item_entities /* EF28 80033B28 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s b/ver/us/asm/nonmatchings/ef070_len_3400/AdjustCam.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/AdjustCam.s rename to ver/us/asm/nonmatchings/ef070_len_3400/AdjustCam.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/LoadSettings.s b/ver/us/asm/nonmatchings/ef070_len_3400/LoadSettings.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/LoadSettings.s rename to ver/us/asm/nonmatchings/ef070_len_3400/LoadSettings.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/ResetCam.s b/ver/us/asm/nonmatchings/ef070_len_3400/ResetCam.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/ResetCam.s rename to ver/us/asm/nonmatchings/ef070_len_3400/ResetCam.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s b/ver/us/asm/nonmatchings/ef070_len_3400/SetCamProperties.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/SetCamProperties.s rename to ver/us/asm/nonmatchings/ef070_len_3400/SetCamProperties.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s b/ver/us/asm/nonmatchings/ef070_len_3400/ShakeCam.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/ShakeCam.s rename to ver/us/asm/nonmatchings/ef070_len_3400/ShakeCam.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/UseSettingsFrom.s b/ver/us/asm/nonmatchings/ef070_len_3400/UseSettingsFrom.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/UseSettingsFrom.s rename to ver/us/asm/nonmatchings/ef070_len_3400/UseSettingsFrom.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s b/ver/us/asm/nonmatchings/ef070_len_3400/draw_anim_models.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s rename to ver/us/asm/nonmatchings/ef070_len_3400/draw_anim_models.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CB008.s b/ver/us/asm/nonmatchings/ef070_len_3400/func_802CB008.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CB008.s rename to ver/us/asm/nonmatchings/ef070_len_3400/func_802CB008.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s b/ver/us/asm/nonmatchings/ef070_len_3400/func_802CD4B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s rename to ver/us/asm/nonmatchings/ef070_len_3400/func_802CD4B4.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD5C0.s b/ver/us/asm/nonmatchings/ef070_len_3400/func_802CD5C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD5C0.s rename to ver/us/asm/nonmatchings/ef070_len_3400/func_802CD5C0.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD6E0.s b/ver/us/asm/nonmatchings/ef070_len_3400/func_802CD6E0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD6E0.s rename to ver/us/asm/nonmatchings/ef070_len_3400/func_802CD6E0.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD7D8.s b/ver/us/asm/nonmatchings/ef070_len_3400/func_802CD7D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD7D8.s rename to ver/us/asm/nonmatchings/ef070_len_3400/func_802CD7D8.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD8F8.s b/ver/us/asm/nonmatchings/ef070_len_3400/func_802CD8F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD8F8.s rename to ver/us/asm/nonmatchings/ef070_len_3400/func_802CD8F8.s diff --git a/ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s b/ver/us/asm/nonmatchings/ef070_len_3400/func_802CD9F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s rename to ver/us/asm/nonmatchings/ef070_len_3400/func_802CD9F0.s diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BAE00_E2B530.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BAE00_E2B530.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2B530/func_802BAE00_E2B530.s rename to ver/us/asm/nonmatchings/entity/default/E2B530/func_802BAE00_E2B530.s diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB044_E2B774.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s rename to ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB044_E2B774.s diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s rename to ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB1E8_E2B918.s diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BB62C_E2BD5C.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB62C_E2BD5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2B530/func_802BB62C_E2BD5C.s rename to ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB62C_E2BD5C.s diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BB664_E2BD94.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB664_E2BD94.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2B530/func_802BB664_E2BD94.s rename to ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB664_E2BD94.s diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BB69C_E2BDCC.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB69C_E2BDCC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2B530/func_802BB69C_E2BDCC.s rename to ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB69C_E2BDCC.s diff --git a/ver/us/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s b/ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB6D4_E2BE04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s rename to ver/us/asm/nonmatchings/entity/default/E2B530/func_802BB6D4_E2BE04.s diff --git a/ver/us/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB710_E2BE40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2BE40/func_802BB710_E2BE40.s rename to ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB710_E2BE40.s diff --git a/ver/us/asm/nonmatchings/code_E2BE40/func_802BB870_E2BFA0.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB870_E2BFA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2BE40/func_802BB870_E2BFA0.s rename to ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB870_E2BFA0.s diff --git a/ver/us/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB8A4_E2BFD4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2BE40/func_802BB8A4_E2BFD4.s rename to ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BB8A4_E2BFD4.s diff --git a/ver/us/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BBE3C_E2C56C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2BE40/func_802BBE3C_E2C56C.s rename to ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BBE3C_E2C56C.s diff --git a/ver/us/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC148_E2C878.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2BE40/func_802BC148_E2C878.s rename to ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC148_E2C878.s diff --git a/ver/us/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s b/ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC1A8_E2C8D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2BE40/func_802BC1A8_E2C8D8.s rename to ver/us/asm/nonmatchings/entity/default/E2BE40/func_802BC1A8_E2C8D8.s diff --git a/ver/us/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC200_E2C930.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2C930/func_802BC200_E2C930.s rename to ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC200_E2C930.s diff --git a/ver/us/asm/nonmatchings/code_E2C930/func_802BC3A8_E2CAD8.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3A8_E2CAD8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2C930/func_802BC3A8_E2CAD8.s rename to ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3A8_E2CAD8.s diff --git a/ver/us/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3DC_E2CB0C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2C930/func_802BC3DC_E2CB0C.s rename to ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC3DC_E2CB0C.s diff --git a/ver/us/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC974_E2D0A4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2C930/func_802BC974_E2D0A4.s rename to ver/us/asm/nonmatchings/entity/default/E2C930/func_802BC974_E2D0A4.s diff --git a/ver/us/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s b/ver/us/asm/nonmatchings/entity/default/E2C930/func_802BCC80_E2D3B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2C930/func_802BCC80_E2D3B0.s rename to ver/us/asm/nonmatchings/entity/default/E2C930/func_802BCC80_E2D3B0.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BAE00_E2D730.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BAE00_E2D730.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BAE00_E2D730.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BAE00_E2D730.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB000_E2D930.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB000_E2D930.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB000_E2D930.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB0A0_E2D9D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB0A0_E2D9D0.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB0A0_E2D9D0.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB228_E2DB58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB228_E2DB58.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB228_E2DB58.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB298_E2DBC8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB298_E2DBC8.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB298_E2DBC8.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB314_E2DC44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB314_E2DC44.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB314_E2DC44.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB34C_E2DC7C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB34C_E2DC7C.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB34C_E2DC7C.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB374_E2DCA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB374_E2DCA4.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB374_E2DCA4.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB648_E2DF78.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB648_E2DF78.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB648_E2DF78.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB6E0_E2E010.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB6E0_E2E010.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB6E0_E2E010.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB6E0_E2E010.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB778_E2E0A8.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB778_E2E0A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB778_E2E0A8.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB778_E2E0A8.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB78C_E2E0BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB78C_E2E0BC.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB78C_E2E0BC.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB8D4_E2E204.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB8D4_E2E204.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB8D4_E2E204.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB98C_E2E2BC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB98C_E2E2BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB98C_E2E2BC.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB98C_E2E2BC.s diff --git a/ver/us/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2D730/func_802BB9E0_E2E310.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2D730/func_802BB9E0_E2E310.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBCC0_E2E5F0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BBCC0_E2E5F0.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBCC0_E2E5F0.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD1C_E2E64C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BBD1C_E2E64C.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD1C_E2E64C.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD78_E2E6A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BBD78_E2E6A8.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBD78_E2E6A8.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBE8C_E2E7BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BBE8C_E2E7BC.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BBE8C_E2E7BC.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC00C_E2E93C.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC00C_E2E93C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC00C_E2E93C.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC00C_E2E93C.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC050_E2E980.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC050_E2E980.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC050_E2E980.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0B8_E2E9E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC0B8_E2E9E8.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0B8_E2E9E8.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0F0_E2EA20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC0F0_E2EA20.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC0F0_E2EA20.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC17C_E2EAAC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC17C_E2EAAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC17C_E2EAAC.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC17C_E2EAAC.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC1D0_E2EB00.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC1D0_E2EB00.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC1D0_E2EB00.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC220_E2EB50.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC220_E2EB50.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC220_E2EB50.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC220_E2EB50.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC250_E2EB80.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC250_E2EB80.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC250_E2EB80.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC274_E2EBA4.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC274_E2EBA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC274_E2EBA4.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC274_E2EBA4.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC2B4_E2EBE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC2B4_E2EBE4.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC2B4_E2EBE4.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC308_E2EC38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC308_E2EC38.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC308_E2EC38.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC32C_E2EC5C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC32C_E2EC5C.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC32C_E2EC5C.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC358_E2EC88.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC358_E2EC88.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC358_E2EC88.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC37C_E2ECAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC37C_E2ECAC.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC37C_E2ECAC.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC3A0_E2ECD0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3A0_E2ECD0.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC3A0_E2ECD0.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3CC_E2ECFC.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC3CC_E2ECFC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3CC_E2ECFC.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC3CC_E2ECFC.s diff --git a/ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC3E4_E2ED14.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2E5F0/func_802BC3E4_E2ED14.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2E5F0/func_802BC3E4_E2ED14.s diff --git a/ver/us/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC4B0_E2EDE0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2EDE0/func_802BC4B0_E2EDE0.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC4B0_E2EDE0.s diff --git a/ver/us/asm/nonmatchings/code_E2EDE0/func_802BC630_E2EF60.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC630_E2EF60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2EDE0/func_802BC630_E2EF60.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC630_E2EF60.s diff --git a/ver/us/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s b/ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC658_E2EF88.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2EDE0/func_802BC658_E2EF88.s rename to ver/us/asm/nonmatchings/entity/jan_iwa/E2EDE0/func_802BC658_E2EF88.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BAE00_E2F750.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAE00_E2F750.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BAE00_E2F750.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAE00_E2F750.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BAF84_E2F8D4.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAF84_E2F8D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BAF84_E2F8D4.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BAF84_E2F8D4.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BB108_E2FA58.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB108_E2FA58.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BB108_E2FA58.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB108_E2FA58.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BB3B8_E2FD08.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB3B8_E2FD08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BB3B8_E2FD08.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB3B8_E2FD08.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB704_E30054.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB704_E30054.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB76C_E300BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB76C_E300BC.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BB7E0_E30130.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB7E0_E30130.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BB7E0_E30130.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB7E0_E30130.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB8E4_E30234.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BB8E4_E30234.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s similarity index 99% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s index 8c8606c861..e9a96e4db7 100644 --- a/ver/us/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s +++ b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBA60_E303B0.s @@ -185,7 +185,7 @@ glabel func_802BBA60_E303B0 /* E30630 802BBCE0 C62C0048 */ lwc1 $f12, 0x48($s1) /* E30634 802BBCE4 C62E004C */ lwc1 $f14, 0x4c($s1) /* E30638 802BBCE8 8E260050 */ lw $a2, 0x50($s1) -/* E3063C 802BBCEC 0C00F431 */ jal func_8003D0C4 +/* E3063C 802BBCEC 0C00F431 */ jal npc_find_near_simple /* E30640 802BBCF0 3C074248 */ lui $a3, 0x4248 /* E30644 802BBCF4 10400007 */ beqz $v0, .L802BBD14 /* E30648 802BBCF8 3C030400 */ lui $v1, 0x400 diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBDB8_E30708.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBDB8_E30708.s diff --git a/ver/us/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBE14_E30764.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E2F750/func_802BBE14_E30764.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BBE70_E307C0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BBE70_E307C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BBE70_E307C0.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BBE70_E307C0.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC2BC_E30C0C.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC2BC_E30C0C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC2BC_E30C0C.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC2BC_E30C0C.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC4B8_E30E08.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC4B8_E30E08.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC4B8_E30E08.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC4B8_E30E08.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC514_E30E64.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC514_E30E64.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC514_E30E64.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC514_E30E64.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC558_E30EA8.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC558_E30EA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC558_E30EA8.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC558_E30EA8.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC570_E30EC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC570_E30EC0.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC570_E30EC0.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC99C_E312EC.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC99C_E312EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC99C_E312EC.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC99C_E312EC.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC9CC_E3131C.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC9CC_E3131C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC9CC_E3131C.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC9CC_E3131C.s diff --git a/ver/us/asm/nonmatchings/code_E307C0/func_802BC9FC_E3134C.s b/ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC9FC_E3134C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_E307C0/func_802BC9FC_E3134C.s rename to ver/us/asm/nonmatchings/entity/sbk_omo/E307C0/func_802BC9FC_E3134C.s diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s b/ver/us/asm/nonmatchings/f2470_len_27f0/BringPartnerOut.s similarity index 99% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/BringPartnerOut.s index f0b62520f1..cf66be9001 100644 --- a/ver/us/asm/nonmatchings/code_f2470_len_27f0/BringPartnerOut.s +++ b/ver/us/asm/nonmatchings/f2470_len_27f0/BringPartnerOut.s @@ -51,7 +51,7 @@ glabel BringPartnerOut /* F401C 802CF66C 0220202D */ daddu $a0, $s1, $zero /* F4020 802CF670 AFA00018 */ sw $zero, 0x18($sp) /* F4024 802CF674 AFA0001C */ sw $zero, 0x1c($sp) -/* F4028 802CF678 0C00E211 */ jal create_basic_npc +/* F4028 802CF678 0C00E211 */ jal npc_create_basic /* F402C 802CF67C AFA20014 */ sw $v0, 0x14($sp) /* F4030 802CF680 0040202D */ daddu $a0, $v0, $zero /* F4034 802CF684 3C01802E */ lui $at, %hi(D_802DAE44) diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/CreateNpc.s b/ver/us/asm/nonmatchings/f2470_len_27f0/CreateNpc.s similarity index 96% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/CreateNpc.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/CreateNpc.s index db86e2278c..b89bbef5c3 100644 --- a/ver/us/asm/nonmatchings/code_f2470_len_27f0/CreateNpc.s +++ b/ver/us/asm/nonmatchings/f2470_len_27f0/CreateNpc.s @@ -19,7 +19,7 @@ glabel CreateNpc /* F258C 802CDBDC AFA00010 */ sw $zero, 0x10($sp) /* F2590 802CDBE0 AFA20014 */ sw $v0, 0x14($sp) /* F2594 802CDBE4 AFA00018 */ sw $zero, 0x18($sp) -/* F2598 802CDBE8 0C00E211 */ jal create_basic_npc +/* F2598 802CDBE8 0C00E211 */ jal npc_create_basic /* F259C 802CDBEC AFA0001C */ sw $zero, 0x1c($sp) /* F25A0 802CDBF0 0C00E2B7 */ jal get_npc_by_index /* F25A4 802CDBF4 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s b/ver/us/asm/nonmatchings/f2470_len_27f0/InterpNpcYaw.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/InterpNpcYaw.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/InterpNpcYaw.s diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s b/ver/us/asm/nonmatchings/f2470_len_27f0/NpcFaceNpc.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFaceNpc.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/NpcFaceNpc.s diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s b/ver/us/asm/nonmatchings/f2470_len_27f0/NpcFacePlayer.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFacePlayer.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/NpcFacePlayer.s diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s b/ver/us/asm/nonmatchings/f2470_len_27f0/NpcFlyTo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcFlyTo.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/NpcFlyTo.s diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s b/ver/us/asm/nonmatchings/f2470_len_27f0/NpcMoveTo.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/NpcMoveTo.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/NpcMoveTo.s diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s b/ver/us/asm/nonmatchings/f2470_len_27f0/PutPartnerAway.s similarity index 99% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/PutPartnerAway.s index d0a3c59cc3..2b4ad916bd 100644 --- a/ver/us/asm/nonmatchings/code_f2470_len_27f0/PutPartnerAway.s +++ b/ver/us/asm/nonmatchings/f2470_len_27f0/PutPartnerAway.s @@ -175,7 +175,7 @@ glabel PutPartnerAway /* F45D0 802CFC20 8C228354 */ lw $v0, %lo(gPartnerAnimations+0xC)($at) /* F45D4 802CFC24 E634001C */ swc1 $f20, 0x1c($s1) /* F45D8 802CFC28 E620003C */ swc1 $f0, 0x3c($s1) -/* F45DC 802CFC2C 0C00E228 */ jal free_npc_by_index +/* F45DC 802CFC2C 0C00E228 */ jal npc_free_by_index /* F45E0 802CFC30 AE220028 */ sw $v0, 0x28($s1) /* F45E4 802CFC34 0C00EABB */ jal get_npc_unsafe /* F45E8 802CFC38 2404FFFB */ addiu $a0, $zero, -5 diff --git a/ver/us/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s b/ver/us/asm/nonmatchings/f2470_len_27f0/_npc_jump_to.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f2470_len_27f0/_npc_jump_to.s rename to ver/us/asm/nonmatchings/f2470_len_27f0/_npc_jump_to.s diff --git a/ver/us/asm/nonmatchings/code_f270_len_1190/appendGfx_intro_logos.s b/ver/us/asm/nonmatchings/f270_len_1190/appendGfx_intro_logos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f270_len_1190/appendGfx_intro_logos.s rename to ver/us/asm/nonmatchings/f270_len_1190/appendGfx_intro_logos.s diff --git a/ver/us/asm/nonmatchings/code_f4c60_len_4300/ShowChoice.s b/ver/us/asm/nonmatchings/f4c60_len_4300/ShowChoice.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f4c60_len_4300/ShowChoice.s rename to ver/us/asm/nonmatchings/f4c60_len_4300/ShowChoice.s diff --git a/ver/us/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtScreenPos.s b/ver/us/asm/nonmatchings/f4c60_len_4300/ShowMessageAtScreenPos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtScreenPos.s rename to ver/us/asm/nonmatchings/f4c60_len_4300/ShowMessageAtScreenPos.s diff --git a/ver/us/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s b/ver/us/asm/nonmatchings/f4c60_len_4300/ShowMessageAtWorldPos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f4c60_len_4300/ShowMessageAtWorldPos.s rename to ver/us/asm/nonmatchings/f4c60_len_4300/ShowMessageAtWorldPos.s diff --git a/ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s b/ver/us/asm/nonmatchings/f4c60_len_4300/_show_message.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f4c60_len_4300/_show_message.s rename to ver/us/asm/nonmatchings/f4c60_len_4300/_show_message.s diff --git a/ver/us/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s b/ver/us/asm/nonmatchings/f8f60_len_1560/GetNextPathPos.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f8f60_len_1560/GetNextPathPos.s rename to ver/us/asm/nonmatchings/f8f60_len_1560/GetNextPathPos.s diff --git a/ver/us/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s b/ver/us/asm/nonmatchings/f8f60_len_1560/func_802D5270.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f8f60_len_1560/func_802D5270.s rename to ver/us/asm/nonmatchings/f8f60_len_1560/func_802D5270.s diff --git a/ver/us/asm/nonmatchings/code_f8f60_len_1560/setup_path_data.s b/ver/us/asm/nonmatchings/f8f60_len_1560/setup_path_data.s similarity index 100% rename from ver/us/asm/nonmatchings/code_f8f60_len_1560/setup_path_data.s rename to ver/us/asm/nonmatchings/f8f60_len_1560/setup_path_data.s diff --git a/ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s b/ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D5B10.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5B10.s rename to ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D5B10.s diff --git a/ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5C70.s b/ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D5C70.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5C70.s rename to ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D5C70.s diff --git a/ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s b/ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D6420.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D6420.s rename to ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D6420.s diff --git a/ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s b/ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D663C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D663C.s rename to ver/us/asm/nonmatchings/fa4c0_len_3bf0/func_802D663C.s diff --git a/ver/us/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s b/ver/us/asm/nonmatchings/fe0b0_len_5a0/SetSpriteShading.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fe0b0_len_5a0/SetSpriteShading.s rename to ver/us/asm/nonmatchings/fe0b0_len_5a0/SetSpriteShading.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBD40.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBD40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBD40.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBD40.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBD8C.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBD8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBD8C.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBD8C.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBDBC.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBDBC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBDBC.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBDBC.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBE78.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBE78.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBE78.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBFC0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DBFC0.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DBFC0.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DC008.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DC008.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DC008.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD634.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD634.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD634.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD6DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD6DC.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD6DC.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD7B0.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD7B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD7B0.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD7B0.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD820.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD820.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD820.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD89C.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD89C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD89C.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD89C.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD8F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DD8F8.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DD8F8.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDA8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDA8C.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDA8C.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDEC4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDEC4.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDEC4.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDEE4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDEE4.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDEE4.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDFF8.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDFF8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DDFF8.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DDFF8.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE044.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE044.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE044.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE044.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE0C0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE0C0.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE0C0.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE0EC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE0EC.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE0EC.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE2AC.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE2AC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE2AC.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE2AC.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE3D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE3D8.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE3D8.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE5C8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE5C8.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE5C8.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE5E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE5E8.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE5E8.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE748.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE748.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE748.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE748.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE780.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE780.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE780.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE894.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE894.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE894.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE894.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE8DC.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE8DC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE8DC.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE8DC.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE9D8.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE9D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DE9D8.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DE9D8.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DEA40.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DEA40.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DEA40.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s b/ver/us/asm/nonmatchings/fee30_len_2d60/func_802DEA6C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/func_802DEA6C.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/func_802DEA6C.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s b/ver/us/asm/nonmatchings/fee30_len_2d60/render_sprite.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/render_sprite.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/render_sprite.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s b/ver/us/asm/nonmatchings/fee30_len_2d60/spr_appendMDL_component.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/spr_appendMDL_component.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/spr_appendMDL_component.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s b/ver/us/asm/nonmatchings/fee30_len_2d60/spr_draw_component.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/spr_draw_component.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/spr_draw_component.s diff --git a/ver/us/asm/nonmatchings/code_fee30_len_2d60/update_component.s b/ver/us/asm/nonmatchings/fee30_len_2d60/update_component.s similarity index 100% rename from ver/us/asm/nonmatchings/code_fee30_len_2d60/update_component.s rename to ver/us/asm/nonmatchings/fee30_len_2d60/update_component.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc_blur.s b/ver/us/asm/nonmatchings/npc/appendGfx_npc_blur.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc_blur.s rename to ver/us/asm/nonmatchings/npc/appendGfx_npc_blur.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s b/ver/us/asm/nonmatchings/npc/bind_enemy_ai.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s rename to ver/us/asm/nonmatchings/npc/bind_enemy_ai.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s b/ver/us/asm/nonmatchings/npc/bind_enemy_aux.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s rename to ver/us/asm/nonmatchings/npc/bind_enemy_aux.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s b/ver/us/asm/nonmatchings/npc/bind_enemy_interact.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s rename to ver/us/asm/nonmatchings/npc/bind_enemy_interact.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s b/ver/us/asm/nonmatchings/npc/bind_npc_ai.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s rename to ver/us/asm/nonmatchings/npc/bind_npc_ai.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s b/ver/us/asm/nonmatchings/npc/bind_npc_aux.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s rename to ver/us/asm/nonmatchings/npc/bind_npc_aux.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s b/ver/us/asm/nonmatchings/npc/bind_npc_interact.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s rename to ver/us/asm/nonmatchings/npc/bind_npc_interact.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_800397E8.s b/ver/us/asm/nonmatchings/npc/func_800397E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_800397E8.s rename to ver/us/asm/nonmatchings/npc/func_800397E8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s b/ver/us/asm/nonmatchings/npc/func_80039DA4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s rename to ver/us/asm/nonmatchings/npc/func_80039DA4.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B184.s b/ver/us/asm/nonmatchings/npc/func_8003B184.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B184.s rename to ver/us/asm/nonmatchings/npc/func_8003B184.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B198.s b/ver/us/asm/nonmatchings/npc/func_8003B198.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B198.s rename to ver/us/asm/nonmatchings/npc/func_8003B198.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s b/ver/us/asm/nonmatchings/npc/func_8003B1B0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s rename to ver/us/asm/nonmatchings/npc/func_8003B1B0.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s b/ver/us/asm/nonmatchings/npc/func_8003B3D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s rename to ver/us/asm/nonmatchings/npc/func_8003B3D0.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B3F8.s b/ver/us/asm/nonmatchings/npc/func_8003B3F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B3F8.s rename to ver/us/asm/nonmatchings/npc/func_8003B3F8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B420.s b/ver/us/asm/nonmatchings/npc/func_8003B420.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B420.s rename to ver/us/asm/nonmatchings/npc/func_8003B420.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B44C.s b/ver/us/asm/nonmatchings/npc/func_8003B44C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B44C.s rename to ver/us/asm/nonmatchings/npc/func_8003B44C.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B464.s b/ver/us/asm/nonmatchings/npc/func_8003B464.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B464.s rename to ver/us/asm/nonmatchings/npc/func_8003B464.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s b/ver/us/asm/nonmatchings/npc/func_8003B47C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s rename to ver/us/asm/nonmatchings/npc/func_8003B47C.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B500.s b/ver/us/asm/nonmatchings/npc/func_8003B500.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B500.s rename to ver/us/asm/nonmatchings/npc/func_8003B500.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s b/ver/us/asm/nonmatchings/npc/func_8003B5B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s rename to ver/us/asm/nonmatchings/npc/func_8003B5B4.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B96C.s b/ver/us/asm/nonmatchings/npc/func_8003B96C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003B96C.s rename to ver/us/asm/nonmatchings/npc/func_8003B96C.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s b/ver/us/asm/nonmatchings/npc/func_8003BA60.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s rename to ver/us/asm/nonmatchings/npc/func_8003BA60.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s b/ver/us/asm/nonmatchings/npc/func_8003BED8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s rename to ver/us/asm/nonmatchings/npc/func_8003BED8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C3D8.s b/ver/us/asm/nonmatchings/npc/func_8003C3D8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C3D8.s rename to ver/us/asm/nonmatchings/npc/func_8003C3D8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C428.s b/ver/us/asm/nonmatchings/npc/func_8003C428.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C428.s rename to ver/us/asm/nonmatchings/npc/func_8003C428.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C444.s b/ver/us/asm/nonmatchings/npc/func_8003C444.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C444.s rename to ver/us/asm/nonmatchings/npc/func_8003C444.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s b/ver/us/asm/nonmatchings/npc/func_8003C53C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s rename to ver/us/asm/nonmatchings/npc/func_8003C53C.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s b/ver/us/asm/nonmatchings/npc/func_8003C61C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s rename to ver/us/asm/nonmatchings/npc/func_8003C61C.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C668.s b/ver/us/asm/nonmatchings/npc/func_8003C668.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C668.s rename to ver/us/asm/nonmatchings/npc/func_8003C668.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C78C.s b/ver/us/asm/nonmatchings/npc/func_8003C78C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C78C.s rename to ver/us/asm/nonmatchings/npc/func_8003C78C.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s b/ver/us/asm/nonmatchings/npc/func_8003C7A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s rename to ver/us/asm/nonmatchings/npc/func_8003C7A8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s b/ver/us/asm/nonmatchings/npc/func_8003C8B4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s rename to ver/us/asm/nonmatchings/npc/func_8003C8B4.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C984.s b/ver/us/asm/nonmatchings/npc/func_8003C984.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C984.s rename to ver/us/asm/nonmatchings/npc/func_8003C984.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s b/ver/us/asm/nonmatchings/npc/func_8003C9A8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s rename to ver/us/asm/nonmatchings/npc/func_8003C9A8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CB20.s b/ver/us/asm/nonmatchings/npc/func_8003CB20.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CB20.s rename to ver/us/asm/nonmatchings/npc/func_8003CB20.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s b/ver/us/asm/nonmatchings/npc/func_8003CB44.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s rename to ver/us/asm/nonmatchings/npc/func_8003CB44.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CC8C.s b/ver/us/asm/nonmatchings/npc/func_8003CC8C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CC8C.s rename to ver/us/asm/nonmatchings/npc/func_8003CC8C.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s b/ver/us/asm/nonmatchings/npc/func_8003CCB0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s rename to ver/us/asm/nonmatchings/npc/func_8003CCB0.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CFA8.s b/ver/us/asm/nonmatchings/npc/func_8003CFA8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003CFA8.s rename to ver/us/asm/nonmatchings/npc/func_8003CFA8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s b/ver/us/asm/nonmatchings/npc/func_8003D1D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s rename to ver/us/asm/nonmatchings/npc/func_8003D1D4.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s b/ver/us/asm/nonmatchings/npc/func_8003D2F8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s rename to ver/us/asm/nonmatchings/npc/func_8003D2F8.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s b/ver/us/asm/nonmatchings/npc/func_8003D3BC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s rename to ver/us/asm/nonmatchings/npc/func_8003D3BC.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D624.s b/ver/us/asm/nonmatchings/npc/func_8003D624.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D624.s rename to ver/us/asm/nonmatchings/npc/func_8003D624.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s b/ver/us/asm/nonmatchings/npc/func_8003D660.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D660.s rename to ver/us/asm/nonmatchings/npc/func_8003D660.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D788.s b/ver/us/asm/nonmatchings/npc/func_8003D788.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003D788.s rename to ver/us/asm/nonmatchings/npc/func_8003D788.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s b/ver/us/asm/nonmatchings/npc/func_8003DA38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s rename to ver/us/asm/nonmatchings/npc/func_8003DA38.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s b/ver/us/asm/nonmatchings/npc/func_8003DC38.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s rename to ver/us/asm/nonmatchings/npc/func_8003DC38.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s b/ver/us/asm/nonmatchings/npc/func_8003DFA0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s rename to ver/us/asm/nonmatchings/npc/func_8003DFA0.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s b/ver/us/asm/nonmatchings/npc/func_8003E0D4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s rename to ver/us/asm/nonmatchings/npc/func_8003E0D4.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s b/ver/us/asm/nonmatchings/npc/func_8003E1D0.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s rename to ver/us/asm/nonmatchings/npc/func_8003E1D0.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003E338.s b/ver/us/asm/nonmatchings/npc/func_8003E338.s similarity index 94% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_8003E338.s rename to ver/us/asm/nonmatchings/npc/func_8003E338.s index e7b7450bb9..b289d27e9e 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_8003E338.s +++ b/ver/us/asm/nonmatchings/npc/func_8003E338.s @@ -47,8 +47,8 @@ glabel func_8003E338 /* 197D0 8003E3D0 2442FFFE */ addiu $v0, $v0, -2 /* 197D4 8003E3D4 0C0116B0 */ jal func_80045AC0 /* 197D8 8003E3D8 00000000 */ nop -/* 197DC 8003E3DC 3C058004 */ lui $a1, %hi(func_8003E670) -/* 197E0 8003E3E0 24A5E670 */ addiu $a1, $a1, %lo(func_8003E670) +/* 197DC 8003E3DC 3C058004 */ lui $a1, %hi(npc_dyn_entity_draw_no_op) +/* 197E0 8003E3E0 24A5E670 */ addiu $a1, $a1, %lo(npc_dyn_entity_draw_no_op) /* 197E4 8003E3E4 3C01800A */ lui $at, %hi(gGameState) /* 197E8 8003E3E8 AC20A600 */ sw $zero, %lo(gGameState)($at) /* 197EC 8003E3EC 0C048C56 */ jal bind_dynamic_entity_3 diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/get_enemy.s b/ver/us/asm/nonmatchings/npc/get_enemy.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/get_enemy.s rename to ver/us/asm/nonmatchings/npc/get_enemy.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s b/ver/us/asm/nonmatchings/npc/get_enemy_safe.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s rename to ver/us/asm/nonmatchings/npc/get_enemy_safe.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s b/ver/us/asm/nonmatchings/npc/get_npc_safe.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s rename to ver/us/asm/nonmatchings/npc/get_npc_safe.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s b/ver/us/asm/nonmatchings/npc/get_npc_unsafe.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s rename to ver/us/asm/nonmatchings/npc/get_npc_unsafe.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/kill_encounter.s b/ver/us/asm/nonmatchings/npc/kill_encounter.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/kill_encounter.s rename to ver/us/asm/nonmatchings/npc/kill_encounter.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/kill_enemy.s b/ver/us/asm/nonmatchings/npc/kill_enemy.s similarity index 99% rename from ver/us/asm/nonmatchings/code_13870_len_6980/kill_enemy.s rename to ver/us/asm/nonmatchings/npc/kill_enemy.s index f9f40f9e78..3831d4dfd5 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/kill_enemy.s +++ b/ver/us/asm/nonmatchings/npc/kill_enemy.s @@ -72,7 +72,7 @@ glabel kill_enemy /* 19C98 8003E898 AE00002C */ sw $zero, 0x2c($s0) /* 19C9C 8003E89C 0C00EABB */ jal get_npc_unsafe /* 19CA0 8003E8A0 AE000030 */ sw $zero, 0x30($s0) -/* 19CA4 8003E8A4 0C00E273 */ jal free_npc +/* 19CA4 8003E8A4 0C00E273 */ jal npc_free /* 19CA8 8003E8A8 0040202D */ daddu $a0, $v0, $zero /* 19CAC 8003E8AC 8E040064 */ lw $a0, 0x64($s0) /* 19CB0 8003E8B0 50800004 */ beql $a0, $zero, .L8003E8C4 diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s b/ver/us/asm/nonmatchings/npc/npc_appendGfx.s similarity index 99% rename from ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s rename to ver/us/asm/nonmatchings/npc/npc_appendGfx.s index 95e6b83e15..c01af45bcc 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s +++ b/ver/us/asm/nonmatchings/npc/npc_appendGfx.s @@ -23,7 +23,7 @@ glabel D_800984A8 .section .text -glabel appendGfx_npc +glabel npc_appendGfx /* 153D0 80039FD0 27BDFF48 */ addiu $sp, $sp, -0xb8 /* 153D4 80039FD4 AFB1009C */ sw $s1, 0x9c($sp) /* 153D8 80039FD8 AFBF00A0 */ sw $ra, 0xa0($sp) @@ -48,7 +48,7 @@ glabel appendGfx_npc /* 15424 8003A024 30420080 */ andi $v0, $v0, 0x80 /* 15428 8003A028 10400007 */ beqz $v0, .L8003A048 /* 1542C 8003A02C 27B00058 */ addiu $s0, $sp, 0x58 -/* 15430 8003A030 0C00E11E */ jal mtx_ident_mirror_y +/* 15430 8003A030 0C00E11E */ jal npc_mtx_ident_mirror_y /* 15434 8003A034 0200202D */ daddu $a0, $s0, $zero /* 15438 8003A038 0200202D */ daddu $a0, $s0, $zero /* 1543C 8003A03C 27A50018 */ addiu $a1, $sp, 0x18 @@ -280,7 +280,7 @@ glabel appendGfx_npc /* 15794 8003A394 30420080 */ andi $v0, $v0, 0x80 /* 15798 8003A398 10400007 */ beqz $v0, .L8003A3B8 /* 1579C 8003A39C 27B00058 */ addiu $s0, $sp, 0x58 -/* 157A0 8003A3A0 0C00E11E */ jal mtx_ident_mirror_y +/* 157A0 8003A3A0 0C00E11E */ jal npc_mtx_ident_mirror_y /* 157A4 8003A3A4 0200202D */ daddu $a0, $s0, $zero /* 157A8 8003A3A8 0200202D */ daddu $a0, $s0, $zero /* 157AC 8003A3AC 27A50018 */ addiu $a1, $sp, 0x18 @@ -429,7 +429,7 @@ glabel appendGfx_npc /* 159CC 8003A5CC 0C019E40 */ jal guTranslateF /* 159D0 8003A5D0 27A40018 */ addiu $a0, $sp, 0x18 /* 159D4 8003A5D4 27B00058 */ addiu $s0, $sp, 0x58 -/* 159D8 8003A5D8 0C00E11E */ jal mtx_ident_mirror_y +/* 159D8 8003A5D8 0C00E11E */ jal npc_mtx_ident_mirror_y /* 159DC 8003A5DC 0200202D */ daddu $a0, $s0, $zero /* 159E0 8003A5E0 0200202D */ daddu $a0, $s0, $zero /* 159E4 8003A5E4 27A50018 */ addiu $a1, $sp, 0x18 diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/_create_npc.s b/ver/us/asm/nonmatchings/npc/npc_create.s similarity index 96% rename from ver/us/asm/nonmatchings/code_13870_len_6980/_create_npc.s rename to ver/us/asm/nonmatchings/npc/npc_create.s index 1135c55eb3..2543a6d6dd 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/_create_npc.s +++ b/ver/us/asm/nonmatchings/npc/npc_create.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel _create_npc +glabel npc_create /* 13998 80038598 3C03800A */ lui $v1, %hi(gCurrentNpcListPtr) /* 1399C 8003859C 8C630B90 */ lw $v1, %lo(gCurrentNpcListPtr)($v1) /* 139A0 800385A0 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -127,15 +127,15 @@ glabel _create_npc /* 13B60 80038760 8E420008 */ lw $v0, 8($s2) /* 13B64 80038764 14400004 */ bnez $v0, .L80038778 /* 13B68 80038768 AE020004 */ sw $v0, 4($s0) -/* 13B6C 8003876C 3C028004 */ lui $v0, %hi(NOP_npc_callback) -/* 13B70 80038770 24428470 */ addiu $v0, $v0, %lo(NOP_npc_callback) +/* 13B6C 8003876C 3C028004 */ lui $v0, %hi(npc_callback_no_op) +/* 13B70 80038770 24428470 */ addiu $v0, $v0, %lo(npc_callback_no_op) /* 13B74 80038774 AE020004 */ sw $v0, 4($s0) .L80038778: /* 13B78 80038778 8E42000C */ lw $v0, 0xc($s2) /* 13B7C 8003877C 14400004 */ bnez $v0, .L80038790 /* 13B80 80038780 AE020008 */ sw $v0, 8($s0) -/* 13B84 80038784 3C028004 */ lui $v0, %hi(NOP_npc_callback) -/* 13B88 80038788 24428470 */ addiu $v0, $v0, %lo(NOP_npc_callback) +/* 13B84 80038784 3C028004 */ lui $v0, %hi(npc_callback_no_op) +/* 13B88 80038788 24428470 */ addiu $v0, $v0, %lo(npc_callback_no_op) /* 13B8C 8003878C AE020008 */ sw $v0, 8($s0) .L80038790: /* 13B90 80038790 16800015 */ bnez $s4, .L800387E8 diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/func_80039688.s b/ver/us/asm/nonmatchings/npc/npc_do_gravity.s similarity index 99% rename from ver/us/asm/nonmatchings/code_13870_len_6980/func_80039688.s rename to ver/us/asm/nonmatchings/npc/npc_do_gravity.s index f3814dbe13..8e9b448cbf 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/func_80039688.s +++ b/ver/us/asm/nonmatchings/npc/npc_do_gravity.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel func_80039688 +glabel npc_do_gravity /* 14A88 80039688 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 14A8C 8003968C AFB00030 */ sw $s0, 0x30($sp) /* 14A90 80039690 0080802D */ daddu $s0, $a0, $zero diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_other_npc_collision.s b/ver/us/asm/nonmatchings/npc/npc_do_other_npc_collision.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_other_npc_collision.s rename to ver/us/asm/nonmatchings/npc/npc_do_other_npc_collision.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s b/ver/us/asm/nonmatchings/npc/npc_do_player_collision.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s rename to ver/us/asm/nonmatchings/npc/npc_do_player_collision.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_world_collision.s b/ver/us/asm/nonmatchings/npc/npc_do_world_collision.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13870_len_6980/npc_do_world_collision.s rename to ver/us/asm/nonmatchings/npc/npc_do_world_collision.s diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/free_npc.s b/ver/us/asm/nonmatchings/npc/npc_free.s similarity index 99% rename from ver/us/asm/nonmatchings/code_13870_len_6980/free_npc.s rename to ver/us/asm/nonmatchings/npc/npc_free.s index bd74881d50..e0895bdd38 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/free_npc.s +++ b/ver/us/asm/nonmatchings/npc/npc_free.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel free_npc +glabel npc_free /* 13DCC 800389CC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 13DD0 800389D0 AFB10014 */ sw $s1, 0x14($sp) /* 13DD4 800389D4 0080882D */ daddu $s1, $a0, $zero diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/free_npc_by_index.s b/ver/us/asm/nonmatchings/npc/npc_free_by_index.s similarity index 99% rename from ver/us/asm/nonmatchings/code_13870_len_6980/free_npc_by_index.s rename to ver/us/asm/nonmatchings/npc/npc_free_by_index.s index 04a4e9108c..0497a99581 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/free_npc_by_index.s +++ b/ver/us/asm/nonmatchings/npc/npc_free_by_index.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel free_npc_by_index +glabel npc_free_by_index /* 13CA0 800388A0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 13CA4 800388A4 2402F7FF */ addiu $v0, $zero, -0x801 /* 13CA8 800388A8 AFB20018 */ sw $s2, 0x18($sp) diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/clear_npcs.s b/ver/us/asm/nonmatchings/npc/npc_list_clear.s similarity index 98% rename from ver/us/asm/nonmatchings/code_13870_len_6980/clear_npcs.s rename to ver/us/asm/nonmatchings/npc/npc_list_clear.s index 0d3b37dcd4..f772b7d2d6 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/clear_npcs.s +++ b/ver/us/asm/nonmatchings/npc/npc_list_clear.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel clear_npcs +glabel npc_list_clear /* 138BC 800384BC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 138C0 800384C0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 138C4 800384C4 80420070 */ lb $v0, 0x70($v0) diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/render_npcs.s b/ver/us/asm/nonmatchings/npc/npc_list_render.s similarity index 98% rename from ver/us/asm/nonmatchings/code_13870_len_6980/render_npcs.s rename to ver/us/asm/nonmatchings/npc/npc_list_render.s index ff9517e944..4ee86337d0 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/render_npcs.s +++ b/ver/us/asm/nonmatchings/npc/npc_list_render.s @@ -11,7 +11,7 @@ glabel D_800984B8 .section .text -glabel render_npcs +glabel npc_list_render /* 15BF0 8003A7F0 27BDFF78 */ addiu $sp, $sp, -0x88 /* 15BF4 8003A7F4 F7BA0080 */ sdc1 $f26, 0x80($sp) /* 15BF8 8003A7F8 3C01459C */ lui $at, 0x459c @@ -112,8 +112,8 @@ glabel render_npcs /* 15D64 8003A964 4600A007 */ neg.s $f0, $f20 /* 15D68 8003A968 4600018D */ trunc.w.s $f6, $f0 /* 15D6C 8003A96C E6260004 */ swc1 $f6, 4($s1) -/* 15D70 8003A970 3C028004 */ lui $v0, %hi(appendGfx_npc) -/* 15D74 8003A974 24429FD0 */ addiu $v0, $v0, %lo(appendGfx_npc) +/* 15D70 8003A970 3C028004 */ lui $v0, %hi(npc_appendGfx) +/* 15D74 8003A974 24429FD0 */ addiu $v0, $v0, %lo(npc_appendGfx) /* 15D78 8003A978 AE300008 */ sw $s0, 8($s1) /* 15D7C 8003A97C AE22000C */ sw $v0, 0xc($s1) /* 15D80 8003A980 820200AA */ lb $v0, 0xaa($s0) diff --git a/ver/us/asm/nonmatchings/code_13870_len_6980/update_npcs.s b/ver/us/asm/nonmatchings/npc/npc_list_update.s similarity index 99% rename from ver/us/asm/nonmatchings/code_13870_len_6980/update_npcs.s rename to ver/us/asm/nonmatchings/npc/npc_list_update.s index 80eae11875..359513f92e 100644 --- a/ver/us/asm/nonmatchings/code_13870_len_6980/update_npcs.s +++ b/ver/us/asm/nonmatchings/npc/npc_list_update.s @@ -1,7 +1,7 @@ .set noat # allow manual use of $at .set noreorder # don't insert nops after branches -glabel update_npcs +glabel npc_list_update /* 14D30 80039930 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 14D34 80039934 3C02FFFF */ lui $v0, 0xffff /* 14D38 80039938 34427FFF */ ori $v0, $v0, 0x7fff @@ -69,7 +69,7 @@ glabel update_npcs /* 14E20 80039A20 00431024 */ and $v0, $v0, $v1 /* 14E24 80039A24 0C00E2BF */ jal npc_do_world_collision /* 14E28 80039A28 AE020000 */ sw $v0, ($s0) -/* 14E2C 80039A2C 0C00E5A2 */ jal func_80039688 +/* 14E2C 80039A2C 0C00E5A2 */ jal npc_do_gravity /* 14E30 80039A30 0200202D */ daddu $a0, $s0, $zero /* 14E34 80039A34 4405A000 */ mfc1 $a1, $f20 /* 14E38 80039A38 0C00E5FA */ jal func_800397E8 diff --git a/ver/us/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s b/ver/us/asm/nonmatchings/os/39cb0_len_100/boot_idle.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_39cb0_len_100/boot_idle.s rename to ver/us/asm/nonmatchings/os/39cb0_len_100/boot_idle.s diff --git a/ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s b/ver/us/asm/nonmatchings/os/3FEA0/_Printf.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3FEA0/_Printf.s rename to ver/us/asm/nonmatchings/os/3FEA0/_Printf.s diff --git a/ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s b/ver/us/asm/nonmatchings/os/3FEA0/_Putfld.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3FEA0/_Putfld.s rename to ver/us/asm/nonmatchings/os/3FEA0/_Putfld.s diff --git a/ver/us/asm/nonmatchings/os/code_3FEA0/proutSprintf.s b/ver/us/asm/nonmatchings/os/3FEA0/proutSprintf.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3FEA0/proutSprintf.s rename to ver/us/asm/nonmatchings/os/3FEA0/proutSprintf.s diff --git a/ver/us/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s b/ver/us/asm/nonmatchings/os/3b710_len_40/nuGfxSwapCfbFuncSet.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s rename to ver/us/asm/nonmatchings/os/3b710_len_40/nuGfxSwapCfbFuncSet.s diff --git a/ver/us/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s b/ver/us/asm/nonmatchings/os/3b770_len_80/nuGfxRetraceWait.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s rename to ver/us/asm/nonmatchings/os/3b770_len_80/nuGfxRetraceWait.s diff --git a/ver/us/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s b/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackAdd.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s rename to ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackAdd.s diff --git a/ver/us/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s b/ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackRemove.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s rename to ver/us/asm/nonmatchings/os/3b7f0_len_120/nuSiCallBackRemove.s diff --git a/ver/us/asm/nonmatchings/os/code_3bd20_len_c0/nuContQueryRead.s b/ver/us/asm/nonmatchings/os/3bd20_len_c0/nuContQueryRead.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3bd20_len_c0/nuContQueryRead.s rename to ver/us/asm/nonmatchings/os/3bd20_len_c0/nuContQueryRead.s diff --git a/ver/us/asm/nonmatchings/os/code_3c490_len_3c0/__osDevMgrMain.s b/ver/us/asm/nonmatchings/os/3c490_len_3c0/__osDevMgrMain.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c490_len_3c0/__osDevMgrMain.s rename to ver/us/asm/nonmatchings/os/3c490_len_3c0/__osDevMgrMain.s diff --git a/ver/us/asm/nonmatchings/os/code_3c850_len_f0/__osPiCreateAccessQueue.s b/ver/us/asm/nonmatchings/os/3c850_len_f0/__osPiCreateAccessQueue.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c850_len_f0/__osPiCreateAccessQueue.s rename to ver/us/asm/nonmatchings/os/3c850_len_f0/__osPiCreateAccessQueue.s diff --git a/ver/us/asm/nonmatchings/os/code_3c850_len_f0/__osPiGetAccess.s b/ver/us/asm/nonmatchings/os/3c850_len_f0/__osPiGetAccess.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c850_len_f0/__osPiGetAccess.s rename to ver/us/asm/nonmatchings/os/3c850_len_f0/__osPiGetAccess.s diff --git a/ver/us/asm/nonmatchings/os/code_3c850_len_f0/__osPiRelAccess.s b/ver/us/asm/nonmatchings/os/3c850_len_f0/__osPiRelAccess.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c850_len_f0/__osPiRelAccess.s rename to ver/us/asm/nonmatchings/os/3c850_len_f0/__osPiRelAccess.s diff --git a/ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiGetLength.s b/ver/us/asm/nonmatchings/os/3c940_len_140/osAiGetLength.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiGetLength.s rename to ver/us/asm/nonmatchings/os/3c940_len_140/osAiGetLength.s diff --git a/ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiGetStatus.s b/ver/us/asm/nonmatchings/os/3c940_len_140/osAiGetStatus.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiGetStatus.s rename to ver/us/asm/nonmatchings/os/3c940_len_140/osAiGetStatus.s diff --git a/ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s b/ver/us/asm/nonmatchings/os/3c940_len_140/osAiSetFrequency.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s rename to ver/us/asm/nonmatchings/os/3c940_len_140/osAiSetFrequency.s diff --git a/ver/us/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s b/ver/us/asm/nonmatchings/os/3ca80_len_a0/osAiSetNextBuffer.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s rename to ver/us/asm/nonmatchings/os/3ca80_len_a0/osAiSetNextBuffer.s diff --git a/ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetQuery.s b/ver/us/asm/nonmatchings/os/3cd00_len_5f0/osContGetQuery.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetQuery.s rename to ver/us/asm/nonmatchings/os/3cd00_len_5f0/osContGetQuery.s diff --git a/ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s b/ver/us/asm/nonmatchings/os/3cd00_len_5f0/osContGetReadData.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s rename to ver/us/asm/nonmatchings/os/3cd00_len_5f0/osContGetReadData.s diff --git a/ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s b/ver/us/asm/nonmatchings/os/3cd00_len_5f0/osContStartReadData.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s rename to ver/us/asm/nonmatchings/os/3cd00_len_5f0/osContStartReadData.s diff --git a/ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s b/ver/us/asm/nonmatchings/os/3cd00_len_5f0/osPackReadData.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s rename to ver/us/asm/nonmatchings/os/3cd00_len_5f0/osPackReadData.s diff --git a/ver/us/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s b/ver/us/asm/nonmatchings/os/3d2f0_len_10/sqrtf.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s rename to ver/us/asm/nonmatchings/os/3d2f0_len_10/sqrtf.s diff --git a/ver/us/asm/nonmatchings/os/code_3d300_len_30/coss.s b/ver/us/asm/nonmatchings/os/3d300_len_30/coss.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3d300_len_30/coss.s rename to ver/us/asm/nonmatchings/os/3d300_len_30/coss.s diff --git a/ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s b/ver/us/asm/nonmatchings/os/3dcc0_len_a60/guLookAtHilite.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s rename to ver/us/asm/nonmatchings/os/3dcc0_len_a60/guLookAtHilite.s diff --git a/ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s b/ver/us/asm/nonmatchings/os/3dcc0_len_a60/guLookAtHiliteF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s rename to ver/us/asm/nonmatchings/os/3dcc0_len_a60/guLookAtHiliteF.s diff --git a/ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s b/ver/us/asm/nonmatchings/os/3e720_len_5f0/guLookAtReflect.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s rename to ver/us/asm/nonmatchings/os/3e720_len_5f0/guLookAtReflect.s diff --git a/ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s b/ver/us/asm/nonmatchings/os/3e720_len_5f0/guLookAtReflectF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s rename to ver/us/asm/nonmatchings/os/3e720_len_5f0/guLookAtReflectF.s diff --git a/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s b/ver/us/asm/nonmatchings/os/3ef90_len_600/guPerspective.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s rename to ver/us/asm/nonmatchings/os/3ef90_len_600/guPerspective.s diff --git a/ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s b/ver/us/asm/nonmatchings/os/3ef90_len_600/guPerspectiveF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s rename to ver/us/asm/nonmatchings/os/3ef90_len_600/guPerspectiveF.s diff --git a/ver/us/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s b/ver/us/asm/nonmatchings/os/3f310_len_3c0/guPosition.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s rename to ver/us/asm/nonmatchings/os/3f310_len_3c0/guPosition.s diff --git a/ver/us/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s b/ver/us/asm/nonmatchings/os/3f310_len_3c0/guPositionF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s rename to ver/us/asm/nonmatchings/os/3f310_len_3c0/guPositionF.s diff --git a/ver/us/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s b/ver/us/asm/nonmatchings/os/3f6d0_len_320/guRotateAngles.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s rename to ver/us/asm/nonmatchings/os/3f6d0_len_320/guRotateAngles.s diff --git a/ver/us/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s b/ver/us/asm/nonmatchings/os/3f6d0_len_320/guRotateAnglesF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s rename to ver/us/asm/nonmatchings/os/3f6d0_len_320/guRotateAnglesF.s diff --git a/ver/us/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s b/ver/us/asm/nonmatchings/os/3fa50_len_f60/bcopy.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s rename to ver/us/asm/nonmatchings/os/3fa50_len_f60/bcopy.s diff --git a/ver/us/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s b/ver/us/asm/nonmatchings/os/3fa50_len_f60/bzero.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s rename to ver/us/asm/nonmatchings/os/3fa50_len_f60/bzero.s diff --git a/ver/us/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s b/ver/us/asm/nonmatchings/os/3fa50_len_f60/memcpy.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s rename to ver/us/asm/nonmatchings/os/3fa50_len_f60/memcpy.s diff --git a/ver/us/asm/nonmatchings/os/code_3fa50_len_f60/strchr.s b/ver/us/asm/nonmatchings/os/3fa50_len_f60/strchr.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3fa50_len_f60/strchr.s rename to ver/us/asm/nonmatchings/os/3fa50_len_f60/strchr.s diff --git a/ver/us/asm/nonmatchings/os/code_3fa50_len_f60/strlen.s b/ver/us/asm/nonmatchings/os/3fa50_len_f60/strlen.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_3fa50_len_f60/strlen.s rename to ver/us/asm/nonmatchings/os/3fa50_len_f60/strlen.s diff --git a/ver/us/asm/nonmatchings/os/code_40E10/osSpTaskLoad.s b/ver/us/asm/nonmatchings/os/40E10/osSpTaskLoad.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_40E10/osSpTaskLoad.s rename to ver/us/asm/nonmatchings/os/40E10/osSpTaskLoad.s diff --git a/ver/us/asm/nonmatchings/os/code_40E10/osSpTaskStartGo.s b/ver/us/asm/nonmatchings/os/40E10/osSpTaskStartGo.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_40E10/osSpTaskStartGo.s rename to ver/us/asm/nonmatchings/os/40E10/osSpTaskStartGo.s diff --git a/ver/us/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s b/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSendMesg.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s rename to ver/us/asm/nonmatchings/os/40c20_len_1f0/osSendMesg.s diff --git a/ver/us/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s b/ver/us/asm/nonmatchings/os/40c20_len_1f0/osSetEventMesg.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s rename to ver/us/asm/nonmatchings/os/40c20_len_1f0/osSetEventMesg.s diff --git a/ver/us/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s b/ver/us/asm/nonmatchings/os/41050_len_120/osSpTaskYield.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s rename to ver/us/asm/nonmatchings/os/41050_len_120/osSpTaskYield.s diff --git a/ver/us/asm/nonmatchings/os/code_41170_len_f0/__osSiCreateAccessQueue.s b/ver/us/asm/nonmatchings/os/41170_len_f0/__osSiCreateAccessQueue.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41170_len_f0/__osSiCreateAccessQueue.s rename to ver/us/asm/nonmatchings/os/41170_len_f0/__osSiCreateAccessQueue.s diff --git a/ver/us/asm/nonmatchings/os/code_41170_len_f0/__osSiGetAccess.s b/ver/us/asm/nonmatchings/os/41170_len_f0/__osSiGetAccess.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41170_len_f0/__osSiGetAccess.s rename to ver/us/asm/nonmatchings/os/41170_len_f0/__osSiGetAccess.s diff --git a/ver/us/asm/nonmatchings/os/code_41170_len_f0/__osSiRelAccess.s b/ver/us/asm/nonmatchings/os/41170_len_f0/__osSiRelAccess.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41170_len_f0/__osSiRelAccess.s rename to ver/us/asm/nonmatchings/os/41170_len_f0/__osSiRelAccess.s diff --git a/ver/us/asm/nonmatchings/os/code_41420_len_120/osStartThread.s b/ver/us/asm/nonmatchings/os/41420_len_120/osStartThread.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41420_len_120/osStartThread.s rename to ver/us/asm/nonmatchings/os/41420_len_120/osStartThread.s diff --git a/ver/us/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s b/ver/us/asm/nonmatchings/os/41540_len_c0/osStopThread.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s rename to ver/us/asm/nonmatchings/os/41540_len_c0/osStopThread.s diff --git a/ver/us/asm/nonmatchings/os/code_41600_len_40/__osDequeueThread.s b/ver/us/asm/nonmatchings/os/41600_len_40/__osDequeueThread.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41600_len_40/__osDequeueThread.s rename to ver/us/asm/nonmatchings/os/41600_len_40/__osDequeueThread.s diff --git a/ver/us/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s b/ver/us/asm/nonmatchings/os/41640_len_50/osYieldThread.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s rename to ver/us/asm/nonmatchings/os/41640_len_50/osYieldThread.s diff --git a/ver/us/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s b/ver/us/asm/nonmatchings/os/41690_len_10/osGetActiveQueue.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s rename to ver/us/asm/nonmatchings/os/41690_len_10/osGetActiveQueue.s diff --git a/ver/us/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s b/ver/us/asm/nonmatchings/os/416a0_len_90/osGetTime.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s rename to ver/us/asm/nonmatchings/os/416a0_len_90/osGetTime.s diff --git a/ver/us/asm/nonmatchings/os/code_41730_len_20/osSetTime.s b/ver/us/asm/nonmatchings/os/41730_len_20/osSetTime.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41730_len_20/osSetTime.s rename to ver/us/asm/nonmatchings/os/41730_len_20/osSetTime.s diff --git a/ver/us/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s b/ver/us/asm/nonmatchings/os/41750_len_450/osSetTimer.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s rename to ver/us/asm/nonmatchings/os/41750_len_450/osSetTimer.s diff --git a/ver/us/asm/nonmatchings/os/code_41880/osInsertTimer.s b/ver/us/asm/nonmatchings/os/41880/osInsertTimer.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41880/osInsertTimer.s rename to ver/us/asm/nonmatchings/os/41880/osInsertTimer.s diff --git a/ver/us/asm/nonmatchings/os/code_41880/osSetTimerIntr.s b/ver/us/asm/nonmatchings/os/41880/osSetTimerIntr.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41880/osSetTimerIntr.s rename to ver/us/asm/nonmatchings/os/41880/osSetTimerIntr.s diff --git a/ver/us/asm/nonmatchings/os/code_41880/osTimerInterrupt.s b/ver/us/asm/nonmatchings/os/41880/osTimerInterrupt.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41880/osTimerInterrupt.s rename to ver/us/asm/nonmatchings/os/41880/osTimerInterrupt.s diff --git a/ver/us/asm/nonmatchings/os/code_41880/osTimerServicesInit.s b/ver/us/asm/nonmatchings/os/41880/osTimerServicesInit.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41880/osTimerServicesInit.s rename to ver/us/asm/nonmatchings/os/41880/osTimerServicesInit.s diff --git a/ver/us/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s b/ver/us/asm/nonmatchings/os/41ba0_len_c0/osMapTLB.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s rename to ver/us/asm/nonmatchings/os/41ba0_len_c0/osMapTLB.s diff --git a/ver/us/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s b/ver/us/asm/nonmatchings/os/41c60_len_c0/osProbeTLB.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s rename to ver/us/asm/nonmatchings/os/41c60_len_c0/osProbeTLB.s diff --git a/ver/us/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s b/ver/us/asm/nonmatchings/os/41d20_len_40/osUnmapTLB.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s rename to ver/us/asm/nonmatchings/os/41d20_len_40/osUnmapTLB.s diff --git a/ver/us/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s b/ver/us/asm/nonmatchings/os/41d60_len_50/osUnmapTLBAll.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s rename to ver/us/asm/nonmatchings/os/41d60_len_50/osUnmapTLBAll.s diff --git a/ver/us/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s b/ver/us/asm/nonmatchings/os/41db0_len_40/osViGetCurrentFramebuffer.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s rename to ver/us/asm/nonmatchings/os/41db0_len_40/osViGetCurrentFramebuffer.s diff --git a/ver/us/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s b/ver/us/asm/nonmatchings/os/41df0_len_40/osViGetNextFramebuffer.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s rename to ver/us/asm/nonmatchings/os/41df0_len_40/osViGetNextFramebuffer.s diff --git a/ver/us/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s b/ver/us/asm/nonmatchings/os/41e30_len_40/osViGetCurrentMode.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s rename to ver/us/asm/nonmatchings/os/41e30_len_40/osViGetCurrentMode.s diff --git a/ver/us/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s b/ver/us/asm/nonmatchings/os/41e70_len_340/osCreateViManager.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s rename to ver/us/asm/nonmatchings/os/41e70_len_340/osCreateViManager.s diff --git a/ver/us/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s b/ver/us/asm/nonmatchings/os/41e70_len_340/viMgrMain.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s rename to ver/us/asm/nonmatchings/os/41e70_len_340/viMgrMain.s diff --git a/ver/us/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s b/ver/us/asm/nonmatchings/os/421b0_len_60/osViSetEvent.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s rename to ver/us/asm/nonmatchings/os/421b0_len_60/osViSetEvent.s diff --git a/ver/us/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s b/ver/us/asm/nonmatchings/os/42210_len_50/osViSetMode.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s rename to ver/us/asm/nonmatchings/os/42210_len_50/osViSetMode.s diff --git a/ver/us/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s b/ver/us/asm/nonmatchings/os/42260_len_170/osViSetSpecialFeatures.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s rename to ver/us/asm/nonmatchings/os/42260_len_170/osViSetSpecialFeatures.s diff --git a/ver/us/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s b/ver/us/asm/nonmatchings/os/423d0_len_50/osViSetYScale.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s rename to ver/us/asm/nonmatchings/os/423d0_len_50/osViSetYScale.s diff --git a/ver/us/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s b/ver/us/asm/nonmatchings/os/42420_len_50/osViSwapBuffer.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s rename to ver/us/asm/nonmatchings/os/42420_len_50/osViSwapBuffer.s diff --git a/ver/us/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s b/ver/us/asm/nonmatchings/os/42470_len_310/osViSwapContext.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s rename to ver/us/asm/nonmatchings/os/42470_len_310/osViSwapContext.s diff --git a/ver/us/asm/nonmatchings/os/code_42780_len_120/osViBlack.s b/ver/us/asm/nonmatchings/os/42780_len_120/osViBlack.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42780_len_120/osViBlack.s rename to ver/us/asm/nonmatchings/os/42780_len_120/osViBlack.s diff --git a/ver/us/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s b/ver/us/asm/nonmatchings/os/42900_len_80/guMtxF2L.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s rename to ver/us/asm/nonmatchings/os/42900_len_80/guMtxF2L.s diff --git a/ver/us/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s b/ver/us/asm/nonmatchings/os/42980_len_80/guMtxL2F.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s rename to ver/us/asm/nonmatchings/os/42980_len_80/guMtxL2F.s diff --git a/ver/us/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s b/ver/us/asm/nonmatchings/os/42a00_len_100/guMtxCatF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s rename to ver/us/asm/nonmatchings/os/42a00_len_100/guMtxCatF.s diff --git a/ver/us/asm/nonmatchings/os/code_42b00_len_c0/guScale.s b/ver/us/asm/nonmatchings/os/42b00_len_c0/guScale.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42b00_len_c0/guScale.s rename to ver/us/asm/nonmatchings/os/42b00_len_c0/guScale.s diff --git a/ver/us/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s b/ver/us/asm/nonmatchings/os/42bc0_len_60/guScaleF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s rename to ver/us/asm/nonmatchings/os/42bc0_len_60/guScaleF.s diff --git a/ver/us/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s b/ver/us/asm/nonmatchings/os/42c20_len_e0/guTranslate.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s rename to ver/us/asm/nonmatchings/os/42c20_len_e0/guTranslate.s diff --git a/ver/us/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s b/ver/us/asm/nonmatchings/os/42d00_len_60/guTranslateF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s rename to ver/us/asm/nonmatchings/os/42d00_len_60/guTranslateF.s diff --git a/ver/us/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s b/ver/us/asm/nonmatchings/os/42d60_len_80/guMtxCat.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s rename to ver/us/asm/nonmatchings/os/42d60_len_80/guMtxCat.s diff --git a/ver/us/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s b/ver/us/asm/nonmatchings/os/42de0_len_90/guMtxXFML.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s rename to ver/us/asm/nonmatchings/os/42de0_len_90/guMtxXFML.s diff --git a/ver/us/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s b/ver/us/asm/nonmatchings/os/42e70_len_390/guMtxXFMF.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s rename to ver/us/asm/nonmatchings/os/42e70_len_390/guMtxXFMF.s diff --git a/ver/us/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s b/ver/us/asm/nonmatchings/os/43200_len_7c0/__osMotorAccess.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s rename to ver/us/asm/nonmatchings/os/43200_len_7c0/__osMotorAccess.s diff --git a/ver/us/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s b/ver/us/asm/nonmatchings/os/43200_len_7c0/osMotorInit.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s rename to ver/us/asm/nonmatchings/os/43200_len_7c0/osMotorInit.s diff --git a/ver/us/asm/nonmatchings/os/code_43590/osPfsAllocateFile.s b/ver/us/asm/nonmatchings/os/43590/osPfsAllocateFile.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_43590/osPfsAllocateFile.s rename to ver/us/asm/nonmatchings/os/43590/osPfsAllocateFile.s diff --git a/ver/us/asm/nonmatchings/os/code_43590/osPfsDeclearPage.s b/ver/us/asm/nonmatchings/os/43590/osPfsDeclearPage.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_43590/osPfsDeclearPage.s rename to ver/us/asm/nonmatchings/os/43590/osPfsDeclearPage.s diff --git a/ver/us/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s b/ver/us/asm/nonmatchings/os/439c0_len_220/osPfsDeleteFile.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s rename to ver/us/asm/nonmatchings/os/439c0_len_220/osPfsDeleteFile.s diff --git a/ver/us/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s b/ver/us/asm/nonmatchings/os/439c0_len_220/osPfsReleasePages.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s rename to ver/us/asm/nonmatchings/os/439c0_len_220/osPfsReleasePages.s diff --git a/ver/us/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s b/ver/us/asm/nonmatchings/os/43be0_len_5e0/osPfsFileState.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s rename to ver/us/asm/nonmatchings/os/43be0_len_5e0/osPfsFileState.s diff --git a/ver/us/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s b/ver/us/asm/nonmatchings/os/43be0_len_5e0/osPfsReadWriteFile.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s rename to ver/us/asm/nonmatchings/os/43be0_len_5e0/osPfsReadWriteFile.s diff --git a/ver/us/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s b/ver/us/asm/nonmatchings/os/441c0_len_1c0/osPfsFindFile.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s rename to ver/us/asm/nonmatchings/os/441c0_len_1c0/osPfsFindFile.s diff --git a/ver/us/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s b/ver/us/asm/nonmatchings/os/44380_len_4e0/osPfsFreeBlocks.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s rename to ver/us/asm/nonmatchings/os/44380_len_4e0/osPfsFreeBlocks.s diff --git a/ver/us/asm/nonmatchings/os/code_44490/osPfsCheckRamArea.s b/ver/us/asm/nonmatchings/os/44490/osPfsCheckRamArea.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44490/osPfsCheckRamArea.s rename to ver/us/asm/nonmatchings/os/44490/osPfsCheckRamArea.s diff --git a/ver/us/asm/nonmatchings/os/code_44490/osPfsInitPak.s b/ver/us/asm/nonmatchings/os/44490/osPfsInitPak.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44490/osPfsInitPak.s rename to ver/us/asm/nonmatchings/os/44490/osPfsInitPak.s diff --git a/ver/us/asm/nonmatchings/os/code_44490/osPfsNumFiles.s b/ver/us/asm/nonmatchings/os/44490/osPfsNumFiles.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44490/osPfsNumFiles.s rename to ver/us/asm/nonmatchings/os/44490/osPfsNumFiles.s diff --git a/ver/us/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s b/ver/us/asm/nonmatchings/os/44860_len_60/osPfsRepairId.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s rename to ver/us/asm/nonmatchings/os/44860_len_60/osPfsRepairId.s diff --git a/ver/us/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s b/ver/us/asm/nonmatchings/os/448c0_len_210/osPfsGetOneChannelData.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s rename to ver/us/asm/nonmatchings/os/448c0_len_210/osPfsGetOneChannelData.s diff --git a/ver/us/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s b/ver/us/asm/nonmatchings/os/448c0_len_210/osPfsGetStatus.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s rename to ver/us/asm/nonmatchings/os/448c0_len_210/osPfsGetStatus.s diff --git a/ver/us/asm/nonmatchings/os/code_448c0_len_210/osPfsRequestOneChannel.s b/ver/us/asm/nonmatchings/os/448c0_len_210/osPfsRequestOneChannel.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_448c0_len_210/osPfsRequestOneChannel.s rename to ver/us/asm/nonmatchings/os/448c0_len_210/osPfsRequestOneChannel.s diff --git a/ver/us/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s b/ver/us/asm/nonmatchings/os/44ad0_len_70/osPfsSelectBank.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s rename to ver/us/asm/nonmatchings/os/44ad0_len_70/osPfsSelectBank.s diff --git a/ver/us/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s b/ver/us/asm/nonmatchings/os/44b40_len_a90/osCheckId.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s rename to ver/us/asm/nonmatchings/os/44b40_len_a90/osCheckId.s diff --git a/ver/us/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s b/ver/us/asm/nonmatchings/os/44b40_len_a90/osCheckPackId.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s rename to ver/us/asm/nonmatchings/os/44b40_len_a90/osCheckPackId.s diff --git a/ver/us/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s b/ver/us/asm/nonmatchings/os/44b40_len_a90/osGetId.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s rename to ver/us/asm/nonmatchings/os/44b40_len_a90/osGetId.s diff --git a/ver/us/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s b/ver/us/asm/nonmatchings/os/44b40_len_a90/osIdCheckSum.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s rename to ver/us/asm/nonmatchings/os/44b40_len_a90/osIdCheckSum.s diff --git a/ver/us/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s b/ver/us/asm/nonmatchings/os/44b40_len_a90/osPfsRWInode.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s rename to ver/us/asm/nonmatchings/os/44b40_len_a90/osPfsRWInode.s diff --git a/ver/us/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s b/ver/us/asm/nonmatchings/os/44b40_len_a90/osRepairPackId.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s rename to ver/us/asm/nonmatchings/os/44b40_len_a90/osRepairPackId.s diff --git a/ver/us/asm/nonmatchings/os/code_44b40_len_a90/osSumcalc.s b/ver/us/asm/nonmatchings/os/44b40_len_a90/osSumcalc.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_44b40_len_a90/osSumcalc.s rename to ver/us/asm/nonmatchings/os/44b40_len_a90/osSumcalc.s diff --git a/ver/us/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s b/ver/us/asm/nonmatchings/os/455d0_len_1f0/osContRamRead.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s rename to ver/us/asm/nonmatchings/os/455d0_len_1f0/osContRamRead.s diff --git a/ver/us/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s b/ver/us/asm/nonmatchings/os/457c0_len_270/osContRamWrite.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s rename to ver/us/asm/nonmatchings/os/457c0_len_270/osContRamWrite.s diff --git a/ver/us/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s b/ver/us/asm/nonmatchings/os/45a30_len_20/osAfterPreNMI.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s rename to ver/us/asm/nonmatchings/os/45a30_len_20/osAfterPreNMI.s diff --git a/ver/us/asm/nonmatchings/os/code_45a50_len_3a0/__osInitialize_common.s b/ver/us/asm/nonmatchings/os/45a50_len_3a0/__osInitialize_common.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_45a50_len_3a0/__osInitialize_common.s rename to ver/us/asm/nonmatchings/os/45a50_len_3a0/__osInitialize_common.s diff --git a/ver/us/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A650.s b/ver/us/asm/nonmatchings/os/45a50_len_3a0/func_8006A650.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A650.s rename to ver/us/asm/nonmatchings/os/45a50_len_3a0/func_8006A650.s diff --git a/ver/us/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A9E0.s b/ver/us/asm/nonmatchings/os/45a50_len_3a0/func_8006A9E0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A9E0.s rename to ver/us/asm/nonmatchings/os/45a50_len_3a0/func_8006A9E0.s diff --git a/ver/us/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s b/ver/us/asm/nonmatchings/os/467f0_len_90/osResetGlobalIntMask.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s rename to ver/us/asm/nonmatchings/os/467f0_len_90/osResetGlobalIntMask.s diff --git a/ver/us/asm/nonmatchings/os/code_467f0_len_90/osSetGlobalIntMask.s b/ver/us/asm/nonmatchings/os/467f0_len_90/osSetGlobalIntMask.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_467f0_len_90/osSetGlobalIntMask.s rename to ver/us/asm/nonmatchings/os/467f0_len_90/osSetGlobalIntMask.s diff --git a/ver/us/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s b/ver/us/asm/nonmatchings/os/46880_len_260/osEPiRawReadIo.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s rename to ver/us/asm/nonmatchings/os/46880_len_260/osEPiRawReadIo.s diff --git a/ver/us/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s b/ver/us/asm/nonmatchings/os/46880_len_260/osPiGetCmdQueue.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s rename to ver/us/asm/nonmatchings/os/46880_len_260/osPiGetCmdQueue.s diff --git a/ver/us/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s b/ver/us/asm/nonmatchings/os/46880_len_260/osPiRawStartDma.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s rename to ver/us/asm/nonmatchings/os/46880_len_260/osPiRawStartDma.s diff --git a/ver/us/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s b/ver/us/asm/nonmatchings/os/46ae0_len_170/osEPiRawWriteIo.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s rename to ver/us/asm/nonmatchings/os/46ae0_len_170/osEPiRawWriteIo.s diff --git a/ver/us/asm/nonmatchings/os/code_46c50_len_20/__osAiDeviceBusy.s b/ver/us/asm/nonmatchings/os/46c50_len_20/__osAiDeviceBusy.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46c50_len_20/__osAiDeviceBusy.s rename to ver/us/asm/nonmatchings/os/46c50_len_20/__osAiDeviceBusy.s diff --git a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s b/ver/us/asm/nonmatchings/os/46c70_len_e00/_Genld.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s rename to ver/us/asm/nonmatchings/os/46c70_len_e00/_Genld.s diff --git a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s b/ver/us/asm/nonmatchings/os/46c70_len_e00/_Ldtob.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s rename to ver/us/asm/nonmatchings/os/46c70_len_e00/_Ldtob.s diff --git a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s b/ver/us/asm/nonmatchings/os/46c70_len_e00/_Ldunscale.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s rename to ver/us/asm/nonmatchings/os/46c70_len_e00/_Ldunscale.s diff --git a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s b/ver/us/asm/nonmatchings/os/46c70_len_e00/_Litob.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s rename to ver/us/asm/nonmatchings/os/46c70_len_e00/_Litob.s diff --git a/ver/us/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s b/ver/us/asm/nonmatchings/os/46c70_len_e00/bcmp.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s rename to ver/us/asm/nonmatchings/os/46c70_len_e00/bcmp.s diff --git a/ver/us/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s b/ver/us/asm/nonmatchings/os/47a70_len_10/osGetSR.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s rename to ver/us/asm/nonmatchings/os/47a70_len_10/osGetSR.s diff --git a/ver/us/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s b/ver/us/asm/nonmatchings/os/47a80_len_10/osSetCompare.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s rename to ver/us/asm/nonmatchings/os/47a80_len_10/osSetCompare.s diff --git a/ver/us/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s b/ver/us/asm/nonmatchings/os/47a90_len_50/osSetFpcCsr.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s rename to ver/us/asm/nonmatchings/os/47a90_len_50/osSetFpcCsr.s diff --git a/ver/us/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s b/ver/us/asm/nonmatchings/os/47a90_len_50/osSetSR.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s rename to ver/us/asm/nonmatchings/os/47a90_len_50/osSetSR.s diff --git a/ver/us/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s b/ver/us/asm/nonmatchings/os/47a90_len_50/osSetWatchLo.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s rename to ver/us/asm/nonmatchings/os/47a90_len_50/osSetWatchLo.s diff --git a/ver/us/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s b/ver/us/asm/nonmatchings/os/47a90_len_50/osSpDeviceBusy.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s rename to ver/us/asm/nonmatchings/os/47a90_len_50/osSpDeviceBusy.s diff --git a/ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpGetStatus.s b/ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpGetStatus.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpGetStatus.s rename to ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpGetStatus.s diff --git a/ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s b/ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpRawStartDma.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s rename to ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpRawStartDma.s diff --git a/ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s b/ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpSetPc.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s rename to ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpSetPc.s diff --git a/ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetStatus.s b/ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpSetStatus.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetStatus.s rename to ver/us/asm/nonmatchings/os/47ae0_len_e0/osSpSetStatus.s diff --git a/ver/us/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s b/ver/us/asm/nonmatchings/os/47bc0_len_50/osSiRawReadIo.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s rename to ver/us/asm/nonmatchings/os/47bc0_len_50/osSiRawReadIo.s diff --git a/ver/us/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s b/ver/us/asm/nonmatchings/os/47c10_len_50/osSiRawWriteIo.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s rename to ver/us/asm/nonmatchings/os/47c10_len_50/osSiRawWriteIo.s diff --git a/ver/us/asm/nonmatchings/os/code_47c60_len_f0/osContAddressCrc.s b/ver/us/asm/nonmatchings/os/47c60_len_f0/osContAddressCrc.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47c60_len_f0/osContAddressCrc.s rename to ver/us/asm/nonmatchings/os/47c60_len_f0/osContAddressCrc.s diff --git a/ver/us/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s b/ver/us/asm/nonmatchings/os/47d50_len_e0/osDestroyThread.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s rename to ver/us/asm/nonmatchings/os/47d50_len_e0/osDestroyThread.s diff --git a/ver/us/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s b/ver/us/asm/nonmatchings/os/47e30_len_60/osMapTLBRdb.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s rename to ver/us/asm/nonmatchings/os/47e30_len_60/osMapTLBRdb.s diff --git a/ver/us/asm/nonmatchings/os/code_47e90_len_110/osViInit.s b/ver/us/asm/nonmatchings/os/47e90_len_110/osViInit.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47e90_len_110/osViInit.s rename to ver/us/asm/nonmatchings/os/47e90_len_110/osViInit.s diff --git a/ver/us/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s b/ver/us/asm/nonmatchings/os/47fa0_len_20/osViGetCurrentContext.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s rename to ver/us/asm/nonmatchings/os/47fa0_len_20/osViGetCurrentContext.s diff --git a/ver/us/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s b/ver/us/asm/nonmatchings/os/47fc0_len_60/guNormalize.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s rename to ver/us/asm/nonmatchings/os/47fc0_len_60/guNormalize.s diff --git a/ver/us/asm/nonmatchings/os/code_48020_len_a00/corrupted.s b/ver/us/asm/nonmatchings/os/48020_len_a00/corrupted.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_48020_len_a00/corrupted.s rename to ver/us/asm/nonmatchings/os/48020_len_a00/corrupted.s diff --git a/ver/us/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s b/ver/us/asm/nonmatchings/os/48020_len_a00/corrupted_init.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s rename to ver/us/asm/nonmatchings/os/48020_len_a00/corrupted_init.s diff --git a/ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s b/ver/us/asm/nonmatchings/os/48020_len_a00/osPfsChecker.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s rename to ver/us/asm/nonmatchings/os/48020_len_a00/osPfsChecker.s diff --git a/ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s b/ver/us/asm/nonmatchings/os/48020_len_a00/osPfsGetInitData.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s rename to ver/us/asm/nonmatchings/os/48020_len_a00/osPfsGetInitData.s diff --git a/ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s b/ver/us/asm/nonmatchings/os/48020_len_a00/osPfsIsPlug.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s rename to ver/us/asm/nonmatchings/os/48020_len_a00/osPfsIsPlug.s diff --git a/ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsRequestData.s b/ver/us/asm/nonmatchings/os/48020_len_a00/osPfsRequestData.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_48020_len_a00/osPfsRequestData.s rename to ver/us/asm/nonmatchings/os/48020_len_a00/osPfsRequestData.s diff --git a/ver/us/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s b/ver/us/asm/nonmatchings/os/48c00_len_5c0/func_8006D800.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s rename to ver/us/asm/nonmatchings/os/48c00_len_5c0/func_8006D800.s diff --git a/ver/us/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s b/ver/us/asm/nonmatchings/os/491c0_len_f80/func_8006DDC0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s rename to ver/us/asm/nonmatchings/os/491c0_len_f80/func_8006DDC0.s diff --git a/ver/us/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s b/ver/us/asm/nonmatchings/os/491c0_len_f80/func_8006E310.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s rename to ver/us/asm/nonmatchings/os/491c0_len_f80/func_8006E310.s diff --git a/ver/us/asm/nonmatchings/os/code_49C70/func_8006E870.s b/ver/us/asm/nonmatchings/os/49C70/func_8006E870.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_49C70/func_8006E870.s rename to ver/us/asm/nonmatchings/os/49C70/func_8006E870.s diff --git a/ver/us/asm/nonmatchings/os/code_4a140_len_70/strcmp.s b/ver/us/asm/nonmatchings/os/4a140_len_70/strcmp.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a140_len_70/strcmp.s rename to ver/us/asm/nonmatchings/os/4a140_len_70/strcmp.s diff --git a/ver/us/asm/nonmatchings/os/code_4a140_len_70/strcpy.s b/ver/us/asm/nonmatchings/os/4a140_len_70/strcpy.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a140_len_70/strcpy.s rename to ver/us/asm/nonmatchings/os/4a140_len_70/strcpy.s diff --git a/ver/us/asm/nonmatchings/os/code_4a1b0_len_40/memset.s b/ver/us/asm/nonmatchings/os/4a1b0_len_40/memset.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a1b0_len_40/memset.s rename to ver/us/asm/nonmatchings/os/4a1b0_len_40/memset.s diff --git a/ver/us/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s b/ver/us/asm/nonmatchings/os/4a1f0_len_170/decode_yay0.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s rename to ver/us/asm/nonmatchings/os/4a1f0_len_170/decode_yay0.s diff --git a/ver/us/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s b/ver/us/asm/nonmatchings/os/4a1f0_len_170/func_8006EF28.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s rename to ver/us/asm/nonmatchings/os/4a1f0_len_170/func_8006EF28.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashAllErase.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashAllErase.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashClearStatus.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashClearStatus.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashInit.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashInit.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashReadArray.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashReadArray.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashReadId.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashReadId.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashReadStatus.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashReadStatus.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashSectorErase.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashSectorErase.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashWriteArray.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashWriteArray.s diff --git a/ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s b/ver/us/asm/nonmatchings/os/4a360_len_930/osFlashWriteBuffer.s similarity index 100% rename from ver/us/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s rename to ver/us/asm/nonmatchings/os/4a360_len_930/osFlashWriteBuffer.s diff --git a/ver/us/asm/nonmatchings/os/nusys/code_3B4A0/nuPiReadRomOverlay.s b/ver/us/asm/nonmatchings/os/nusys/3B4A0/nuPiReadRomOverlay.s similarity index 100% rename from ver/us/asm/nonmatchings/os/nusys/code_3B4A0/nuPiReadRomOverlay.s rename to ver/us/asm/nonmatchings/os/nusys/3B4A0/nuPiReadRomOverlay.s diff --git a/ver/us/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgr.s b/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgr.s similarity index 100% rename from ver/us/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgr.s rename to ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgr.s diff --git a/ver/us/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgrInit.s b/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgrInit.s similarity index 100% rename from ver/us/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskMgrInit.s rename to ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskMgrInit.s diff --git a/ver/us/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskStart.s b/ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskStart.s similarity index 100% rename from ver/us/asm/nonmatchings/os/nusys/code_7e40_len_3f0/nuGfxTaskStart.s rename to ver/us/asm/nonmatchings/os/nusys/7e40_len_3f0/nuGfxTaskStart.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80242BAC.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80242BAC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80242BAC.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80242BAC.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80242D04.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80242D04.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80242D04.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80242D04.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80242F90.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80242F90.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80242F90.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80242F90.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80242FBC.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80242FBC.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80242FBC.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80242FBC.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80242FF4.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80242FF4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80242FF4.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80242FF4.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80243090.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80243090.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80243090.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80243090.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_802430E4.s b/ver/us/asm/nonmatchings/pause/135EE0/func_802430E4.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_802430E4.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_802430E4.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_8024313C.s b/ver/us/asm/nonmatchings/pause/135EE0/func_8024313C.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_8024313C.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_8024313C.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80243188.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80243188.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80243188.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80243188.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80243238.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80243238.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80243238.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80243238.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_802432E8.s b/ver/us/asm/nonmatchings/pause/135EE0/func_802432E8.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_802432E8.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_802432E8.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/func_80243388.s b/ver/us/asm/nonmatchings/pause/135EE0/func_80243388.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/func_80243388.s rename to ver/us/asm/nonmatchings/pause/135EE0/func_80243388.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_cleanup.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_cleanup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_cleanup.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_cleanup.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_draw_rect.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_draw_rect.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_draw_rect.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_draw_rect.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_get_total_equipped_bp_cost.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_get_total_equipped_bp_cost.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_get_total_equipped_bp_cost.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_get_total_equipped_bp_cost.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_handle_input.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_handle_input.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_handle_input.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_init.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_init.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_init.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_init.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_interp_cursor.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_interp_cursor.s similarity index 85% rename from ver/us/asm/nonmatchings/code_135EE0/pause_interp_cursor.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_interp_cursor.s index 8daf0e4558..a6b5dc1275 100644 --- a/ver/us/asm/nonmatchings/code_135EE0/pause_interp_cursor.s +++ b/ver/us/asm/nonmatchings/pause/135EE0/pause_interp_cursor.s @@ -12,34 +12,34 @@ glabel pause_interp_cursor /* 1361C8 80242E88 44802000 */ mtc1 $zero, $f4 /* 1361CC 80242E8C 00A31023 */ subu $v0, $a1, $v1 /* 1361D0 80242E90 44821000 */ mtc1 $v0, $f2 -/* 1361D4 80242E94 00000000 */ nop +/* 1361D4 80242E94 00000000 */ nop /* 1361D8 80242E98 468010A1 */ cvt.d.w $f2, $f2 /* 1361DC 80242E9C 46241082 */ mul.d $f2, $f2, $f4 -/* 1361E0 80242EA0 00000000 */ nop -/* 1361E4 80242EA4 3C098025 */ lui $t1, %hi(gPauseMenuCursorPosY) -/* 1361E8 80242EA8 2529EFA0 */ addiu $t1, $t1, %lo(gPauseMenuCursorPosY) +/* 1361E0 80242EA0 00000000 */ nop +/* 1361E4 80242EA4 3C098025 */ lui $t1, %hi(D_8024EFA0) +/* 1361E8 80242EA8 2529EFA0 */ addiu $t1, $t1, %lo(D_8024EFA0) /* 1361EC 80242EAC 3C048025 */ lui $a0, %hi(gPauseMenuTargetPosY) /* 1361F0 80242EB0 8C84EFAC */ lw $a0, %lo(gPauseMenuTargetPosY)($a0) /* 1361F4 80242EB4 8D260000 */ lw $a2, ($t1) /* 1361F8 80242EB8 00861023 */ subu $v0, $a0, $a2 /* 1361FC 80242EBC 44820000 */ mtc1 $v0, $f0 -/* 136200 80242EC0 00000000 */ nop +/* 136200 80242EC0 00000000 */ nop /* 136204 80242EC4 46800021 */ cvt.d.w $f0, $f0 /* 136208 80242EC8 46240002 */ mul.d $f0, $f0, $f4 -/* 13620C 80242ECC 00000000 */ nop +/* 13620C 80242ECC 00000000 */ nop /* 136210 80242ED0 4620118D */ trunc.w.d $f6, $f2 /* 136214 80242ED4 44073000 */ mfc1 $a3, $f6 /* 136218 80242ED8 4620018D */ trunc.w.d $f6, $f0 /* 13621C 80242EDC 44083000 */ mfc1 $t0, $f6 /* 136220 80242EE0 14A30003 */ bne $a1, $v1, .L80242EF0 -/* 136224 80242EE4 00000000 */ nop +/* 136224 80242EE4 00000000 */ nop /* 136228 80242EE8 10860007 */ beq $a0, $a2, .L80242F08 -/* 13622C 80242EEC 00000000 */ nop +/* 13622C 80242EEC 00000000 */ nop .L80242EF0: /* 136230 80242EF0 14E00005 */ bnez $a3, .L80242F08 -/* 136234 80242EF4 00000000 */ nop +/* 136234 80242EF4 00000000 */ nop /* 136238 80242EF8 15000003 */ bnez $t0, .L80242F08 -/* 13623C 80242EFC 00000000 */ nop +/* 13623C 80242EFC 00000000 */ nop /* 136240 80242F00 AD450000 */ sw $a1, ($t2) /* 136244 80242F04 AD240000 */ sw $a0, ($t1) .L80242F08: @@ -48,8 +48,8 @@ glabel pause_interp_cursor /* 136250 80242F10 8C620000 */ lw $v0, ($v1) /* 136254 80242F14 00471021 */ addu $v0, $v0, $a3 /* 136258 80242F18 AC620000 */ sw $v0, ($v1) -/* 13625C 80242F1C 3C038025 */ lui $v1, %hi(gPauseMenuCursorPosY) -/* 136260 80242F20 2463EFA0 */ addiu $v1, $v1, %lo(gPauseMenuCursorPosY) +/* 13625C 80242F1C 3C038025 */ lui $v1, %hi(D_8024EFA0) +/* 136260 80242F20 2463EFA0 */ addiu $v1, $v1, %lo(D_8024EFA0) /* 136264 80242F24 8C620000 */ lw $v0, ($v1) /* 136268 80242F28 3C048025 */ lui $a0, %hi(gPauseMenuCursorTargetOpacity) /* 13626C 80242F2C 8C84EFB0 */ lw $a0, %lo(gPauseMenuCursorTargetOpacity)($a0) diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_interp_text_scroll.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_interp_text_scroll.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_interp_text_scroll.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_interp_text_scroll.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_set_cursor_opacity.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_set_cursor_opacity.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_set_cursor_opacity.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_set_cursor_opacity.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_sort_item_list.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_sort_item_list.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_sort_item_list.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_sort_item_list.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_textbox_draw_contents.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_textbox_draw_contents.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_draw_contents.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_draw_contents.s diff --git a/ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_input.s b/ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_135EE0/pause_tutorial_input.s rename to ver/us/asm/nonmatchings/pause/135EE0/pause_tutorial_input.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_badges.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_badges.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_badges.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_badges.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_items.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_items.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_items.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_items.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_map.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_map.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_map.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_map.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_party.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_party.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_party.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_party.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_spirits.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_spirits.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_spirits.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_spirits.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_stats.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_stats.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_draw_stats.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_draw_stats.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_handle_input.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_handle_input.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_init.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_init.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_init.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_init.s diff --git a/ver/us/asm/nonmatchings/code_137ED0/pause_tabs_update.s b/ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_update.s similarity index 100% rename from ver/us/asm/nonmatchings/code_137ED0/pause_tabs_update.s rename to ver/us/asm/nonmatchings/pause/137ED0/pause_tabs_update.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_cleanup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_cleanup.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_draw_bp_orbs.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_bp_orbs.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_draw_bp_orbs.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_bp_orbs.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_draw_contents.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_handle_input.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_init.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_init.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_init.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_init.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_load_badges.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_load_badges.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_try_equip.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_try_equip.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_try_equip.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_try_equip.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_badges_try_remove.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_badges_try_remove.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_badges_try_remove.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_badges_try_remove.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_stats_draw_contents.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_stats_handle_input.s diff --git a/ver/us/asm/nonmatchings/code_138CC0/pause_stats_init.s b/ver/us/asm/nonmatchings/pause/138CC0/pause_stats_init.s similarity index 100% rename from ver/us/asm/nonmatchings/code_138CC0/pause_stats_init.s rename to ver/us/asm/nonmatchings/pause/138CC0/pause_stats_init.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_cleanup.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_cleanup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_cleanup.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_cleanup.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_contents.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_contents.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_movelist.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_flower.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_flower.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_flower.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_title.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_movelist_title.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_movelist_title.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_title.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_draw_title.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_draw_title.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_handle_input.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_handle_input.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_handle_input.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_init.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_init.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_init.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_init.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_load_portrait.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_load_portrait.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_load_portrait.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_load_portrait.s diff --git a/ver/us/asm/nonmatchings/code_13E120/pause_partners_update.s b/ver/us/asm/nonmatchings/pause/13E120/pause_partners_update.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13E120/pause_partners_update.s rename to ver/us/asm/nonmatchings/pause/13E120/pause_partners_update.s diff --git a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_cleanup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s rename to ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_cleanup.s diff --git a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s rename to ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_contents.s diff --git a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_title.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s rename to ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_draw_title.s diff --git a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s rename to ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_handle_input.s diff --git a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_init.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_init.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13FD40/pause_spirits_init.s rename to ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_init.s diff --git a/ver/us/asm/nonmatchings/code_13FD40/pause_spirits_update.s b/ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_update.s similarity index 100% rename from ver/us/asm/nonmatchings/code_13FD40/pause_spirits_update.s rename to ver/us/asm/nonmatchings/pause/13FD40/pause_spirits_update.s diff --git a/ver/us/asm/nonmatchings/code_140C70/func_8024D930.s b/ver/us/asm/nonmatchings/pause/140C70/func_8024D930.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/func_8024D930.s rename to ver/us/asm/nonmatchings/pause/140C70/func_8024D930.s diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_cleanup.s b/ver/us/asm/nonmatchings/pause/140C70/pause_map_cleanup.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/pause_map_cleanup.s rename to ver/us/asm/nonmatchings/pause/140C70/pause_map_cleanup.s diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_draw_border_arrows.s b/ver/us/asm/nonmatchings/pause/140C70/pause_map_draw_border_arrows.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/pause_map_draw_border_arrows.s rename to ver/us/asm/nonmatchings/pause/140C70/pause_map_draw_border_arrows.s diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_draw_contents.s b/ver/us/asm/nonmatchings/pause/140C70/pause_map_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/pause_map_draw_contents.s rename to ver/us/asm/nonmatchings/pause/140C70/pause_map_draw_contents.s diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_draw_title.s b/ver/us/asm/nonmatchings/pause/140C70/pause_map_draw_title.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/pause_map_draw_title.s rename to ver/us/asm/nonmatchings/pause/140C70/pause_map_draw_title.s diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_handle_input.s b/ver/us/asm/nonmatchings/pause/140C70/pause_map_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/pause_map_handle_input.s rename to ver/us/asm/nonmatchings/pause/140C70/pause_map_handle_input.s diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_init.s b/ver/us/asm/nonmatchings/pause/140C70/pause_map_init.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/pause_map_init.s rename to ver/us/asm/nonmatchings/pause/140C70/pause_map_init.s diff --git a/ver/us/asm/nonmatchings/code_140C70/pause_map_update.s b/ver/us/asm/nonmatchings/pause/140C70/pause_map_update.s similarity index 100% rename from ver/us/asm/nonmatchings/code_140C70/pause_map_update.s rename to ver/us/asm/nonmatchings/pause/140C70/pause_map_update.s diff --git a/ver/us/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s b/ver/us/asm/nonmatchings/pause/1421C0/pause_draw_menu_label.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1421C0/pause_draw_menu_label.s rename to ver/us/asm/nonmatchings/pause/1421C0/pause_draw_menu_label.s diff --git a/ver/us/asm/nonmatchings/code_1421C0/pause_get_menu_string.s b/ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_string.s similarity index 100% rename from ver/us/asm/nonmatchings/code_1421C0/pause_get_menu_string.s rename to ver/us/asm/nonmatchings/pause/1421C0/pause_get_menu_string.s diff --git a/ver/us/asm/nonmatchings/pause_items/pause_items_draw_contents.s b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s similarity index 100% rename from ver/us/asm/nonmatchings/pause_items/pause_items_draw_contents.s rename to ver/us/asm/nonmatchings/pause/pause_items/pause_items_draw_contents.s diff --git a/ver/us/asm/nonmatchings/pause_items/pause_items_handle_input.s b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_handle_input.s similarity index 100% rename from ver/us/asm/nonmatchings/pause_items/pause_items_handle_input.s rename to ver/us/asm/nonmatchings/pause/pause_items/pause_items_handle_input.s diff --git a/ver/us/asm/nonmatchings/pause_items/pause_items_load_items.s b/ver/us/asm/nonmatchings/pause/pause_items/pause_items_load_items.s similarity index 100% rename from ver/us/asm/nonmatchings/pause_items/pause_items_load_items.s rename to ver/us/asm/nonmatchings/pause/pause_items/pause_items_load_items.s diff --git a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s index 8bc3d57ab6..4c9c528052 100644 --- a/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s +++ b/ver/us/asm/nonmatchings/world/area_end/end_00/DF6A20/func_80242680_DF9080.s @@ -26,7 +26,7 @@ glabel func_80242680_DF9080 /* DF90D4 802426D4 24020001 */ addiu $v0, $zero, 1 /* DF90D8 802426D8 3C01802E */ lui $at, %hi(D_802DF524) /* DF90DC 802426DC AC22F524 */ sw $v0, %lo(D_802DF524)($at) -/* DF90E0 802426E0 0C00E219 */ jal create_standard_npc +/* DF90E0 802426E0 0C00E219 */ jal npc_create_standard /* DF90E4 802426E4 27A40010 */ addiu $a0, $sp, 0x10 /* DF90E8 802426E8 0C00E2B7 */ jal get_npc_by_index /* DF90EC 802426EC 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s index 51429efba4..73f143c11d 100644 --- a/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s +++ b/ver/us/asm/nonmatchings/world/area_end/end_01/E05390/func_80242690_E079F0.s @@ -26,7 +26,7 @@ glabel func_80242690_E079F0 /* E07A44 802426E4 24020001 */ addiu $v0, $zero, 1 /* E07A48 802426E8 3C01802E */ lui $at, %hi(D_802DF524) /* E07A4C 802426EC AC22F524 */ sw $v0, %lo(D_802DF524)($at) -/* E07A50 802426F0 0C00E219 */ jal create_standard_npc +/* E07A50 802426F0 0C00E219 */ jal npc_create_standard /* E07A54 802426F4 27A40010 */ addiu $a0, $sp, 0x10 /* E07A58 802426F8 0C00E2B7 */ jal get_npc_by_index /* E07A5C 802426FC 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s b/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s index ddc2d14def..a2992bf493 100644 --- a/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s +++ b/ver/us/asm/nonmatchings/world/area_gv/gv_01/E1E460/func_80240688_E1EAE8.s @@ -53,7 +53,7 @@ glabel func_80240688_E1EAE8 /* E1EBA8 80240748 00000000 */ nop /* E1EBAC 8024074C 0C037F14 */ jal clear_player_status /* E1EBB0 80240750 00000000 */ nop -/* E1EBB4 80240754 0C00E12F */ jal clear_npcs +/* E1EBB4 80240754 0C00E12F */ jal npc_list_clear /* E1EBB8 80240758 00000000 */ nop /* E1EBBC 8024075C 0C039CE8 */ jal clear_player_data /* E1EBC0 80240760 00000000 */ nop diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s index 4d03996ada..7b05eb576d 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_80241108_97EBD8.s @@ -29,7 +29,7 @@ glabel func_80241108_97EBD8 /* 97EC38 80241168 AFA00018 */ sw $zero, 0x18($sp) /* 97EC3C 8024116C AFA0001C */ sw $zero, 0x1c($sp) .L80241170: -/* 97EC40 80241170 0C00E211 */ jal create_basic_npc +/* 97EC40 80241170 0C00E211 */ jal npc_create_basic /* 97EC44 80241174 0280202D */ daddu $a0, $s4, $zero /* 97EC48 80241178 0C00E2B7 */ jal get_npc_by_index /* 97EC4C 8024117C 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0_97F090.s b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0_97F090.s index d2dbce2e4c..4bdaf5d1da 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0_97F090.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_05/97DAD0/func_802415C0_97F090.s @@ -13,7 +13,7 @@ glabel func_802415C0_97F090 .L802415E0: /* 97F0B0 802415E0 8E040000 */ lw $a0, ($s0) /* 97F0B4 802415E4 26310001 */ addiu $s1, $s1, 1 -/* 97F0B8 802415E8 0C00E273 */ jal free_npc +/* 97F0B8 802415E8 0C00E273 */ jal npc_free /* 97F0BC 802415EC 26100010 */ addiu $s0, $s0, 0x10 /* 97F0C0 802415F0 2A220008 */ slti $v0, $s1, 8 /* 97F0C4 802415F4 1440FFFA */ bnez $v0, .L802415E0 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s index 282f00345a..36b9ff10dd 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_80241108_9908E8.s @@ -29,7 +29,7 @@ glabel func_80241108_9908E8 /* 990948 80241168 AFA00018 */ sw $zero, 0x18($sp) /* 99094C 8024116C AFA0001C */ sw $zero, 0x1c($sp) .L80241170: -/* 990950 80241170 0C00E211 */ jal create_basic_npc +/* 990950 80241170 0C00E211 */ jal npc_create_basic /* 990954 80241174 0280202D */ daddu $a0, $s4, $zero /* 990958 80241178 0C00E2B7 */ jal get_npc_by_index /* 99095C 8024117C 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802415C0_990DA0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802415C0_990DA0.s index 1d61d77198..284a8fb503 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802415C0_990DA0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_13/98F7E0/func_802415C0_990DA0.s @@ -13,7 +13,7 @@ glabel func_802415C0_990DA0 .L802415E0: /* 990DC0 802415E0 8E040000 */ lw $a0, ($s0) /* 990DC4 802415E4 26310001 */ addiu $s1, $s1, 1 -/* 990DC8 802415E8 0C00E273 */ jal free_npc +/* 990DC8 802415E8 0C00E273 */ jal npc_free /* 990DCC 802415EC 26100010 */ addiu $s0, $s0, 0x10 /* 990DD0 802415F0 2A220008 */ slti $v0, $s1, 8 /* 990DD4 802415F4 1440FFFA */ bnez $v0, .L802415E0 diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s index 4b7cc660f4..e2113d8b52 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_80241108_993838.s @@ -29,7 +29,7 @@ glabel func_80241108_993838 /* 993898 80241168 AFA00018 */ sw $zero, 0x18($sp) /* 99389C 8024116C AFA0001C */ sw $zero, 0x1c($sp) .L80241170: -/* 9938A0 80241170 0C00E211 */ jal create_basic_npc +/* 9938A0 80241170 0C00E211 */ jal npc_create_basic /* 9938A4 80241174 0280202D */ daddu $a0, $s4, $zero /* 9938A8 80241178 0C00E2B7 */ jal get_npc_by_index /* 9938AC 8024117C 0040202D */ daddu $a0, $v0, $zero diff --git a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802415C0_993CF0.s b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802415C0_993CF0.s index 4f3c8b6d71..6fadcb4a20 100644 --- a/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802415C0_993CF0.s +++ b/ver/us/asm/nonmatchings/world/area_isk/isk_14/992730/func_802415C0_993CF0.s @@ -13,7 +13,7 @@ glabel func_802415C0_993CF0 .L802415E0: /* 993D10 802415E0 8E040000 */ lw $a0, ($s0) /* 993D14 802415E4 26310001 */ addiu $s1, $s1, 1 -/* 993D18 802415E8 0C00E273 */ jal free_npc +/* 993D18 802415E8 0C00E273 */ jal npc_free /* 993D1C 802415EC 26100010 */ addiu $s0, $s0, 0x10 /* 993D20 802415F0 2A220008 */ slti $v0, $s1, 8 /* 993D24 802415F4 1440FFFA */ bnez $v0, .L802415E0 diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml index 9a9497bed1..61215e822b 100644 --- a/ver/us/splat.yaml +++ b/ver/us/splat.yaml @@ -4,16 +4,24 @@ options: find_file_boundaries: True compiler: GCC mnemonic_ljust: 10 - ld_o_replace_extension: False - ld_addrs_header: build/include/ld_addrs.h - extensions: ../../tools/splat_ext - symbol_addrs_path: symbol_addrs.txt platform: n64 - out_dir: . - target_path: baserom.z64 - src_path: ../../src - assets_dir: assets subalign: 8 + + base_path: ../.. + target_path: ver/us/baserom.z64 + extensions_path: tools/splat_ext + symbol_addrs_path: ver/us/symbol_addrs.txt + ld_script_path: ver/us/papermario.ld + linker_symbol_header_path: ver/us/build/include/ld_addrs.h + src_path: src + asm_path: ver/us/asm + asset_path: assets/us + build_path: ver/us/build + cache_path: ver/us/.splat_cache + undefined_funcs_auto_path: ver/us/undefined_funcs_auto.txt + undefined_syms_auto_path: ver/us/undefined_syms_auto.txt +asset_stack: + - us segments: - name: header type: header @@ -22,63 +30,63 @@ segments: type: code start: 0x0040 vram: 0xA4000040 - subsections: + subsegments: - [0x0040, asm, boot] - [0x0B70, bin, bootcode_font] - type: code start: 0x1000 vram: 0x80025C00 subalign: 4 - subsections: + subsegments: - [0x1000, hasm, entry_point] - - [0x1060, c, code_1060_len_310] - - [0x1370, c, code_1370_len_7d0] - - [0x1b40, c, code_1b40_len_20b0] - - [0x3bf0, c, code_3bf0_len_6f0] - - [0x42e0, c, code_42e0_len_1f60] + - [0x1060, c, 1060_len_310] + - [0x1370, c, 1370_len_7d0] + - [0x1b40, c, 1b40_len_20b0] + - [0x3bf0, c, 3bf0_len_6f0] + - [0x42e0, c, 42e0_len_1f60] - [0x43F0, c] - - [0x6000, c, code_6000] - - [0x6240, c, code_6240_len_c00] - - [0x6e40, c, code_6e40_len_500] - - [0x7340, c, code_7340_len_b00] - - [0x7e40, c, os/nusys/code_7e40_len_3f0] + - [0x6000, c, 6000] + - [0x6240, c, 6240_len_c00] + - [0x6e40, c, 6e40_len_500] + - [0x7340, c, 7340_len_b00] + - [0x7e40, c, os/nusys/7e40_len_3f0] - [0x8230, c, os/nusys/nuSiMgr] - [0x8560, c] - [0x8800, c] - - [0x9d10, c, code_9d10_len_1080] - - [0xad90, c, code_ad90_len_2880] + - [0x9d10, c, 9d10_len_1080] + - [0xad90, c, ad90_len_2880] - [0xB0E0, c] - - [0xd610, c, code_d610_len_1330] - - [0xe940, c, code_e940_len_290] - - [0xebd0, c, code_ebd0_len_6a0] - - [0xf270, c, code_f270_len_1190] - - [0x10400, c, code_10400_len_d30] - - [0x11130, c, code_11130_len_c0] - - [0x111f0, c, code_111f0_len_860] - - [0x11a50, c, code_11a50_len_7a0] - - [0x121f0, c, code_121f0_len_1290] - - [0x13480, c, code_13480_len_3f0] - - [0x13870, c, code_13870_len_6980] - - [0x1a1f0, c, code_1a1f0_len_5390] - - [0x1f580, c, code_1f580_len_1940] - - [0x20ec0, c, code_20ec0_len_5040] + - [0xd610, c, d610_len_1330] + - [0xe940, c, e940_len_290] + - [0xebd0, c, ebd0_len_6a0] + - [0xf270, c, f270_len_1190] + - [0x10400, c, 10400_len_d30] + - [0x11130, c, 11130_len_c0] + - [0x111f0, c, 111f0_len_860] + - [0x11a50, c, 11a50_len_7a0] + - [0x121f0, c, 121f0_len_1290] + - [0x13480, c, 13480_len_3f0] + - [0x13870, c, npc] + - [0x1a1f0, c, 1a1f0_len_5390] + - [0x1f580, c, 1f580_len_1940] + - [0x20ec0, c, 20ec0_len_5040] - [0x23680, c] - [0x25AF0, c] - - [0x25f00, c, code_25f00_len_940] - - [0x26840, c, code_26840_len_20d0] - - [0x28910, c, code_28910_len_5090] + - [0x25f00, c, 25f00_len_940] + - [0x26840, c, 26840_len_20d0] + - [0x28910, c, 28910_len_5090] - [0x2BF90, c] - - [0x2d9a0, c, code_2d9a0_len_890] - - [0x2e230, c, code_2e230_len_2190] - - [0x303c0, c, code_303c0_len_3e10] + - [0x2d9a0, c, 2d9a0_len_890] + - [0x2e230, c, 2e230_len_2190] + - [0x303c0, c, 303c0_len_3e10] - [0x30450, c] - - [0x31650, c, code_31650] + - [0x31650, c, 31650] - [0x33450, c] - - [0x341d0, c, code_341d0] + - [0x341d0, c, 341d0] - [0x35ac0, c, world/world] - - [0x362a0, c, code_362a0_len_2f70] - - [0x39210, c, code_39210_len_aa0] - - [0x39cb0, c, os/code_39cb0_len_100] + - [0x362a0, c, 362a0_len_2f70] + - [0x39210, c, 39210_len_aa0] + - [0x39cb0, c, os/39cb0_len_100] - [0x39db0, c, os/nusys/nuSched] - [0x3a650, c, os/nusys/nuGfxFuncSet] - [0x3a690, c, os/nusys/nuGfxPreNMIFuncSet] @@ -96,14 +104,14 @@ segments: - [0x3b290, c, os/nusys/nuContRmbStart] - [0x3b2f0, c, os/nusys/nuContRmbCheck] - [0x3b390, c, os/nusys/nuContRmbModeSet] - - [0x3b4a0, c, os/nusys/code_3B4A0] + - [0x3b4a0, c, os/nusys/3B4A0] - [0x3B5F0, c, os/nusys/nuGfxThread] - - [0x3b710, c, os/code_3b710_len_40] - - [0x3b750, c, os/code_3b750_len_20] - - [0x3b770, c, os/code_3b770_len_80] - - [0x3b7f0, c, os/code_3b7f0_len_120] + - [0x3b710, c, os/3b710_len_40] + - [0x3b750, c, os/3b750_len_20] + - [0x3b770, c, os/3b770_len_80] + - [0x3b7f0, c, os/3b7f0_len_120] - [0x3b910, c, os/nuContMgr] - - [0x3bd20, c, os/code_3bd20_len_c0] + - [0x3bd20, c, os/3bd20_len_c0] - [0x3BD40, hasm, os/osSetIntMask] - [0x3bde0, c, os/osCreatePiManager] - [0x3C160, c, os/osEPiWriteIo] # MOVE_ADDU @@ -111,141 +119,142 @@ segments: - [0x3c220, c, os/osEPiStartDma] # MOVE_ADDU - [0x3c2c0, c, os/osEPiLinkHandle] - [0x3c310, c, os/osCartRomInit] - - [0x3c490, c, os/code_3c490_len_3c0] - - [0x3c850, c, os/code_3c850_len_f0] - - [0x3c940, c, os/code_3c940_len_140] - - [0x3ca80, c, os/code_3ca80_len_a0] + - [0x3c490, c, os/3c490_len_3c0] + - [0x3c850, c, os/3c850_len_f0] + - [0x3c940, c, os/3c940_len_140] + - [0x3ca80, c, os/3ca80_len_a0] - [0x3CB20, hasm, os/osInvalDCache] - [0x3CBD0, hasm, os/osInvalICache] - [0x3cc50, hasm, os/osWritebackDCache] - [0x3ccd0, hasm, os/osWritebackDCacheAll] - - [0x3cd00, c, os/code_3cd00_len_5f0] # MOVE_ADDU + - [0x3cd00, c, os/3cd00_len_5f0] # MOVE_ADDU - [0x3CF80, c, os/controller] - [0x3D290, c, os/osVirtualToPhysical] - - [0x3d2f0, c, os/code_3d2f0_len_10] - - [0x3d300, c, os/code_3d300_len_30] + - [0x3d2f0, c, os/3d2f0_len_10] + - [0x3d300, c, os/3d300_len_30] - [0x3d330, c, os/guFrustum] - [0x3D5B0, c, os/guLookAt] - - [0x3dcc0, c, os/code_3dcc0_len_a60] - - [0x3e720, c, os/code_3e720_len_5f0] + - [0x3dcc0, c, os/3dcc0_len_a60] + - [0x3e720, c, os/3e720_len_5f0] - [0x3ed10, c, os/guOrtho] - - [0x3ef90, c, os/code_3ef90_len_600] - - [0x3f310, c, os/code_3f310_len_3c0] - - [0x3f6d0, c, os/code_3f6d0_len_320] + - [0x3ef90, c, os/3ef90_len_600] + - [0x3f310, c, os/3f310_len_3c0] + - [0x3f6d0, c, os/3f6d0_len_320] - [0x3f9f0, c, os/sins] - - [0x3fa50, c, os/code_3fa50_len_f60] - - [0x3FEA0, c, os/code_3FEA0] # MOVE_ADDU + - [0x3fa50, c, os/3fa50_len_f60] + - [0x3FEA0, c, os/3FEA0] # MOVE_ADDU - [0x40980, c, os/osCreateMesgQueue] - [0x409b0, c, os/osJamMesg] - [0x40af0, c, os/osRecvMesg] - - [0x40c20, c, os/code_40c20_len_1f0] + - [0x40c20, c, os/40c20_len_1f0] - [0x40E00, hasm, os/osGetCount] - - [0x40E10, c, os/code_40E10] + - [0x40E10, c, os/40E10] - [0x41050, c, os/osSpTaskYield] - [0x41070, c, os/osSpTaskYielded] - [0x410C0, c, os/osSiRawStartDma] - - [0x41170, c, os/code_41170_len_f0] + - [0x41170, c, os/41170_len_f0] - [0x41260, c, os/osCreateThread] - [0x41330, c, os/osGetThreadPri] - [0x41350, c, os/osSetThreadPri] # MOVE_ADDU - - [0x41420, c, os/code_41420_len_120] - - [0x41540, c, os/code_41540_len_c0] - - [0x41600, c, os/code_41600_len_40] - - [0x41640, c, os/code_41640_len_50] - - [0x41690, c, os/code_41690_len_10] - - [0x416a0, c, os/code_416a0_len_90] - - [0x41730, c, os/code_41730_len_20] - - [0x41750, c, os/code_41750_len_450] - - [0x41880, c, os/code_41880] - - [0x41ba0, c, os/code_41ba0_len_c0] - - [0x41c60, c, os/code_41c60_len_c0] - - [0x41d20, c, os/code_41d20_len_40] - - [0x41d60, c, os/code_41d60_len_50] - - [0x41db0, c, os/code_41db0_len_40] - - [0x41df0, c, os/code_41df0_len_40] - - [0x41e30, c, os/code_41e30_len_40] - - [0x41e70, c, os/code_41e70_len_340] - - [0x421b0, c, os/code_421b0_len_60] - - [0x42210, c, os/code_42210_len_50] - - [0x42260, c, os/code_42260_len_170] - - [0x423d0, c, os/code_423d0_len_50] - - [0x42420, c, os/code_42420_len_50] - - [0x42470, c, os/code_42470_len_310] - - [0x42780, c, os/code_42780_len_120] + - [0x41420, c, os/41420_len_120] + - [0x41540, c, os/41540_len_c0] + - [0x41600, c, os/41600_len_40] + - [0x41640, c, os/41640_len_50] + - [0x41690, c, os/41690_len_10] + - [0x416a0, c, os/416a0_len_90] + - [0x41730, c, os/41730_len_20] + - [0x41750, c, os/41750_len_450] + - [0x41880, c, os/41880] + - [0x41ba0, c, os/41ba0_len_c0] + - [0x41c60, c, os/41c60_len_c0] + - [0x41d20, c, os/41d20_len_40] + - [0x41d60, c, os/41d60_len_50] + - [0x41db0, c, os/41db0_len_40] + - [0x41df0, c, os/41df0_len_40] + - [0x41e30, c, os/41e30_len_40] + - [0x41e70, c, os/41e70_len_340] + - [0x421b0, c, os/421b0_len_60] + - [0x42210, c, os/42210_len_50] + - [0x42260, c, os/42260_len_170] + - [0x423d0, c, os/423d0_len_50] + - [0x42420, c, os/42420_len_50] + - [0x42470, c, os/42470_len_310] + - [0x42780, c, os/42780_len_120] - [0x427E0, c, os/osViRepeatLine] - [0x42840, c, os/guMtxIdent] - [0x428a0, c, os/guMtxIdentF] - - [0x42900, c, os/code_42900_len_80] - - [0x42980, c, os/code_42980_len_80] - - [0x42a00, c, os/code_42a00_len_100] - - [0x42b00, c, os/code_42b00_len_c0] - - [0x42bc0, c, os/code_42bc0_len_60] - - [0x42c20, c, os/code_42c20_len_e0] - - [0x42d00, c, os/code_42d00_len_60] - - [0x42d60, c, os/code_42d60_len_80] - - [0x42de0, c, os/code_42de0_len_90] - - [0x42e70, c, os/code_42e70_len_390] + - [0x42900, c, os/42900_len_80] + - [0x42980, c, os/42980_len_80] + - [0x42a00, c, os/42a00_len_100] + - [0x42b00, c, os/42b00_len_c0] + - [0x42bc0, c, os/42bc0_len_60] + - [0x42c20, c, os/42c20_len_e0] + - [0x42d00, c, os/42d00_len_60] + - [0x42d60, c, os/42d60_len_80] + - [0x42de0, c, os/42de0_len_90] + - [0x42e70, c, os/42e70_len_390] - [0x42F20, c, os/guRotate] - - [0x43200, c, os/code_43200_len_7c0] - - [0x43590, c, os/code_43590] - - [0x439c0, c, os/code_439c0_len_220] - - [0x43be0, c, os/code_43be0_len_5e0] - - [0x441c0, c, os/code_441c0_len_1c0] - - [0x44380, c, os/code_44380_len_4e0] - - [0x44490, c, os/code_44490] - - [0x44860, c, os/code_44860_len_60] - - [0x448c0, c, os/code_448c0_len_210] - - [0x44ad0, c, os/code_44ad0_len_70] - - [0x44b40, c, os/code_44b40_len_a90] - - [0x455d0, c, os/code_455d0_len_1f0] - - [0x457c0, c, os/code_457c0_len_270] - - [0x45a30, c, os/code_45a30_len_20] - - [0x45a50, c, os/code_45a50_len_3a0] + - [0x43200, c, os/43200_len_7c0] + - [0x43590, c, os/43590] + - [0x439c0, c, os/439c0_len_220] + - [0x43be0, c, os/43be0_len_5e0] + - [0x441c0, c, os/441c0_len_1c0] + - [0x44380, c, os/44380_len_4e0] + - [0x44490, c, os/44490] + - [0x44860, c, os/44860_len_60] + - [0x448c0, c, os/448c0_len_210] + - [0x44ad0, c, os/44ad0_len_70] + - [0x44b40, c, os/44b40_len_a90] + - [0x455d0, c, os/455d0_len_1f0] + - [0x457c0, c, os/457c0_len_270] + - [0x45a30, c, os/45a30_len_20] + - [0x45a50, c, os/45a50_len_3a0] - [0x45df0, hasm, os/exceptasm] - [0x46760, hasm, os/__osDisableInt] - [0x467D0, hasm, os/__osRestoreInt] - - [0x467f0, c, os/code_467f0_len_90] - - [0x46880, c, os/code_46880_len_260] - - [0x46ae0, c, os/code_46ae0_len_170] - - [0x46c50, c, os/code_46c50_len_20] - - [0x46c70, c, os/code_46c70_len_e00] + - [0x467f0, c, os/467f0_len_90] + - [0x46880, c, os/46880_len_260] + - [0x46ae0, c, os/46ae0_len_170] + - [0x46c50, c, os/46c50_len_20] + - [0x46c70, c, os/46c70_len_e00] - [0x47A60, hasm, os/__osGetCause] - - [0x47a70, c, os/code_47a70_len_10] - - [0x47a80, c, os/code_47a80_len_10] - - [0x47a90, c, os/code_47a90_len_50] - - [0x47ae0, c, os/code_47ae0_len_e0] - - [0x47bc0, c, os/code_47bc0_len_50] - - [0x47c10, c, os/code_47c10_len_50] - - [0x47c60, c, os/code_47c60_len_f0] # MOVE_ADDU - - [0x47d50, c, os/code_47d50_len_e0] - - [0x47e30, c, os/code_47e30_len_60] - - [0x47e90, c, os/code_47e90_len_110] - - [0x47fa0, c, os/code_47fa0_len_20] - - [0x47fc0, c, os/code_47fc0_len_60] - - [0x48020, c, os/code_48020_len_a00] + - [0x47a70, c, os/47a70_len_10] + - [0x47a80, c, os/47a80_len_10] + - [0x47a90, c, os/47a90_len_50] + - [0x47ae0, c, os/47ae0_len_e0] + - [0x47bc0, c, os/47bc0_len_50] + - [0x47c10, c, os/47c10_len_50] + - [0x47c60, c, os/47c60_len_f0] # MOVE_ADDU + - [0x47d50, c, os/47d50_len_e0] + - [0x47e30, c, os/47e30_len_60] + - [0x47e90, c, os/47e90_len_110] + - [0x47fa0, c, os/47fa0_len_20] + - [0x47fc0, c, os/47fc0_len_60] + - [0x48020, c, os/48020_len_a00] - [0x48a20, c, os/ldiv] - [0x48be0, c, os/osSiDeviceBusy] - - [0x48c00, c, os/code_48c00_len_5c0] - - [0x491c0, c, os/code_491c0_len_f80] - - [0x49C70, c, os/code_49C70] - - [0x4a140, c, os/code_4a140_len_70] - - [0x4a1b0, c, os/code_4a1b0_len_40] - - [0x4a1f0, c, os/code_4a1f0_len_170] # yay0 decompression - some or all is hand-written - - [0x4a360, c, os/code_4a360_len_930] # osFlash* - IDO O2 -g - - [0x4ac90, c, code_4ac90_len_3910] + - [0x48c00, c, os/48c00_len_5c0] + - [0x491c0, c, os/491c0_len_f80] + - [0x49C70, c, os/49C70] + - [0x4a140, c, os/4a140_len_70] + - [0x4a1b0, c, os/4a1b0_len_40] + - [0x4a1f0, c, os/4a1f0_len_170] # yay0 decompression - some or all is hand-written + - [0x4a360, c, os/4a360_len_930] # osFlash* - IDO O2 -g + - [0x4ac90, c, 4ac90_len_3910] + - [0x4DF30, c, battle/battle] # DUMMY ROM location - not sure where it should go - [0x4DF30, c] - - [0x4E5A0, data, code_1000_len_60] - - [0x4F410, .data, code_1370_len_7d0] - - [0x4F420, .data, code_1b40_len_20b0] - - [0x4F660, .data, code_42e0_len_1f60] - - [0x4F670, .data, code_43F0] - - [0x4F9D0, data, code_6240_len_c00] - - [0x52D08, .data, code_f270_len_1190] + - [0x4E5A0, data, 1000_len_60] + - [0x4F410, .data, 1370_len_7d0] + - [0x4F420, .data, 1b40_len_20b0] + - [0x4F660, .data, 42e0_len_1f60] + - [0x4F670, .data, 43F0] + - [0x4F9D0, data, 6240_len_c00] + - [0x52D08, .data, f270_len_1190] - [0x52D80, data] - - [0x53570, .data, code_25f00_len_940] - - [0x53590, data, code_26840_len_20d0] - - [0x541B0, .data, code_30450] - - [0x54250, .data, code_31650] + - [0x53570, .data, 25f00_len_940] + - [0x53590, data, 26840_len_20d0] + - [0x541B0, .data, 30450] + - [0x54250, .data, 31650] - [0x542E0, data] - [0x6B360, .data, world/world] - [0x6EAC0, data] # has scripts @@ -255,75 +264,76 @@ segments: - [0x6F120, .data, os/nuContMgr] - [0x6F120, .data, os/osCreatePiManager] - [0x6F180, .data, os/osCartRomInit] - - [0x6F190, .data, os/code_3c850_len_f0] - - [0x6F1A0, .data, os/code_3ca80_len_a0] + - [0x6F190, .data, os/3c850_len_f0] + - [0x6F1A0, .data, os/3ca80_len_a0] - [0x6F1B0, .data, os/controller] - - [0x6F1C0, .data, os/code_3f310_len_3c0] - - [0x6F1D0, .data, os/code_3f6d0_len_320] + - [0x6F1C0, .data, os/3f310_len_3c0] + - [0x6F1D0, .data, os/3f6d0_len_320] - [0x6F1E0, .data, os/sins] - - [0x6F9E0, .data, os/code_3FEA0] - - [0x6FA30, .data, os/code_40c20_len_1f0] - - [0x6FA40, .data, os/code_41170_len_f0] + - [0x6F9E0, .data, os/3FEA0] + - [0x6FA30, .data, os/40c20_len_1f0] + - [0x6FA40, .data, os/41170_len_f0] - [0x6FA50, .data, os/osSetThreadPri] - [0x6FA70, data] # has scripts? - [0x70E30, .data, battle/battle] - [0x71430, data] - - [0x73130, .rodata, code_1060_len_310] - - [0x73148, .rodata, code_1b40_len_20b0] - - [0x73160, .rodata, code_43F0] - - [0x73200, .rodata, code_6e40_len_500] - - [0x73434, .rodata, code_7340_len_b00] - - [0x735E0, .rodata, code_8800] - - [0x73610, .rodata, code_B0E0] - - [0x73680, .rodata, code_d610_len_1330] - - [0x73690, .rodata, code_f270_len_1190] - - [0x736E8, .rodata, code_10400_len_d30] - - [0x73720, .rodata, code_111f0_len_860] - - [0x73738, .rodata, code_11a50_len_7a0] - - [0x73790, .rodata, code_121f0_len_1290] - - [0x73860, .rodata, code_13480_len_3f0] - - [0x73880, .rodata, code_13870_len_6980] - - [0x739F0, .rodata, code_1a1f0_len_5390] - - [0x73AB0, .rodata, code_20ec0_len_5040] - - [0x73B10, .rodata, code_23680] - - [0x73CC0, .rodata, code_28910_len_5090] - - [0x73CF0, .rodata, code_2e230_len_2190] - - [0x73D08, .rodata, code_30450] - - [0x73D30, .rodata, code_33450] - - [0x73D40, .rodata, code_341d0] + - [0x73130, .rodata, 1060_len_310] + - [0x73148, .rodata, 1b40_len_20b0] + - [0x73160, .rodata, 43F0] + - [0x73200, .rodata, 6e40_len_500] + - [0x73434, .rodata, 7340_len_b00] + - [0x735E0, .rodata, 8800] + - [0x73610, .rodata, B0E0] + - [0x73680, .rodata, d610_len_1330] + - [0x73690, .rodata, f270_len_1190] + - [0x736E8, .rodata, 10400_len_d30] + - [0x73720, .rodata, 111f0_len_860] + - [0x73738, .rodata, 11a50_len_7a0] + - [0x73790, .rodata, 121f0_len_1290] + - [0x73860, .rodata, 13480_len_3f0] + - [0x73880, .rodata, npc] + - [0x739F0, .rodata, 1a1f0_len_5390] + - [0x73AB0, .rodata, 20ec0_len_5040] + - [0x73B10, .rodata, 23680] + - [0x73CC0, .rodata, 28910_len_5090] + - [0x73CF0, .rodata, 2e230_len_2190] + - [0x73D08, .rodata, 30450] + - [0x73D30, .rodata, 33450] + - [0x73D40, .rodata, 341d0] - [0x73DA0, .rodata, world/world] - [0x74EA0, .rodata, os/osSetIntMask] - - [0x74F20, .rodata, os/code_3c490_len_3c0] - - [0x74F40, .rodata, os/code_3c940_len_140] + - [0x74F20, .rodata, os/3c490_len_3c0] + - [0x74F40, .rodata, os/3c940_len_140] - [0x74F50, .rodata, os/guLookAt] - - [0x74F70, .rodata, os/code_3dcc0_len_a60] - - [0x74FA0, .rodata, os/code_3e720_len_5f0] - - [0x74FB0, .rodata, os/code_3ef90_len_600] - - [0x74FF0, .rodata, os/code_3FEA0] - - [0x75170, .rodata, os/code_42470_len_310] + - [0x74F70, .rodata, os/3dcc0_len_a60] + - [0x74FA0, .rodata, os/3e720_len_5f0] + - [0x74FB0, .rodata, os/3ef90_len_600] + - [0x74FF0, .rodata, os/3FEA0] + - [0x75170, .rodata, os/42470_len_310] - [0x75180, .rodata, os/exceptasm] - - [0x751D0, .rodata, os/code_46c70_len_e00] + - [0x751D0, .rodata, os/46c70_len_e00] - [0x75240, .rodata, battle/battle] # ram 80099E40 # bss starts at 0x8009A5B0 # 0x800 of bss until... - - [0x75240, .bss, os/code_39cb0_len_100, 0x0] # size unknown + - [0x75240, .bss, os/39cb0_len_100, 0x0] # size unknown - type: code start: 0x759B0 vram: 0x800DC500 subalign: 4 - subsections: - - [0x759b0, c, code_759b0_len_61b0] - - [0x77480, c, code_77480] - - [0x7B440, c, code_7B440] - - [0x7bb60, c, code_7bb60_len_41b0] - - [0x7fd10, c, code_7fd10_len_b40] - - [0x80850, c, code_80850_len_3060] - - [0x838b0, c, world/partners] - - [0x891b0, c, code_891b0_len_fb0] - - [0x8a160, c, code_8a160_len_700] - - [0x8a860, c, code_8a860_len_3f30] - - [0x8e790, c, code_8e790_len_2850] - - [0x90FE0, .data, code_759b0_len_61b0] + subsegments: + - [0x759b0, c, 759b0_len_61b0] + - [0x77480, c, 77480] + - [0x7B440, c, 7B440] + - [0x7bb60, c, 7bb60_len_41b0] + - [0x7fd10, c, 7fd10_len_b40] + - [0x80850, c, 80850_len_3060] + - [0x838B0, c, world/actions] # DUMMY ROM + - [0x838B0, c, world/partners] + - [0x891b0, c, 891b0_len_fb0] + - [0x8a160, c, 8a160_len_700] + - [0x8a860, c, 8a860_len_3f30] + - [0x8e790, c, 8e790_len_2850] + - [0x90FE0, .data, 759b0_len_61b0] - [0x913B0, .data, world/actions] - [0x914E0, .data, world/partners] - [0x917F8, data] @@ -335,124 +345,124 @@ segments: - [0x9DA58, data] - [0x9DA60, rgba32, ui/stat_flower, 16, 16] - [0x9DE60, data] - - [0xA5100, .rodata, code_77480] - - [0xA51E0, .rodata, code_7B440] - - [0xA5230, .rodata, code_7bb60_len_41b0] - - [0xA53E0, .rodata, code_7fd10_len_b40] - - [0xA5410, .rodata, code_80850_len_3060] + - [0xA5100, .rodata, 77480] + - [0xA51E0, .rodata, 7B440] + - [0xA5230, .rodata, 7bb60_len_41b0] + - [0xA53E0, .rodata, 7fd10_len_b40] + - [0xA5410, .rodata, 80850_len_3060] - [0xA54F0, .rodata, world/partners] - - [0xA5798, .rodata, code_891b0_len_fb0] - - [0xA57C0, .rodata, code_8a160_len_700] - - [0xA57E0, .rodata, code_8a860_len_3f30] + - [0xA5798, .rodata, 891b0_len_fb0] + - [0xA57C0, .rodata, 8a160_len_700] + - [0xA57E0, .rodata, 8a860_len_3f30] - type: code start: 0xA5DD0 vram: 0x8010F6D0 - subsections: - - [0xa5dd0, c, code_a5dd0_len_114e0] - - [0xB4580, c, code_B4580] - - [0xb72b0, c, code_b72b0_len_15ed0] - - [0xB9D60, c, code_B9D60] - - [0xC50A0, c, code_C50A0] - - [0xcd180, c, code_cd180_len_38f0] - - [0xCEE40, c, code_CEE40] - - [0xd0a70, c, code_d0a70_len_4fe0] - - [0xd5a50, c, code_d5a50_len_5fd0] - - [0xdba20, c, code_dba20_len_350] - - [0xdbd70, c, code_dbd70_len_700] - - [0xdc470, c, code_dc470_len_14c0] - - [0xdd930, c, code_dd930_len_1c0] - - [0xddaf0, c, code_ddaf0_len_c50] - - [0xde740, c, code_de740_len_23f0] - - [0xDF950, c, code_DF950] - - [0xe0b30, c, code_e0b30_len_b80] - - [0xE16B0, data, code_a5dd0_len_114e0] - - [0xE5510, .data, code_d0a70_len_4fe0] - - [0xE56C0, .data, code_d5a50_len_5fd0] - - [0xE5820, .data, code_dc470_len_14c0] - - [0xE5840, .data, code_dd930_len_1c0] - - [0xE5850, .data, code_ddaf0_len_c50] - - [0xE59D0, .data, code_DF950] - - [0xE5DF0, .data, code_e0b30_len_b80] - - [0xE5E40, .rodata, code_a5dd0_len_114e0] - - [0xE6560, .rodata, code_B4580] - - [0xE67B0, .rodata, code_b72b0_len_15ed0] - - [0xE6A70, .rodata, code_B9D60] - - [0xE7140, .rodata, code_C50A0] - - [0xE75A0, .rodata, code_cd180_len_38f0] - - [0xE7680, .rodata, code_CEE40] - - [0xE76B0, .rodata, code_d0a70_len_4fe0] - - [0xE7840, .rodata, code_d5a50_len_5fd0] - - [0xE7920, .rodata, code_dc470_len_14c0] - - [0xE7940, .rodata, code_ddaf0_len_c50] - - [0xE7950, .rodata, code_DF950] - - [0xE7990, .rodata, code_e0b30_len_b80] + subsegments: + - [0xa5dd0, c, a5dd0_len_114e0] + - [0xB4580, c, B4580] + - [0xb72b0, c, b72b0_len_15ed0] + - [0xB9D60, c, B9D60] + - [0xC50A0, c, C50A0] + - [0xcd180, c, cd180_len_38f0] + - [0xCEE40, c, CEE40] + - [0xd0a70, c, d0a70_len_4fe0] + - [0xd5a50, c, d5a50_len_5fd0] + - [0xdba20, c, dba20_len_350] + - [0xdbd70, c, dbd70_len_700] + - [0xdc470, c, dc470_len_14c0] + - [0xdd930, c, dd930_len_1c0] + - [0xddaf0, c, ddaf0_len_c50] + - [0xde740, c, de740_len_23f0] + - [0xDF950, c, DF950] + - [0xe0b30, c, e0b30_len_b80] + - [0xE16B0, data, a5dd0_len_114e0] + - [0xE5510, .data, d0a70_len_4fe0] + - [0xE56C0, .data, d5a50_len_5fd0] + - [0xE5820, .data, dc470_len_14c0] + - [0xE5840, .data, dd930_len_1c0] + - [0xE5850, .data, ddaf0_len_c50] + - [0xE59D0, .data, DF950] + - [0xE5DF0, .data, e0b30_len_b80] + - [0xE5E40, .rodata, a5dd0_len_114e0] + - [0xE6560, .rodata, B4580] + - [0xE67B0, .rodata, b72b0_len_15ed0] + - [0xE6A70, .rodata, B9D60] + - [0xE7140, .rodata, C50A0] + - [0xE75A0, .rodata, cd180_len_38f0] + - [0xE7680, .rodata, CEE40] + - [0xE76B0, .rodata, d0a70_len_4fe0] + - [0xE7840, .rodata, d5a50_len_5fd0] + - [0xE7920, .rodata, dc470_len_14c0] + - [0xE7940, .rodata, ddaf0_len_c50] + - [0xE7950, .rodata, DF950] + - [0xE7990, .rodata, e0b30_len_b80] - type: code start: 0xE79B0 vram: 0x802C3000 - subsections: - - [0xe79b0, c, code_e79b0_len_1920] + subsegments: + - [0xe79b0, c, e79b0_len_1920] - [0xe92d0, c, si] - - [0xED510, c, code_ED510] - - [0xef070, c, code_ef070_len_3400] - - [0xf2470, c, code_f2470_len_27f0] - - [0xf4c60, c, code_f4c60_len_4300] - - [0xf5750, c, code_F5750] - - [0xf8f60, c, code_f8f60_len_1560] - - [0xfa4c0, c, code_fa4c0_len_3bf0] - - [0xFBE10, c, code_FBE10] - - [0xfe0b0, c, code_fe0b0_len_5a0] - - [0xFE650, .data, code_e79b0_len_1920] + - [0xED510, c, ED510] + - [0xef070, c, ef070_len_3400] + - [0xf2470, c, f2470_len_27f0] + - [0xf4c60, c, f4c60_len_4300] + - [0xf5750, c, F5750] + - [0xf8f60, c, f8f60_len_1560] + - [0xfa4c0, c, fa4c0_len_3bf0] + - [0xFBE10, c, FBE10] + - [0xfe0b0, c, fe0b0_len_5a0] + - [0xFE650, .data, e79b0_len_1920] - [0xFE660, data, si] - - [0xFE730, .rodata, code_e79b0_len_1920] + - [0xFE730, .rodata, e79b0_len_1920] - [0xFE748, .rodata, si] - - [0xFEB80, .rodata, code_ef070_len_3400] - - [0xFEB90, .rodata, code_f2470_len_27f0] - - [0xFEBA0, .rodata, code_f4c60_len_4300] - - [0xFEBB8, .rodata, code_F5750] - - [0xFEC08, .rodata, code_FBE10] + - [0xFEB80, .rodata, ef070_len_3400] + - [0xFEB90, .rodata, f2470_len_27f0] + - [0xFEBA0, .rodata, f4c60_len_4300] + - [0xFEBB8, .rodata, F5750] + - [0xFEC08, .rodata, FBE10] - type: code start: 0xFEE30 vram: 0x802DBD40 - subsections: - - [0x0fee30, c, code_fee30_len_2d60] - - [0x101b90, c, code_101b90_len_8f0] - - [0x102480, .data, code_fee30_len_2d60] + subsegments: + - [0x0fee30, c, fee30_len_2d60] + - [0x101b90, c, 101b90_len_8f0] + - [0x102480, .data, fee30_len_2d60] - type: code start: 0x102610 vram: 0x802E0D90 - subsections: - - [0x102610, c, code_102610_len_2330] - - [0x102C80, c, code_102C80] - - [0x104730, c, code_104730] - - [0x104940, c, code_104940_len_dc0] - - [0x105700, c, code_105700_len_2130] - - [0x105F90, c, code_105F90] + subsegments: + - [0x102610, c, 102610_len_2330] + - [0x102C80, c, 102C80] + - [0x104730, c, 104730] + - [0x104940, c, 104940_len_dc0] + - [0x105700, c, 105700_len_2130] + - [0x105F90, c, 105F90] - [0x106EF0, c] - - [0x107830, c, code_107830_len_e70] - - [0x1086a0, c, code_1086a0_len_fc0] - - [0x109660, c, code_109660_len_1270] - - [0x10A230, c, code_10A230] - - [0x10A8D0, c, code_10A8D0] + - [0x107830, c, 107830_len_e70] + - [0x1086a0, c, 1086a0_len_fc0] + - [0x109660, c, 109660_len_1270] + - [0x10A230, c, 10A230] + - [0x10A8D0, c, 10A8D0] - [0x10A9F0, data] #- [0x10A9F0, i4, shadow/square, 16, 16] #- [0x10AA70, i4, shadow/circle, 16, 16] - [0x10AAF0, data] #- [0x10AB70, i4, shadow/10AB70, 32, 32] #- [0x10AD70, i4, shadow/10AD70, 32, 32] - - [0x10AF70, .data, code_104730] + - [0x10AF70, .data, 104730] - [0x10B610, data] - - [0x10C880, .rodata, code_102C80] - - [0x10C9E0, .rodata, code_104730] - - [0x10CA50, .rodata, code_104940_len_dc0] - - [0x10CAF0, .rodata, code_105F90] - - [0x10CB30, .rodata, code_107830_len_e70] - - [0x10CB70, .rodata, code_1086a0_len_fc0] - - [0x10CBD0, .rodata, code_109660_len_1270] - - [0x10CC00, .rodata, code_10A230] + - [0x10C880, .rodata, 102C80] + - [0x10C9E0, .rodata, 104730] + - [0x10CA50, .rodata, 104940_len_dc0] + - [0x10CAF0, .rodata, 105F90] + - [0x10CB30, .rodata, 107830_len_e70] + - [0x10CB70, .rodata, 1086a0_len_fc0] + - [0x10CBD0, .rodata, 109660_len_1270] + - [0x10CC00, .rodata, 10A230] - type: code start: 0x10CC10 vram: 0x802EB3D0 - subsections: + subsegments: - [0x10CC10, data] - [0x10F1B0, bin] - [0x1164B8, ci8, peach_letter, 150, 105] @@ -460,9 +470,10 @@ segments: - [0x11A440, bin] - [0x131340, bin] - type: code + dir: pause start: 0x135EE0 vram: 0x80242BA0 - subsections: + subsegments: - [0x135EE0, c] - [0x137ED0, c] - [0x138CC0, c] @@ -472,87 +483,87 @@ segments: - [0x140C70, c] - [0x1421C0, c] - [0x1422A0, data] - - [0x1443F0, ci8, pause/world_map, 320, 320] - - [0x15D3F0, palette, pause/world_map] - - [0x15D5F0, ci4, pause/spirits_bg, 128, 110] - - [0x15F170, palette, pause/spirits_bg] - - [0x15F370, rgba16, pause/filled_pip, 8, 8] - - [0x15F3F0, rgba16, pause/empty_pip, 8, 8] - - [0x15F470, rgba16, pause/red_pip, 8, 8] + - [0x1443F0, ci8, world_map, 320, 320] + - [0x15D3F0, palette, world_map] + - [0x15D5F0, ci4, spirits_bg, 128, 110] + - [0x15F170, palette, spirits_bg] + - [0x15F370, rgba16, filled_pip, 8, 8] + - [0x15F3F0, rgba16, empty_pip, 8, 8] + - [0x15F470, rgba16, red_pip, 8, 8] - [0x15F4F0, bin] - - [0x15F570, ia8, pause/image_15F570, 16, 16] - - [0x15F670, ia8, pause/image_15F670, 16, 16] - - [0x15F770, ia8, pause/arrows, 16, 32] - - [0x15F970, ci4, pause/banner_hp, 64, 16] - - [0x15FB70, palette, pause/banner_hp] - - [0x15FD70, ci4, pause/banner_fp, 64, 16] - - [0x15FF70, palette, pause/banner_fp] - - [0x160170, ci4, pause/banner_bp, 64, 16] - - [0x160370, palette, pause/banner_bp] - - [0x160570, ci4, pause/banner_boots, 48, 16] - - [0x1606F0, palette, pause/banner_boots] - - [0x1608F0, ci4, pause/banner_hammer, 48, 16] - - [0x160A70, palette, pause/banner_hammer] - - [0x160C70, ci4, pause/banner_star_energy, 48, 16] - - [0x160DF0, palette, pause/banner_star_energy] - - [0x160FF0, ci4, pause/available, 64, 16] - - [0x1611F0, palette, pause/available] - - [0x1613F0, ci4, pause/prompt_check_abilities, 128, 16] - - [0x1617F0, palette, pause/prompt_check_abilities] - - [0x1619F0, ci4, pause/stats_bar, 160, 8] - - [0x161C70, palette, pause/stats_bar] + - [0x15F570, ia8, image_15F570, 16, 16] + - [0x15F670, ia8, image_15F670, 16, 16] + - [0x15F770, ia8, arrows, 16, 32] + - [0x15F970, ci4, banner_hp, 64, 16] + - [0x15FB70, palette, banner_hp] + - [0x15FD70, ci4, banner_fp, 64, 16] + - [0x15FF70, palette, banner_fp] + - [0x160170, ci4, banner_bp, 64, 16] + - [0x160370, palette, banner_bp] + - [0x160570, ci4, banner_boots, 48, 16] + - [0x1606F0, palette, banner_boots] + - [0x1608F0, ci4, banner_hammer, 48, 16] + - [0x160A70, palette, banner_hammer] + - [0x160C70, ci4, banner_star_energy, 48, 16] + - [0x160DF0, palette, banner_star_energy] + - [0x160FF0, ci4, available, 64, 16] + - [0x1611F0, palette, available] + - [0x1613F0, ci4, prompt_check_abilities, 128, 16] + - [0x1617F0, palette, prompt_check_abilities] + - [0x1619F0, ci4, stats_bar, 160, 8] + - [0x161C70, palette, stats_bar] - [0x161E70, bin] - type: code start: 0x163400 vram: 0x80242BA0 - subsections: + subsegments: - [0x163400, c] - - [0x165490, c, code_165490] - - [0x167570, c, code_167570] - - [0x168590, c, code_168590] + - [0x165490, c, 165490] + - [0x167570, c, 167570] + - [0x168590, c, 168590] - [0x169BE0, c] - [0x16A3E0, data] - - [0x16C7D0, .rodata, code_165490] - - [0x16C848, .rodata, code_167570] - - [0x16C8C0, .rodata, code_168590] + - [0x16C7D0, .rodata, 165490] + - [0x16C848, .rodata, 167570] + - [0x16C8C0, .rodata, 168590] - type: code start: 0x16C8E0 vram: 0x8023E000 - subsections: - - [0x16C8E0, c, code_16c8e0] - - [0x16F740, c, code_16F740] - - [0x1776B0, c, code_1776B0] - - [0x17D6A0, c, code_17D6A0] + subsegments: + - [0x16C8E0, c, 16c8e0] + - [0x16F740, c, 16F740] + - [0x1776B0, c, 1776B0] + - [0x17D6A0, c, 17D6A0] - [0x17FEB0, c] - [0x181810, c] - - [0x182B30, c, code_182B30] - - [0x18C790, c, code_18C790] - - [0x18F340, c, code_18F340] + - [0x182B30, c, 182B30] + - [0x18C790, c, 18C790] + - [0x18F340, c, 18F340] - [0x190A10, c] - - [0x190B20, c, code_190B20] + - [0x190B20, c, 190B20] - [0x1967B0, c] - - [0x196AA0, c, code_196AA0] - - [0x197F40, c, code_197F40] - - [0x19FAF0, c, code_19FAF0] - - [0x1A5830, c, code_1A5830] + - [0x196AA0, c, 196AA0] + - [0x197F40, c, 197F40] + - [0x19FAF0, c, 19FAF0] + - [0x1A5830, c, 1A5830] - [0x1AC760, c] - [0x1AF120, c] - [0x1AF230, c] - - [0x1AF2D0, .data, code_16c8e0] - - [0x1AF8A0, .data, code_190B20] - - [0x1B21E0, data, code_1AF2D0] # begins with image? - - [0x1CB240, .rodata, code_16c8e0] - - [0x1CB368, .rodata, code_16F740] - - [0x1CB4E0, .rodata, code_1776B0] - - [0x1CB670, .rodata, code_17D6A0] - - [0x1CBC30, .rodata, code_182B30] - - [0x1CBDD0, .rodata, code_18C790] - - [0x1CBE70, .rodata, code_18F340] - - [0x1CBE80, .rodata, code_190B20] - - [0x1CBF80, .rodata, code_196AA0] - - [0x1CC0A0, .rodata, code_197F40] - - [0x1CC160, .rodata, code_19FAF0] - - [0x1CC270, .rodata, code_1A5830] + - [0x1AF2D0, .data, 16c8e0] + - [0x1AF8A0, .data, 190B20] + - [0x1B21E0, data, 1AF2D0] # begins with image? + - [0x1CB240, .rodata, 16c8e0] + - [0x1CB368, .rodata, 16F740] + - [0x1CB4E0, .rodata, 1776B0] + - [0x1CB670, .rodata, 17D6A0] + - [0x1CBC30, .rodata, 182B30] + - [0x1CBDD0, .rodata, 18C790] + - [0x1CBE70, .rodata, 18F340] + - [0x1CBE80, .rodata, 190B20] + - [0x1CBF80, .rodata, 196AA0] + - [0x1CC0A0, .rodata, 197F40] + - [0x1CC160, .rodata, 19FAF0] + - [0x1CC270, .rodata, 1A5830] - [0x1CC310, ci4, icon/present, 32, 32] - [0x1CC510, palette, icon/present] - [0x1CC530, ci4, icon/cake/finished_cake, 32, 32] @@ -1560,12 +1571,13 @@ segments: - [0x1FE150, palette, icon/small_star_point/small_star_point_7] - [0x1FE170, ci4, icon/small_star_point/small_star_point_8, 8, 8] - [0x1FE190, palette, icon/small_star_point/small_star_point_8] - - type: code + - dir: logos + type: code start: 0x1FE1B0 - subsections: - - [0x1FE1B0, rgba16, title/logo_n64, 128, 112] - - [0x2051B0, rgba16, title/logo_is, 256, 112] - - [0x2131B0, rgba16, title/logo_nintendo, 256, 48] + subsegments: + - [0x1FE1B0, rgba16, logo_n64, 128, 112] + - [0x2051B0, rgba16, logo_is, 256, 112] + - [0x2131B0, rgba16, logo_nintendo, 256, 48] - [0x2191B0, ci8, title/bg_1, 264, 162] - [0x2238C0, palette, title/bg_1] - [0x223AC0, ci8, title/bg_2, 264, 162] @@ -1581,135 +1593,146 @@ segments: - type: code start: 0x3169F0 vram: 0x80200000 - subsections: - - [0x3169f0, c, code_3169f0] + subsegments: + - [0x3169f0, c, 3169f0] - type: code start: 0x316a70 vram: 0x80200080 - subsections: - - [0x316a70, c, code_316a70] + subsegments: + - [0x316a70, c, 316a70] - type: code start: 0x316C00 vram: 0x802AE000 overlay: True - subsections: + subsegments: - [0x316C00, c] - type: code start: 0x316D90 vram: 0x802AE000 overlay: True - subsections: - - [0x316d90, c, code_316d90] + subsegments: + - [0x316d90, c, 316d90] - type: code start: 0x316f30 vram: 0x802B2000 - subsections: - - [0x316f30, c, code_316f30] + subsegments: + - [0x316f30, c, 316f30] - type: code - ld_name: world_partner_goombario + dir: world/partner + name: world_partner_goombario start: 0x317020 vram: 0x802BD100 overlay: True - subsections: - - [0x317020, c, world/partner/goombario] - - [0x317b60, .data, world/partner/goombario] - - [0x317DA0, .rodata, world/partner/goombario] + subsegments: + - [0x317020, c, goombario] + - [0x317b60, .data, goombario] + - [0x317DA0, .rodata, goombario] - type: code - ld_name: world_partner_bombette + dir: world/partner + name: world_partner_bombette start: 0x317e50 vram: 0x802BD100 overlay: True - subsections: - - [0x317e50, c, world/partner/bombette] + subsegments: + - [0x317e50, c, bombette] - [0x3195d0, data] - type: code - ld_name: world_partner_parakarry + dir: world/partner + name: world_partner_parakarry start: 0x319670 vram: 0x802BD100 overlay: True - subsections: - - [0x319670, c, world/partner/parakarry] + subsegments: + - [0x319670, c, parakarry] - [0x31b000, data] - - [0x31B080, .rodata, world/partner/parakarry] + - [0x31B080, .rodata, parakarry] - type: code - ld_name: world_partner_kooper + dir: world/partner + name: world_partner_kooper start: 0x31b120 vram: 0x802BD100 overlay: True - subsections: - - [0x31b120, c, world/partner/kooper] + subsegments: + - [0x31b120, c, kooper] - [0x31cb60, data] - - [0x31CBE0, .rodata, world/partner/kooper] + - [0x31CBE0, .rodata, kooper] - type: code - ld_name: world_partner_watt + dir: world/partner + name: world_partner_watt start: 0x31cc70 vram: 0x802BD100 overlay: True - subsections: - - [0x31cc70, c, world/partner/watt] + subsegments: + - [0x31cc70, c, watt] - [0x31ddc0, data] - type: code - ld_name: world_partner_sushie + dir: world/partner + name: world_partner_sushie start: 0x31de70 vram: 0x802BD100 overlay: True - subsections: - - [0x31de70, c, world/partner/sushie] + subsegments: + - [0x31de70, c, sushie] - [0x320b20, data] - - [0x320BC0, .rodata, world/partner/sushie] + - [0x320BC0, .rodata, sushie] - type: code - ld_name: world_partner_lakilester + dir: world/partner + name: world_partner_lakilester start: 0x320c50 vram: 0x802BD100 overlay: True - subsections: - - [0x320c50, c, world/partner/lakilester] + subsegments: + - [0x320c50, c, lakilester] - [0x3239b0, data] - type: code - ld_name: world_partner_bow + dir: world/partner + name: world_partner_bow start: 0x323A50 vram: 0x802BD100 overlay: True - subsections: - - [0x323A50, c, world/partner/bow] + subsegments: + - [0x323A50, c, bow] - [0x324930, data] - - [0x3249B0, .rodata, world/partner/bow] + - [0x3249B0, .rodata, bow] - type: code - ld_name: world_partner_goompa + dir: world/partner + name: world_partner_goompa start: 0x324a10 vram: 0x802BD100 overlay: True - subsections: - - [0x324a10, c, world/partner/goompa] - - [0x324e80, .data, world/partner/goompa] - - [0x324F00, .rodata, world/partner/goompa] + subsegments: + - [0x324a10, c, goompa] + - [0x324e80, .data, goompa] + - [0x324F00, .rodata, goompa] - type: code - ld_name: world_partner_goombaria + dir: world/partner + name: world_partner_goombaria start: 0x324f10 vram: 0x802BD100 overlay: True - subsections: - - [0x324f10, c, world/partner/goombaria] - - [0x325000, .data, world/partner/goombaria] + subsegments: + - [0x324f10, c, goombaria] + - [0x325000, .data, goombaria] - type: code - ld_name: world_partner_twink + dir: world/partner + name: world_partner_twink start: 0x325070 vram: 0x802BD100 overlay: True - subsections: - - [0x325070, c, world/partner/twink] - - [0x325160, .data, world/partner/twink] + subsegments: + - [0x325070, c, twink] + - [0x325160, .data, twink] - type: code start: 0x3251d0 vram: 0x802BD100 overlay: True - subsections: + subsegments: - [0x3251d0, c] - [0x3255e0, bin] - type: code start: 0x325ad0 vram: 0xE0200000 - subsections: + subsegments: - [0x325ad0, c] - [0x325ee0, c] - [0x326160, bin] @@ -1717,436 +1740,436 @@ segments: - type: code start: 0x3278f0 vram: 0xE0002000 - subsections: + subsegments: - [0x3278f0, c] - [0x328050, bin] - type: code start: 0x328110 vram: 0xE000C000 - subsections: + subsegments: - [0x328110, c] - [0x328d20, bin] - [0x328EA0, bin] - type: code start: 0x32C110 vram: 0xE000E000 - subsections: + subsegments: - [0x32C110, c] - [0x32c770, bin] - type: code start: 0x32C7A0 vram: 0xE0010000 - subsections: + subsegments: - [0x32C7A0, c] - [0x32CEB0, bin] - type: code start: 0x32DD10 vram: 0xE0012000 - subsections: + subsegments: - [0x32DD10, c] - type: code start: 0x32E490 vram: 0xE0014000 - subsections: + subsegments: - [0x32E490, c] - [0x32EC10, bin] - type: code start: 0x32EE30 vram: 0xE0016000 - subsections: + subsegments: - [0x32EE30, c] - [0x32F550, bin] - type: code start: 0x32F580 vram: 0xE0018000 - subsections: + subsegments: - [0x32F580, c] - [0x32fb50, bin] # data/rodata section for above. - type: code start: 0x32FE30 vram: 0xE001A000 - subsections: + subsegments: - [0x32FE30, c] - [0x330440, bin] - type: code start: 0x330910 vram: 0xE001C000 - subsections: + subsegments: - [0x330910, c] - [0x330ef0, bin] # data/rodata section for above. - type: code start: 0x331940 vram: 0xE001E000 - subsections: + subsegments: - [0x331940, c] - [0x332690, bin] - [0x3326A0, bin] - type: code start: 0x333ec0 vram: 0xE0020000 - subsections: + subsegments: - [0x333ec0, c] - [0x334b50, bin] - [0x334C70, bin] - type: code start: 0x337240 vram: 0xE0022000 - subsections: + subsegments: - [0x337240, c] - [0x337f10, bin] - [0x337FC0, bin] - type: code start: 0x339250 vram: 0xE0024000 - subsections: + subsegments: - [0x339250, c] - [0x339f10, bin] - [0x339F60, bin] - type: code start: 0x33B180 vram: 0xE0026000 - subsections: + subsegments: - [0x33B180, c] - [0x33bb70, bin] - [0x33BBD0, bin] - type: code start: 0x33CDF0 vram: 0xE0028000 - subsections: + subsegments: - [0x33CDF0, c] - [0x33d5d0, bin] - [0x33D610, bin] - type: code start: 0x33E8C0 vram: 0xE002A000 - subsections: + subsegments: - [0x33E8C0, c] - [0x33efe0, bin] - type: code start: 0x33FE80 vram: 0xE002C000 - subsections: + subsegments: - [0x33FE80, c] - [0x3407c0, bin] - [0x340880, bin] - type: code start: 0x3419E0 vram: 0xE002E000 - subsections: + subsegments: - [0x3419E0, c] - [0x342120, bin] - type: code start: 0x342140 vram: 0xE0030000 - subsections: + subsegments: - [0x342140, c] - [0x342fd0, bin] - [0x343040, bin] - type: code start: 0x343680 vram: 0xE0032000 - subsections: + subsegments: - [0x343680, c] - [0x343f30, bin] - [0x343F70, bin] - type: code start: 0x344a10 vram: 0xE0034000 - subsections: + subsegments: - [0x344a10, c] - [0x345190, bin] - [0x3451E0, bin] - type: code start: 0x3454E0 vram: 0xE0036000 - subsections: + subsegments: - [0x3454E0, c] - [0x345b10, bin] - [0x345B40, bin] - type: code start: 0x34DD20 vram: 0xE0038000 - subsections: + subsegments: - [0x34DD20, c] - [0x34E710, bin] - type: code start: 0x34EC80 vram: 0xE003A000 - subsections: + subsegments: - [0x34EC80, c] - [0x34f480, bin] - type: code start: 0x34F4C0 vram: 0xE003C000 - subsections: + subsegments: - [0x34F4C0, c] - [0x350160, bin] - [0x350220, bin] - type: code start: 0x352440 vram: 0xE003E000 - subsections: + subsegments: - [0x352440, c] - [0x352cb0, bin] - [0x352CE0, bin] - type: code start: 0x353300 vram: 0xE0040000 - subsections: + subsegments: - [0x353300, c] - [0x353B40, bin] - type: code start: 0x3547A0 vram: 0xE0042000 - subsections: + subsegments: - [0x3547A0, c] - [0x354F20, bin] - type: code start: 0x354F60 vram: 0xE0044000 - subsections: + subsegments: - [0x354F60, c] - [0x355d10, bin] - type: code start: 0x355EE0 vram: 0xE0046000 - subsections: + subsegments: - [0x355EE0, c] - [0x3564e0, bin] - [0x356530, bin] - type: code start: 0x356980 vram: 0xE0048000 - subsections: + subsegments: - [0x356980, c] - [0x357380, bin] - [0x3573A0, bin] - type: code start: 0x3584C0 vram: 0xE004A000 - subsections: + subsegments: - [0x3584C0, c] - [0x359320, bin] - [0x3593B0, bin] - type: code start: 0x359F20 vram: 0xE004C000 - subsections: + subsegments: - [0x359F20, c] - [0x35A580, bin] - type: code start: 0x35B9D0 vram: 0xE004E000 - subsections: + subsegments: - [0x35B9D0, c] - [0x35bfb0, bin] - type: code start: 0x35BFD0 vram: 0xE0050000 - subsections: + subsegments: - [0x35BFD0, c] - [0x35c530, bin] - [0x35C550, bin] - type: code start: 0x35CA80 vram: 0xE0052000 - subsections: + subsegments: - [0x35CA80, c] - [0x35D460, bin] - type: code start: 0x35DA00 vram: 0xE0056000 - subsections: + subsegments: - [0x35DA00, c] - [0x35E8A0, bin] - type: code start: 0x35E920 vram: 0xE0058000 - subsections: + subsegments: - [0x35E920, c] - [0x35F0A0, bin] - type: code start: 0x3602C0 vram: 0xE005A000 - subsections: + subsegments: - [0x3602C0, c] - [0x360a10, bin] - [0x360A30, bin] - type: code start: 0x360F40 vram: 0xE005C000 - subsections: + subsegments: - [0x360F40, c] - [0x361640, bin] - type: code start: 0x3625C0 vram: 0xE005E000 - subsections: + subsegments: - [0x3625C0, c] - [0x362C30, bin] - type: code start: 0x363160 vram: 0xE0060000 - subsections: + subsegments: - [0x363160, c] - [0x363890, bin] - type: code start: 0x364300 vram: 0xE0062000 - subsections: + subsegments: - [0x364300, c] - [0x364BC0, bin] - type: code start: 0x364F10 vram: 0xE0064000 - subsections: + subsegments: - [0x364F10, c] - [0x365970, bin] - type: code start: 0x366030 vram: 0xE0066000 - subsections: + subsegments: - [0x366030, c] - [0x366c80, bin] - [0x366D60, bin] - type: code start: 0x36A8D0 vram: 0xE0068000 - subsections: + subsegments: - [0x36A8D0, c] - [0x36ae80, bin] - [0x36AEE0, bin] - type: code start: 0x36D020 vram: 0xE006A000 - subsections: + subsegments: - [0x36D020, c] - [0x36de10, bin] - [0x36DF90, bin] - type: code start: 0x36E1D0 vram: 0xE006C000 - subsections: + subsegments: - [0x36E1D0, c] - [0x36ed30, bin] - [0x36ED60, bin] - type: code start: 0x372790 vram: 0xE006E000 - subsections: + subsegments: - [0x372790, c] - [0x373390, bin] - [0x3733E0, bin] - type: code start: 0x3740B0 vram: 0xE0070000 - subsections: + subsegments: - [0x3740B0, c] - [0x374d80, bin] - type: code start: 0x374E50 vram: 0xE0072000 - subsections: + subsegments: - [0x374E50, c] - [0x375500, bin] - [0x375510, bin] - type: code start: 0x376460 vram: 0xE0074000 - subsections: + subsegments: - [0x376460, c] - [0x376fc0, bin] - type: code start: 0x377070 vram: 0xE0076000 - subsections: + subsegments: - [0x377070, c] - [0x377f00, bin] - [0x377F80, bin] - type: code start: 0x37A3F0 vram: 0xE0078000 - subsections: + subsegments: - [0x37A3F0, c] - [0x37acf0, bin] - [0x37ADD0, bin] - type: code start: 0x37C540 vram: 0xE007A000 - subsections: + subsegments: - [0x37C540, c] - [0x37D140, bin] - type: code start: 0x37D490 vram: 0xE007C000 - subsections: + subsegments: - [0x37D490, c] - [0x37D9A0, bin] - [0x37D9D0, bin] - type: code start: 0x37F720 vram: 0xE007E000 - subsections: + subsegments: - [0x37F720, c] - [0x380350, bin] - [0x3803A0, bin] - type: code start: 0x3812C0 vram: 0xE0080000 - subsections: + subsegments: - [0x3812C0, c] - [0x381d80, bin] - [0x381E00, bin] - type: code start: 0x385640 vram: 0xE0082000 - subsections: + subsegments: - [0x385640, c] - [0x386340, bin] - [0x3863B0, bin] - type: code start: 0x3889D0 vram: 0xE0084000 - subsections: + subsegments: - [0x3889D0, c] - [0x3897e0, bin] - type: code start: 0x389850 vram: 0xE0086000 - subsections: + subsegments: - [0x389850, c] - [0x38a2f0, bin] - [0x38A350, bin] - type: code start: 0x38ADF0 vram: 0xE0088000 - subsections: + subsegments: - [0x38ADF0, c] - [0x38bab0, bin] - [0x38BBA0, bin] - type: code start: 0x38C5F0 vram: 0xE008A000 - subsections: + subsegments: - [0x38C5F0, c] - [0x38D040, bin] - type: code start: 0x38DE00 vram: 0xE008C000 - subsections: + subsegments: - [0x38DE00, c] - [0x38E8F0, bin] - type: code start: 0x38EE60 vram: 0xE008E000 - subsections: + subsegments: - [0x38EE60, c] - [0x38f6f0, bin] - [0x38F710, bin] - type: code start: 0x38F900 vram: 0xE0090000 - subsections: + subsegments: - [0x38F900, c] - [0x390340, bin] - [0x3903D0, bin] @@ -2160,292 +2183,292 @@ segments: - type: code start: 0x391D30 vram: 0xE0092000 - subsections: + subsegments: - [0x391D30, c] - [0x3923c0, bin] - [0x392440, bin] - type: code start: 0x3928D0 vram: 0xE0094000 - subsections: + subsegments: - [0x3928D0, c] - [0x393080, bin] - [0x3930A0, bin] - type: code start: 0x394280 vram: 0xE0096000 - subsections: + subsegments: - [0x394280, c] - [0x394660, bin] # data/rodata for the above, and some extra unknown data. - type: code start: 0x395BB0 vram: 0xE0098000 - subsections: + subsegments: - [0x395BB0, c] - [0x3960C0, bin] - type: code start: 0x3965B0 vram: 0xE009A000 - subsections: + subsegments: - [0x3965B0, c] - [0x397010, bin] - type: code start: 0x3981F0 vram: 0xE009C000 - subsections: + subsegments: - [0x3981F0, c] - [0x398bc0, bin] # data/rodata for the above, and some extra unknown data. - type: code start: 0x39FF20 vram: 0xE009E000 - subsections: + subsegments: - [0x39FF20, c] - [0x3A0D10, bin] - type: code start: 0x3A2290 vram: 0xE00A0000 - subsections: + subsegments: - [0x3A2290, c] - [0x3a2440, bin] # data/rodata for the above, and some extra unknown data. - type: code start: 0x3A2990 vram: 0xE00A2000 - subsections: + subsegments: - [0x3A2990, c] - [0x3A3360, bin] - type: code start: 0x3A37E0 vram: 0xE00A4000 - subsections: + subsegments: - [0x3A37E0, c] - [0x3a42b0, bin] - [0x3A4320, bin] - type: code start: 0x3A5550 vram: 0xE00A6000 - subsections: + subsegments: - [0x3A5550, c] - [0x3A5BE0, bin] - type: code start: 0x3A70F0 vram: 0xE00A8000 - subsections: + subsegments: - [0x3A70F0, c] - [0x3A7710, bin] - [0x3A77A0, bin] # split further - type: code start: 0x3AA920 vram: 0xE00AA000 - subsections: + subsegments: - [0x3AA920, c] - [0x3AAFE0, bin] - [0x3AB030, bin] # todo split this further - type: code start: 0x3AEE20 vram: 0xE00AC000 - subsections: + subsegments: - [0x3AEE20, c] - [0x3AF5D0, bin] - [0x3AF700, bin] # todo split this further - type: code start: 0x3B2350 vram: 0xE00AE000 - subsections: + subsegments: - [0x3B2350, c] - [0x3B2D90, bin] # todo split this further - type: code start: 0x3B3EB0 vram: 0xE00B0000 - subsections: + subsegments: - [0x3B3EB0, c] - [0x3B4690, bin] - [0x3B46A0, bin] # todo split this further - type: code start: 0x3B4790 vram: 0xE00B2000 - subsections: + subsegments: - [0x3B4790, c] - [0x3B5330, bin] - type: code start: 0x3B5CF0 vram: 0xE00B4000 - subsections: + subsegments: - [0x3B5CF0, c] - [0x3B69E0, bin] - type: code start: 0x3B7160 vram: 0xE00B6000 - subsections: + subsegments: - [0x3B7160, c] - [0x3B78B0, bin] - type: code start: 0x3B7B80 vram: 0xE00B8000 - subsections: + subsegments: - [0x3B7B80, c] - [0x3B8470, bin] - [0x3B8860, bin] # todo split this further - type: code start: 0x3B8BD0 vram: 0xE00BA000 - subsections: + subsegments: - [0x3B8BD0, c] - [0x3B9A50, bin] - type: code start: 0x3BA030 vram: 0xE00BC000 - subsections: + subsegments: - [0x3BA030, c] - [0x3BAC60, bin] - [0x3BAEA0, bin] # todo split this further ADD STUFF AFTER HERE - type: code start: 0x3BBF60 vram: 0xE00BE000 - subsections: + subsegments: - [0x3BBF60, c] - [0x3BCA50, bin] - type: code start: 0x3BCD60 vram: 0xE00C0000 - subsections: + subsegments: - [0x3BCD60, c] - [0x3BD770, bin] - type: code start: 0x3C11D0 vram: 0xE00C2000 - subsections: + subsegments: - [0x3C11D0, c] - [0x3C1B60, bin] - type: code start: 0x3CADF0 vram: 0xE00C4000 - subsections: + subsegments: - [0x3CADF0, c] - [0x3CB7C0, bin] - type: code start: 0x3CC9E0 vram: 0xE00C6000 - subsections: + subsegments: - [0x3CC9E0, c] - [0x3CD670, bin] - type: code start: 0x3CF3A0 vram: 0xE00C8000 - subsections: + subsegments: - [0x3CF3A0, c] - [0x3CFAB0, bin] - type: code start: 0x3D0500 vram: 0xE00CA000 - subsections: + subsegments: - [0x3D0500, c] - [0x3D11B0, bin] - type: code start: 0x3D1690 vram: 0xE00CC000 - subsections: + subsegments: - [0x3D1690, c] - [0x3D2460, bin] - type: code start: 0x3D2AC0 vram: 0xE00CE000 - subsections: + subsegments: - [0x3D2AC0, c] - [0x3D3910, bin] - type: code start: 0x3D3E20 vram: 0xE00D0000 - subsections: + subsegments: - [0x3D3E20, c] - [0x3D4930, bin] - type: code start: 0x3D4970 vram: 0xE00D2000 - subsections: + subsegments: - [0x3D4970, c] - [0x3D4E70, bin] - type: code start: 0x3D5020 vram: 0xE00D6000 - subsections: + subsegments: - [0x3D5020, c] - [0x3D5E60, bin] - type: code start: 0x3D67C0 vram: 0xE00D8000 - subsections: + subsegments: - [0x3D67C0, c] - [0x3D6FA0, bin] - type: code start: 0x3D7240 vram: 0xE00DA000 - subsections: + subsegments: - [0x3D7240, c] - [0x3D7740, bin] - type: code start: 0x3D7A70 vram: 0xE00DC000 - subsections: + subsegments: - [0x3D7A70, c] - [0x3D80B0, bin] - type: code start: 0x3D8720 vram: 0xE00DE000 - subsections: + subsegments: - [0x3D8720, c] - [0x3D8F30, bin] - type: code start: 0x3DB460 vram: 0xE00E0000 - subsections: + subsegments: - [0x3DB460, c] - [0x3DBEA0, bin] - type: code start: 0x3DC310 vram: 0xE00E2000 - subsections: + subsegments: - [0x3DC310, c] - [0x3DCD00, bin] - type: code start: 0x3DE000 vram: 0xE00E4000 - subsections: + subsegments: - [0x3DE000, c] - [0x3DED90, bin] - type: code start: 0x3E0930 vram: 0xE00E6000 - subsections: + subsegments: - [0x3E0930, c] - [0x3E11B0, bin] - type: code start: 0x3E1690 vram: 0xE00E8000 - subsections: + subsegments: - [0x3E1690, c] - [0x3E1CC0, bin] - type: code start: 0x3E1EE0 vram: 0xE00EA000 - subsections: + subsegments: - [0x3E1EE0, c] - [0x3E2930, bin] - type: code start: 0x3E43A0 vram: 0xE010A000 - subsections: + subsegments: - [0x3E43A0, c] - [0x3E5060, bin] - type: code start: 0x3E54C0 vram: 0xE010C000 - subsections: + subsegments: - [0x3E54C0, c] - [0x3E5ED0, bin] - type: code start: 0x3EB4E0 vram: 0xE010E000 - subsections: + subsegments: - [0x3EB4E0, c] - [0x3EBC30, bin] - [0x3ED4E0, ia8, world/text_chapter, 128, 38] @@ -2453,256 +2476,258 @@ segments: - type: code start: 0x3F83F0 vram: 0xE0110000 - subsections: + subsegments: - [0x3F83F0, c] - [0x3F8CA0, bin] - type: code start: 0x3F9E50 vram: 0xE0112000 - subsections: + subsegments: - [0x3F9E50, c] - [0x3FA480, bin] - type: code start: 0x3FEAE0 vram: 0xE0114000 - subsections: + subsegments: - [0x3FEAE0, c] - [0x3FF180, bin] - type: code start: 0x402640 vram: 0xE0116000 - subsections: + subsegments: - [0x402640, c] - [0x4032A0, bin] - type: code start: 0x403400 vram: 0xE0118000 - subsections: + subsegments: - [0x403400, c] - [0x403BB0, bin] - type: code start: 0x404220 vram: 0xE011A000 - subsections: + subsegments: - [0x404220, c] - [0x404E40, bin] - type: code start: 0x406B40 vram: 0xE011C000 - subsections: + subsegments: - [0x406B40, c] - [0x407040, bin] - type: code start: 0x409990 vram: 0xE011E000 - subsections: + subsegments: - [0x409990, c] - [0x40A180, bin] - type: code start: 0x40B3F0 vram: 0xE0120000 - subsections: + subsegments: - [0x40B3F0, c] - [0x40BB70, bin] - type: code start: 0x40C5A0 vram: 0xE0122000 - subsections: + subsegments: - [0x40C5A0, c] - [0x40D130, bin] - type: code start: 0x412730 vram: 0xE0124000 - subsections: + subsegments: - [0x412730, c] - [0x412FD0, bin] - type: code start: 0x413360 vram: 0xE0126000 - subsections: + subsegments: - [0x413360, c] - [0x413F20, bin] - type: code start: 0x414BA0 vram: 0xE0128000 - subsections: + subsegments: - [0x414BA0, c] - [0x415020, bin] - type: code start: 0x415D90 vram: 0x802A1000 - subsections: - - [0x415D90, c, code_415D90] - - [0x4200D0, .data, code_415D90] - - [0x420500, .rodata, code_415D90] + subsegments: + - [0x415D90, c, 415D90] + - [0x4200D0, .data, 415D90] + - [0x420500, .rodata, 415D90] - type: code start: 0x4219F0 vram: 0x802A9000 overlay: True - subsections: - - [0x4219F0, c, code_4219F0] - - [0x421FC0, .rodata, code_4219F0] + subsegments: + - [0x4219F0, c, 4219F0] + - [0x421FC0, .rodata, 4219F0] - type: code start: 0x422000 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x422000, c] - [0x422A90, bin] - type: code start: 0x422AD0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x422AD0, c] - [0x4233B0, bin] - type: code start: 0x4233F0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x4233F0, c] - [0x423C30, bin] - type: code start: 0x423C70 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x423C70, c] - [0x424550, bin] - type: code start: 0x425590 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x425590, c] - [0x425B10, bin] - type: code start: 0x425B50 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x425B50, c] - [0x426130, bin] - type: code start: 0x426170 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x426170, c] - [0x426970, bin] - type: code start: 0x4269D0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x4269D0, c] - [0x427320, bin] - type: code start: 0x4273B0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x4273B0, c] - [0x427A30, bin] - type: code start: 0x427A70 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x427A70, c] - [0x428280, bin] - type: code start: 0x4282E0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x4282E0, c] - [0x428A30, bin] - type: code start: 0x428A70 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x428A70, c] - [0x4292C0, bin] - type: code start: 0x429320 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x429320, c] - [0x429C90, bin] - type: code start: 0x429D20 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x429D20, c] - [0x42A480, bin] - type: code start: 0x42A4F0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x42A4F0, c] - [0x42B650, bin] - type: code start: 0x42C6F0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x42C6F0, c] - [0x42CEB0, bin] - type: code start: 0x42CF10 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x42CF10, c] - [0x42D9B0, bin] - type: code start: 0x42DA10 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x42DA10, c] - [0x42E330, bin] - type: code start: 0x42E3A0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x42E3A0, c] - [0x42ED70, bin] - type: code start: 0x42EE20 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x42EE20, c] - [0x42F680, bin] - type: code start: 0x42F6E0 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x42F6E0, c] - [0x42FFC0, bin] - type: code start: 0x430020 vram: 0x802A9000 overlay: True - subsections: + subsegments: - [0x430020, c] - [0x430940, bin] - - name: battle/area_kmr_part_1/ + - dir: battle/area_kmr_part_1 type: code start: 0x4309A0 vram: 0x80218000 overlay: True subalign: 4 - subsections: + subsegments: + - [0x4309A0, c, battles] # DUMMY ROM + - [0x4309A0, c, goomba] # DUMMY ROM - [0x4309A0, c] - [0x431180, c] - [0x4313F0, c] @@ -2713,12 +2738,12 @@ segments: - [0x433970, bin] - [0x4398A0, .rodata, battles] - [0x439984, bin] # TODO change - - name: battle/area_kmr_part_2/ + - dir: battle/area_kmr_part_2 type: code start: 0x439A90 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x439A90, c] - [0x43A5A0, c] - [0x43A7E0, c] @@ -2726,12 +2751,12 @@ segments: - [0x43ACC0, c] - [0x43AF30, c] - [0x43B1E0, bin] - - name: battle/area_kmr_part_3/ + - dir: battle/area_kmr_part_3 type: code start: 0x447440 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x447440, c] - [0x4479A0, c] - [0x447C80, c] @@ -2743,54 +2768,54 @@ segments: - [0x448E20, c] - [0x448E80, c] - [0x4495F0, bin] - - name: battle/area_mac/ + - dir: battle/area_mac type: code start: 0x464490 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x464490, c] - [0x464560, c] - [0x465D90, c] - [0x4661E0, bin] - - name: battle/area_hos/ + - dir: battle/area_hos type: code start: 0x47F0B0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x47F0B0, c] - [0x47F0D0, c] - [0x47F570, c] - [0x4800C0, bin] - - name: battle/area_nok/ + - dir: battle/area_nok type: code start: 0x48D1A0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x48D1A0, c] - [0x48D700, c] - [0x48DA50, c] - [0x48DBC0, c] - [0x48DCF0, c] - [0x48DFC0, bin] - - name: battle/area_trd_part_1/ + - dir: battle/area_trd_part_1 type: code start: 0x4A10A0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4A10A0, c] - [0x4A1190, c] - [0x4A12C0, c] - [0x4A1530, bin] - - name: battle/area_trd_part_2/ + - dir: battle/area_trd_part_2 type: code start: 0x4B11F0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4B11F0, c] - [0x4B15D0, c] - [0x4B1D90, c] @@ -2798,42 +2823,42 @@ segments: - [0x4B2D10, c] - [0x4B34D0, c] - [0x4B3740, bin] - - name: battle/area_trd_part_3/ + - dir: battle/area_trd_part_3 type: code start: 0x4CF1B0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4CF1B0, c] - [0x4CF3D0, bin] - - name: battle/area_iwa/ + - dir: battle/area_iwa type: code start: 0x4D01F0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4D01F0, c] - [0x4D02B0, c] - [0x4D0310, c] - [0x4D0360, c] - [0x4D03B0, c] - [0x4D0400, bin] - - name: battle/area_sbk/ + - dir: battle/area_sbk type: code start: 0x4DA5E0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4DA5E0, c] - [0x4DA6B0, c] - [0x4DA860, bin] - [0x4E25E0, rodata] - - name: battle/area_isk_part_1/ + - dir: battle/area_isk_part_1 type: code start: 0x4E2740 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4E2740, c] - [0x4E2810, c] - [0x4E28E0, c] @@ -2841,51 +2866,51 @@ segments: - [0x4E30C0, c] - [0x4E3190, c] - [0x4E3350, bin] - - name: battle/area_isk_part_2/ + - dir: battle/area_isk_part_2 type: code start: 0x4EF4A0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4EF4A0, c] - [0x4EFCF0, c] - [0x4EFDC0, c] - [0x4EFE90, c] - [0x4EFFE0, bin] - - name: battle/area_mim/ + - dir: battle/area_mim type: code start: 0x4F7BE0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4F7BE0, c] - [0x4F7D50, c] - [0x4F7F40, c] - [0x4F7FA0, bin] - - name: battle/area_arn/ + - dir: battle/area_arn type: code start: 0x4FEA50 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x4FEA50, c] - [0x4FED30, c] - [0x4FF010, c] - [0x4FF0D0, c] - [0x4FF1C0, bin] - - name: battle/area_dgb/ + - dir: battle/area_dgb type: code start: 0x50F020 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x50F020, bin] - - name: battle/area_omo/ + - dir: battle/area_omo type: code start: 0x5125D0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x5125D0, c] - [0x5126A0, c] - [0x512770, c] @@ -2900,66 +2925,66 @@ segments: - [0x513580, c] - [0x513790, c] - [0x5137E0, bin] - - name: battle/area_omo2/ + - dir: battle/area_omo2 type: code start: 0x52B6A0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x52B6A0, c] - [0x52B7C0, c] - [0x52B9D0, bin] - - name: battle/area_omo2_1/ + - dir: battle/area_omo2_1 type: code start: 0x543570 vram: 0x80231000 overlay: True - subsections: + subsegments: - [0x543570, c] - [0x543620, bin] - - name: battle/area_omo2_2/ + - dir: battle/area_omo2_2 type: code start: 0x5483E0 vram: 0x80231000 overlay: True - subsections: + subsegments: - [0x5483E0, c] - [0x548500, bin] - - name: battle/area_omo2_3/ + - dir: battle/area_omo2_3 type: code start: 0x54CC70 vram: 0x80231000 overlay: True - subsections: + subsegments: - [0x54CC70, c] - [0x54CCA0, bin] - - name: battle/area_omo2_4/ + - dir: battle/area_omo2_4 type: code start: 0x552440 vram: 0x80231000 overlay: True - subsections: + subsegments: - [0x552440, bin] - - name: battle/area_omo2_5/ + - dir: battle/area_omo2_5 type: code start: 0x552BB0 vram: 0x80231000 overlay: True - subsections: + subsegments: - [0x552BB0, bin] - - name: battle/area_omo2_6/ + - dir: battle/area_omo2_6 type: code start: 0x556C90 vram: 0x80231000 overlay: True - subsections: + subsegments: - [0x556C90, bin] - - name: battle/area_omo3/ + - dir: battle/area_omo3 type: code start: 0x5573E0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x5573E0, c] - [0x557A80, c] - [0x557AD0, c] @@ -2967,64 +2992,64 @@ segments: - [0x557F90, c] - [0x5580C0, c] - [0x558190, bin] - - name: battle/area_kgr/ + - dir: battle/area_kgr type: code start: 0x56E2A0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x56E2A0, c] - [0x56E800, c] - [0x56EC50, bin] - - name: battle/area_jan/ + - dir: battle/area_jan type: code start: 0x573920 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x573920, c] - [0x5739F0, c] - [0x573AC0, c] - [0x573C30, c] - [0x573E10, c] - [0x573EE0, bin] - - name: battle/area_jan2/ + - dir: battle/area_jan2 type: code start: 0x584940 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x584940, c] - [0x584B90, c] - [0x585000, bin] - - name: battle/area_kzn/ + - dir: battle/area_kzn type: code start: 0x58C2F0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x58C2F0, c] - [0x58C670, c] - [0x58C740, c] - [0x58C920, c] - [0x58CC90, c] - [0x58D100, bin] - - name: battle/area_kzn2/ + - dir: battle/area_kzn2 type: code start: 0x59E6E0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x59E6E0, c] - [0x59F420, c] - [0x59F4D0, c] - [0x59F530, bin] - - name: battle/area_flo/ + - dir: battle/area_flo type: code start: 0x5B14B0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x5B14B0, c] - [0x5B16A0, c] - [0x5B1A10, c] @@ -3032,21 +3057,21 @@ segments: - [0x5B20F0, c] - [0x5B28D0, c] - [0x5B3370, bin] - - name: battle/area_flo2/ + - dir: battle/area_flo2 type: code start: 0x5CE690 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x5CE690, c] - [0x5CF2D0, c] - [0x5CFF00, bin] - - name: battle/area_tik/ + - dir: battle/area_tik type: code start: 0x5EC490 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x5EC490, c] - [0x5EC560, c] - [0x5EC690, c] @@ -3057,24 +3082,24 @@ segments: - [0x5ED950, c] - [0x5EDDF0, c] - [0x5EE550, bin] - - name: battle/area_tik2/ + - dir: battle/area_tik2 type: code start: 0x608AB0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x608AB0, c] - [0x608CB0, c] - [0x609B30, c] - [0x609FD0, c] - [0x60A470, c] - [0x60ABD0, bin] - - name: battle/area_tik3/ + - dir: battle/area_tik3 type: code start: 0x6186F0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x6186F0, c] - [0x6187C0, c] - [0x618A00, c] @@ -3082,33 +3107,33 @@ segments: - [0x619340, c] - [0x6197E0, c] - [0x619F40, bin] - - name: battle/area_sam/ + - dir: battle/area_sam type: code start: 0x623BA0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x623BA0, c] - [0x6253E0, c] - [0x625750, c] - [0x626A30, bin] - - name: battle/area_sam2/ + - dir: battle/area_sam2 type: code start: 0x63D1E0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x63D1E0, c] - [0x63D710, c] - [0x63D9F0, c] - [0x63DD60, c] - [0x63F040, bin] - - name: battle/area_pra/ + - dir: battle/area_pra type: code start: 0x648E10 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x648E10, c] - [0x649050, c] - [0x649480, c] @@ -3116,80 +3141,80 @@ segments: - [0x649B60, c] - [0x649ED0, c] - [0x64A340, bin] - - name: battle/area_pra2/ + - dir: battle/area_pra2 type: code start: 0x660750 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x660750, c] - [0x660D20, c] - [0x660E10, c] - [0x661150, bin] - - name: battle/area_pra3/ + - dir: battle/area_pra3 type: code start: 0x669D80 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x669D80, c] - [0x66B5B0, c] - [0x66B920, c] - [0x66BC90, bin] - - name: battle/area_kpa/ + - dir: battle/area_kpa type: code start: 0x684A30 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x684A30, c] - [0x684B00, c] - [0x684C30, c] - [0x685130, c] - [0x685260, bin] - - name: battle/area_kpa2/ + - dir: battle/area_kpa2 type: code start: 0x69F200 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x69F200, c] - [0x69F320, c] - [0x6A2B50, c] - [0x6A44E0, bin] - - name: battle/area_kpa3/ + - dir: battle/area_kpa3 type: code start: 0x6BBB90 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x6BBB90, c] - [0x6BBC60, c] - [0x6BD250, bin] - - name: battle/area_kpa4/ + - dir: battle/area_kpa4 type: code start: 0x6CC070 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x6CC070, c] - [0x6CC1C0, c] - [0x6CC6C0, bin] - - name: battle/area_kkj/ + - dir: battle/area_kkj type: code start: 0x6DBDA0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x6DBDA0, c] - [0x6DC2F0, c] - [0x6DC340, bin] - - name: battle/area_dig/ + - dir: battle/area_dig type: code start: 0x6DDDC0 vram: 0x80218000 overlay: True - subsections: + subsegments: - [0x6DDDC0, c] - [0x6DDE90, c] - [0x6DE000, c] @@ -3201,204 +3226,216 @@ segments: - [0x6DE4A0, c] - [0x6DE650, c] - [0x6DE670, bin] - - name: battle/partner/goompa + - name: battle_partner_goompa + dir: battle/partner type: code start: 0x6F0B30 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x6F0B30, data] - - name: battle/partner/goombario + - name: battle_partner_goombario + dir: battle/partner type: code start: 0x6F10E0 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x6F10E0, c] - [0x6F2290, data] - - name: battle/partner/kooper + - name: battle_partner_kooper + dir: battle/partner type: code start: 0x6F5E80 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x6F5E80, c] - [0x6F62B0, data] - - name: battle/partner/bombette + - name: battle_partner_bombette + dir: battle/partner type: code start: 0x6FAD10 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x6FAD10, c] - [0x6FB350, data] - - name: battle/partner/parakarry + - name: battle_partner_parakarry + dir: battle/partner type: code start: 0x6FFD80 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x6FFD80, c] - [0x701590, data] - - name: battle/partner/watt + - name: battle_partner_watt + dir: battle/partner type: code start: 0x703AF0 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x703AF0, c] - [0x704A80, data] - - name: battle/partner/sushie + - name: battle_partner_sushie + dir: battle/partner type: code start: 0x707CA0 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x707CA0, c] - [0x708B70, data] - - name: battle/partner/lakilester + - name: battle_partner_lakilester + dir: battle/partner type: code start: 0x70BD10 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x70BD10, c] - [0x70DED0, data] - - name: battle/partner/bow + - name: battle_partner_bow + dir: battle/partner type: code start: 0x710EF0 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x710EF0, c] - [0x7111F0, data] - - name: battle/partner/twink + - name: battle_partner_twink + dir: battle/partner type: code start: 0x714CF0 vram: 0x80238000 overlay: True - subsections: + subsegments: - [0x714CF0, c] - [0x714DC0, data] - - name: battle/item/mushroom/ + - dir: battle/item/mushroom type: code start: 0x715850 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x715850, c, lib] + - [0x715E50, c, mushroom] # DUMMY ROM - [0x715E50, .data, lib] - [0x71640C, .data, mushroom] - [0x716C60, .bss, lib] - - name: battle/item/fire_flower/ + - dir: battle/item/fire_flower type: code start: 0x716C60 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x716C60, c, lib] + - [0x717060, c, fire_flower] # DUMMY ROM - [0x717060, .data, lib] - [0x71761C, .data, fire_flower] - [0x7179D0, .bss, lib] - - name: battle/item/dusty_hammer/ - ld_name: battle_item_dusty_hammer + - dir: battle/item/dusty_hammer type: code start: 0x7179D0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x7179D0, c, lib] + - [0x717C10, c, dusty_hammer] # DUMMY ROM - [0x717C10, .data, lib] - [0x7181D0, ci4, dusty_hammer, 32, 32] - [0x7183D0, palette, dusty_hammer] - [0x7183F0, .data, dusty_hammer] - [0x718850, .bss, lib] - - name: battle/item/pow_block/ + - dir: battle/item/pow_block type: code start: 0x718850 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x718850, c, lib] - [0x718BF0, .data, lib] - [0x7191AC, .data, pow_block] - [0x719970, .bss, lib] - - name: battle/item/pebble/ + - dir: battle/item/pebble type: code start: 0x719970 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x719970, c, lib] - [0x719BB0, .data, lib] - [0x71A170, ci4, pebble, 32, 32] - [0x71A370, palette, pebble] - [0x71A390, .data, pebble] - [0x71A7F0, .bss, lib] - - name: battle/item/volt_shroom/ + - dir: battle/item/volt_shroom type: code start: 0x71A7F0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x71A7F0, c, lib] - [0x71AA70, .data, lib] - [0x71B02C, .data, volt_shroom] - [0x71B1A0, .bss, lib] - - name: battle/item/thunder_rage/ + - dir: battle/item/thunder_rage type: code start: 0x71B1A0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x71B1A0, c, lib] - [0x71B640, .data, lib] - [0x71BBFC, .data, thunder_rage] - [0x71BE30, .bss, lib] - - name: battle/item/snowman_doll/ + - dir: battle/item/snowman_doll type: code start: 0x71BE30 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x71BE30, c, lib] - [0x71C270, .data, lib] - [0x71C82C, .data, snowman_doll] - [0x71CCE0, .bss, lib] - - name: battle/item/dried_shroom/ + - dir: battle/item/dried_shroom type: code start: 0x71CCE0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x71CCE0, c, lib] - [0x71D010, .data, lib] - [0x71D5DC, .data, dried_shroom] - [0x71D770, .bss, lib] - - name: battle/item/shooting_star/ + - dir: battle/item/shooting_star type: code start: 0x71D770 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x71D770, c, lib] - [0x71DCC0, .data, lib] - [0x71E27C, .data, shooting_star] - [0x71E650, .bss, lib] - - name: battle/item/sleepy_sheep/ + - dir: battle/item/sleepy_sheep type: code start: 0x71E650 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x71E650, c, lib] - [0x71EFC0, .data, lib] - [0x71F580, ci4, sleepy_sheep1, 56, 48] @@ -3410,124 +3447,123 @@ segments: - [0x7205A0, .data, sleepy_sheep] - [0x7214D8, .rodata, lib] - [0x7215A0, .bss, lib] - - name: battle/item/stone_cap/ + - dir: battle/item/stone_cap type: code start: 0x7215A0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x7215A0, c, lib] - [0x721970, .data, lib] - [0x721F2C, .data, stone_cap] - [0x722000, .bss, lib] - - name: battle/item/tasty_tonic/ + - dir: battle/item/tasty_tonic type: code start: 0x722000 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x722000, c, lib] - [0x7222D0, .data, lib] - [0x72289C, .data, tasty_tonic] - [0x722B40, .bss, lib] - - name: battle/item/thunder_bolt/ + - dir: battle/item/thunder_bolt type: code start: 0x722B40 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x722B40, c, lib] - [0x722FE0, .data, lib] - [0x72359C, .data, thunder_bolt] - [0x723780, .bss, lib] - - name: battle/item/ultra_shroom/ + - dir: battle/item/ultra_shroom type: code start: 0x723780 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x723780, c, lib] - [0x723AB0, .data, lib] - [0x72407C, .data, ultra_shroom] - [0x724240, .bss, lib] - - name: battle/item/unknown_item/ + - dir: battle/item/unknown_item type: code start: 0x724240 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x724240, c, lib] - [0x724570, .data, lib] - [0x724B3C, .data, unknown_item] - [0x724CE0, .bss, lib] - - name: battle/item/super_soda/ + - dir: battle/item/super_soda type: code start: 0x724CE0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x724CE0, c, lib] - [0x725210, .data, lib] - [0x7257CC, .data, super_soda] - [0x725F60, .bss, lib] - - name: battle/item/hustle_drink/ + - dir: battle/item/hustle_drink type: code start: 0x725F60 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x725F60, c, lib] - [0x726240, .data, lib] - [0x7267FC, .data, hustle_drink] - [0x726DD0, .bss, lib] - - name: battle/item/stop_watch/ + - dir: battle/item/stop_watch type: code start: 0x726DD0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x726DD0, c, lib] - [0x727120, .data, lib] - [0x7276EC, .data, stop_watch] - [0x727910, .bss, lib] - - name: battle/item/dizzy_dial/ + - dir: battle/item/dizzy_dial type: code start: 0x727910 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x727910, c, lib] - [0x727CE0, .data, lib] - [0x72829C, .data, dizzy_dial] - [0x7285D0, .rodata, lib] - [0x7285E0, .bss, lib] - - name: battle/item/please_come_back/ + - dir: battle/item/please_come_back type: code start: 0x7285E0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x7285E0, c, lib] - [0x728820, .data, lib] - [0x728DDC, .data, please_come_back] - [0x728EC0, .bss, lib] - - name: battle/item/egg_missile/ - ld_name: battle_item_egg_missile + - dir: battle/item/egg_missile type: code start: 0x728EC0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x728EC0, c, lib] - [0x7291D0, .data, lib] - [0x729790, ci4, egg_missile1, 32, 32] @@ -3540,35 +3576,35 @@ segments: - [0x729FF0, palette, egg_missile4] - [0x72A010, .data, egg_missile] - [0x72A750, .bss, lib] - - name: battle/item/insecticide_herb/ + - dir: battle/item/insecticide_herb type: code start: 0x72A750 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x72A750, c, lib] - [0x72AB70, .data, lib] - [0x72B130, ci4, insecticide_herb, 32, 32] - [0x72B330, palette, insecticide_herb] - [0x72B350, .data, insecticide_herb] - [0x72B910, .bss, lib] - - name: battle/item/fright_jar/ + - dir: battle/item/fright_jar type: code start: 0x72B910 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x72B910, c, lib] - [0x72BC60, .data, lib] - [0x72C22C, .data, fright_jar] - [0x72C5B0, .bss, lib] - - name: battle/item/mystery/ + - dir: battle/item/mystery type: code start: 0x72C5B0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x72C5B0, c, lib] - [0x72CF00, .data, lib] - [0x72D4C0, ci4, mystery, 32, 32] @@ -3576,58 +3612,57 @@ segments: - [0x72D6E0, .data, mystery] - [0x72DB50, .rodata, lib] - [0x72DB70, .bss, lib] - - name: battle/item/repel_gel/ + - dir: battle/item/repel_gel type: code start: 0x72DB70 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x72DB70, c, lib] - [0x72DE00, .data, lib] - [0x72E3CC, .data, repel_gel] - [0x72E530, .bss, lib] - - name: battle/item/life_shroom/ + - dir: battle/item/life_shroom type: code start: 0x72E530 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x72E530, c, lib] - [0x72EA20, .data, lib] - [0x72EFEC, .data, life_shroom] - [0x72F720, .bss, lib] - - name: battle/item/coconut/ - ld_name: battle_item_coconut + - dir: battle/item/coconut type: code start: 0x72F720 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x72F720, c, lib] - [0x72F960, .data, lib] - [0x72FF20, ci4, coconut, 32, 32] - [0x730120, palette, coconut] - [0x730140, .data, coconut] - [0x7305A0, .bss, lib] - - name: battle/item/electro_pop/ + - dir: battle/item/electro_pop type: code start: 0x7305A0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x7305A0, c, lib] - [0x730AE0, .data, lib] - [0x73109C, .data, electro_pop] - [0x731300, .bss, lib] - - name: battle/item/strange_cake/ + - dir: battle/item/strange_cake type: code start: 0x731300 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x731300, c, lib] - [0x731EA0, .data, lib] - [0x732470, ci4, strange_cake1, 32, 32] @@ -3639,396 +3674,396 @@ segments: - [0x732AD0, .data, strange_cake] - [0x7330B0, .rodata, lib] - [0x7330D0, .bss, lib] - - name: battle/item/food/ + - dir: battle/item/food type: code start: 0x7330D0 vram: 0x802A1000 overlay: True subalign: 4 - subsections: + subsegments: - [0x7330D0, c, lib] - [0x733700, .data, lib] - [0x733CBC, .data, food] - [0x7345A0, .bss, lib] - - name: battle/move/hammer + - dir: battle/move/hammer type: code start: 0x7345A0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x7345A0, c] - [0x734650, data] - - name: battle/move/spin_smash + - dir: battle/move/spin_smash type: code start: 0x737890 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x737890, c] - [0x737A20, data] - - name: battle/move/quake_hammer + - dir: battle/move/quake_hammer type: code start: 0x73AED0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x73AED0, c] - [0x73AF80, data] - - name: battle/move/jump + - dir: battle/move/jump type: code start: 0x73D860 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x73D860, c] - [0x73D9A0, data] - - name: battle/move/multibounce + - dir: battle/move/multibounce type: code start: 0x740CC0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x740CC0, c] - [0x740DB0, data] - - name: battle/move/power_bounce + - dir: battle/move/power_bounce type: code start: 0x743DF0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x743DF0, c] - [0x743FE0, data] - - name: battle/move/sleep_stomp + - dir: battle/move/sleep_stomp type: code start: 0x746E10 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x746E10, c] - [0x746F00, data] - - name: battle/move/dizzy_stomp + - dir: battle/move/dizzy_stomp type: code start: 0x748DD0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x748DD0, c] - [0x748EC0, data] - - name: battle/move/d_down_pound + - dir: battle/move/d_down_pound type: code start: 0x74AD90 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x74AD90, c] - [0x74AF40, data] - - name: battle/move/jump_charge_0 + - dir: battle/move/jump_charge_0 type: code start: 0x74D570 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x74D570, c] - [0x74D850, data] - - name: battle/move/hammer_charge_0 + - dir: battle/move/hammer_charge_0 type: code start: 0x74F130 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x74F130, c] - [0x74F3D0, data] - - name: battle/move/hammer_throw + - dir: battle/move/hammer_throw type: code start: 0x752450 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x752450, c] - [0x752500, data] - - name: battle/move/mega_quake + - dir: battle/move/mega_quake type: code start: 0x756780 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x756780, c] - [0x756900, data] - - name: battle/move/hammer_charge_1 + - dir: battle/move/hammer_charge_1 type: code start: 0x7595B0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x7595B0, c] - [0x7598D0, data] - - name: battle/move/jump_charge_1 + - dir: battle/move/jump_charge_1 type: code start: 0x75C980 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x75C980, c] - [0x75CCE0, data] - - name: battle/move/hammer_charge_2 + - dir: battle/move/hammer_charge_2 type: code start: 0x75E5D0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x75E5D0, c] - [0x75E8F0, data] - - name: battle/move/jump_charge_2 + - dir: battle/move/jump_charge_2 type: code start: 0x761920 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x761920, c] - [0x761C80, data] - - name: battle/move/auto_smash + - dir: battle/move/auto_smash type: code start: 0x763540 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x763540, c] - [0x7635F0, data] - - name: battle/move/auto_jump + - dir: battle/move/auto_jump type: code start: 0x765C20 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x765C20, c] - [0x765D10, data] - - name: battle/move/power_quake + - dir: battle/move/power_quake type: code start: 0x767C90 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x767C90, c] - [0x767D40, data] - - name: battle/move/auto_multibounce + - dir: battle/move/auto_multibounce type: code start: 0x76A830 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x76A830, c] - [0x76A920, data] - - name: battle/move/power_jump + - dir: battle/move/power_jump type: code start: 0x76D760 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x76D760, c] - [0x76D850, data] - - name: battle/move/super_jump + - dir: battle/move/super_jump type: code start: 0x76F330 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x76F330, c] - [0x76F420, data] - - name: battle/move/mega_jump + - dir: battle/move/mega_jump type: code start: 0x770F30 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x770F30, c] - [0x771020, data] - - name: battle/move/power_smash + - dir: battle/move/power_smash type: code start: 0x772BA0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x772BA0, c] - [0x772C50, data] - - name: battle/move/super_smash + - dir: battle/move/super_smash type: code start: 0x775100 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x775100, c] - [0x7751B0, data] - - name: battle/move/mega_smash + - dir: battle/move/mega_smash type: code start: 0x777690 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x777690, c] - [0x777740, data] - - name: battle/move/unknown_move + - dir: battle/move/unknown_move type: code start: 0x779C90 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x779C90, c] - [0x779E20, data] - - name: battle/move/shrink_smash + - dir: battle/move/shrink_smash type: code start: 0x77CB80 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x77CB80, c] - [0x77CC30, data] - - name: battle/move/shell_crack + - dir: battle/move/shell_crack type: code start: 0x77F240 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x77F240, c] - [0x77F3D0, data] - - name: battle/move/d_down_jump + - dir: battle/move/d_down_jump type: code start: 0x781920 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x781920, c] - [0x781AF0, data] - - name: battle/move/shrink_stomp + - dir: battle/move/shrink_stomp type: code start: 0x783BA0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x783BA0, c] - [0x783C90, data] - - name: battle/move/earthquake_jump + - dir: battle/move/earthquake_jump type: code start: 0x785B20 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x785B20, c] - [0x785C20, data] - - name: battle/star/focus + - dir: battle/star/focus type: code start: 0x789E60 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x789E60, c] - [0x78A490, data] - - name: battle/star/refresh + - dir: battle/star/refresh type: code start: 0x78B600 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x78B600, c] - [0x78C070, data] - - name: battle/star/lullaby + - dir: battle/star/lullaby type: code start: 0x78D150 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x78D150, c] - [0x78D770, data] - - name: battle/star/star_storm + - dir: battle/star/star_storm type: code start: 0x78E7D0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x78E7D0, c] - [0x78EEC0, data] - - name: battle/star/chill_out + - dir: battle/star/chill_out type: code start: 0x7900D0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x7900D0, c] - [0x7909C0, data] - - name: battle/star/smooch + - dir: battle/star/smooch type: code start: 0x791D90 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x791D90, c] - [0x7923C0, data] - - name: battle/star/time_out + - dir: battle/star/time_out type: code start: 0x793D20 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x793D20, c] - [0x794240, data] - - name: battle/star/up_and_away + - dir: battle/star/up_and_away type: code start: 0x7952E0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x7952E0, c] - [0x7959B0, data] - - name: battle/star/star_beam + - dir: battle/star/star_beam type: code start: 0x796FC0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x796FC0, c] - [0x7984B0, data] - - name: battle/star/peach_beam + - dir: battle/star/peach_beam type: code start: 0x7997B0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x7997B0, c] - [0x79ACA0, data] - - name: battle/star/peach_focus + - dir: battle/star/peach_focus type: code start: 0x79BFA0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x79BFA0, c] - [0x79C4D0, data] - - name: battle/star/peach_dash + - dir: battle/star/peach_dash type: code start: 0x79D8A0 vram: 0x802A1000 overlay: True - subsections: + subsegments: - [0x79D8A0, c] - [0x79DE50, data] - [0x79EF40, bin] # todo identify - - name: world/script_api/ - ld_name: world_script_api + - dir: world/script_api type: code start: 0x7E0E80 vram: 0x80280000 - subsections: + subsegments: - [0x7E0E80, c] - [0x7E2AA0, c] - [0x7E3700, c] - [0x7E4690, c] - [0x7E4D00, data] - [0x7E7380, .rodata, 7E2AA0] - - name: world/area_mac/machi/ + - name: machi + dir: world/area_mac/machi type: code overlay: True start: 0x7E73A0 vram: 0x80240000 - subsections: + subsegments: - [0x7E73A0, c] - [0x7E7550, c] - [0x7E7850, c] @@ -4037,12 +4072,13 @@ segments: - [0x7EA340, data] - [0x7EAA50, data] - [0x7EACD8, rodata] - - name: world/area_mac/mac_00/ + - name: mac_00 + dir: world/area_mac/mac_00 type: code overlay: True start: 0x7EAD10 vram: 0x80240000 - subsections: + subsegments: - [0x7EAD10, c] - [0x7EB340, c] - [0x7ECFD0, c] @@ -4060,12 +4096,13 @@ segments: - [0x8000B0, data] - [0x8006A0, rodata] - [0x8006D0, rodata] - - name: world/area_mac/mac_01/ + - name: mac_01 + dir: world/area_mac/mac_01 type: code overlay: True start: 0x800880 vram: 0x80240000 - subsections: + subsegments: - [0x800880, c] - [0x800C40, c] - [0x801700, c] @@ -4081,12 +4118,13 @@ segments: - [0x822100, data] - [0x822460, data] - [0x822F30, rodata] - - name: world/area_mac/mac_02/ + - name: mac_02 + dir: world/area_mac/mac_02 type: code overlay: True start: 0x8232C0 vram: 0x80240000 - subsections: + subsegments: - [0x8232C0, c] - [0x8238B0, c] - [0x823970, c] @@ -4099,12 +4137,13 @@ segments: - [0x828F10, data] - [0x8313E0, data] - [0x831490, rodata] - - name: world/area_mac/mac_03/ + - name: mac_03 + dir: world/area_mac/mac_03 type: code overlay: True start: 0x831800 vram: 0x80240000 - subsections: + subsegments: - [0x831800, c] - [0x831B20, c] - [0x833500, c] @@ -4117,12 +4156,13 @@ segments: - [0x83F6C0, data] - [0x8404A0, data] - [0x842BB0, rodata] - - name: world/area_mac/mac_04/ + - name: mac_04 + dir: world/area_mac/mac_04 type: code overlay: True start: 0x842BD0 vram: 0x80240000 - subsections: + subsegments: - [0x842BD0, c] - [0x842C20, c] - [0x842D90, c] @@ -4141,12 +4181,13 @@ segments: - [0x8520A0, data] - [0x852120, rodata] - [0x852150, rodata] - - name: world/area_mac/mac_05/ + - name: mac_05 + dir: world/area_mac/mac_05 type: code overlay: True start: 0x852170 vram: 0x80240000 - subsections: + subsegments: - [0x852170, c] - [0x855560, c] - [0x855F20, c] @@ -4160,12 +4201,13 @@ segments: - [0x864910, rodata] - [0x864AE0, rodata] - [0x864B20, rodata] - - name: world/area_mac/mac_06/ + - name: mac_06 + dir: world/area_mac/mac_06 type: code overlay: True start: 0x864B40 vram: 0x80240000 - subsections: + subsegments: - [0x864B40, c] - [0x865000, c] - [0x8659C0, c] @@ -4174,12 +4216,13 @@ segments: - [0x867EF0, data] - [0x869450, rodata] - [0x869490, rodata] - - name: world/area_tik/tik_01/ + - name: tik_01 + dir: world/area_tik/tik_01 type: code overlay: True start: 0x8694B0 vram: 0x80240000 - subsections: + subsegments: - [0x8694B0, c] - [0x869AA0, c] - [0x869EE0, c] @@ -4188,12 +4231,13 @@ segments: - [0x86B350, data] - [0x86BC00, data] - [0x86C710, rodata] - - name: world/area_tik/tik_02/ + - name: tik_02 + dir: world/area_tik/tik_02 type: code overlay: True start: 0x86C740 vram: 0x80240000 - subsections: + subsegments: - [0x86C740, c] - [0x86CA50, c] - [0x86CD10, c] @@ -4202,12 +4246,13 @@ segments: - [0x86D800, data] - [0x86E2C0, data] - [0x86EAF0, rodata] - - name: world/area_tik/tik_03/ + - name: tik_03 + dir: world/area_tik/tik_03 type: code overlay: True start: 0x86EB00 vram: 0x80240000 - subsections: + subsegments: - [0x86EB00, c] - [0x86F0F0, c] - [0x86F5D0, data] @@ -4217,12 +4262,13 @@ segments: - [0x871730, data] - [0x8717F0, data] - [0x871A10, rodata] - - name: world/area_tik/tik_04/ + - name: tik_04 + dir: world/area_tik/tik_04 type: code overlay: True start: 0x871A30 vram: 0x80240000 - subsections: + subsegments: - [0x871A30, c] - [0x872020, c] - [0x8726A0, data] @@ -4231,12 +4277,13 @@ segments: - [0x8742C0, data] - [0x8746E0, data] - [0x874DA0, rodata] - - name: world/area_tik/tik_05/ + - name: tik_05 + dir: world/area_tik/tik_05 type: code overlay: True start: 0x874DC0 vram: 0x80240000 - subsections: + subsegments: - [0x874DC0, c] - [0x8750D0, c] - [0x875810, data] @@ -4245,12 +4292,13 @@ segments: - [0x8765C0, data] - [0x876A50, data] - [0x876ED0, rodata] - - name: world/area_tik/tik_06/ + - name: tik_06 + dir: world/area_tik/tik_06 type: code overlay: True start: 0x876EE0 vram: 0x80240000 - subsections: + subsegments: - [0x876EE0, c] - [0x8774D0, c] - [0x877840, data] @@ -4258,12 +4306,13 @@ segments: - [0x878F90, data] - [0x879860, data] - [0x879BB0, rodata] - - name: world/area_tik/tik_07/ + - name: tik_07 + dir: world/area_tik/tik_07 type: code overlay: True start: 0x879BE0 vram: 0x80240000 - subsections: + subsegments: - [0x879BE0, c] - [0x87AC00, c] - [0x87C4D0, data] @@ -4272,12 +4321,13 @@ segments: - [0x87E590, data] - [0x87E890, data] - [0x87ED80, rodata] - - name: world/area_tik/tik_08/ + - name: tik_08 + dir: world/area_tik/tik_08 type: code overlay: True start: 0x87EDF0 vram: 0x80240000 - subsections: + subsegments: - [0x87EDF0, c] - [0x87F3E0, c] - [0x87F820, c] @@ -4286,12 +4336,13 @@ segments: - [0x881770, data] - [0x8819D0, data] - [0x8821A0, rodata] - - name: world/area_tik/tik_09/ + - name: tik_09 + dir: world/area_tik/tik_09 type: code overlay: True start: 0x8821C0 vram: 0x80240000 - subsections: + subsegments: - [0x8821C0, c] - [0x8827B0, c] - [0x882BF0, c] @@ -4301,12 +4352,13 @@ segments: - [0x885A80, data] - [0x886340, rodata] - [0x886360, rodata] - - name: world/area_tik/tik_10/ + - name: tik_10 + dir: world/area_tik/tik_10 type: code overlay: True start: 0x8863C0 vram: 0x80240000 - subsections: + subsegments: - [0x8863C0, c] - [0x8866D0, c] - [0x887780, data] @@ -4314,12 +4366,13 @@ segments: - [0x887B20, data] - [0x8883F0, data] - [0x888BC0, rodata] - - name: world/area_tik/tik_12/ + - name: tik_12 + dir: world/area_tik/tik_12 type: code overlay: True start: 0x888BD0 vram: 0x80240000 - subsections: + subsegments: - [0x888BD0, c] - [0x8891C0, c] - [0x88A530, c] @@ -4329,12 +4382,13 @@ segments: - [0x88C810, data] - [0x88D590, rodata] - [0x88D5A0, rodata] - - name: world/area_tik/tik_14/ + - name: tik_14 + dir: world/area_tik/tik_14 type: code overlay: True start: 0x88D600 vram: 0x80240000 - subsections: + subsegments: - [0x88D600, c] - [0x88DBF0, c] - [0x88DF60, data] @@ -4342,12 +4396,13 @@ segments: - [0x88F180, data] - [0x88FA30, data] - [0x88FB90, rodata] - - name: world/area_tik/tik_15/ + - name: tik_15 + dir: world/area_tik/tik_15 type: code overlay: True start: 0x88FBA0 vram: 0x80240000 - subsections: + subsegments: - [0x88FBA0, c] - [0x890190, c] - [0x8906B0, data] @@ -4355,12 +4410,13 @@ segments: - [0x891890, data] - [0x8922A0, data] - [0x892A10, rodata] - - name: world/area_tik/tik_17/ + - name: tik_17 + dir: world/area_tik/tik_17 type: code overlay: True start: 0x892A20 vram: 0x80240000 - subsections: + subsegments: - [0x892A20, c] - [0x892A50, c] - [0x893790, c] @@ -4368,12 +4424,13 @@ segments: - [0x893E40, data] - [0x8944F0, data] - [0x8956C0, rodata] - - name: world/area_tik/tik_18/ + - name: tik_18 + dir: world/area_tik/tik_18 type: code overlay: True start: 0x8956E0 vram: 0x80240000 - subsections: + subsegments: - [0x8956E0, c] - [0x8959F0, c] - [0x895D90, data] @@ -4381,24 +4438,26 @@ segments: - [0x896CA0, data] - [0x897450, data] - [0x8975D0, rodata] - - name: world/area_tik/tik_19/ + - name: tik_19 + dir: world/area_tik/tik_19 type: code overlay: True start: 0x8975E0 vram: 0x80240000 - subsections: + subsegments: - [0x8975E0, c] - [0x897BD0, c] - [0x898910, data] - [0x898990, data] - [0x899C90, data] - [0x89A340, rodata] - - name: world/area_tik/tik_20/ + - name: tik_20 + dir: world/area_tik/tik_20 type: code overlay: True start: 0x89A350 vram: 0x80240000 - subsections: + subsegments: - [0x89A350, c] - [0x89ACB0, c] - [0x89B490, data] @@ -4406,46 +4465,50 @@ segments: - [0x89D200, data] - [0x89D720, rodata] - [0x89D740, rodata] - - name: world/area_tik/tik_21/ + - name: tik_21 + dir: world/area_tik/tik_21 type: code overlay: True start: 0x89D7A0 vram: 0x80240000 - subsections: + subsegments: - [0x89D7A0, c] - [0x89E100, data] - [0x89E1A0, data] - [0x89FD70, data] - [0x89FEA0, rodata] - - name: world/area_tik/tik_22/ + - name: tik_22 + dir: world/area_tik/tik_22 type: code overlay: True start: 0x89FEC0 vram: 0x80240000 - subsections: + subsegments: - [0x89FEC0, c] - [0x89FEF0, c] - [0x8A0870, data] - [0x8A0930, data] - [0x8A23C0, rodata] - - name: world/area_tik/tik_23/ + - name: tik_23 + dir: world/area_tik/tik_23 type: code overlay: True start: 0x8A23D0 vram: 0x80240000 - subsections: + subsegments: - [0x8A23D0, c] - [0x8A2D30, c] - [0x8A3510, data] - [0x8A35A0, data] - [0x8A5340, data] - [0x8A5A10, rodata] - - name: world/area_tik/tik_24/ + - name: tik_24 + dir: world/area_tik/tik_24 type: code overlay: True start: 0x8A5A80 vram: 0x80240000 - subsections: + subsegments: - [0x8A5A80, c] - [0x8A5AD0, c] - [0x8A5DE0, c] @@ -4455,36 +4518,39 @@ segments: - [0x8A7A20, data] - [0x8A7EF0, rodata] - [0x8A7F20, rodata] - - name: world/area_tik/tik_25/ + - name: tik_25 + dir: world/area_tik/tik_25 type: code overlay: True start: 0x8A7F80 vram: 0x80240000 - subsections: + subsegments: - [0x8A7F80, c] - [0x8A8600, c] - [0x8A8740, data] - [0x8A8800, data] - [0x8A93D0, data] - [0x8A9A00, rodata] - - name: world/area_kgr/kgr_01/ + - name: kgr_01 + dir: world/area_kgr/kgr_01 type: code overlay: True start: 0x8A9A10 vram: 0x80240000 - subsections: + subsegments: - [0x8A9A10, c] - [0x8A9B70, c] - [0x8A9F30, data] - [0x8AA1D0, data] - [0x8AA310, data] - [0x8AA430, rodata] - - name: world/area_kgr/kgr_02/ + - name: kgr_02 + dir: world/area_kgr/kgr_02 type: code overlay: True start: 0x8AA450 vram: 0x80240000 - subsections: + subsegments: - [0x8AA450, c] - [0x8AA5B0, c] - [0x8AAB80, c] @@ -4492,12 +4558,13 @@ segments: - [0x8AADC0, data] - [0x8ABE60, data] - [0x8ABF80, rodata] - - name: world/area_kmr/kmr_00/ + - name: kmr_00 + dir: world/area_kmr/kmr_00 type: code overlay: True start: 0x8ABF90 vram: 0x80240000 - subsections: + subsegments: - [0x8ABF90, c] - [0x8ACD00, data] - [0x8ACDB0, data] @@ -4505,12 +4572,13 @@ segments: - [0x8AEC40, data] - [0x8B0010, data] - [0x8B0060, rodata] - - name: world/area_kmr/kmr_02/ + - name: kmr_02 + dir: world/area_kmr/kmr_02 type: code overlay: True start: 0x8B0070 vram: 0x80240000 - subsections: + subsegments: - [0x8B0070, c] - [0x8B30E0, c] - [0x8B33E0, c] @@ -4527,12 +4595,13 @@ segments: - [0x8C7D90, rodata] - [0x8C7DB0, rodata] - [0x8C7F70, rodata] - - name: world/area_kmr/kmr_03/ + - name: kmr_03 + dir: world/area_kmr/kmr_03 type: code overlay: True start: 0x8C7F90 vram: 0x80240000 - subsections: + subsegments: - [0x8C7F90, c] - [0x8C8140, c] - [0x8C82B0, c] @@ -4545,12 +4614,13 @@ segments: - [0x8C9780, .data, 8C83A0] - [0x8CA2D0, .data, 8C85E0] - [0x8CA8F0, .rodata, 8C8140] - - name: world/area_kmr/kmr_04/ + - name: kmr_04 + dir: world/area_kmr/kmr_04 type: code overlay: True start: 0x8CA900 vram: 0x80240000 - subsections: + subsegments: - [0x8CA900, c] - [0x8CA960, c] - [0x8CAD70, data] @@ -4559,12 +4629,13 @@ segments: # - [0x8CC35C, data] - [0x8CC4F0, data] - [0x8CE060, rodata] - - name: world/area_kmr/kmr_05/ + - name: kmr_05 + dir: world/area_kmr/kmr_05 type: code overlay: True start: 0x8CE070 vram: 0x80240000 - subsections: + subsegments: - [0x8CE070, c] - [0x8CF570, c] - [0x8CF7F0, data] @@ -4572,12 +4643,13 @@ segments: - [0x8D0900, data] - [0x8D0940, data] - [0x8D14A0, rodata] - - name: world/area_kmr/kmr_06/ + - name: kmr_06 + dir: world/area_kmr/kmr_06 type: code overlay: True start: 0x8D1510 vram: 0x80240000 - subsections: + subsegments: - [0x8D1510, c] - [0x8D2A10, c] - [0x8D32B0, data] @@ -4585,33 +4657,36 @@ segments: - [0x8D3AC0, data] - [0x8D3B30, data] - [0x8D3D50, rodata] - - name: world/area_kmr/kmr_07/ + - name: kmr_07 + dir: world/area_kmr/kmr_07 type: code overlay: True start: 0x8D3DC0 vram: 0x80240000 - subsections: + subsegments: - [0x8D3DC0, c] - [0x8D4880, data] - [0x8D49A0, data] - [0x8D5C40, rodata] - - name: world/area_kmr/kmr_09/ + - name: kmr_09 + dir: world/area_kmr/kmr_09 type: code overlay: True start: 0x8D5E00 vram: 0x80240000 - subsections: + subsegments: - [0x8D5E00, c] - [0x8D7330, data] - [0x8D73C0, data] - [0x8D83B0, data] - [0x8D8460, rodata] - - name: world/area_kmr/kmr_10/ + - name: kmr_10 + dir: world/area_kmr/kmr_10 type: code overlay: True start: 0x8D84D0 vram: 0x80240000 - subsections: + subsegments: - [0x8D84D0, c] - [0x8D88A0, c] - [0x8D8AE0, data] @@ -4619,12 +4694,13 @@ segments: - [0x8D8E60, data] - [0x8D90F0, data] - [0x8DA0F0, rodata] - - name: world/area_kmr/kmr_11/ + - name: kmr_11 + dir: world/area_kmr/kmr_11 type: code overlay: True start: 0x8DA100 vram: 0x80240000 - subsections: + subsegments: - [0x8DA100, c] - [0x8DA3A0, c] - [0x8DAFC0, c] @@ -4638,22 +4714,24 @@ segments: - [0x8E0190, data] - [0x8EB190, rodata] - [0x8EB1B0, rodata] - - name: world/area_kmr/kmr_12/ + - name: kmr_12 + dir: world/area_kmr/kmr_12 type: code overlay: True start: 0x8EB360 vram: 0x80240000 - subsections: + subsegments: - [0x8EB360, c, header] - [0x8EB390, .data, header] - [0x8EB420, .data, events] - [0x8EBE10, .rodata, events] - - name: world/area_kmr/kmr_20/ + - name: kmr_20 + dir: world/area_kmr/kmr_20 type: code overlay: True start: 0x8EBE20 vram: 0x80240000 - subsections: + subsegments: - [0x8EBE20, c] - [0x8EBE50, c] - [0x8ECBF0, c] @@ -4677,22 +4755,24 @@ segments: - [0x8F9D30, data] - [0x8FEE20, rodata] - [0x8FEE50, rodata] - - name: world/area_kmr/kmr_21/ + - name: kmr_21 + dir: world/area_kmr/kmr_21 type: code overlay: True start: 0x8FEE80 vram: 0x80240000 - subsections: + subsegments: - [0x8FEE80, c] - [0x8FEE90, c] - [0x8FF160, data] - [0x8FF650, rodata] - - name: world/area_kmr/kmr_22/ + - name: kmr_22 + dir: world/area_kmr/kmr_22 type: code overlay: True start: 0x8FF670 vram: 0x80240000 - subsections: + subsegments: - [0x8FF670, c] - [0x8FF680, c] - [0x8FF8B0, c] @@ -4700,53 +4780,58 @@ segments: - [0x900A80, data] - [0x9079D0, rodata] - [0x907A20, rodata] - - name: world/area_kmr/kmr_23/ + - name: kmr_23 + dir: world/area_kmr/kmr_23 type: code overlay: True start: 0x907A30 vram: 0x80240000 - subsections: + subsegments: - [0x907A30, c] - [0x907A40, c] - [0x908B00, data] - [0x90B210, rodata] - - name: world/area_kmr/kmr_24/ + - name: kmr_24 + dir: world/area_kmr/kmr_24 type: code overlay: True start: 0x90B240 vram: 0x80240000 - subsections: + subsegments: - [0x90B240, c] - [0x90B250, c] - [0x90B350, data] - [0x90B6C0, rodata] - - name: world/area_kmr/kmr_30/ + - name: kmr_30 + dir: world/area_kmr/kmr_30 type: code overlay: True start: 0x90B6D0 vram: 0x80240000 - subsections: + subsegments: - [0x90B6D0, c] - [0x90B9E0, c] - [0x90BBB0, data] - [0x90BDB0, data] - [0x90BFF0, data] - - name: world/area_iwa/iwa_00/ + - name: iwa_00 + dir: world/area_iwa/iwa_00 type: code overlay: True start: 0x90CC40 vram: 0x80240000 - subsections: + subsegments: - [0x90CC40, c] - [0x90CEF0, c] - [0x90CF20, data] - [0x90F6A0, rodata] - - name: world/area_iwa/iwa_01/ + - name: iwa_01 + dir: world/area_iwa/iwa_01 type: code overlay: True start: 0x90F6B0 vram: 0x80240000 - subsections: + subsegments: - [0x90F6B0, c] - [0x90FBD0, c] - [0x912960, c] @@ -4757,23 +4842,25 @@ segments: - [0x915A00, rodata] - [0x915A20, rodata] - [0x915A40, rodata] - - name: world/area_iwa/iwa_02/ + - name: iwa_02 + dir: world/area_iwa/iwa_02 type: code overlay: True start: 0x915D70 vram: 0x80240000 - subsections: + subsegments: - [0x915D70, c] - [0x916E70, data] - [0x917170, data] - [0x917220, data] - [0x918AA0, rodata] - - name: world/area_iwa/iwa_03/ + - name: iwa_03 + dir: world/area_iwa/iwa_03 type: code overlay: True start: 0x918BB0 vram: 0x80240000 - subsections: + subsegments: - [0x918BB0, c] - [0x918EF0, c] - [0x919F00, data] @@ -4781,23 +4868,25 @@ segments: - [0x91B510, data] - [0x91B7D0, rodata] - [0x91B7E0, rodata] - - name: world/area_iwa/iwa_04/ + - name: iwa_04 + dir: world/area_iwa/iwa_04 type: code overlay: True start: 0x91B8E0 vram: 0x80240000 - subsections: + subsegments: - [0x91B8E0, c] - [0x91C9C0, data] - [0x91CA50, data] - [0x91CFA0, data] - [0x91E460, rodata] - - name: world/area_iwa/iwa_10/ + - name: iwa_10 + dir: world/area_iwa/iwa_10 type: code overlay: True start: 0x91E570 vram: 0x80240000 - subsections: + subsegments: - [0x91E570, c] - [0x91E5B0, c] - [0x91E6D0, c] @@ -4811,12 +4900,13 @@ segments: - [0x923FD0, data] - [0x9247B0, data] - [0x9269D0, rodata] - - name: world/area_iwa/iwa_11/ + - name: iwa_11 + dir: world/area_iwa/iwa_11 type: code overlay: True start: 0x9269F0 vram: 0x80240000 - subsections: + subsegments: - [0x9269F0, c] - [0x926A10, c] - [0x926C70, c] @@ -4824,34 +4914,37 @@ segments: - [0x926D90, data] - [0x927030, data] - [0x929240, rodata] - - name: world/area_sbk/sbk_00/ + - name: sbk_00 + dir: world/area_sbk/sbk_00 type: code overlay: True start: 0x929270 vram: 0x80240000 - subsections: + subsegments: - [0x929270, c] - [0x9292B0, c] - [0x9292D0, .data, "929270"] - [0x929A00, .data, 9292B0] - [0x929A80, .rodata, "929270"] - - name: world/area_sbk/sbk_01/ + - name: sbk_01 + dir: world/area_sbk/sbk_01 type: code overlay: True start: 0x929A90 vram: 0x80240000 - subsections: + subsegments: - [0x929A90, c] - [0x929AD0, c] - [0x929AF0, .data, 929A90] - [0x929E00, .data, 929AD0] - [0x92A290, .rodata, 929A90] - - name: world/area_sbk/sbk_02/ + - name: sbk_02 + dir: world/area_sbk/sbk_02 type: code overlay: True start: 0x92A2B0 vram: 0x80240000 - subsections: + subsegments: - [0x92A2B0, c] - [0x92A9A0, c] - [0x92AEB0, data] @@ -4860,187 +4953,204 @@ segments: - [0x92E220, data] - [0x92F830, data] - [0x92F880, rodata] - - name: world/area_sbk/sbk_03/ + - name: sbk_03 + dir: world/area_sbk/sbk_03 type: code overlay: True start: 0x92F8B0 vram: 0x80240000 - subsections: + subsegments: - [0x92F8B0, c] - [0x92F8F0, c] - [0x92F910, data] - [0x92FC20, data] - [0x9304B0, rodata] - - name: world/area_sbk/sbk_04/ + - name: sbk_04 + dir: world/area_sbk/sbk_04 type: code overlay: True start: 0x9304D0 vram: 0x80240000 - subsections: + subsegments: - [0x9304D0, c] - [0x930510, c] - [0x930530, data] - [0x930840, data] - [0x930CD0, rodata] - - name: world/area_sbk/sbk_05/ + - name: sbk_05 + dir: world/area_sbk/sbk_05 type: code overlay: True start: 0x930CF0 vram: 0x80240000 - subsections: + subsegments: - [0x930CF0, c] - [0x930D30, c] - [0x930D50, data] - [0x9310F0, data] - [0x931130, data] - [0x9325A0, rodata] - - name: world/area_sbk/sbk_06/ + - name: sbk_06 + dir: world/area_sbk/sbk_06 type: code overlay: True start: 0x9325C0 vram: 0x80240000 - subsections: + subsegments: - [0x9325C0, c] - [0x932600, c] - [0x932940, data] - [0x932BF0, data] - [0x933160, data] - [0x933C70, rodata] - - name: world/area_sbk/sbk_10/ + - name: sbk_10 + dir: world/area_sbk/sbk_10 type: code overlay: True start: 0x933C80 vram: 0x80240000 - subsections: + subsegments: - [0x933C80, c] - [0x933CC0, data] - [0x933FD0, data] - [0x934020, rodata] - - name: world/area_sbk/sbk_11/ + - name: sbk_11 + dir: world/area_sbk/sbk_11 type: code overlay: True start: 0x934040 vram: 0x80240000 - subsections: + subsegments: - [0x934040, c] - [0x934080, c] - [0x9341A0, data] - [0x934530, data] - [0x934D20, rodata] - - name: world/area_sbk/sbk_12/ + - name: sbk_12 + dir: world/area_sbk/sbk_12 type: code overlay: True start: 0x934D40 vram: 0x80240000 - subsections: + subsegments: - [0x934D40, c] - [0x934D80, c] - [0x934DA0, data] - [0x935130, data] - [0x9357C0, rodata] - - name: world/area_sbk/sbk_13/ + - name: sbk_13 + dir: world/area_sbk/sbk_13 type: code overlay: True start: 0x9357E0 vram: 0x80240000 - subsections: + subsegments: - [0x9357E0, c] - [0x935820, c] - [0x935940, data] - [0x935CD0, data] - [0x9366C0, rodata] - - name: world/area_sbk/sbk_14/ + - name: sbk_14 + dir: world/area_sbk/sbk_14 type: code overlay: True start: 0x9366E0 vram: 0x80240000 - subsections: + subsegments: - [0x9366E0, c] - [0x936720, data] - [0x936B20, data] - [0x936CA0, rodata] - - name: world/area_sbk/sbk_15/ + - name: sbk_15 + dir: world/area_sbk/sbk_15 type: code overlay: True start: 0x936CD0 vram: 0x80240000 - subsections: + subsegments: - [0x936CD0, c] - [0x936D10, c] - [0x936D30, data] - [0x9370C0, data] - [0x937550, rodata] - - name: world/area_sbk/sbk_16/ + - name: sbk_16 + dir: world/area_sbk/sbk_16 type: code overlay: True start: 0x937570 vram: 0x80240000 - subsections: + subsegments: - [0x937570, c] - [0x9375B0, c] - [0x9377F0, data] - [0x937B00, data] - [0x938570, rodata] - - name: world/area_sbk/sbk_20/ + - name: sbk_20 + dir: world/area_sbk/sbk_20 type: code overlay: True start: 0x938590 vram: 0x80240000 - subsections: + subsegments: - [0x938590, c] - [0x9385D0, c] - [0x9386D0, data] - [0x9389F0, data] - [0x938DD0, data] - [0x939540, rodata] - - name: world/area_sbk/sbk_21/ + - name: sbk_21 + dir: world/area_sbk/sbk_21 type: code overlay: True start: 0x939560 vram: 0x80240000 - subsections: + subsegments: - [0x939560, c] - [0x9395A0, data] - [0x939910, rodata] - - name: world/area_sbk/sbk_22/ + - name: sbk_22 + dir: world/area_sbk/sbk_22 type: code overlay: True start: 0x939930 vram: 0x80240000 - subsections: + subsegments: - [0x939930, c] - [0x939970, c] - [0x939A90, data] - [0x93A610, data] - [0x93A740, rodata] - - name: world/area_sbk/sbk_23/ + - name: sbk_23 + dir: world/area_sbk/sbk_23 type: code overlay: True start: 0x93A760 vram: 0x80240000 - subsections: + subsegments: - [0x93A760, c] - [0x93A7A0, data] - [0x93AB20, data] - [0x93AC00, rodata] - - name: world/area_sbk/sbk_24/ + - name: sbk_24 + dir: world/area_sbk/sbk_24 type: code overlay: True start: 0x93AC30 vram: 0x80240000 - subsections: + subsegments: - [0x93AC30, c] - [0x93AC70, c] - [0x93AFB0, data] - [0x93B3C0, data] - [0x93B770, data] - [0x93C260, rodata] - - name: world/area_sbk/sbk_25/ + - name: sbk_25 + dir: world/area_sbk/sbk_25 type: code overlay: True start: 0x93C280 vram: 0x80240000 - subsections: + subsegments: - [0x93C280, c] - [0x93C2C0, c] - [0x93C600, data] @@ -5048,12 +5158,13 @@ segments: - [0x93D110, data] - [0x93DB80, data] - [0x93DCB0, rodata] - - name: world/area_sbk/sbk_26/ + - name: sbk_26 + dir: world/area_sbk/sbk_26 type: code overlay: True start: 0x93DCD0 vram: 0x80240000 - subsections: + subsegments: - [0x93DCD0, c] - [0x93DD10, c] - [0x93DE30, c] @@ -5061,151 +5172,165 @@ segments: - [0x93E390, data] - [0x93EB80, data] - [0x93F590, rodata] - - name: world/area_sbk/sbk_30/ + - name: sbk_30 + dir: world/area_sbk/sbk_30 type: code overlay: True start: 0x93F5B0 vram: 0x80240000 - subsections: + subsegments: - [0x93F5B0, c] - [0x940DC0, data] - [0x943E20, rodata] - [0x943E50, rodata] - - name: world/area_sbk/sbk_31/ + - name: sbk_31 + dir: world/area_sbk/sbk_31 type: code overlay: True start: 0x944000 vram: 0x80240000 - subsections: + subsegments: - [0x944000, c] - [0x944040, c] - [0x944140, data] - [0x9444D0, data] - [0x944A40, rodata] - - name: world/area_sbk/sbk_32/ + - name: sbk_32 + dir: world/area_sbk/sbk_32 type: code overlay: True start: 0x944A60 vram: 0x80240000 - subsections: + subsegments: - [0x944A60, c] - [0x944AA0, c] - [0x944BC0, data] - [0x9459B0, rodata] - - name: world/area_sbk/sbk_33/ + - name: sbk_33 + dir: world/area_sbk/sbk_33 type: code overlay: True start: 0x9459D0 vram: 0x80240000 - subsections: + subsegments: - [0x9459D0, c] - [0x945A10, data] - [0x945BA0, data] - [0x945EA0, rodata] - - name: world/area_sbk/sbk_34/ + - name: sbk_34 + dir: world/area_sbk/sbk_34 type: code overlay: True start: 0x945ED0 vram: 0x80240000 - subsections: + subsegments: - [0x945ED0, c] - [0x945F10, c] - [0x946670, c] - [0x9468B0, data] - [0x947C80, data] - [0x948690, rodata] - - name: world/area_sbk/sbk_35/ + - name: sbk_35 + dir: world/area_sbk/sbk_35 type: code overlay: True start: 0x9486B0 vram: 0x80240000 - subsections: + subsegments: - [0x9486B0, c] - [0x9486F0, c] - [0x948A30, data] - [0x949330, data] - [0x949E40, rodata] - - name: world/area_sbk/sbk_36/ + - name: sbk_36 + dir: world/area_sbk/sbk_36 type: code overlay: True start: 0x949E60 vram: 0x80240000 - subsections: + subsegments: - [0x949E60, c] - [0x949EA0, c] - [0x94A0E0, data] - [0x94A470, data] - [0x94B380, rodata] - - name: world/area_sbk/sbk_40/ + - name: sbk_40 + dir: world/area_sbk/sbk_40 type: code overlay: True start: 0x94B3A0 vram: 0x80240000 - subsections: + subsegments: - [0x94B3A0, c] - [0x94B3E0, c] - [0x94B4E0, data] - [0x94B800, data] - [0x94BF70, data] - [0x94C020, rodata] - - name: world/area_sbk/sbk_41/ + - name: sbk_41 + dir: world/area_sbk/sbk_41 type: code overlay: True start: 0x94C040 vram: 0x80240000 - subsections: + subsegments: - [0x94C040, c] - [0x94C080, data] - [0x94C400, data] - [0x94C4E0, rodata] - - name: world/area_sbk/sbk_42/ + - name: sbk_42 + dir: world/area_sbk/sbk_42 type: code overlay: True start: 0x94C510 vram: 0x80240000 - subsections: + subsegments: - [0x94C510, c] - [0x94C550, c] - [0x94C650, data] - [0x94C9E0, data] - [0x94D150, rodata] - - name: world/area_sbk/sbk_43/ + - name: sbk_43 + dir: world/area_sbk/sbk_43 type: code overlay: True start: 0x94D170 vram: 0x80240000 - subsections: + subsegments: - [0x94D170, c] - [0x94D1B0, data] - [0x94D530, data] - [0x94D580, rodata] - - name: world/area_sbk/sbk_44/ + - name: sbk_44 + dir: world/area_sbk/sbk_44 type: code overlay: True start: 0x94D5A0 vram: 0x80240000 - subsections: + subsegments: - [0x94D5A0, c] - [0x94D5E0, c] - [0x94D700, data] - [0x94DA90, data] - [0x94E480, rodata] - - name: world/area_sbk/sbk_45/ + - name: sbk_45 + dir: world/area_sbk/sbk_45 type: code overlay: True start: 0x94E4A0 vram: 0x80240000 - subsections: + subsegments: - [0x94E4A0, c] - [0x94E4E0, data] - [0x94E8E0, data] - [0x94E980, rodata] - - name: world/area_sbk/sbk_46/ + - name: sbk_46 + dir: world/area_sbk/sbk_46 type: code overlay: True start: 0x94E9A0 vram: 0x80240000 - subsections: + subsegments: - [0x94E9A0, c] - [0x94E9E0, c] - [0x94EB00, c] @@ -5214,63 +5339,69 @@ segments: - [0x94FA60, data] - [0x950570, data] - [0x9505F0, rodata] - - name: world/area_sbk/sbk_50/ + - name: sbk_50 + dir: world/area_sbk/sbk_50 type: code overlay: True start: 0x950610 vram: 0x80240000 - subsections: + subsegments: - [0x950610, c] - [0x950650, data] - [0x950950, rodata] - - name: world/area_sbk/sbk_51/ + - name: sbk_51 + dir: world/area_sbk/sbk_51 type: code overlay: True start: 0x950970 vram: 0x80240000 - subsections: + subsegments: - [0x950970, c] - [0x9509B0, c] - [0x950AD0, data] - [0x950E60, data] - [0x951650, rodata] - - name: world/area_sbk/sbk_52/ + - name: sbk_52 + dir: world/area_sbk/sbk_52 type: code overlay: True start: 0x951670 vram: 0x80240000 - subsections: + subsegments: - [0x951670, c] - [0x9516B0, data] - [0x951A30, data] - [0x951AC0, rodata] - - name: world/area_sbk/sbk_53/ + - name: sbk_53 + dir: world/area_sbk/sbk_53 type: code overlay: True start: 0x951AE0 vram: 0x80240000 - subsections: + subsegments: - [0x951AE0, c] - [0x951B20, c] - [0x951B40, data] - [0x951ED0, data] - [0x952560, rodata] - - name: world/area_sbk/sbk_54/ + - name: sbk_54 + dir: world/area_sbk/sbk_54 type: code overlay: True start: 0x952580 vram: 0x80240000 - subsections: + subsegments: - [0x952580, c] - [0x9525C0, data] - [0x952940, data] - [0x952A20, rodata] - - name: world/area_sbk/sbk_55/ + - name: sbk_55 + dir: world/area_sbk/sbk_55 type: code overlay: True start: 0x952A50 vram: 0x80240000 - subsections: + subsegments: - [0x952A50, c] - [0x952A90, c] - [0x952AB0, c] @@ -5278,85 +5409,93 @@ segments: - [0x953090, data] - [0x953520, data] - [0x953FA0, rodata] - - name: world/area_sbk/sbk_56/ + - name: sbk_56 + dir: world/area_sbk/sbk_56 type: code overlay: True start: 0x953FC0 vram: 0x80240000 - subsections: + subsegments: - [0x953FC0, c] - [0x954D80, c] - [0x954FC0, data] - [0x9553F0, data] - [0x9569D0, rodata] - - name: world/area_sbk/sbk_60/ + - name: sbk_60 + dir: world/area_sbk/sbk_60 type: code overlay: True start: 0x9569F0 vram: 0x80240000 - subsections: + subsegments: - [0x9569F0, c] - [0x956A30, c] - [0x956A50, data] - [0x956CF0, data] - [0x956F80, rodata] - - name: world/area_sbk/sbk_61/ + - name: sbk_61 + dir: world/area_sbk/sbk_61 type: code overlay: True start: 0x956F90 vram: 0x80240000 - subsections: + subsegments: - [0x956F90, c] - [0x956FD0, data] - [0x9572E0, data] - [0x957330, rodata] - - name: world/area_sbk/sbk_62/ + - name: sbk_62 + dir: world/area_sbk/sbk_62 type: code overlay: True start: 0x957350 vram: 0x80240000 - subsections: + subsegments: - [0x957350, c] - [0x957390, c] - [0x9573B0, data] - [0x9576C0, data] - [0x957D50, rodata] - - name: world/area_sbk/sbk_63/ + - name: sbk_63 + dir: world/area_sbk/sbk_63 type: code overlay: True start: 0x957D70 vram: 0x80240000 - subsections: + subsegments: - [0x957D70, c] - [0x957DB0, c] - [0x957DD0, data] - [0x9580E0, data] - [0x958570, rodata] - - name: world/area_sbk/sbk_64/ + - name: sbk_64 + dir: world/area_sbk/sbk_64 type: code overlay: True start: 0x958590 vram: 0x80240000 - subsections: + subsegments: - [0x958590, c] - [0x9585D0, data] - [0x9588E0, data] - [0x958930, rodata] - - name: world/area_sbk/sbk_65/ + - name: sbk_65 + dir: world/area_sbk/sbk_65 type: code overlay: True start: 0x958950 vram: 0x80240000 - subsections: + subsegments: - [0x958950, c] - [0x958990, data] - [0x958C90, rodata] - - name: world/area_sbk/sbk_66/ + - name: sbk_66 + dir: world/area_sbk/sbk_66 type: code overlay: True start: 0x958CB0 vram: 0x80240000 - subsections: + subsegments: - [0x958CB0, c] - [0x958CF0, c] - [0x959030, data] @@ -5364,21 +5503,23 @@ segments: - [0x95A240, data] - [0x95AD50, data] - [0x95AEA0, rodata] - - name: world/area_sbk/sbk_99/ + - name: sbk_99 + dir: world/area_sbk/sbk_99 type: code overlay: True start: 0x95AEB0 vram: 0x80240000 - subsections: + subsegments: - [0x95AEB0, data] - [0x95B190, data] - [0x95B1F0, rodata] - - name: world/area_dro/dro_01/ + - name: dro_01 + dir: world/area_dro/dro_01 type: code overlay: True start: 0x95B200 vram: 0x80240000 - subsections: + subsegments: - [0x95B200, c] - [0x95B7E0, c] - [0x95E660, c] @@ -5391,12 +5532,13 @@ segments: - [0x968FD0, rodata] - [0x969198, rodata] - [0x9691B0, rodata] - - name: world/area_dro/dro_02/ + - name: dro_02 + dir: world/area_dro/dro_02 type: code overlay: True start: 0x9691C0 vram: 0x80240000 - subsections: + subsegments: - [0x9691C0, c] - [0x9694C0, c] - [0x96CC30, data] @@ -5405,22 +5547,24 @@ segments: - [0x96D380, data] - [0x96DFA0, data] - [0x9780D0, rodata] - - name: world/area_isk/isk_01/ + - name: isk_01 + dir: world/area_isk/isk_01 type: code overlay: True start: 0x978140 vram: 0x80240000 - subsections: + subsegments: - [0x978140, data] - [0x978360, data] - [0x9785C0, data] - [0x978700, rodata] - - name: world/area_isk/isk_02/ + - name: isk_02 + dir: world/area_isk/isk_02 type: code overlay: True start: 0x978710 vram: 0x80240000 - subsections: + subsegments: - [0x978710, c] - [0x978750, c] - [0x978800, c] @@ -5430,22 +5574,24 @@ segments: - [0x979390, data] - [0x9793F0, data] - [0x979E40, rodata] - - name: world/area_isk/isk_03/ + - name: isk_03 + dir: world/area_isk/isk_03 type: code overlay: True start: 0x979E50 vram: 0x80240000 - subsections: + subsegments: - [0x979E50, data] - [0x97A210, data] - [0x97B340, data] - [0x97B620, rodata] - - name: world/area_isk/isk_04/ + - name: isk_04 + dir: world/area_isk/isk_04 type: code overlay: True start: 0x97B630 vram: 0x80240000 - subsections: + subsegments: - [0x97B630, c] - [0x97B670, c] - [0x97BF60, c] @@ -5456,12 +5602,13 @@ segments: - [0x97D2F0, data] - [0x97DA40, rodata] - [0x97DAC0, rodata] - - name: world/area_isk/isk_05/ + - name: isk_05 + dir: world/area_isk/isk_05 type: code overlay: True start: 0x97DAD0 vram: 0x80240000 - subsections: + subsegments: - [0x97DAD0, c] - [0x97F990, data] - [0x97FCE0, data] @@ -5470,22 +5617,24 @@ segments: - [0x980980, rodata] - [0x9809C8, rodata] - [0x980A08, rodata] - - name: world/area_isk/isk_06/ + - name: isk_06 + dir: world/area_isk/isk_06 type: code overlay: True start: 0x980A20 vram: 0x80240000 - subsections: + subsegments: - [0x980A20, data] - [0x980D40, data] - [0x982150, data] - [0x982430, rodata] - - name: world/area_isk/isk_07/ + - name: isk_07 + dir: world/area_isk/isk_07 type: code overlay: True start: 0x982440 vram: 0x80240000 - subsections: + subsegments: - [0x982440, c] - [0x9824F0, c] - [0x982530, c] @@ -5496,23 +5645,25 @@ segments: - [0x984390, data] - [0x9845D0, data] - [0x984E20, rodata] - - name: world/area_isk/isk_08/ + - name: isk_08 + dir: world/area_isk/isk_08 type: code overlay: True start: 0x984E30 vram: 0x80240000 - subsections: + subsegments: - [0x984E30, c] - [0x985720, data] - [0x985B00, data] - [0x986090, data] - [0x986460, rodata] - - name: world/area_isk/isk_09/ + - name: isk_09 + dir: world/area_isk/isk_09 type: code overlay: True start: 0x9864E0 vram: 0x80240000 - subsections: + subsegments: - [0x9864E0, c] - [0x9867D0, c] - [0x986810, data] @@ -5521,23 +5672,25 @@ segments: - [0x987560, data] - [0x988290, data] - [0x988B50, rodata] - - name: world/area_isk/isk_10/ + - name: isk_10 + dir: world/area_isk/isk_10 type: code overlay: True start: 0x988B60 vram: 0x80240000 - subsections: + subsegments: - [0x988B60, c] - [0x989910, data] - [0x98A580, data] - [0x98A9E0, rodata] - [0x98AA00, rodata] - - name: world/area_isk/isk_11/ + - name: isk_11 + dir: world/area_isk/isk_11 type: code overlay: True start: 0x98AA10 vram: 0x80240000 - subsections: + subsegments: - [0x98AA10, c] - [0x98AAC0, c] - [0x98AB30, c] @@ -5547,23 +5700,25 @@ segments: - [0x98B620, data] - [0x98D3C0, data] - [0x98D620, rodata] - - name: world/area_isk/isk_12/ + - name: isk_12 + dir: world/area_isk/isk_12 type: code overlay: True start: 0x98D640 vram: 0x80240000 - subsections: + subsegments: - [0x98D640, data] - [0x98DA70, data] - [0x98DCB0, data] - [0x98ED40, data] - [0x98F7C0, rodata] - - name: world/area_isk/isk_13/ + - name: isk_13 + dir: world/area_isk/isk_13 type: code overlay: True start: 0x98F7E0 vram: 0x80240000 - subsections: + subsegments: - [0x98F7E0, c] - [0x991850, data] - [0x991A90, data] @@ -5571,12 +5726,13 @@ segments: - [0x992690, rodata] - [0x9926D8, rodata] - [0x992718, rodata] - - name: world/area_isk/isk_14/ + - name: isk_14 + dir: world/area_isk/isk_14 type: code overlay: True start: 0x992730 vram: 0x80240000 - subsections: + subsegments: - [0x992730, c] - [0x994490, data] - [0x9946D0, data] @@ -5584,12 +5740,13 @@ segments: - [0x995150, rodata] - [0x995160, rodata] - [0x9951A8, rodata] - - name: world/area_isk/isk_16/ + - name: isk_16 + dir: world/area_isk/isk_16 type: code overlay: True start: 0x9951F0 vram: 0x80240000 - subsections: + subsegments: - [0x9951F0, c] - [0x9959F0, c] - [0x995CF0, data] @@ -5597,33 +5754,36 @@ segments: - [0x996C40, data] - [0x997E20, data] - [0x997F40, rodata] - - name: world/area_isk/isk_18/ + - name: isk_18 + dir: world/area_isk/isk_18 type: code overlay: True start: 0x997F70 vram: 0x80240000 - subsections: + subsegments: - [0x997F70, c] - [0x998860, data] - [0x998B90, data] - [0x999520, data] - [0x9996D0, rodata] - - name: world/area_isk/isk_19/ + - name: isk_19 + dir: world/area_isk/isk_19 type: code overlay: True start: 0x999740 vram: 0x80240000 - subsections: + subsegments: - [0x999740, data] - [0x999960, data] - [0x999BA0, data] - [0x999C60, rodata] - - name: world/area_trd/trd_00/ + - name: trd_00 + dir: world/area_trd/trd_00 type: code overlay: True start: 0x999C70 vram: 0x80240000 - subsections: + subsegments: - [0x999C70, c] - [0x999F80, c] - [0x99A240, c] @@ -5632,12 +5792,13 @@ segments: - [0x99AFB0, data] - [0x99B280, data] - [0x99C970, rodata] - - name: world/area_trd/trd_01/ + - name: trd_01 + dir: world/area_trd/trd_01 type: code overlay: True start: 0x99C990 vram: 0x80240000 - subsections: + subsegments: - [0x99C990, c] - [0x99CCA0, c] - [0x99CD80, c] @@ -5648,12 +5809,13 @@ segments: - [0x9A0DB0, rodata] - [0x9A0DD0, rodata] - [0x9A0E30, rodata] - - name: world/area_trd/trd_02/ + - name: trd_02 + dir: world/area_trd/trd_02 type: code overlay: True start: 0x9A0FE0 vram: 0x80240000 - subsections: + subsegments: - [0x9A0FE0, c] - [0x9A10C0, c] - [0x9A2A30, data] @@ -5662,12 +5824,13 @@ segments: - [0x9A3AB0, data] - [0x9A42B0, rodata] - [0x9A4320, rodata] - - name: world/area_trd/trd_03/ + - name: trd_03 + dir: world/area_trd/trd_03 type: code overlay: True start: 0x9A4650 vram: 0x80240000 - subsections: + subsegments: - [0x9A4650, c] - [0x9A46F0, c] - [0x9A4ED0, c] @@ -5676,12 +5839,13 @@ segments: - [0x9A5FF0, data] - [0x9A60F0, data] - [0x9A8380, rodata] - - name: world/area_trd/trd_04/ + - name: trd_04 + dir: world/area_trd/trd_04 type: code overlay: True start: 0x9A83F0 vram: 0x80240000 - subsections: + subsegments: - [0x9A83F0, c] - [0x9A8700, c] - [0x9A88A0, c] @@ -5691,12 +5855,13 @@ segments: - [0x9AE2B0, rodata] - [0x9AE330, rodata] - [0x9AE6B8, rodata] - - name: world/area_trd/trd_05/ + - name: trd_05 + dir: world/area_trd/trd_05 type: code overlay: True start: 0x9AE700 vram: 0x80240000 - subsections: + subsegments: - [0x9AE700, c] - [0x9AEE20, c] - [0x9AEE70, data] @@ -5704,12 +5869,13 @@ segments: - [0x9AF7C0, data] - [0x9AF820, data] - [0x9B1760, rodata] - - name: world/area_trd/trd_06/ + - name: trd_06 + dir: world/area_trd/trd_06 type: code overlay: True start: 0x9B1790 vram: 0x80240000 - subsections: + subsegments: - [0x9B1790, c] - [0x9B1AA0, c] - [0x9B2280, c] @@ -5719,12 +5885,13 @@ segments: - [0x9B5FC0, data] - [0x9B6940, rodata] - [0x9B6950, rodata] - - name: world/area_trd/trd_07/ + - name: trd_07 + dir: world/area_trd/trd_07 type: code overlay: True start: 0x9B6980 vram: 0x80240000 - subsections: + subsegments: - [0x9B6980, c] - [0x9B6C90, c] - [0x9B9270, data] @@ -5734,24 +5901,26 @@ segments: - [0x9BB190, rodata] - [0x9BB200, rodata] - [0x9BB258, rodata] - - name: world/area_trd/trd_08/ + - name: trd_08 + dir: world/area_trd/trd_08 type: code overlay: True start: 0x9BB2A0 vram: 0x80240000 - subsections: + subsegments: - [0x9BB2A0, c] - [0x9BB5B0, c] - [0x9BBCC0, data] - [0x9BBD50, data] - [0x9BC1A0, data] - [0x9BD650, rodata] - - name: world/area_trd/trd_09/ + - name: trd_09 + dir: world/area_trd/trd_09 type: code overlay: True start: 0x9BD660 vram: 0x80240000 - subsections: + subsegments: - [0x9BD660, c] - [0x9BD720, c] - [0x9BD830, data] @@ -5760,24 +5929,26 @@ segments: - [0x9BDE80, data] - [0x9C24C0, data] - [0x9C28F0, rodata] - - name: world/area_trd/trd_10/ + - name: trd_10 + dir: world/area_trd/trd_10 type: code overlay: True start: 0x9C2910 vram: 0x80240000 - subsections: + subsegments: - [0x9C2910, c] - [0x9C3130, c] - [0x9C3160, data] - [0x9C3A30, data] - [0x9C4FC0, data] - [0x9C53B0, rodata] - - name: world/area_nok/nok_01/ + - name: nok_01 + dir: world/area_nok/nok_01 type: code overlay: True start: 0x9C53E0 vram: 0x80240000 - subsections: + subsegments: - [0x9C53E0, c] - [0x9C7D10, c] - [0x9C7F50, data] @@ -5790,12 +5961,13 @@ segments: - [0x9D5BF0, data] - [0x9D5F80, data] - [0x9D6E60, rodata] - - name: world/area_nok/nok_02/ + - name: nok_02 + dir: world/area_nok/nok_02 type: code overlay: True start: 0x9D7020 vram: 0x80240000 - subsections: + subsegments: - [0x9D7020, c] - [0x9D7770, c] - [0x9D7990, c] @@ -5814,23 +5986,25 @@ segments: - [0x9EB3D0, data] - [0x9EB620, rodata] - [0x9EB640, rodata] - - name: world/area_nok/nok_03/ + - name: nok_03 + dir: world/area_nok/nok_03 type: code overlay: True start: 0x9EB7F0 vram: 0x80240000 - subsections: + subsegments: - [0x9EB7F0, c] - [0x9EC610, data] - [0x9EC700, data] - [0x9ECBD0, data] - [0x9EDB90, rodata] - - name: world/area_nok/nok_04/ + - name: nok_04 + dir: world/area_nok/nok_04 type: code overlay: True start: 0x9EDBF0 vram: 0x80240000 - subsections: + subsegments: - [0x9EDBF0, c] - [0x9EEA80, c] - [0x9EEB20, data] @@ -5840,24 +6014,26 @@ segments: - [0x9F4A00, rodata] - [0x9F4A10, rodata] - [0x9F4A30, rodata] - - name: world/area_nok/nok_11/ + - name: nok_11 + dir: world/area_nok/nok_11 type: code overlay: True start: 0x9F4A40 vram: 0x80240000 - subsections: + subsegments: - [0x9F4A40, c] - [0x9F6990, data] - [0x9F6A50, data] - [0x9F7180, data] - [0x9FA720, rodata] - [0x9FA790, rodata] - - name: world/area_nok/nok_12/ + - name: nok_12 + dir: world/area_nok/nok_12 type: code overlay: True start: 0x9FA7F0 vram: 0x80240000 - subsections: + subsegments: - [0x9FA7F0, c] - [0x9FA970, c] - [0x9FAAE0, c] @@ -5871,12 +6047,13 @@ segments: - [0x9FFB70, data] - [0xA00250, rodata] - [0xA002C0, rodata] - - name: world/area_nok/nok_13/ + - name: nok_13 + dir: world/area_nok/nok_13 type: code overlay: True start: 0xA00600 vram: 0x80240000 - subsections: + subsegments: - [0xA00600, c] - [0xA01420, c] - [0xA01A90, data] @@ -5887,12 +6064,13 @@ segments: - [0xA027B0, rodata] - [0xA027D0, rodata] - [0xA02820, rodata] - - name: world/area_nok/nok_14/ + - name: nok_14 + dir: world/area_nok/nok_14 type: code overlay: True start: 0xA02840 vram: 0x80240000 - subsections: + subsegments: - [0xA02840, c] - [0xA029C0, c] - [0xA02A00, c] @@ -5904,12 +6082,13 @@ segments: - [0xA06DF0, rodata] - [0xA06E60, rodata] - [0xA06EB8, rodata] - - name: world/area_nok/nok_15/ + - name: nok_15 + dir: world/area_nok/nok_15 type: code overlay: True start: 0xA06F00 vram: 0x80240000 - subsections: + subsegments: - [0xA06F00, c] - [0xA09440, c] - [0xA09680, data] @@ -5920,12 +6099,13 @@ segments: - [0xA0BBF0, rodata] - [0xA0BC50, rodata] - [0xA0BCA8, rodata] - - name: world/area_hos/hos_00/ + - name: hos_00 + dir: world/area_hos/hos_00 type: code overlay: True start: 0xA0BCF0 vram: 0x80240000 - subsections: + subsegments: - [0xA0BCF0, c] - [0xA0BD40, c] - [0xA0C4B0, c] @@ -5939,12 +6119,13 @@ segments: - [0xA10820, rodata] - [0xA10830, rodata] - [0xA10870, rodata] - - name: world/area_hos/hos_01/ + - name: hos_01 + dir: world/area_hos/hos_01 type: code overlay: True start: 0xA10880 vram: 0x80240000 - subsections: + subsegments: - [0xA10880, c] - [0xA11020, c] - [0xA11650, c] @@ -5954,12 +6135,13 @@ segments: - [0xA15860, data] - [0xA158D0, data] - [0xA161F0, rodata] - - name: world/area_hos/hos_02/ + - name: hos_02 + dir: world/area_hos/hos_02 type: code overlay: True start: 0xA16220 vram: 0x80240000 - subsections: + subsegments: - [0xA16220, c] - [0xA171F0, c] - [0xA17210, c] @@ -5970,12 +6152,13 @@ segments: - [0xA1ADA0, data] - [0xA1AFF0, rodata] - [0xA1B098, rodata] - - name: world/area_hos/hos_03/ + - name: hos_03 + dir: world/area_hos/hos_03 type: code overlay: True start: 0xA1B100 vram: 0x80240000 - subsections: + subsegments: - [0xA1B100, c] - [0xA1B130, c] - [0xA1BB70, c] @@ -5989,12 +6172,13 @@ segments: - [0xA26E00, data] - [0xA26E50, rodata] - [0xA26E70, rodata] - - name: world/area_hos/hos_04/ + - name: hos_04 + dir: world/area_hos/hos_04 type: code overlay: True start: 0xA26ED0 vram: 0x80240000 - subsections: + subsegments: - [0xA26ED0, c] - [0xA27490, c] - [0xA274B0, c] @@ -6011,12 +6195,13 @@ segments: - [0xA2A1C0, rodata] - [0xA2A1E0, rodata] - [0xA2A1F8, rodata] - - name: world/area_hos/hos_05/ + - name: hos_05 + dir: world/area_hos/hos_05 type: code overlay: True start: 0xA2A240 vram: 0x80240000 - subsections: + subsegments: - [0xA2A240, c] - [0xA2AA70, c] - [0xA2AAC0, c] @@ -6031,12 +6216,13 @@ segments: - [0xA39410, rodata] - [0xA394A0, rodata] - [0xA394C0, rodata] - - name: world/area_hos/hos_06/ + - name: hos_06 + dir: world/area_hos/hos_06 type: code overlay: True start: 0xA394E0 vram: 0x80240000 - subsections: + subsegments: - [0xA394E0, c] - [0xA397F0, c] - [0xA3A210, c] @@ -6047,12 +6233,13 @@ segments: - [0xA3C090, data] - [0xA3DAB0, data] - [0xA3F730, rodata] - - name: world/area_hos/hos_10/ + - name: hos_10 + dir: world/area_hos/hos_10 type: code overlay: True start: 0xA3F740 vram: 0x80240000 - subsections: + subsegments: - [0xA3F740, c] - [0xA3F760, c] - [0xA3FBA0, c] @@ -6062,23 +6249,25 @@ segments: - [0xA42DA0, data] - [0xA43920, data] - [0xA45910, rodata] - - name: world/area_hos/hos_20/ + - name: hos_20 + dir: world/area_hos/hos_20 type: code overlay: True start: 0xA45930 vram: 0x80240000 - subsections: + subsegments: - [0xA45930, c] - [0xA45C40, c] - [0xA45C90, data] - [0xA46350, data] - [0xA46F40, rodata] - - name: world/area_kpa/kpa_01/ + - name: kpa_01 + dir: world/area_kpa/kpa_01 type: code overlay: True start: 0xA46F60 vram: 0x80240000 - subsections: + subsegments: - [0xA46F60, c] - [0xA470C0, c] - [0xA479B0, data] @@ -6086,12 +6275,13 @@ segments: - [0xA47D70, data] - [0xA48500, data] - [0xA48550, rodata] - - name: world/area_kpa/kpa_03/ + - name: kpa_03 + dir: world/area_kpa/kpa_03 type: code overlay: True start: 0xA485C0 vram: 0x80240000 - subsections: + subsegments: - [0xA485C0, c] - [0xA48720, c] - [0xA4A410, c] @@ -6101,22 +6291,24 @@ segments: - [0xA4BE30, rodata] - [0xA4BEA0, rodata] - [0xA4BED8, rodata] - - name: world/area_kpa/kpa_04/ + - name: kpa_04 + dir: world/area_kpa/kpa_04 type: code overlay: True start: 0xA4BF60 vram: 0x80240000 - subsections: + subsegments: - [0xA4BF60, c] - [0xA4C0D0, data] - [0xA4C1A0, data] - [0xA4CA10, rodata] - - name: world/area_kpa/kpa_08/ + - name: kpa_08 + dir: world/area_kpa/kpa_08 type: code overlay: True start: 0xA4CA20 vram: 0x80240000 - subsections: + subsegments: - [0xA4CA20, c] - [0xA4CAC0, c] - [0xA4DEC0, data] @@ -6125,12 +6317,13 @@ segments: - [0xA4E710, data] - [0xA4EF30, rodata] - [0xA4EF78, rodata] - - name: world/area_kpa/kpa_09/ + - name: kpa_09 + dir: world/area_kpa/kpa_09 type: code overlay: True start: 0xA4F000 vram: 0x80240000 - subsections: + subsegments: - [0xA4F000, c] - [0xA4F0A0, c] - [0xA502F0, data] @@ -6138,22 +6331,24 @@ segments: - [0xA506D0, data] - [0xA50B90, data] - [0xA517B0, rodata] - - name: world/area_kpa/kpa_10/ + - name: kpa_10 + dir: world/area_kpa/kpa_10 type: code overlay: True start: 0xA51980 vram: 0x80240000 - subsections: + subsegments: - [0xA51980, c] - [0xA51C90, data] - [0xA51D90, data] - [0xA528A0, rodata] - - name: world/area_kpa/kpa_11/ + - name: kpa_11 + dir: world/area_kpa/kpa_11 type: code overlay: True start: 0xA528C0 vram: 0x80240000 - subsections: + subsegments: - [0xA528C0, c] - [0xA52BD0, c] - [0xA533B0, data] @@ -6162,24 +6357,26 @@ segments: - [0xA53E30, data] - [0xA548D0, rodata] - [0xA548F0, rodata] - - name: world/area_kpa/kpa_12/ + - name: kpa_12 + dir: world/area_kpa/kpa_12 type: code overlay: True start: 0xA54950 vram: 0x80240000 - subsections: + subsegments: - [0xA54950, c] - [0xA54990, c] - [0xA54CA0, c] - [0xA54DC0, data] - [0xA55620, data] - [0xA55F00, rodata] - - name: world/area_kpa/kpa_13/ + - name: kpa_13 + dir: world/area_kpa/kpa_13 type: code overlay: True start: 0xA55F20 vram: 0x80240000 - subsections: + subsegments: - [0xA55F20, c] - [0xA55F60, c] - [0xA56270, c] @@ -6187,12 +6384,13 @@ segments: - [0xA56BD0, data] - [0xA56CA0, data] - [0xA57490, rodata] - - name: world/area_kpa/kpa_14/ + - name: kpa_14 + dir: world/area_kpa/kpa_14 type: code overlay: True start: 0xA574B0 vram: 0x80240000 - subsections: + subsegments: - [0xA574B0, c] - [0xA574F0, c] - [0xA57830, c] @@ -6201,95 +6399,104 @@ segments: - [0xA58DB0, data] - [0xA59060, data] - [0xA59370, rodata] - - name: world/area_kpa/kpa_15/ + - name: kpa_15 + dir: world/area_kpa/kpa_15 type: code overlay: True start: 0xA59390 vram: 0x80240000 - subsections: + subsegments: - [0xA59390, c] - [0xA596A0, c] - [0xA59960, data] - [0xA59E30, data] - [0xA5A020, rodata] - - name: world/area_kpa/kpa_16/ + - name: kpa_16 + dir: world/area_kpa/kpa_16 type: code overlay: True start: 0xA5A030 vram: 0x80240000 - subsections: + subsegments: - [0xA5A030, c] - [0xA5A340, c] - [0xA5A3D0, data] - [0xA5B180, data] - [0xA5CA10, rodata] - - name: world/area_kpa/kpa_17/ + - name: kpa_17 + dir: world/area_kpa/kpa_17 type: code overlay: True start: 0xA5CA20 vram: 0x80240000 - subsections: + subsegments: - [0xA5CA20, data] - [0xA5CB00, data] - [0xA5CBD0, data] - [0xA5CE90, data] - [0xA5E0B0, rodata] - - name: world/area_kpa/kpa_32/ + - name: kpa_32 + dir: world/area_kpa/kpa_32 type: code overlay: True start: 0xA5E0C0 vram: 0x80240000 - subsections: + subsegments: - [0xA5E0C0, c] - [0xA5E3D0, data] - [0xA5E4C0, data] - [0xA5E500, data] - [0xA5F060, rodata] - - name: world/area_kpa/kpa_33/ + - name: kpa_33 + dir: world/area_kpa/kpa_33 type: code overlay: True start: 0xA5F080 vram: 0x80240000 - subsections: + subsegments: - [0xA5F080, c] - [0xA5F390, data] - [0xA5F480, data] - [0xA5F4C0, data] - [0xA60020, rodata] - - name: world/area_kpa/kpa_40/ + - name: kpa_40 + dir: world/area_kpa/kpa_40 type: code overlay: True start: 0xA60040 vram: 0x80240000 - subsections: + subsegments: - [0xA60040, data] - [0xA60130, data] - [0xA60450, rodata] - - name: world/area_kpa/kpa_41/ + - name: kpa_41 + dir: world/area_kpa/kpa_41 type: code overlay: True start: 0xA60470 vram: 0x80240000 - subsections: + subsegments: - [0xA60470, data] - [0xA60560, data] - [0xA609B0, rodata] - - name: world/area_kpa/kpa_50/ + - name: kpa_50 + dir: world/area_kpa/kpa_50 type: code overlay: True start: 0xA609D0 vram: 0x80240000 - subsections: + subsegments: - [0xA609D0, c] - [0xA623F0, data] - [0xA624D0, data] - [0xA63E60, rodata] - - name: world/area_kpa/kpa_51/ + - name: kpa_51 + dir: world/area_kpa/kpa_51 type: code overlay: True start: 0xA64090 vram: 0x80240000 - subsections: + subsegments: - [0xA64090, c] - [0xA640E0, c] - [0xA65CB0, data] @@ -6299,12 +6506,13 @@ segments: - [0xA66FE0, rodata] - [0xA67018, rodata] - [0xA67098, rodata] - - name: world/area_kpa/kpa_52/ + - name: kpa_52 + dir: world/area_kpa/kpa_52 type: code overlay: True start: 0xA67100 vram: 0x80240000 - subsections: + subsegments: - [0xA67100, c] - [0xA671E0, c] - [0xA68430, data] @@ -6313,12 +6521,13 @@ segments: - [0xA68B40, data] - [0xA6AAC0, rodata] - [0xA6AAE0, rodata] - - name: world/area_kpa/kpa_53/ + - name: kpa_53 + dir: world/area_kpa/kpa_53 type: code overlay: True start: 0xA6ACA0 vram: 0x80240000 - subsections: + subsegments: - [0xA6ACA0, c] - [0xA6AE10, data] - [0xA6AEE0, data] @@ -6326,22 +6535,24 @@ segments: - [0xA6CA80, data] - [0xA6CAC0, rodata] - [0xA6CAF0, rodata] - - name: world/area_kpa/kpa_60/ + - name: kpa_60 + dir: world/area_kpa/kpa_60 type: code overlay: True start: 0xA6CB00 vram: 0x80240000 - subsections: + subsegments: - [0xA6CB00, c] - [0xA6CBE0, c] - [0xA6CEF0, data] - [0xA6E3A0, rodata] - - name: world/area_kpa/kpa_61/ + - name: kpa_61 + dir: world/area_kpa/kpa_61 type: code overlay: True start: 0xA6E3E0 vram: 0x80240000 - subsections: + subsegments: - [0xA6E3E0, c] - [0xA6E6F0, c] - [0xA70720, data] @@ -6351,92 +6562,100 @@ segments: - [0xA720A0, rodata] - [0xA72110, rodata] - [0xA72148, rodata] - - name: world/area_kpa/kpa_62/ + - name: kpa_62 + dir: world/area_kpa/kpa_62 type: code overlay: True start: 0xA72220 vram: 0x80240000 - subsections: + subsegments: - [0xA72220, c] - [0xA72300, c] - [0xA72610, data] - [0xA72740, data] - [0xA73590, rodata] - - name: world/area_kpa/kpa_63/ + - name: kpa_63 + dir: world/area_kpa/kpa_63 type: code overlay: True start: 0xA735B0 vram: 0x80240000 - subsections: + subsegments: - [0xA735B0, c] - [0xA73740, data] - [0xA738E0, data] - [0xA73920, data] - [0xA73D30, data] - [0xA74860, rodata] - - name: world/area_kpa/kpa_70/ + - name: kpa_70 + dir: world/area_kpa/kpa_70 type: code overlay: True start: 0xA74870 vram: 0x80240000 - subsections: + subsegments: - [0xA74870, c] - [0xA74B80, c] - [0xA75360, data] - [0xA75440, data] - [0xA75B70, data] - [0xA78450, rodata] - - name: world/area_kpa/kpa_81/ + - name: kpa_81 + dir: world/area_kpa/kpa_81 type: code overlay: True start: 0xA784C0 vram: 0x80240000 - subsections: + subsegments: - [0xA784C0, c] - [0xA78510, c] - [0xA78900, data] - [0xA789F0, data] - [0xA79200, data] - [0xA7A4C0, rodata] - - name: world/area_kpa/kpa_82/ + - name: kpa_82 + dir: world/area_kpa/kpa_82 type: code overlay: True start: 0xA7A500 vram: 0x80240000 - subsections: + subsegments: - [0xA7A500, c] - [0xA7A550, c] - [0xA7A940, data] - [0xA7AA10, data] - [0xA7AF80, data] - [0xA83460, rodata] - - name: world/area_kpa/kpa_83/ + - name: kpa_83 + dir: world/area_kpa/kpa_83 type: code overlay: True start: 0xA83490 vram: 0x80240000 - subsections: + subsegments: - [0xA83490, c] - [0xA834E0, c] - [0xA83500, data] - [0xA835D0, data] - [0xA83AC0, data] - [0xA86780, rodata] - - name: world/area_kpa/kpa_90/ + - name: kpa_90 + dir: world/area_kpa/kpa_90 type: code overlay: True start: 0xA867B0 vram: 0x80240000 - subsections: + subsegments: - [0xA867B0, data] - [0xA86880, data] - [0xA86A40, rodata] - - name: world/area_kpa/kpa_91/ + - name: kpa_91 + dir: world/area_kpa/kpa_91 type: code overlay: True start: 0xA86A50 vram: 0x80240000 - subsections: + subsegments: - [0xA86A50, c] - [0xA88280, c] - [0xA88360, data] @@ -6445,21 +6664,23 @@ segments: - [0xA8C230, data] - [0xA8C470, rodata] - [0xA8C480, rodata] - - name: world/area_kpa/kpa_94/ + - name: kpa_94 + dir: world/area_kpa/kpa_94 type: code overlay: True start: 0xA8C7C0 vram: 0x80240000 - subsections: + subsegments: - [0xA8C7C0, data] - [0xA8C890, data] - [0xA8CA70, rodata] - - name: world/area_kpa/kpa_95/ + - name: kpa_95 + dir: world/area_kpa/kpa_95 type: code overlay: True start: 0xA8CA80 vram: 0x80240000 - subsections: + subsegments: - [0xA8CA80, c] - [0xA8CB60, c] - [0xA8E390, data] @@ -6468,44 +6689,48 @@ segments: - [0xA8E970, data] - [0xA92470, rodata] - [0xA92480, rodata] - - name: world/area_kpa/kpa_96/ + - name: kpa_96 + dir: world/area_kpa/kpa_96 type: code overlay: True start: 0xA927C0 vram: 0x80240000 - subsections: + subsegments: - [0xA927C0, c] - [0xA927F0, data] - [0xA928B0, data] - [0xA93150, rodata] - - name: world/area_kpa/kpa_100/ + - name: kpa_100 + dir: world/area_kpa/kpa_100 type: code overlay: True start: 0xA93160 vram: 0x80240000 - subsections: + subsegments: - [0xA93160, c] - [0xA931B0, data] - [0xA93270, data] - [0xA933D0, data] - [0xA93410, rodata] - - name: world/area_kpa/kpa_101/ + - name: kpa_101 + dir: world/area_kpa/kpa_101 type: code overlay: True start: 0xA93440 vram: 0x80240000 - subsections: + subsegments: - [0xA93440, c] - [0xA93490, data] - [0xA93550, data] - [0xA936D0, data] - [0xA93710, rodata] - - name: world/area_kpa/kpa_102/ + - name: kpa_102 + dir: world/area_kpa/kpa_102 type: code overlay: True start: 0xA93740 vram: 0x80240000 - subsections: + subsegments: - [0xA93740, c] - [0xA93A50, c] - [0xA96CD0, data] @@ -6514,33 +6739,36 @@ segments: - [0xA99250, rodata] - [0xA99478, rodata] - [0xA994B0, rodata] - - name: world/area_kpa/kpa_111/ + - name: kpa_111 + dir: world/area_kpa/kpa_111 type: code overlay: True start: 0xA99590 vram: 0x80240000 - subsections: + subsegments: - [0xA99590, c] - [0xA9A950, data] - [0xA9AA20, data] - [0xA9ACF0, data] - [0xA9C740, data] - [0xA9C7C0, rodata] - - name: world/area_kpa/kpa_112/ + - name: kpa_112 + dir: world/area_kpa/kpa_112 type: code overlay: True start: 0xA9C990 vram: 0x80240000 - subsections: + subsegments: - [0xA9C990, data] - [0xA9CA60, data] - [0xA9CC20, rodata] - - name: world/area_kpa/kpa_113/ + - name: kpa_113 + dir: world/area_kpa/kpa_113 type: code overlay: True start: 0xA9CC30 vram: 0x80240000 - subsections: + subsegments: - [0xA9CC30, c] - [0xA9CC70, c] - [0xA9D6D0, data] @@ -6549,22 +6777,24 @@ segments: - [0xA9DD00, data] - [0xA9E900, rodata] - [0xA9E920, rodata] - - name: world/area_kpa/kpa_114/ + - name: kpa_114 + dir: world/area_kpa/kpa_114 type: code overlay: True start: 0xA9E980 vram: 0x80240000 - subsections: + subsegments: - [0xA9E980, c] - [0xA9E9D0, data] - [0xA9EAA0, data] - [0xA9ED10, rodata] - - name: world/area_kpa/kpa_115/ + - name: kpa_115 + dir: world/area_kpa/kpa_115 type: code overlay: True start: 0xA9ED40 vram: 0x80240000 - subsections: + subsegments: - [0xA9ED40, c] - [0xAA0100, data] - [0xAA01E0, data] @@ -6572,69 +6802,76 @@ segments: - [0xAA0B20, data] - [0xAA1D00, rodata] - [0xAA1D20, rodata] - - name: world/area_kpa/kpa_116/ + - name: kpa_116 + dir: world/area_kpa/kpa_116 type: code overlay: True start: 0xAA1EE0 vram: 0x80240000 - subsections: + subsegments: - [0xAA1EE0, data] - [0xAA1FB0, data] - [0xAA2170, rodata] - - name: world/area_kpa/kpa_117/ + - name: kpa_117 + dir: world/area_kpa/kpa_117 type: code overlay: True start: 0xAA2180 vram: 0x80240000 - subsections: + subsegments: - [0xAA2180, data] - [0xAA2240, data] - [0xAA23B0, rodata] - - name: world/area_kpa/kpa_118/ + - name: kpa_118 + dir: world/area_kpa/kpa_118 type: code overlay: True start: 0xAA23C0 vram: 0x80240000 - subsections: + subsegments: - [0xAA23C0, data] - [0xAA2490, data] - [0xAA2650, rodata] - - name: world/area_kpa/kpa_119/ + - name: kpa_119 + dir: world/area_kpa/kpa_119 type: code overlay: True start: 0xAA2660 vram: 0x80240000 - subsections: + subsegments: - [0xAA2660, data] - [0xAA2720, data] - [0xAA2760, data] - [0xAA28E0, rodata] - - name: world/area_kpa/kpa_121/ + - name: kpa_121 + dir: world/area_kpa/kpa_121 type: code overlay: True start: 0xAA28F0 vram: 0x80240000 - subsections: + subsegments: - [0xAA28F0, data] - [0xAA29C0, data] - [0xAA2D10, rodata] - - name: world/area_kpa/kpa_130/ + - name: kpa_130 + dir: world/area_kpa/kpa_130 type: code overlay: True start: 0xAA2D20 vram: 0x80240000 - subsections: + subsegments: - [0xAA2D20, c] - [0xAA3460, data] - [0xAA3530, data] - [0xAA3870, data] - [0xAA7460, rodata] - - name: world/area_kpa/kpa_133/ + - name: kpa_133 + dir: world/area_kpa/kpa_133 type: code overlay: True start: 0xAA7480 vram: 0x80240000 - subsections: + subsegments: - [0xAA7480, c] - [0xAA7790, c] - [0xAA78F0, data] @@ -6643,12 +6880,13 @@ segments: - [0xAA8C70, data] - [0xAA8F10, data] - [0xAA8F90, rodata] - - name: world/area_kpa/kpa_134/ + - name: kpa_134 + dir: world/area_kpa/kpa_134 type: code overlay: True start: 0xAA8FA0 vram: 0x80240000 - subsections: + subsegments: - [0xAA8FA0, c] - [0xAA92B0, c] - [0xAA94B0, c] @@ -6658,23 +6896,25 @@ segments: - [0xAABF00, data] - [0xAAC3B0, data] - [0xAAC820, rodata] - - name: world/area_osr/osr_00/ + - name: osr_00 + dir: world/area_osr/osr_00 type: code overlay: True start: 0xAAC830 vram: 0x80240000 - subsections: + subsegments: - [0xAAC830, c] - [0xAACBB0, c] - [0xAACFC0, data] - [0xAAD790, data] - [0xAAFFD0, rodata] - - name: world/area_osr/osr_01/ + - name: osr_01 + dir: world/area_osr/osr_01 type: code overlay: True start: 0xAAFFF0 vram: 0x80240000 - subsections: + subsegments: - [0xAAFFF0, c] - [0xAB0040, c] - [0xAB0350, c] @@ -6682,12 +6922,13 @@ segments: - [0xAB0C10, data] - [0xAB1150, data] - [0xAB2150, rodata] - - name: world/area_osr/osr_02/ + - name: osr_02 + dir: world/area_osr/osr_02 type: code overlay: True start: 0xAB2170 vram: 0x80240000 - subsections: + subsegments: - [0xAB2170, c] - [0xAB2190, c] - [0xAB21D0, c] @@ -6697,12 +6938,13 @@ segments: - [0xAB2BB0, data] - [0xAB5D40, data] - [0xAB6270, rodata] - - name: world/area_osr/osr_03/ + - name: osr_03 + dir: world/area_osr/osr_03 type: code overlay: True start: 0xAB6290 vram: 0x80240000 - subsections: + subsegments: - [0xAB6290, c] - [0xAB62B0, c] - [0xAB6610, data] @@ -6711,22 +6953,24 @@ segments: - [0xAB8350, data] - [0xAB8B10, data] - [0xAB9270, rodata] - - name: world/area_osr/osr_04/ + - name: osr_04 + dir: world/area_osr/osr_04 type: code overlay: True start: 0xAB92B0 vram: 0x80240000 - subsections: + subsegments: - [0xAB92B0, c] - [0xAB9370, data] - [0xAB95D0, data] - [0xABB260, rodata] - - name: world/area_kkj/kkj_00/ + - name: kkj_00 + dir: world/area_kkj/kkj_00 type: code overlay: True start: 0xABB290 vram: 0x80240000 - subsections: + subsegments: - [0xABB290, c] - [0xABB340, c] - [0xABC250, data] @@ -6735,34 +6979,37 @@ segments: - [0xABEF20, data] - [0xAC40D0, data] - [0xAC4FB0, rodata] - - name: world/area_kkj/kkj_01/ + - name: kkj_01 + dir: world/area_kkj/kkj_01 type: code overlay: True start: 0xAC5170 vram: 0x80240000 - subsections: + subsegments: - [0xAC5170, c] - [0xAC6000, data] - [0xAC6140, data] - [0xAC67E0, data] - [0xAC8B60, rodata] - [0xAC8B80, rodata] - - name: world/area_kkj/kkj_02/ + - name: kkj_02 + dir: world/area_kkj/kkj_02 type: code overlay: True start: 0xAC8D20 vram: 0x80240000 - subsections: + subsegments: - [0xAC8D20, data] - [0xAC8E40, data] - [0xAC9160, data] - [0xAC9700, rodata] - - name: world/area_kkj/kkj_03/ + - name: kkj_03 + dir: world/area_kkj/kkj_03 type: code overlay: True start: 0xAC9710 vram: 0x80240000 - subsections: + subsegments: - [0xAC9710, c] - [0xAC9730, c] - [0xAC9A40, data] @@ -6770,12 +7017,13 @@ segments: - [0xACA010, data] - [0xACA250, data] - [0xACAB00, rodata] - - name: world/area_kkj/kkj_10/ + - name: kkj_10 + dir: world/area_kkj/kkj_10 type: code overlay: True start: 0xACAB20 vram: 0x80240000 - subsections: + subsegments: - [0xACAB20, c] - [0xACAB90, c] - [0xACABD0, c] @@ -6784,12 +7032,13 @@ segments: - [0xACC510, data] - [0xACC700, data] - [0xACE0D0, rodata] - - name: world/area_kkj/kkj_11/ + - name: kkj_11 + dir: world/area_kkj/kkj_11 type: code overlay: True start: 0xACE140 vram: 0x80240000 - subsections: + subsegments: - [0xACE140, c] - [0xACE1B0, c] - [0xACE1F0, c] @@ -6800,22 +7049,24 @@ segments: - [0xAD02E0, data] - [0xAD27F0, data] - [0xAD4010, rodata] - - name: world/area_kkj/kkj_12/ + - name: kkj_12 + dir: world/area_kkj/kkj_12 type: code overlay: True start: 0xAD4090 vram: 0x80240000 - subsections: + subsegments: - [0xAD4090, c] - [0xAD4100, c] - [0xAD4940, data] - [0xAD5EA0, rodata] - - name: world/area_kkj/kkj_13/ + - name: kkj_13 + dir: world/area_kkj/kkj_13 type: code overlay: True start: 0xAD5ED0 vram: 0x80240000 - subsections: + subsegments: - [0xAD5ED0, c] - [0xAD5EF0, c] - [0xAD6200, c] @@ -6826,12 +7077,13 @@ segments: - [0xAD8650, data] - [0xAD9460, data] - [0xADAE60, rodata] - - name: world/area_kkj/kkj_14/ + - name: kkj_14 + dir: world/area_kkj/kkj_14 type: code overlay: True start: 0xADAEA0 vram: 0x80240000 - subsections: + subsegments: - [0xADAEA0, c] - [0xADAEF0, c] - [0xADB360, data] @@ -6849,12 +7101,13 @@ segments: - [0xAE3610, data] - [0xAE3850, data] - [0xAE5550, rodata] - - name: world/area_kkj/kkj_15/ + - name: kkj_15 + dir: world/area_kkj/kkj_15 type: code overlay: True start: 0xAE5590 vram: 0x80240000 - subsections: + subsegments: - [0xAE5590, c] - [0xAE58D0, c] - [0xAE5A90, c] @@ -6870,12 +7123,13 @@ segments: - [0xAEB820, data] - [0xAECB30, data] - [0xAED3E0, rodata] - - name: world/area_kkj/kkj_16/ + - name: kkj_16 + dir: world/area_kkj/kkj_16 type: code overlay: True start: 0xAED410 vram: 0x80240000 - subsections: + subsegments: - [0xAED410, c] - [0xAEDC60, c] - [0xAEE490, data] @@ -6883,23 +7137,25 @@ segments: - [0xAF09D0, data] - [0xAF1B10, data] - [0xAF1C10, rodata] - - name: world/area_kkj/kkj_17/ + - name: kkj_17 + dir: world/area_kkj/kkj_17 type: code overlay: True start: 0xAF1C60 vram: 0x80240000 - subsections: + subsegments: - [0xAF1C60, c] - [0xAF2200, data] - [0xAF2440, data] - [0xAF2520, data] - [0xAF2C90, rodata] - - name: world/area_kkj/kkj_18/ + - name: kkj_18 + dir: world/area_kkj/kkj_18 type: code overlay: True start: 0xAF2CA0 vram: 0x80240000 - subsections: + subsegments: - [0xAF2CA0, c] - [0xAF2FE0, c] - [0xAF34C0, data] @@ -6909,12 +7165,13 @@ segments: - [0xAF4BB0, data] - [0xAF7920, rodata] - [0xAF7940, rodata] - - name: world/area_kkj/kkj_19/ + - name: kkj_19 + dir: world/area_kkj/kkj_19 type: code overlay: True start: 0xAF7950 vram: 0x80240000 - subsections: + subsegments: - [0xAF7950, c] - [0xAF7C00, c] - [0xAF8660, data] @@ -6923,12 +7180,13 @@ segments: - [0xAF9050, data] - [0xAF9460, data] - [0xAFDAF0, rodata] - - name: world/area_kkj/kkj_20/ + - name: kkj_20 + dir: world/area_kkj/kkj_20 type: code overlay: True start: 0xAFDB40 vram: 0x80240000 - subsections: + subsegments: - [0xAFDB40, c] - [0xAFDE00, c] - [0xAFE130, data] @@ -6936,29 +7194,32 @@ segments: - [0xAFE3C0, data] - [0xAFE610, data] - [0xB02290, rodata] - - name: world/area_kkj/kkj_21/ + - name: kkj_21 + dir: world/area_kkj/kkj_21 type: code overlay: True start: 0xB022A0 vram: 0x80240000 - subsections: + subsegments: - [0xB022A0, data] - [0xB024E0, rodata] - - name: world/area_kkj/kkj_22/ + - name: kkj_22 + dir: world/area_kkj/kkj_22 type: code overlay: True start: 0xB024F0 vram: 0x80240000 - subsections: + subsegments: - [0xB024F0, data] - [0xB025A0, data] - [0xB02870, rodata] - - name: world/area_kkj/kkj_23/ + - name: kkj_23 + dir: world/area_kkj/kkj_23 type: code overlay: True start: 0xB02880 vram: 0x80240000 - subsections: + subsegments: - [0xB02880, c] - [0xB028A0, c] - [0xB03190, c] @@ -6969,23 +7230,25 @@ segments: - [0xB04FB0, data] - [0xB06530, rodata] - [0xB06550, rodata] - - name: world/area_kkj/kkj_24/ + - name: kkj_24 + dir: world/area_kkj/kkj_24 type: code overlay: True start: 0xB06570 vram: 0x80240000 - subsections: + subsegments: - [0xB06570, c] - [0xB06590, data] - [0xB06640, data] - [0xB069B0, data] - [0xB069F0, rodata] - - name: world/area_kkj/kkj_25/ + - name: kkj_25 + dir: world/area_kkj/kkj_25 type: code overlay: True start: 0xB06A00 vram: 0x80240000 - subsections: + subsegments: - [0xB06A00, c] - [0xB06A20, c] - [0xB06A50, c] @@ -6997,82 +7260,90 @@ segments: - [0xB0E3A0, data] - [0xB0F280, data] - [0xB13100, rodata] - - name: world/area_kkj/kkj_26/ + - name: kkj_26 + dir: world/area_kkj/kkj_26 type: code overlay: True start: 0xB13120 vram: 0x80240000 - subsections: + subsegments: - [0xB13120, c] - [0xB13150, data] - [0xB13500, data] - [0xB13A40, data] - [0xB13D50, rodata] - - name: world/area_kkj/kkj_27/ + - name: kkj_27 + dir: world/area_kkj/kkj_27 type: code overlay: True start: 0xB13D70 vram: 0x80240000 - subsections: + subsegments: - [0xB13D70, c] - [0xB14080, c] - [0xB14210, data] - [0xB14340, data] - [0xB143E0, data] - [0xB14E90, rodata] - - name: world/area_kkj/kkj_28/ + - name: kkj_28 + dir: world/area_kkj/kkj_28 type: code overlay: True start: 0xB14EA0 vram: 0x80240000 - subsections: + subsegments: - [0xB14EA0, data] - [0xB150A0, rodata] - - name: world/area_kkj/kkj_29/ + - name: kkj_29 + dir: world/area_kkj/kkj_29 type: code overlay: True start: 0xB150B0 vram: 0x80240000 - subsections: + subsegments: - [0xB150B0, c] - [0xB150E0, c] - [0xB15120, data] - [0xB15410, data] - [0xB15DA0, data] - [0xB1A8F0, rodata] - - name: world/area_tst/tst_01/ + - name: tst_01 + dir: world/area_tst/tst_01 type: code overlay: True start: 0xB1A900 vram: 0x80240000 - subsections: + subsegments: - [0xB1A900, data] - [0xB1AB20, data] - [0xB1AC20, rodata] - - name: world/area_tst/tst_02/ + - name: tst_02 + dir: world/area_tst/tst_02 type: code overlay: True start: 0xB1AC30 vram: 0x80240000 - subsections: + subsegments: - [0xB1AC30, data] - [0xB1AE50, data] - [0xB1AF70, rodata] - - name: world/area_tst/tst_03/ + - name: tst_03 + dir: world/area_tst/tst_03 type: code overlay: True start: 0xB1AF80 vram: 0x80240000 - subsections: + subsegments: - [0xB1AF80, data] - [0xB1B240, data] - [0xB1B560, rodata] - - name: world/area_tst/tst_04/ + - name: tst_04 + dir: world/area_tst/tst_04 type: code overlay: True start: 0xB1B570 vram: 0x80240000 - subsections: + subsegments: - [0xB1B570, c] - [0xB1BBD0, c] - [0xB1BC00, data] @@ -7081,52 +7352,58 @@ segments: - [0xB1C270, data] - [0xB1C510, data] - [0xB1C530, rodata] - - name: world/area_tst/tst_10/ + - name: tst_10 + dir: world/area_tst/tst_10 type: code overlay: True start: 0xB1C540 vram: 0x80240000 - subsections: + subsegments: - [0xB1C540, data] - [0xB1CA40, rodata] - - name: world/area_tst/tst_11/ + - name: tst_11 + dir: world/area_tst/tst_11 type: code overlay: True start: 0xB1CA50 vram: 0x80240000 - subsections: + subsegments: - [0xB1CA50, c] - [0xB1D1C0, data] - [0xB1D2A0, data] - - name: world/area_tst/tst_12/ + - name: tst_12 + dir: world/area_tst/tst_12 type: code overlay: True start: 0xB1D2F0 vram: 0x80240000 - subsections: + subsegments: - [0xB1D2F0, data] - - name: world/area_tst/tst_13/ + - name: tst_13 + dir: world/area_tst/tst_13 type: code overlay: True start: 0xB1D760 vram: 0x80240000 - subsections: + subsegments: - [0xB1D760, c] - [0xB1DB20, data] - [0xB20460, rodata] - - name: world/area_tst/tst_20/ + - name: tst_20 + dir: world/area_tst/tst_20 type: code overlay: True start: 0xB20470 vram: 0x80240000 - subsections: + subsegments: - [0xB20470, data] - - name: world/area_jan/jan_00/ + - name: jan_00 + dir: world/area_jan/jan_00 type: code overlay: True start: 0xB20540 vram: 0x80240000 - subsections: + subsegments: - [0xB20540, c] - [0xB216E0, c] - [0xB21EA0, c] @@ -7136,12 +7413,13 @@ segments: - [0xB25E90, data] - [0xB275B0, data] - [0xB27FE0, rodata] - - name: world/area_jan/jan_01/ + - name: jan_01 + dir: world/area_jan/jan_01 type: code overlay: True start: 0xB28030 vram: 0x80240000 - subsections: + subsegments: - [0xB28030, c] - [0xB291C0, c] - [0xB29400, data] @@ -7150,12 +7428,13 @@ segments: - [0xB2B430, data] - [0xB2B590, data] - [0xB2C410, rodata] - - name: world/area_jan/jan_02/ + - name: jan_02 + dir: world/area_jan/jan_02 type: code overlay: True start: 0xB2C470 vram: 0x80240000 - subsections: + subsegments: - [0xB2C470, c] - [0xB2C4A0, c] - [0xB2C8A0, c] @@ -7166,12 +7445,13 @@ segments: - [0xB33E00, data] - [0xB33E50, data] - [0xB34A20, rodata] - - name: world/area_jan/jan_03/ + - name: jan_03 + dir: world/area_jan/jan_03 type: code overlay: True start: 0xB34BD0 vram: 0x80240000 - subsections: + subsegments: - [0xB34BD0, c] - [0xB37B70, c] - [0xB37C20, c] @@ -7182,12 +7462,13 @@ segments: - [0xB43B60, data] - [0xB445A0, rodata] - [0xB445C0, rodata] - - name: world/area_jan/jan_04/ + - name: jan_04 + dir: world/area_jan/jan_04 type: code overlay: True start: 0xB44770 vram: 0x80240000 - subsections: + subsegments: - [0xB44770, c] - [0xB447B0, c] - [0xB44AC0, c] @@ -7207,12 +7488,13 @@ segments: - [0xB4A4B0, data] - [0xB4AA20, rodata] - [0xB4AA50, rodata] - - name: world/area_jan/jan_05/ + - name: jan_05 + dir: world/area_jan/jan_05 type: code overlay: True start: 0xB4AA70 vram: 0x80240000 - subsections: + subsegments: - [0xB4AA70, c] - [0xB4AAB0, c] - [0xB4ADC0, c] @@ -7228,12 +7510,13 @@ segments: - [0xB52470, rodata] - [0xB524A0, rodata] - [0xB524E8, rodata] - - name: world/area_jan/jan_06/ + - name: jan_06 + dir: world/area_jan/jan_06 type: code overlay: True start: 0xB52830 vram: 0x80240000 - subsections: + subsegments: - [0xB52830, c] - [0xB52B40, c] - [0xB52BE0, c] @@ -7248,12 +7531,13 @@ segments: - [0xB586B0, data] - [0xB594C0, rodata] - [0xB59528, rodata] - - name: world/area_jan/jan_07/ + - name: jan_07 + dir: world/area_jan/jan_07 type: code overlay: True start: 0xB59870 vram: 0x80240000 - subsections: + subsegments: - [0xB59870, c] - [0xB5A610, c] - [0xB5A850, c] @@ -7264,12 +7548,13 @@ segments: - [0xB5D490, data] - [0xB5DF60, rodata] - [0xB5DF70, rodata] - - name: world/area_jan/jan_08/ + - name: jan_08 + dir: world/area_jan/jan_08 type: code overlay: True start: 0xB5E2B0 vram: 0x80240000 - subsections: + subsegments: - [0xB5E2B0, c] - [0xB5E5C0, c] - [0xB5E910, c] @@ -7283,12 +7568,13 @@ segments: - [0xB65740, rodata] - [0xB65760, rodata] - [0xB65770, rodata] - - name: world/area_jan/jan_09/ + - name: jan_09 + dir: world/area_jan/jan_09 type: code overlay: True start: 0xB65AB0 vram: 0x80240000 - subsections: + subsegments: - [0xB65AB0, c] - [0xB660A0, c] - [0xB663F0, c] @@ -7299,12 +7585,13 @@ segments: - [0xB6BFB0, data] - [0xB6C020, rodata] - [0xB6C050, rodata] - - name: world/area_jan/jan_10/ + - name: jan_10 + dir: world/area_jan/jan_10 type: code overlay: True start: 0xB6C390 vram: 0x80240000 - subsections: + subsegments: - [0xB6C390, c] - [0xB6C6A0, c] - [0xB6D4C0, c] @@ -7317,24 +7604,26 @@ segments: - [0xB707C0, data] - [0xB70800, rodata] - [0xB70810, rodata] - - name: world/area_jan/jan_11/ + - name: jan_11 + dir: world/area_jan/jan_11 type: code overlay: True start: 0xB70860 vram: 0x80240000 - subsections: + subsegments: - [0xB70860, c] - [0xB71010, c] - [0xB71060, data] - [0xB710F0, data] - [0xB728B0, data] - [0xB730A0, rodata] - - name: world/area_jan/jan_12/ + - name: jan_12 + dir: world/area_jan/jan_12 type: code overlay: True start: 0xB730B0 vram: 0x80240000 - subsections: + subsegments: - [0xB730B0, c] - [0xB73570, c] - [0xB74310, data] @@ -7342,24 +7631,26 @@ segments: - [0xB75D30, data] - [0xB76450, rodata] - [0xB76470, rodata] - - name: world/area_jan/jan_13/ + - name: jan_13 + dir: world/area_jan/jan_13 type: code overlay: True start: 0xB767B0 vram: 0x80240000 - subsections: + subsegments: - [0xB767B0, c] - [0xB76D80, data] - [0xB77000, data] - [0xB794C0, data] - [0xB79FA0, data] - [0xB7A020, rodata] - - name: world/area_jan/jan_14/ + - name: jan_14 + dir: world/area_jan/jan_14 type: code overlay: True start: 0xB7A050 vram: 0x80240000 - subsections: + subsegments: - [0xB7A050, c] - [0xB7A510, c] - [0xB7B330, data] @@ -7368,12 +7659,13 @@ segments: - [0xB7D2C0, data] - [0xB7D8B0, rodata] - [0xB7D8D0, rodata] - - name: world/area_jan/jan_15/ + - name: jan_15 + dir: world/area_jan/jan_15 type: code overlay: True start: 0xB7D920 vram: 0x80240000 - subsections: + subsegments: - [0xB7D920, c] - [0xB7D9E0, c] - [0xB7DC20, data] @@ -7381,54 +7673,59 @@ segments: - [0xB7F4A0, data] - [0xB7FF80, data] - [0xB7FFF0, rodata] - - name: world/area_jan/jan_16/ + - name: jan_16 + dir: world/area_jan/jan_16 type: code overlay: True start: 0xB80000 vram: 0x80240000 - subsections: + subsegments: - [0xB80000, c] - [0xB80300, c] - [0xB80540, data] - [0xB82C70, data] - [0xB82CD0, data] - [0xB837A0, rodata] - - name: world/area_jan/jan_17/ + - name: jan_17 + dir: world/area_jan/jan_17 type: code overlay: True start: 0xB837C0 vram: 0x80240000 - subsections: + subsegments: - [0xB837C0, c] - [0xB837E0, data] - [0xB838C0, data] - [0xB83B20, data] - [0xB83B80, rodata] - - name: world/area_jan/jan_18/ + - name: jan_18 + dir: world/area_jan/jan_18 type: code overlay: True start: 0xB83B90 vram: 0x80240000 - subsections: + subsegments: - [0xB83B90, data] - [0xB83E10, data] - [0xB83E50, rodata] - - name: world/area_jan/jan_19/ + - name: jan_19 + dir: world/area_jan/jan_19 type: code overlay: True start: 0xB83E60 vram: 0x80240000 - subsections: + subsegments: - [0xB83E60, c] - [0xB83E80, data] - [0xB84110, data] - [0xB84170, rodata] - - name: world/area_jan/jan_22/ + - name: jan_22 + dir: world/area_jan/jan_22 type: code overlay: True start: 0xB84180 vram: 0x80240000 - subsections: + subsegments: - [0xB84180, c] - [0xB851A0, c] - [0xB858A0, c] @@ -7437,21 +7734,23 @@ segments: - [0xB8E200, data] - [0xB8FB00, rodata] - [0xB8FB20, rodata] - - name: world/area_jan/jan_23/ + - name: jan_23 + dir: world/area_jan/jan_23 type: code overlay: True start: 0xB8FCD0 vram: 0x80240000 - subsections: + subsegments: - [0xB8FCD0, data] - [0xB903A0, data] - [0xB93430, rodata] - - name: world/area_mim/mim_01/ + - name: mim_01 + dir: world/area_mim/mim_01 type: code overlay: True start: 0xB93440 vram: 0x80240000 - subsections: + subsegments: - [0xB93440, c] - [0xB934B0, c] - [0xB93940, c] @@ -7461,12 +7760,13 @@ segments: - [0xB960E0, data] - [0xB97A10, rodata] - [0xB97A30, rodata] - - name: world/area_mim/mim_02/ + - name: mim_02 + dir: world/area_mim/mim_02 type: code overlay: True start: 0xB97C00 vram: 0x80240000 - subsections: + subsegments: - [0xB97C00, c] - [0xB97C70, c] - [0xB98DE0, data] @@ -7474,24 +7774,26 @@ segments: - [0xB9A390, data] - [0xB9B250, data] - [0xB9B420, rodata] - - name: world/area_mim/mim_03/ + - name: mim_03 + dir: world/area_mim/mim_03 type: code overlay: True start: 0xB9B480 vram: 0x80240000 - subsections: + subsegments: - [0xB9B480, c] - [0xB9B9B0, data] - [0xB9BA70, data] - [0xB9BE30, data] - [0xB9D500, data] - [0xB9D940, rodata] - - name: world/area_mim/mim_04/ + - name: mim_04 + dir: world/area_mim/mim_04 type: code overlay: True start: 0xB9D960 vram: 0x80240000 - subsections: + subsegments: - [0xB9D960, c] - [0xB9D9D0, c] - [0xB9DB60, c] @@ -7501,24 +7803,26 @@ segments: - [0xB9FEA0, data] - [0xBA06C0, rodata] - [0xBA06E0, rodata] - - name: world/area_mim/mim_05/ + - name: mim_05 + dir: world/area_mim/mim_05 type: code overlay: True start: 0xBA0730 vram: 0x80240000 - subsections: + subsegments: - [0xBA0730, c] - [0xBA07A0, c] - [0xBA2150, data] - [0xBA2210, data] - [0xBA3A80, data] - [0xBA4590, rodata] - - name: world/area_mim/mim_06/ + - name: mim_06 + dir: world/area_mim/mim_06 type: code overlay: True start: 0xBA4780 vram: 0x80240000 - subsections: + subsegments: - [0xBA4780, c] - [0xBA47F0, c] - [0xBA4CF0, c] @@ -7528,12 +7832,13 @@ segments: - [0xBA9170, data] - [0xBA9F10, rodata] - [0xBA9F30, rodata] - - name: world/area_mim/mim_07/ + - name: mim_07 + dir: world/area_mim/mim_07 type: code overlay: True start: 0xBAA140 vram: 0x80240000 - subsections: + subsegments: - [0xBAA140, c] - [0xBAA1B0, c] - [0xBAA3B0, c] @@ -7544,12 +7849,13 @@ segments: - [0xBABAD0, data] - [0xBAC9C0, data] - [0xBAD8D0, rodata] - - name: world/area_mim/mim_08/ + - name: mim_08 + dir: world/area_mim/mim_08 type: code overlay: True start: 0xBAD940 vram: 0x80240000 - subsections: + subsegments: - [0xBAD940, c] - [0xBB0880, data] - [0xBB0940, data] @@ -7558,12 +7864,13 @@ segments: - [0xBB1D00, data] - [0xBB2BD0, rodata] - [0xBB2C38, rodata] - - name: world/area_mim/mim_09/ + - name: mim_09 + dir: world/area_mim/mim_09 type: code overlay: True start: 0xBB2E00 vram: 0x80240000 - subsections: + subsegments: - [0xBB2E00, c] - [0xBB3CC0, data] - [0xBB3D80, data] @@ -7571,24 +7878,26 @@ segments: - [0xBB4180, data] - [0xBB4830, data] - [0xBB5980, rodata] - - name: world/area_mim/mim_10/ + - name: mim_10 + dir: world/area_mim/mim_10 type: code overlay: True start: 0xBB59E0 vram: 0x80240000 - subsections: + subsegments: - [0xBB59E0, c] - [0xBB5B70, data] - [0xBB5EB0, data] - [0xBB5EF0, data] - [0xBB61D0, data] - [0xBB7050, rodata] - - name: world/area_mim/mim_11/ + - name: mim_11 + dir: world/area_mim/mim_11 type: code overlay: True start: 0xBB7070 vram: 0x80240000 - subsections: + subsegments: - [0xBB7070, c] - [0xBB7940, c] - [0xBB79F0, c] @@ -7596,24 +7905,26 @@ segments: - [0xBBA180, data] - [0xBBA2E0, data] - [0xBBB350, rodata] - - name: world/area_mim/mim_12/ + - name: mim_12 + dir: world/area_mim/mim_12 type: code overlay: True start: 0xBBB380 vram: 0x80240000 - subsections: + subsegments: - [0xBBB380, c] - [0xBBB960, data] - [0xBBBB90, data] - [0xBBBE60, data] - [0xBBC2B0, data] - [0xBBD190, rodata] - - name: world/area_obk/obk_01/ + - name: obk_01 + dir: world/area_obk/obk_01 type: code overlay: True start: 0xBBD1A0 vram: 0x80240000 - subsections: + subsegments: - [0xBBD1A0, c] - [0xBBD980, c] - [0xBBE2E0, data] @@ -7621,12 +7932,13 @@ segments: - [0xBC0100, data] - [0xBC11A0, data] - [0xBC2A30, rodata] - - name: world/area_obk/obk_02/ + - name: obk_02 + dir: world/area_obk/obk_02 type: code overlay: True start: 0xBC2A90 vram: 0x80240000 - subsections: + subsegments: - [0xBC2A90, c] - [0xBC2CD0, c] - [0xBC2D40, data] @@ -7635,12 +7947,13 @@ segments: - [0xBC3DE0, data] - [0xBC3F60, data] - [0xBC4260, rodata] - - name: world/area_obk/obk_03/ + - name: obk_03 + dir: world/area_obk/obk_03 type: code overlay: True start: 0xBC4280 vram: 0x80240000 - subsections: + subsegments: - [0xBC4280, c] - [0xBC43F0, c] - [0xBC4B50, c] @@ -7652,12 +7965,13 @@ segments: - [0xBC7120, data] - [0xBC7DE0, data] - [0xBC7E40, rodata] - - name: world/area_obk/obk_04/ + - name: obk_04 + dir: world/area_obk/obk_04 type: code overlay: True start: 0xBC7E60 vram: 0x80240000 - subsections: + subsegments: - [0xBC7E60, c] - [0xBC7EB0, c] - [0xBC8CE0, data] @@ -7666,12 +7980,13 @@ segments: - [0xBCB260, data] - [0xBCB870, data] - [0xBCD030, rodata] - - name: world/area_obk/obk_05/ + - name: obk_05 + dir: world/area_obk/obk_05 type: code overlay: True start: 0xBCD060 vram: 0x80240000 - subsections: + subsegments: - [0xBCD060, c] - [0xBCD7D0, c] - [0xBCDA40, data] @@ -7679,22 +7994,24 @@ segments: - [0xBCDFF0, data] - [0xBCE040, data] - [0xBCE680, rodata] - - name: world/area_obk/obk_06/ + - name: obk_06 + dir: world/area_obk/obk_06 type: code overlay: True start: 0xBCE690 vram: 0x80240000 - subsections: + subsegments: - [0xBCE690, data] - [0xBCE760, data] - [0xBCEAD0, data] - [0xBCEBE0, rodata] - - name: world/area_obk/obk_07/ + - name: obk_07 + dir: world/area_obk/obk_07 type: code overlay: True start: 0xBCEBF0 vram: 0x80240000 - subsections: + subsegments: - [0xBCEBF0, c] - [0xBCEEB0, c] - [0xBCF0F0, c] @@ -7705,12 +8022,13 @@ segments: - [0xBD14F0, data] - [0xBD1C80, data] - [0xBD3860, rodata] - - name: world/area_obk/obk_08/ + - name: obk_08 + dir: world/area_obk/obk_08 type: code overlay: True start: 0xBD3870 vram: 0x80240000 - subsections: + subsegments: - [0xBD3870, c] - [0xBD40B0, c] - [0xBD4110, c] @@ -7720,12 +8038,13 @@ segments: - [0xBD64D0, data] - [0xBD6DD0, data] - [0xBDA730, rodata] - - name: world/area_obk/obk_09/ + - name: obk_09 + dir: world/area_obk/obk_09 type: code overlay: True start: 0xBDA7B0 vram: 0x80240000 - subsections: + subsegments: - [0xBDA7B0, c] - [0xBDA940, c] - [0xBDAB00, c] @@ -7734,76 +8053,82 @@ segments: - [0xBDB140, data] - [0xBDCE10, data] - [0xBDD190, rodata] - - name: world/area_arn/arn_02/ + - name: arn_02 + dir: world/area_arn/arn_02 type: code overlay: True start: 0xBDD1B0 vram: 0x80240000 - subsections: + subsegments: - [0xBDD1B0, c, events] - [0xBDE190, .data, header] - [0xBDE2A0, .data, events] - [0xBDEC80, .rodata, events] - - name: world/area_arn/arn_03/ + - name: arn_03 + dir: world/area_arn/arn_03 type: code overlay: True start: 0xBDED90 vram: 0x80240000 - subsections: + subsegments: - [0xBDED90, c, events] - [0xBE04B0, .data, header] - [0xBE05C0, .data, events] - [0xBE0950, .data, events] - [0xBE3570, .data, events] - [0xBE35E0, .rodata, events] - - name: world/area_arn/arn_04/ + - name: arn_04 + dir: world/area_arn/arn_04 type: code overlay: True start: 0xBE37B0 vram: 0x80240000 - subsections: - - [0xBE37B0, .c, events] + subsegments: + - [0xBE37B0, c, events] - [0xBE6B20, .data, header] - [0xBE6C30, .data, events] - [0xBE6E10, .data, events] - [0xBE77F0, .data, events] - [0xBE78D0, .rodata, events] - [0xBE7AD8, .rodata, events] - - name: world/area_arn/arn_05/ + - name: arn_05 + dir: world/area_arn/arn_05 type: code overlay: True start: 0xBE7BE0 vram: 0x80240000 - subsections: - - [0xBE7BE0, .c, events] + subsegments: + - [0xBE7BE0, c, events] - [0xBE8EE0, .data, header] - [0xBE9290, .data, events] - [0xBECBE0, .data, events] - [0xBECC20, .rodata, events] - - name: world/area_arn/arn_07/ + - name: arn_07 + dir: world/area_arn/arn_07 type: code overlay: True start: 0xBECDF0 vram: 0x80240000 - subsections: - - [0xBECDF0, .c, BECDF0] - - [0xBED5F0, .c, BED5F0] - - [0xBED660, .c, BED660] - - [0xBED740, .c, events] + subsegments: + - [0xBECDF0, c, BECDF0] + - [0xBED5F0, c, BED5F0] + - [0xBED660, c, BED660] + - [0xBED740, c, events] - [0xBEEC80, .data, header] - [0xBEEE30, .data, BECDF0] - [0xBF0580, .data, events] - [0xBF46F0, .rodata, BECDF0] - [0xBF4730, .rodata, BED5F0] - [0xBF4740, .rodata, events] - - name: world/area_arn/arn_08/ + - name: arn_08 + dir: world/area_arn/arn_08 type: code overlay: True start: 0xBF47A0 vram: 0x80240000 - subsections: - - [0xBF47A0, .c, BF47A0] - - [0xBF4860, .c, events] + subsegments: + - [0xBF47A0, c, BF47A0] + - [0xBF4860, c, events] - [0xBF4A30, .data, header] - [0xBF4B50, .data, events] - [0xBF5210, .data, events] @@ -7812,82 +8137,89 @@ segments: - [0xBF59A0, .data, events] - [0xBF5FF0, .data, events] - [0xBF6040, .rodata, events] - - name: world/area_arn/arn_09/ + - name: arn_09 + dir: world/area_arn/arn_09 type: code overlay: True start: 0xBF6060 vram: 0x80240000 - subsections: - - [0xBF6060, .c, events] + subsegments: + - [0xBF6060, c, events] - [0xBF60A0, .data, header] - [0xBF61A0, .data, events] - [0xBF6400, .data, events] - [0xBF6530, .data, events] - [0xBF6610, .data, events] - [0xBF69F0, .rodata, events] - - name: world/area_arn/arn_10/ + - name: arn_10 + dir: world/area_arn/arn_10 type: code overlay: True start: 0xBF6A00 vram: 0x80240000 - subsections: + subsegments: - [0xBF6A00, .data, header] - [0xBF6B00, .data, events] - [0xBF6E30, .data, events] - [0xBF75E0, .data, events] - [0xBF7670, .rodata, events] - - name: world/area_arn/arn_11/ + - name: arn_11 + dir: world/area_arn/arn_11 type: code overlay: True start: 0xBF7680 vram: 0x80240000 - subsections: + subsegments: - [0xBF7680, .data, header] - [0xBF7770, .data, events] - [0xBF7D00, .data, events] - [0xBF8780, .rodata, events] - - name: world/area_arn/arn_12/ + - name: arn_12 + dir: world/area_arn/arn_12 type: code overlay: True start: 0xBF8790 vram: 0x80240000 - subsections: + subsegments: - [0xBF8790, .data, header] - [0xBF8890, .data, events] - [0xBF8BB0, .data, events] - [0xBF9400, .rodata, events] - - name: world/area_arn/arn_13/ + - name: arn_13 + dir: world/area_arn/arn_13 type: code overlay: True start: 0xBF9410 vram: 0x80240000 - subsections: + subsegments: - [0xBF9410, .data, header] - [0xBF9510, .data, events] - [0xBF9840, .data, events] - [0xBFA090, .rodata, events] - - name: world/area_dgb/dgb_00/ + - name: dgb_00 + dir: world/area_dgb/dgb_00 type: code overlay: True start: 0xBFA0A0 vram: 0x80240000 - subsections: - - [0xBFA0A0, .c, BFA0A0] - - [0xBFA100, .c, BFA100] + subsegments: + - [0xBFA0A0, c, BFA0A0] + - [0xBFA100, c, BFA100] - [0xBFA150, .data, BFA0A0] - [0xBFA260, .data, BFA100] - [0xBFD800, .data, BFA100] - [0xBFD840, .rodata, BFA0A0] - [0xBFD864, .rodata, BFA100] - - name: world/area_dgb/dgb_01/ + - name: dgb_01 + dir: world/area_dgb/dgb_01 type: code overlay: True start: 0xBFD880 vram: 0x80240000 - subsections: - - [0xBFD880, .c, BFD880] - - [0xBFD8C0, .c, BFD8C0] - - [0xBFD9A0, .c, BFD9A0] + subsegments: + - [0xBFD880, c, BFD880] + - [0xBFD8C0, c, BFD8C0] + - [0xBFD9A0, c, BFD9A0] - [0xC00C70, .data, BFD9A0] - [0xC00DD0, .data, BFD9A0] - [0xC01770, .data, BFD9A0] @@ -7914,88 +8246,95 @@ segments: - type: code start: 0xC20F40 vram: 0x80200000 - subsections: + subsegments: - [0xC20F40, bin] # DMAd at the beginning of tubba blubba's castle (bridge cutscene) - - name: world/area_dgb/dgb_02/ + - name: dgb_02 + dir: world/area_dgb/dgb_02 type: code overlay: True start: 0xC2EBA0 vram: 0x80240000 - subsections: - - [0xC2EBA0, .c, C2EBA0] + subsegments: + - [0xC2EBA0, c, C2EBA0] - [0xC2FFD0, .data, C2EBA0] - [0xC300F0, .data, C2EBA0] - [0xC30650, .data, C2EBA0] - [0xC31190, .rodata, C2EBA0] - - name: world/area_dgb/dgb_03/ + - name: dgb_03 + dir: world/area_dgb/dgb_03 type: code overlay: True start: 0xC314E0 vram: 0x80240000 - subsections: - - [0xC314E0, .c, C314E0] - - [0xC31730, .c, C31730] + subsegments: + - [0xC314E0, c, C314E0] + - [0xC31730, c, C31730] - [0xC33CB0, .data, C31730] - [0xC33DF0, .data, C31730] - [0xC345C0, .data, C31730] - [0xC34C20, .data, C31730] - [0xC34E50, .data, C31730] - [0xC35EA0, .rodata, C31730] - - name: world/area_dgb/dgb_04/ + - name: dgb_04 + dir: world/area_dgb/dgb_04 type: code overlay: True start: 0xC36530 vram: 0x80240000 - subsections: - - [0xC36530, .c, C36530] + subsegments: + - [0xC36530, c, C36530] - [0xC39640, .data, C36530] - [0xC39740, .data, C36530] - [0xC39A90, .data, C36530] - [0xC3A910, .rodata, C36530] - [0xC3A978, .rodata, C36530] - - name: world/area_dgb/dgb_05/ + - name: dgb_05 + dir: world/area_dgb/dgb_05 type: code overlay: True start: 0xC3AA10 vram: 0x80240000 - subsections: - - [0xC3AA10, .c, C3AA10] + subsegments: + - [0xC3AA10, c, C3AA10] - [0xC3BEA0, .data, C3AA10] - [0xC3BF90, .data, C3AA10] - [0xC3C200, .data, C3AA10] - [0xC3C280, .data, C3AA10] - [0xC3C2D0, .data, C3AA10] - [0xC3CD40, .rodata, C3AA10] - - name: world/area_dgb/dgb_06/ + - name: dgb_06 + dir: world/area_dgb/dgb_06 type: code overlay: True start: 0xC3D080 vram: 0x80240000 - subsections: - - [0xC3D080, .c, C3D080] + subsegments: + - [0xC3D080, c, C3D080] - [0xC3D340, .data, C3D080] - [0xC3D440, .data, C3D080] - [0xC3D8C0, .data, C3D080] - [0xC3DBE0, .rodata, C3D080] - - name: world/area_dgb/dgb_07/ + - name: dgb_07 + dir: world/area_dgb/dgb_07 type: code overlay: True start: 0xC3DBF0 vram: 0x80240000 - subsections: - - [0xC3DBF0, .c, C3DBF0] + subsegments: + - [0xC3DBF0, c, C3DBF0] - [0xC3F020, .data, C3DBF0] - [0xC3F120, .data, C3DBF0] - [0xC3F3E0, .data, C3DBF0] - [0xC3FA70, .rodata, C3DBF0] - [0xC3FA80, .rodata, C3DBF0] - - name: world/area_dgb/dgb_08/ + - name: dgb_08 + dir: world/area_dgb/dgb_08 type: code overlay: True start: 0xC3FDB0 vram: 0x80240000 - subsections: - - [0xC3FDB0, .c, C3FDB0] + subsegments: + - [0xC3FDB0, c, C3FDB0] - [0xC43A40, .data, C3FDB0] - [0xC43B40, .data, C3FDB0] - [0xC43EB0, .data, C3FDB0] @@ -8003,138 +8342,150 @@ segments: - [0xC467A0, .rodata, C3FDB0] - [0xC467B0, .rodata, C3FDB0] - [0xC46B40, .rodata, C3FDB0] - - name: world/area_dgb/dgb_09/ + - name: dgb_09 + dir: world/area_dgb/dgb_09 type: code overlay: True start: 0xC46BE0 vram: 0x80240000 - subsections: - - [0xC46BE0, .c, C46BE0] + subsegments: + - [0xC46BE0, c, C46BE0] - [0xC4A3E0, .data, C46BE0] - [0xC4A500, .data, C46BE0] - [0xC4AA30, .data, C46BE0] - [0xC4ABE0, .data, C46BE0] - [0xC4BF50, .rodata, C46BE0] - [0xC4C2F8, .rodata, C46BE0] - - name: world/area_dgb/dgb_10/ + - name: dgb_10 + dir: world/area_dgb/dgb_10 type: code overlay: True start: 0xC4C390 vram: 0x80240000 - subsections: - - [0xC4C390, .c, C4C390] + subsegments: + - [0xC4C390, c, C4C390] - [0xC4C580, .data, C4C390] - [0xC4C680, .data, C4C390] - [0xC4CA00, .data, C4C390] - [0xC4D270, .data, C4C390] - [0xC4D3D0, .rodata, C4C390] - - name: world/area_dgb/dgb_11/ + - name: dgb_11 + dir: world/area_dgb/dgb_11 type: code overlay: True start: 0xC4D3E0 vram: 0x80240000 - subsections: - - [0xC4D3E0, .c, C4D3E0] + subsegments: + - [0xC4D3E0, c, C4D3E0] - [0xC4D430, .data, C4D3E0] - [0xC4D550, .data, C4D3E0] - [0xC4D950, .data, C4D3E0] - [0xC4DEE0, .rodata, C4D3E0] - - name: world/area_dgb/dgb_12/ + - name: dgb_12 + dir: world/area_dgb/dgb_12 type: code overlay: True start: 0xC4DEF0 vram: 0x80240000 - subsections: - - [0xC4DEF0, .c, C4DEF0] + subsegments: + - [0xC4DEF0, c, C4DEF0] - [0xC4E1B0, .data, C4DEF0] - [0xC4E2A0, .data, C4DEF0] - [0xC4E760, .data, C4DEF0] - [0xC4E950, .rodata, C4DEF0] - - name: world/area_dgb/dgb_13/ + - name: dgb_13 + dir: world/area_dgb/dgb_13 type: code overlay: True start: 0xC4E960 vram: 0x80240000 - subsections: + subsegments: - [0xC4E960, .data, C4E960] - [0xC4EA50, .data, C4E960] - [0xC4ECE0, .data, C4E960] - [0xC4F020, .rodata, C4E960] - - name: world/area_dgb/dgb_14/ + - name: dgb_14 + dir: world/area_dgb/dgb_14 type: code overlay: True start: 0xC4F030 vram: 0x80240000 - subsections: + subsegments: - [0xC4F030, .data, C4F030] - [0xC4F130, .data, C4F030] - [0xC4F4B0, .data, C4F030] - [0xC4F500, .rodata, C4F030] - - name: world/area_dgb/dgb_15/ + - name: dgb_15 + dir: world/area_dgb/dgb_15 type: code overlay: True start: 0xC4F510 vram: 0x80240000 - subsections: - - [0xC4F510, .c, C4F510] - - [0xC50CA0, .c, C50CA0] + subsegments: + - [0xC4F510, c, C4F510] + - [0xC50CA0, c, C50CA0] - [0xC50D80, .data, C4F510] - [0xC50ED0, .data, C4F510] - [0xC513B0, .data, C4F510] - [0xC51FE0, .data, C4F510] - [0xC521E0, .rodata, C4F510] - [0xC52200, .rodata, C4F510] - - name: world/area_dgb/dgb_16/ + - name: dgb_16 + dir: world/area_dgb/dgb_16 type: code overlay: True start: 0xC52540 vram: 0x80240000 - subsections: - - [0xC52540, .c, C52540] + subsegments: + - [0xC52540, c, C52540] - [0xC53970, .data, C52540] - [0xC53A60, .data, C52540] - [0xC53CC0, .data, C52540] - [0xC53D00, .data, C52540] - [0xC55720, .rodata, C52540] - [0xC55730, .rodata, C52540] - - name: world/area_dgb/dgb_17/ + - name: dgb_17 + dir: world/area_dgb/dgb_17 type: code overlay: True start: 0xC55A60 vram: 0x80240000 - subsections: + subsegments: - [0xC55A60, .data, C55A60] - [0xC55B60, .data, C55A60] - [0xC55F30, .rodata, C55A60] - - name: world/area_dgb/dgb_18/ + - name: dgb_18 + dir: world/area_dgb/dgb_18 type: code overlay: True start: 0xC55F40 vram: 0x80240000 - subsections: - - [0xC55F40, .c, C55F40] - - [0xC56EF0, .c, C56EF0] + subsegments: + - [0xC55F40, c, C55F40] + - [0xC56EF0, c, C56EF0] - [0xC571B0, .data, C55F40] - [0xC572A0, .data, C55F40] - [0xC574C0, .data, C55F40] - [0xC59620, .data, C55F40] - [0xC59810, .rodata, C55F40] - [0xC59820, .rodata, C55F40] - - name: world/area_kzn/kzn_01/ + - name: kzn_01 + dir: world/area_kzn/kzn_01 type: code overlay: True start: 0xC599D0 vram: 0x80240000 - subsections: + subsegments: - [0xC599D0, c] - [0xC59CE0, data] - [0xC5A730, rodata] - - name: world/area_kzn/kzn_02/ + - name: kzn_02 + dir: world/area_kzn/kzn_02 type: code overlay: True start: 0xC5A740 vram: 0x80240000 - subsections: + subsegments: - [0xC5A740, c] - [0xC5AA50, c] - [0xC5AC20, c] @@ -8145,12 +8496,13 @@ segments: - [0xC60C30, rodata] - [0xC60C98, rodata] - [0xC60D00, rodata] - - name: world/area_kzn/kzn_03/ + - name: kzn_03 + dir: world/area_kzn/kzn_03 type: code overlay: True start: 0xC60D10 vram: 0x80240000 - subsections: + subsegments: - [0xC60D10, c] - [0xC61020, c] - [0xC63A10, c] @@ -8161,12 +8513,13 @@ segments: - [0xC67ED0, rodata] - [0xC67F50, rodata] - [0xC68120, rodata] - - name: world/area_kzn/kzn_04/ + - name: kzn_04 + dir: world/area_kzn/kzn_04 type: code overlay: True start: 0xC68130 vram: 0x80240000 - subsections: + subsegments: - [0xC68130, c] - [0xC68440, c] - [0xC69180, c] @@ -8174,33 +8527,36 @@ segments: - [0xC69D70, data] - [0xC6A420, data] - [0xC6C0C0, rodata] - - name: world/area_kzn/kzn_05/ + - name: kzn_05 + dir: world/area_kzn/kzn_05 type: code overlay: True start: 0xC6C0D0 vram: 0x80240000 - subsections: + subsegments: - [0xC6C0D0, c] - [0xC6C3E0, data] - [0xC6C910, rodata] - - name: world/area_kzn/kzn_06/ + - name: kzn_06 + dir: world/area_kzn/kzn_06 type: code overlay: True start: 0xC6C920 vram: 0x80240000 - subsections: + subsegments: - [0xC6C920, c] - [0xC6CC30, c] - [0xC6CD10, c] - [0xC6D390, data] - [0xC6E300, rodata] - [0xC6E320, rodata] - - name: world/area_kzn/kzn_07/ + - name: kzn_07 + dir: world/area_kzn/kzn_07 type: code overlay: True start: 0xC6E330 vram: 0x80240000 - subsections: + subsegments: - [0xC6E330, c] - [0xC6EA50, c] - [0xC70640, data] @@ -8209,12 +8565,13 @@ segments: - [0xC70EC0, data] - [0xC713B0, rodata] - [0xC71418, rodata] - - name: world/area_kzn/kzn_08/ + - name: kzn_08 + dir: world/area_kzn/kzn_08 type: code overlay: True start: 0xC71480 vram: 0x80240000 - subsections: + subsegments: - [0xC71480, c] - [0xC71C10, c] - [0xC71ED0, c] @@ -8223,12 +8580,13 @@ segments: - [0xC76A50, rodata] - [0xC76AB8, rodata] - [0xC76B18, rodata] - - name: world/area_kzn/kzn_09/ + - name: kzn_09 + dir: world/area_kzn/kzn_09 type: code overlay: True start: 0xC76CE0 vram: 0x80240000 - subsections: + subsegments: - [0xC76CE0, c] - [0xC77A20, c] - [0xC77D00, c] @@ -8236,23 +8594,25 @@ segments: - [0xC7A9E0, data] - [0xC7B0D0, data] - [0xC7DF40, rodata] - - name: world/area_kzn/kzn_10/ + - name: kzn_10 + dir: world/area_kzn/kzn_10 type: code overlay: True start: 0xC7E180 vram: 0x80240000 - subsections: + subsegments: - [0xC7E180, c] - [0xC7E4B0, c] - [0xC7E850, data] - [0xC7EE90, data] - [0xC80170, rodata] - - name: world/area_kzn/kzn_11/ + - name: kzn_11 + dir: world/area_kzn/kzn_11 type: code overlay: True start: 0xC801A0 vram: 0x80240000 - subsections: + subsegments: - [0xC801A0, c] - [0xC804B0, c] - [0xC80600, c] @@ -8261,12 +8621,13 @@ segments: - [0xC83870, data] - [0xC859E0, rodata] - [0xC85A48, rodata] - - name: world/area_kzn/kzn_17/ + - name: kzn_17 + dir: world/area_kzn/kzn_17 type: code overlay: True start: 0xC85AB0 vram: 0x80240000 - subsections: + subsegments: - [0xC85AB0, c] - [0xC85DC0, c] - [0xC887B0, c] @@ -8274,23 +8635,25 @@ segments: - [0xC89450, data] - [0xC8BE40, rodata] - [0xC8C080, rodata] - - name: world/area_kzn/kzn_18/ + - name: kzn_18 + dir: world/area_kzn/kzn_18 type: code overlay: True start: 0xC8C0A0 vram: 0x80240000 - subsections: + subsegments: - [0xC8C0A0, c] - [0xC8C0E0, c] - [0xC8C3F0, c] - [0xC8C460, data] - [0xC8DBA0, rodata] - - name: world/area_kzn/kzn_19/ + - name: kzn_19 + dir: world/area_kzn/kzn_19 type: code overlay: True start: 0xC8DBB0 vram: 0x80240000 - subsections: + subsegments: - [0xC8DBB0, c] - [0xC8F8E0, data] - [0xC8FA40, data] @@ -8300,47 +8663,51 @@ segments: - [0xC95E70, data] - [0xC95EF0, rodata] - [0xC95F20, rodata] - - name: world/area_kzn/kzn_20/ + - name: kzn_20 + dir: world/area_kzn/kzn_20 type: code overlay: True start: 0xC95F30 vram: 0x80240000 - subsections: + subsegments: - [0xC95F30, c] - [0xC96240, c] - [0xC969F0, data] - [0xC97600, data] - [0xC9A1F0, rodata] - - name: world/area_kzn/kzn_22/ + - name: kzn_22 + dir: world/area_kzn/kzn_22 type: code overlay: True start: 0xC9A200 vram: 0x80240000 - subsections: + subsegments: - [0xC9A200, c] - [0xC9A540, c] - [0xC9A590, data] - [0xC9A650, data] - [0xC9B120, data] - [0xC9C2F0, rodata] - - name: world/area_kzn/kzn_23/ + - name: kzn_23 + dir: world/area_kzn/kzn_23 type: code overlay: True start: 0xC9C300 vram: 0x80240000 - subsections: + subsegments: - [0xC9C300, c] - [0xC9C610, c] - [0xC9C920, data] - [0xC9C9B0, data] - [0xC9D020, data] - [0xC9DF10, rodata] - - name: world/area_flo/flo_00/ + - name: flo_00 + dir: world/area_flo/flo_00 type: code overlay: True start: 0xC9DF20 vram: 0x80240000 - subsections: + subsegments: - [0xC9DF20, c] - [0xC9DF60, c] - [0xC9EE30, c] @@ -8352,36 +8719,39 @@ segments: - [0xCA70A0, rodata] - [0xCA70E0, rodata] - [0xCA7290, rodata] - - name: world/area_flo/flo_03/ + - name: flo_03 + dir: world/area_flo/flo_03 type: code overlay: True start: 0xCA72A0 vram: 0x80240000 - subsections: + subsegments: - [0xCA72A0, c] - [0xCA72E0, c] - [0xCA78D0, data] - [0xCA8150, data] - [0xCAC170, data] - [0xCAC1D0, rodata] - - name: world/area_flo/flo_07/ + - name: flo_07 + dir: world/area_flo/flo_07 type: code overlay: True start: 0xCAC1F0 vram: 0x80240000 - subsections: + subsegments: - [0xCAC1F0, c] - [0xCAC5D0, c] - [0xCAC930, data] - [0xCACAC0, data] - [0xCAD410, data] - [0xCAED20, rodata] - - name: world/area_flo/flo_08/ + - name: flo_08 + dir: world/area_flo/flo_08 type: code overlay: True start: 0xCAED40 vram: 0x80240000 - subsections: + subsegments: - [0xCAED40, c] - [0xCAFA80, c] - [0xCAFAC0, c] @@ -8391,12 +8761,13 @@ segments: - [0xCB3C80, data] - [0xCB46D0, data] - [0xCB4E60, rodata] - - name: world/area_flo/flo_09/ + - name: flo_09 + dir: world/area_flo/flo_09 type: code overlay: True start: 0xCB5000 vram: 0x80240000 - subsections: + subsegments: - [0xCB5000, c] - [0xCB5040, c] - [0xCB50E0, c] @@ -8405,12 +8776,13 @@ segments: - [0xCB7010, data] - [0xCB7880, data] - [0xCB9190, rodata] - - name: world/area_flo/flo_10/ + - name: flo_10 + dir: world/area_flo/flo_10 type: code overlay: True start: 0xCB9200 vram: 0x80240000 - subsections: + subsegments: - [0xCB9200, c] - [0xCB9240, c] - [0xCB9280, c] @@ -8424,35 +8796,38 @@ segments: - [0xCBD270, data] - [0xCBD290, data] - [0xCBDCB0, rodata] - - name: world/area_flo/flo_11/ + - name: flo_11 + dir: world/area_flo/flo_11 type: code overlay: True start: 0xCBDCD0 vram: 0x80240000 - subsections: + subsegments: - [0xCBDCD0, c] - [0xCBDFF0, data] - [0xCBF790, data] - [0xCC0DC0, data] - [0xCC0E10, rodata] - - name: world/area_flo/flo_12/ + - name: flo_12 + dir: world/area_flo/flo_12 type: code overlay: True start: 0xCC0E30 vram: 0x80240000 - subsections: + subsegments: - [0xCC0E30, c] - [0xCC0E70, c] - [0xCC1520, data] - [0xCC16A0, data] - [0xCC1C60, data] - [0xCC3800, rodata] - - name: world/area_flo/flo_13/ + - name: flo_13 + dir: world/area_flo/flo_13 type: code overlay: True start: 0xCC3810 vram: 0x80240000 - subsections: + subsegments: - [0xCC3810, c] - [0xCC3850, c] - [0xCC6DE0, c] @@ -8462,12 +8837,13 @@ segments: - [0xCCB230, rodata] - [0xCCB298, rodata] - [0xCCB2F8, rodata] - - name: world/area_flo/flo_14/ + - name: flo_14 + dir: world/area_flo/flo_14 type: code overlay: True start: 0xCCB310 vram: 0x80240000 - subsections: + subsegments: - [0xCCB310, c] - [0xCCBE20, c] - [0xCCD670, c] @@ -8477,24 +8853,26 @@ segments: - [0xCD0240, data] - [0xCD0280, data] - [0xCD0620, rodata] - - name: world/area_flo/flo_15/ + - name: flo_15 + dir: world/area_flo/flo_15 type: code overlay: True start: 0xCD06C0 vram: 0x80240000 - subsections: + subsegments: - [0xCD06C0, data] - [0xCD07E0, data] - [0xCD09C0, data] - [0xCD19A0, data] - [0xCD1A20, data] - [0xCD1E20, rodata] - - name: world/area_flo/flo_16/ + - name: flo_16 + dir: world/area_flo/flo_16 type: code overlay: True start: 0xCD1E30 vram: 0x80240000 - subsections: + subsegments: - [0xCD1E30, c] - [0xCD1E70, c] - [0xCD1F10, c] @@ -8506,12 +8884,13 @@ segments: - [0xCD6330, data] - [0xCD7210, rodata] - [0xCD7278, rodata] - - name: world/area_flo/flo_17/ + - name: flo_17 + dir: world/area_flo/flo_17 type: code overlay: True start: 0xCD72E0 vram: 0x80240000 - subsections: + subsegments: - [0xCD72E0, c] - [0xCD7320, c] - [0xCD7350, c] @@ -8521,12 +8900,13 @@ segments: - [0xCDC5D0, rodata] - [0xCDC638, rodata] - [0xCDC698, rodata] - - name: world/area_flo/flo_18/ + - name: flo_18 + dir: world/area_flo/flo_18 type: code overlay: True start: 0xCDC6A0 vram: 0x80240000 - subsections: + subsegments: - [0xCDC6A0, c] - [0xCDCBD0, c] - [0xCDCC30, c] @@ -8535,12 +8915,13 @@ segments: - [0xCDD530, data] - [0xCE2D60, data] - [0xCE36E0, rodata] - - name: world/area_flo/flo_19/ + - name: flo_19 + dir: world/area_flo/flo_19 type: code overlay: True start: 0xCE36F0 vram: 0x80240000 - subsections: + subsegments: - [0xCE36F0, c] - [0xCE4030, data] - [0xCE41B0, data] @@ -8548,23 +8929,25 @@ segments: - [0xCE4740, data] - [0xCE5160, data] - [0xCE66F0, rodata] - - name: world/area_flo/flo_21/ + - name: flo_21 + dir: world/area_flo/flo_21 type: code overlay: True start: 0xCE6700 vram: 0x80240000 - subsections: + subsegments: - [0xCE6700, c] - [0xCE7240, c] - [0xCE73F0, data] - [0xCE7EC0, data] - [0xCEC210, rodata] - - name: world/area_flo/flo_22/ + - name: flo_22 + dir: world/area_flo/flo_22 type: code overlay: True start: 0xCEC240 vram: 0x80240000 - subsections: + subsegments: - [0xCEC240, c] - [0xCEC280, c] - [0xCEC290, c] @@ -8573,24 +8956,26 @@ segments: - [0xCED050, data] - [0xCED7E0, data] - [0xCEE250, rodata] - - name: world/area_flo/flo_23/ + - name: flo_23 + dir: world/area_flo/flo_23 type: code overlay: True start: 0xCEE260 vram: 0x80240000 - subsections: + subsegments: - [0xCEE260, c] - [0xCEE2A0, c] - [0xCEEF30, data] - [0xCEF540, data] - [0xCF0800, data] - [0xCF08D0, rodata] - - name: world/area_flo/flo_24/ + - name: flo_24 + dir: world/area_flo/flo_24 type: code overlay: True start: 0xCF0940 vram: 0x80240000 - subsections: + subsegments: - [0xCF0940, c] - [0xCF0980, c] - [0xCF0BC0, c] @@ -8598,12 +8983,13 @@ segments: - [0xCF1680, data] - [0xCF2AF0, data] - [0xCF2BB0, rodata] - - name: world/area_flo/flo_25/ + - name: flo_25 + dir: world/area_flo/flo_25 type: code overlay: True start: 0xCF2BD0 vram: 0x80240000 - subsections: + subsegments: - [0xCF2BD0, c] - [0xCF2C10, c] - [0xCF4BC0, c] @@ -8614,12 +9000,13 @@ segments: - [0xCF7310, data] - [0xCF7AA0, rodata] - [0xCF7B08, rodata] - - name: world/area_sam/sam_01/ + - name: sam_01 + dir: world/area_sam/sam_01 type: code overlay: True start: 0xCF7B70 vram: 0x80240000 - subsections: + subsegments: - [0xCF7B70, c] - [0xCF7E80, c] - [0xCF9AC0, data] @@ -8627,12 +9014,13 @@ segments: - [0xD01D90, data] - [0xD05460, data] - [0xD05720, rodata] - - name: world/area_sam/sam_02/ + - name: sam_02 + dir: world/area_sam/sam_02 type: code overlay: True start: 0xD05730 vram: 0x80240000 - subsections: + subsegments: - [0xD05730, c] - [0xD05F60, c] - [0xD072F0, data] @@ -8642,23 +9030,25 @@ segments: #- [0xD0C294, data] - [0xD10DA0, data] - [0xD110A0, rodata] - - name: world/area_sam/sam_03/ + - name: sam_03 + dir: world/area_sam/sam_03 type: code overlay: True start: 0xD110C0 vram: 0x80240000 - subsections: + subsegments: - [0xD110C0, c] - [0xD119E0, data] - [0xD11A70, data] - [0xD11D40, data] - [0xD13420, rodata] - - name: world/area_sam/sam_04/ + - name: sam_04 + dir: world/area_sam/sam_04 type: code overlay: True start: 0xD135D0 vram: 0x80240000 - subsections: + subsegments: - [0xD135D0, c] - [0xD13810, c] - [0xD138E0, c] @@ -8668,12 +9058,13 @@ segments: - [0xD16E20, data] - [0xD18720, data] - [0xD187C0, rodata] - - name: world/area_sam/sam_05/ + - name: sam_05 + dir: world/area_sam/sam_05 type: code overlay: True start: 0xD187E0 vram: 0x80240000 - subsections: + subsegments: - [0xD187E0, c] - [0xD1A520, data] - [0xD1A5B0, data] @@ -8681,12 +9072,13 @@ segments: - [0xD1A900, data] - [0xD1F780, data] - [0xD1FCB0, rodata] - - name: world/area_sam/sam_06/ + - name: sam_06 + dir: world/area_sam/sam_06 type: code overlay: True start: 0xD1FE90 vram: 0x80240000 - subsections: + subsegments: - [0xD1FE90, c] - [0xD203E0, c] - [0xD224B0, data] @@ -8695,12 +9087,13 @@ segments: - [0xD2BC50, data] - [0xD2BCC0, rodata] - [0xD2BCD0, rodata] - - name: world/area_sam/sam_07/ + - name: sam_07 + dir: world/area_sam/sam_07 type: code overlay: True start: 0xD2BD30 vram: 0x80240000 - subsections: + subsegments: - [0xD2BD30, c] - [0xD2DD30, data] - [0xD2DDC0, data] @@ -8708,12 +9101,13 @@ segments: - [0xD2E1F0, data] - [0xD2E9C0, data] - [0xD2FAA0, rodata] - - name: world/area_sam/sam_08/ + - name: sam_08 + dir: world/area_sam/sam_08 type: code overlay: True start: 0xD2FC80 vram: 0x80240000 - subsections: + subsegments: - [0xD2FC80, c] - [0xD309C0, c] - [0xD31430, data] @@ -8721,23 +9115,25 @@ segments: - [0xD31E80, data] - [0xD335E0, data] - [0xD36140, rodata] - - name: world/area_sam/sam_09/ + - name: sam_09 + dir: world/area_sam/sam_09 type: code overlay: True start: 0xD362F0 vram: 0x80240000 - subsections: + subsegments: - [0xD362F0, c] - [0xD366F0, data] - [0xD36780, data] - [0xD369A0, data] - [0xD377F0, rodata] - - name: world/area_sam/sam_10/ + - name: sam_10 + dir: world/area_sam/sam_10 type: code overlay: True start: 0xD37800 vram: 0x80240000 - subsections: + subsegments: - [0xD37800, c] - [0xD37BD0, c] - [0xD384A0, data] @@ -8745,12 +9141,13 @@ segments: - [0xD38840, data] - [0xD3A410, rodata] - [0xD3A430, rodata] - - name: world/area_sam/sam_11/ + - name: sam_11 + dir: world/area_sam/sam_11 type: code overlay: True start: 0xD3A5D0 vram: 0x80240000 - subsections: + subsegments: - [0xD3A5D0, c] - [0xD3A610, c] - [0xD3A850, c] @@ -8763,12 +9160,13 @@ segments: - [0xD48C40, data] - [0xD4B9E0, rodata] - [0xD4BA00, rodata] - - name: world/area_sam/sam_12/ + - name: sam_12 + dir: world/area_sam/sam_12 type: code overlay: True start: 0xD4BA20 vram: 0x80240000 - subsections: + subsegments: - [0xD4BA20, c] - [0xD4BAB0, c] - [0xD4BDC0, data] @@ -8777,12 +9175,13 @@ segments: - [0xD4C2A0, data] - [0xD4CF90, data] - [0xD4D030, rodata] - - name: world/area_pra/pra_01/ + - name: pra_01 + dir: world/area_pra/pra_01 type: code overlay: True start: 0xD4D040 vram: 0x80240000 - subsections: + subsegments: - [0xD4D040, c] - [0xD4D060, c] - [0xD4E3F0, data] @@ -8790,12 +9189,13 @@ segments: - [0xD4EF50, data] - [0xD4FFC0, data] - [0xD4FFD0, rodata] - - name: world/area_pra/pra_02/ + - name: pra_02 + dir: world/area_pra/pra_02 type: code overlay: True start: 0xD4FFF0 vram: 0x80240000 - subsections: + subsegments: - [0xD4FFF0, c] - [0xD50010, c] - [0xD51650, data] @@ -8803,24 +9203,26 @@ segments: - [0xD52A80, data] - [0xD52DE0, data] - [0xD53C80, rodata] - - name: world/area_pra/pra_03/ + - name: pra_03 + dir: world/area_pra/pra_03 type: code overlay: True start: 0xD53CB0 vram: 0x80240000 - subsections: + subsegments: - [0xD53CB0, c] - [0xD53CD0, c] - [0xD53E60, data] - [0xD53F10, data] - [0xD543C0, data] - [0xD54670, rodata] - - name: world/area_pra/pra_04/ + - name: pra_04 + dir: world/area_pra/pra_04 type: code overlay: True start: 0xD54690 vram: 0x80240000 - subsections: + subsegments: - [0xD54690, c] - [0xD546B0, c] - [0xD54840, c] @@ -8830,217 +9232,236 @@ segments: - [0xD55840, data] - [0xD55B40, rodata] - [0xD55B60, rodata] - - name: world/area_pra/pra_05/ + - name: pra_05 + dir: world/area_pra/pra_05 type: code overlay: True start: 0xD55BB0 vram: 0x80240000 - subsections: + subsegments: - [0xD55BB0, c] - [0xD55BD0, c] - [0xD56D90, data] - [0xD56E20, data] - [0xD57420, rodata] - - name: world/area_pra/pra_06/ + - name: pra_06 + dir: world/area_pra/pra_06 type: code overlay: True start: 0xD57430 vram: 0x80240000 - subsections: + subsegments: - [0xD57430, c] - [0xD58380, data] - [0xD58410, data] - [0xD58860, rodata] - - name: world/area_pra/pra_09/ + - name: pra_09 + dir: world/area_pra/pra_09 type: code overlay: True start: 0xD58890 vram: 0x80240000 - subsections: + subsegments: - [0xD58890, c] - [0xD588B0, c] - [0xD59EE0, data] - [0xD59F80, data] - [0xD5F2A0, rodata] - - name: world/area_pra/pra_10/ + - name: pra_10 + dir: world/area_pra/pra_10 type: code overlay: True start: 0xD5F2B0 vram: 0x80240000 - subsections: + subsegments: - [0xD5F2B0, c] - [0xD5F2D0, c] - [0xD60960, data] - [0xD60A00, data] - [0xD614A0, rodata] - - name: world/area_pra/pra_11/ + - name: pra_11 + dir: world/area_pra/pra_11 type: code overlay: True start: 0xD61500 vram: 0x80240000 - subsections: + subsegments: - [0xD61500, c] - [0xD61520, c] - [0xD626E0, data] - [0xD62770, data] - [0xD62B10, data] - [0xD62D00, rodata] - - name: world/area_pra/pra_12/ + - name: pra_12 + dir: world/area_pra/pra_12 type: code overlay: True start: 0xD62D10 vram: 0x80240000 - subsections: + subsegments: - [0xD62D10, c] - [0xD63F20, data] - [0xD63FB0, data] - [0xD645B0, rodata] - - name: world/area_pra/pra_13/ + - name: pra_13 + dir: world/area_pra/pra_13 type: code overlay: True start: 0xD645E0 vram: 0x80240000 - subsections: + subsegments: - [0xD645E0, c] - [0xD64600, c] - [0xD65BC0, data] - [0xD65C70, data] - [0xD66880, data] - [0xD67CF0, rodata] - - name: world/area_pra/pra_14/ + - name: pra_14 + dir: world/area_pra/pra_14 type: code overlay: True start: 0xD67D00 vram: 0x80240000 - subsections: + subsegments: - [0xD67D00, c] - [0xD67D20, c] - [0xD68EE0, data] - [0xD68F80, data] - [0xD69630, data] - [0xD69800, rodata] - - name: world/area_pra/pra_15/ + - name: pra_15 + dir: world/area_pra/pra_15 type: code overlay: True start: 0xD69810 vram: 0x80240000 - subsections: + subsegments: - [0xD69810, c] - [0xD69830, c] - [0xD69850, data] - [0xD698E0, data] - [0xD69AD0, data] - [0xD69B10, rodata] - - name: world/area_pra/pra_16/ + - name: pra_16 + dir: world/area_pra/pra_16 type: code overlay: True start: 0xD69B20 vram: 0x80240000 - subsections: + subsegments: - [0xD69B20, c] - [0xD69B40, c] - [0xD6AA40, data] - [0xD6AAF0, data] - [0xD6B610, rodata] - - name: world/area_pra/pra_18/ + - name: pra_18 + dir: world/area_pra/pra_18 type: code overlay: True start: 0xD6B620 vram: 0x80240000 - subsections: + subsegments: - [0xD6B620, c] - [0xD6B640, c] - [0xD6C540, data] - [0xD6C5F0, data] - [0xD6CF60, data] - [0xD6E9A0, rodata] - - name: world/area_pra/pra_19/ + - name: pra_19 + dir: world/area_pra/pra_19 type: code overlay: True start: 0xD6E9B0 vram: 0x80240000 - subsections: + subsegments: - [0xD6E9B0, c] - [0xD6E9D0, c] - [0xD70360, data] - [0xD70400, data] - [0xD70A70, data] - [0xD76390, rodata] - - name: world/area_pra/pra_20/ + - name: pra_20 + dir: world/area_pra/pra_20 type: code overlay: True start: 0xD763A0 vram: 0x80240000 - subsections: + subsegments: - [0xD763A0, c] - [0xD763C0, c] - [0xD772C0, data] - [0xD77390, data] - [0xD77F00, rodata] - - name: world/area_pra/pra_21/ + - name: pra_21 + dir: world/area_pra/pra_21 type: code overlay: True start: 0xD77F20 vram: 0x80240000 - subsections: + subsegments: - [0xD77F20, c] - [0xD77F40, c] - [0xD78040, data] - [0xD780E0, data] - [0xD78540, data] - [0xD78870, rodata] - - name: world/area_pra/pra_22/ + - name: pra_22 + dir: world/area_pra/pra_22 type: code overlay: True start: 0xD78880 vram: 0x80240000 - subsections: + subsegments: - [0xD78880, c] - [0xD788A0, c] - [0xD78B50, data] - [0xD78BF0, data] - [0xD796B0, data] - [0xD799E0, rodata] - - name: world/area_pra/pra_27/ + - name: pra_27 + dir: world/area_pra/pra_27 type: code overlay: True start: 0xD799F0 vram: 0x80240000 - subsections: + subsegments: - [0xD799F0, c] - [0xD7AC00, data] - [0xD7AC90, data] - [0xD7B080, data] - [0xD7B270, rodata] - - name: world/area_pra/pra_28/ + - name: pra_28 + dir: world/area_pra/pra_28 type: code overlay: True start: 0xD7B2A0 vram: 0x80240000 - subsections: + subsegments: - [0xD7B2A0, c] - [0xD7C4B0, data] - [0xD7C540, data] - [0xD7C930, data] - [0xD7CB20, rodata] - - name: world/area_pra/pra_29/ + - name: pra_29 + dir: world/area_pra/pra_29 type: code overlay: True start: 0xD7CB50 vram: 0x80240000 - subsections: + subsegments: - [0xD7CB50, c] - [0xD7CB70, c] - [0xD7DDD0, data] - [0xD7DE90, data] - [0xD7E9B0, data] - [0xD7ED50, rodata] - - name: world/area_pra/pra_31/ + - name: pra_31 + dir: world/area_pra/pra_31 type: code overlay: True start: 0xD7ED60 vram: 0x80240000 - subsections: + subsegments: - [0xD7ED60, c] - [0xD7ED80, c] - [0xD7F270, c] @@ -9049,47 +9470,51 @@ segments: - [0xD80E20, data] - [0xD81250, data] - [0xD869E0, rodata] - - name: world/area_pra/pra_32/ + - name: pra_32 + dir: world/area_pra/pra_32 type: code overlay: True start: 0xD86A00 vram: 0x80240000 - subsections: + subsegments: - [0xD86A00, c] - [0xD86A20, c] - [0xD87240, data] - [0xD87DF0, data] - [0xD896B0, rodata] - - name: world/area_pra/pra_33/ + - name: pra_33 + dir: world/area_pra/pra_33 type: code overlay: True start: 0xD896E0 vram: 0x80240000 - subsections: + subsegments: - [0xD896E0, c] - [0xD89700, c] - [0xD8A770, data] - [0xD8A820, data] - [0xD8B060, data] - [0xD8B3A0, rodata] - - name: world/area_pra/pra_34/ + - name: pra_34 + dir: world/area_pra/pra_34 type: code overlay: True start: 0xD8B3B0 vram: 0x80240000 - subsections: + subsegments: - [0xD8B3B0, c] - [0xD8B3D0, c] - [0xD8C3B0, data] - [0xD8C470, data] - [0xD8D130, data] - [0xD8D240, rodata] - - name: world/area_pra/pra_35/ + - name: pra_35 + dir: world/area_pra/pra_35 type: code overlay: True start: 0xD8D250 vram: 0x80240000 - subsections: + subsegments: - [0xD8D250, c] - [0xD8D270, c] - [0xD8FBA0, c] @@ -9098,67 +9523,73 @@ segments: - [0xD90700, data] - [0xD91030, data] - [0xD91220, rodata] - - name: world/area_pra/pra_36/ + - name: pra_36 + dir: world/area_pra/pra_36 type: code overlay: True start: 0xD91700 vram: 0x80240000 - subsections: + subsegments: - [0xD91700, c] - [0xD92650, data] - [0xD926F0, data] - [0xD92F10, rodata] - - name: world/area_pra/pra_37/ + - name: pra_37 + dir: world/area_pra/pra_37 type: code overlay: True start: 0xD92F40 vram: 0x80240000 - subsections: + subsegments: - [0xD92F40, c] - [0xD94760, data] - [0xD94800, data] - [0xD95420, rodata] - [0xD95450, rodata] - - name: world/area_pra/pra_38/ + - name: pra_38 + dir: world/area_pra/pra_38 type: code overlay: True start: 0xD955F0 vram: 0x80240000 - subsections: + subsegments: - [0xD955F0, c] - [0xD96CD0, data] - [0xD96D70, data] - [0xD97810, rodata] - [0xD97840, rodata] - - name: world/area_pra/pra_39/ + - name: pra_39 + dir: world/area_pra/pra_39 type: code overlay: True start: 0xD97890 vram: 0x80240000 - subsections: + subsegments: - [0xD97890, c] - [0xD98F70, data] - [0xD99010, data] - [0xD99930, rodata] - [0xD99960, rodata] - - name: world/area_pra/pra_40/ + - name: pra_40 + dir: world/area_pra/pra_40 type: code overlay: True start: 0xD999B0 vram: 0x80240000 - subsections: + subsegments: - [0xD999B0, c] - [0xD999D0, c] - [0xD9A8D0, data] - [0xD9A970, data] - [0xD9AE80, data] - [0xD9AEE0, rodata] - - name: world/area_omo/omo_01/ + - name: omo_01 + dir: world/area_omo/omo_01 type: code overlay: True start: 0xD9AEF0 vram: 0x80240000 - subsections: + subsegments: - [0xD9AEF0, c] - [0xD9B150, c] - [0xD9BB20, data] @@ -9167,12 +9598,13 @@ segments: - [0xD9C200, data] - [0xD9D250, data] - [0xD9D330, rodata] - - name: world/area_omo/omo_02/ + - name: omo_02 + dir: world/area_omo/omo_02 type: code overlay: True start: 0xD9D4D0 vram: 0x80240000 - subsections: + subsegments: - [0xD9D4D0, c] - [0xD9D510, c] - [0xDA0080, data] @@ -9182,24 +9614,26 @@ segments: - [0xDA0A50, data] - [0xDA1CD0, data] - [0xDA4D30, rodata] - - name: world/area_omo/omo_03/ + - name: omo_03 + dir: world/area_omo/omo_03 type: code overlay: True start: 0xDA5240 vram: 0x80240000 - subsections: + subsegments: - [0xDA5240, c] - [0xDA5260, c] - [0xDA5AD0, data] - [0xDA6050, data] - [0xDA8190, data] - [0xDAD3B0, rodata] - - name: world/area_omo/omo_04/ + - name: omo_04 + dir: world/area_omo/omo_04 type: code overlay: True start: 0xDAD400 vram: 0x80240000 - subsections: + subsegments: - [0xDAD400, c] - [0xDAF240, c] - [0xDAF320, data] @@ -9208,12 +9642,13 @@ segments: - [0xDB20B0, rodata] - [0xDB2108, rodata] - [0xDB22B0, rodata] - - name: world/area_omo/omo_05/ + - name: omo_05 + dir: world/area_omo/omo_05 type: code overlay: True start: 0xDB22C0 vram: 0x80240000 - subsections: + subsegments: - [0xDB22C0, c] - [0xDB46C0, data] - [0xDB4770, data] @@ -9221,12 +9656,13 @@ segments: - [0xDB7560, rodata] - [0xDB7570, rodata] - [0xDB7908, rodata] - - name: world/area_omo/omo_06/ + - name: omo_06 + dir: world/area_omo/omo_06 type: code overlay: True start: 0xDB7910 vram: 0x80240000 - subsections: + subsegments: - [0xDB7910, c] - [0xDB8180, c] - [0xDB8440, data] @@ -9234,12 +9670,13 @@ segments: - [0xDB9060, data] - [0xDBCFD0, data] - [0xDBD270, rodata] - - name: world/area_omo/omo_07/ + - name: omo_07 + dir: world/area_omo/omo_07 type: code overlay: True start: 0xDBD2B0 vram: 0x80240000 - subsections: + subsegments: - [0xDBD2B0, c] - [0xDC01D0, c] - [0xDC04D0, c] @@ -9252,12 +9689,13 @@ segments: - [0xDC3E70, rodata] - [0xDC3E80, rodata] - [0xDC43C0, rodata] - - name: world/area_omo/omo_08/ + - name: omo_08 + dir: world/area_omo/omo_08 type: code overlay: True start: 0xDC43D0 vram: 0x80240000 - subsections: + subsegments: - [0xDC43D0, c] - [0xDC4C40, c] - [0xDC51B0, data] @@ -9265,12 +9703,13 @@ segments: - [0xDC8100, data] - [0xDCBA10, data] - [0xDCCB00, rodata] - - name: world/area_omo/omo_09/ + - name: omo_09 + dir: world/area_omo/omo_09 type: code overlay: True start: 0xDCCCD0 vram: 0x80240000 - subsections: + subsegments: - [0xDCCCD0, c] - [0xDCCFA0, c] - [0xDCD3B0, c] @@ -9287,48 +9726,52 @@ segments: - [0xDD72F0, rodata] - [0xDD7300, rodata] - [0xDD79A0, rodata] - - name: world/area_omo/omo_10/ + - name: omo_10 + dir: world/area_omo/omo_10 type: code overlay: True start: 0xDD79B0 vram: 0x80240000 - subsections: + subsegments: - [0xDD79B0, c] - [0xDD8220, data] - [0xDD8640, data] - [0xDD8A60, data] - [0xDDC720, data] - [0xDDC7F0, rodata] - - name: world/area_omo/omo_11/ + - name: omo_11 + dir: world/area_omo/omo_11 type: code overlay: True start: 0xDDC830 vram: 0x80240000 - subsections: + subsegments: - [0xDDC830, c] - [0xDDCFC0, c] - [0xDDDD00, data] - [0xDDDD90, data] - [0xDDEE80, data] - [0xDDF300, rodata] - - name: world/area_omo/omo_12/ + - name: omo_12 + dir: world/area_omo/omo_12 type: code overlay: True start: 0xDDF310 vram: 0x80240000 - subsections: + subsegments: - [0xDDF310, c] - [0xDDF730, c] - [0xDDF7D0, data] - [0xDDF960, data] - [0xDDFB60, data] - [0xDE2470, rodata] - - name: world/area_omo/omo_13/ + - name: omo_13 + dir: world/area_omo/omo_13 type: code overlay: True start: 0xDE2490 vram: 0x80240000 - subsections: + subsegments: - [0xDE2490, c] - [0xDE2710, c] - [0xDE36C0, c] @@ -9337,45 +9780,49 @@ segments: - [0xDE3F70, data] - [0xDE5100, data] - [0xDE5360, rodata] - - name: world/area_omo/omo_14/ + - name: omo_14 + dir: world/area_omo/omo_14 type: code overlay: True start: 0xDE56B0 vram: 0x80240000 - subsections: + subsegments: - [0xDE56B0, c] - [0xDE5810, c] - [0xDE5C70, data] - [0xDE5D00, data] - [0xDE5FA0, data] - [0xDE8760, rodata] - - name: world/area_omo/omo_15/ + - name: omo_15 + dir: world/area_omo/omo_15 type: code overlay: True start: 0xDE8770 vram: 0x80240000 - subsections: + subsegments: - [0xDE8770, c] - [0xDE8F70, data] - [0xDE9670, data] - [0xDEBEA0, rodata] - - name: world/area_omo/omo_16/ + - name: omo_16 + dir: world/area_omo/omo_16 type: code overlay: True start: 0xDEBED0 vram: 0x80240000 - subsections: + subsegments: - [0xDEBED0, c] - [0xDEC4D0, data] - [0xDEC600, data] - [0xDEEC30, data] - [0xDEEE80, rodata] - - name: world/area_omo/omo_17/ + - name: omo_17 + dir: world/area_omo/omo_17 type: code overlay: True start: 0xDEEEA0 vram: 0x80240000 - subsections: + subsegments: - [0xDEEEA0, c] - [0xDEF400, c] - [0xDF25B0, data] @@ -9387,12 +9834,13 @@ segments: - [0xDF6470, rodata] - [0xDF64B0, rodata] - [0xDF6848, rodata] - - name: world/area_end/end_00/ + - name: end_00 + dir: world/area_end/end_00 type: code overlay: True start: 0xDF6A00 vram: 0x80240000 - subsections: + subsegments: - [0xDF6A00, c] - [0xDF6A20, c] - [0xDF9300, c] @@ -9404,12 +9852,13 @@ segments: - [0xE04180, data] - [0xE052C0, data] - [0xE05300, rodata] - - name: world/area_end/end_01/ + - name: end_01 + dir: world/area_end/end_01 type: code overlay: True start: 0xE05360 vram: 0x80240000 - subsections: + subsegments: - [0xE05360, c] - [0xE05370, c] - [0xE05390, c] @@ -9422,12 +9871,13 @@ segments: - [0xE0D510, data] - [0xE0E700, data] - [0xE0E740, rodata] - - name: world/area_mgm/mgm_00/ + - name: mgm_00 + dir: world/area_mgm/mgm_00 type: code overlay: True start: 0xE0E7A0 vram: 0x80240000 - subsections: + subsegments: - [0xE0E7A0, c] - [0xE0F980, c] - [0xE0FF60, data] @@ -9435,255 +9885,259 @@ segments: - [0xE123E0, data] - [0xE12570, rodata] - [0xE12590, rodata] - - name: world/area_mgm/mgm_01/ + - name: mgm_01 + dir: world/area_mgm/mgm_01 type: code overlay: True start: 0xE12760 vram: 0x80240000 - subsections: + subsegments: - [0xE12760, c] - [0xE12930, c] - [0xE13F10, data] - [0xE141D0, data] - [0xE15440, data] - [0xE15D10, rodata] - - name: world/area_mgm/mgm_02/ + - name: mgm_02 + dir: world/area_mgm/mgm_02 type: code overlay: True start: 0xE15D80 vram: 0x80240000 - subsections: + subsegments: - [0xE15D80, c] - [0xE18150, c] - [0xE18180, data] - [0xE183D0, data] - [0xE1E020, data] - [0xE1E260, rodata] - - name: world/area_mgm/mgm_03/ + - name: mgm_03 + dir: world/area_mgm/mgm_03 type: code overlay: True start: 0xE1E380 vram: 0x80240000 - subsections: + subsegments: - [0xE1E380, data] - - name: world/area_gv/gv_01/ + - name: gv_01 + dir: world/area_gv/gv_01 type: code overlay: True start: 0xE1E460 vram: 0x80240000 - subsections: + subsegments: - [0xE1E460, c] - [0xE1EC20, data] - type: code overlay: True start: 0xE20110 vram: 0x802B7000 - subsections: - - [0xE20110, c, code_E20110] + subsegments: + - [0xE20110, c, E20110] - [0xE20B30, data] - - [0xE20DD0, .rodata, code_E20110] + - [0xE20DD0, .rodata, E20110] - type: code overlay: True start: 0xE20EB0 vram: 0x802B7000 - subsections: - - [0xe20eb0, c, code_e20eb0] + subsegments: + - [0xe20eb0, c, e20eb0] - [0xE215C0, data] - - [0xE21860, .rodata, code_e20eb0] + - [0xE21860, .rodata, e20eb0] - type: code overlay: True start: 0xE21870 vram: 0x802B7000 - subsections: - - [0xE21870, c, code_E21870] + subsegments: + - [0xE21870, c, E21870] - [0xE21EB0, data] - - [0xE22590, .rodata, code_E21870] + - [0xE22590, .rodata, E21870] - type: code overlay: True start: 0xE225B0 vram: 0x802B7000 - subsections: - - [0xE225B0, c, code_E225B0] + subsegments: + - [0xE225B0, c, E225B0] - [0xE22B30, data] - - [0xE23230, .rodata, code_E225B0] + - [0xE23230, .rodata, E225B0] - type: code start: 0xE23260 vram: 0x802B6000 overlay: True - subsections: + subsegments: - [0xE23260, c] - [0xE23690, data] - type: code start: 0xE236E0 vram: 0x802B6000 overlay: True - subsections: + subsegments: - [0xE236E0, c] - [0xE23FF0, data] - type: code start: 0xE24040 vram: 0x802B6000 overlay: True - subsections: + subsegments: - [0xE24040, c] - type: code start: 0xE245D0 vram: 0x802B6000 overlay: True - subsections: + subsegments: - [0xE245D0, c] - [0xE248D0, data] - type: code start: 0xE24920 vram: 0x802B6000 overlay: True - subsections: + subsegments: - [0xE24920, c] - type: code start: 0xE24ED0 vram: 0x802B6000 overlay: True - subsections: - - [0xE24ED0, c, code_E24ED0] + subsegments: + - [0xE24ED0, c, E24ED0] - [0xE25C80, data] - - [0xE25CC0, .rodata, code_E24ED0] + - [0xE25CC0, .rodata, E24ED0] - type: code start: 0xE25D60 vram: 0x802B6000 overlay: True - subsections: - - [0xE25D60, c, code_E25D60] - - [0xE26700, .rodata, code_E25D60] + subsegments: + - [0xE25D60, c, E25D60] + - [0xE26700, .rodata, E25D60] - type: code start: 0xE26710 vram: 0x802B6000 overlay: True - subsections: - - [0xE26710, c, code_E26710] - - [0xE26DA0, .rodata, code_E26710] + subsegments: + - [0xE26710, c, E26710] + - [0xE26DA0, .rodata, E26710] - type: code start: 0xE26DE0 vram: 0x802B6000 overlay: True - subsections: - - [0xE26DE0, c, code_E26DE0] - - [0xE274C0, .rodata, code_E26DE0] + subsegments: + - [0xE26DE0, c, E26DE0] + - [0xE274C0, .rodata, E26DE0] - type: code start: 0xE27510 vram: 0x802B6000 overlay: True - subsections: - - [0xE27510, c, code_E27510] - - [0xE27C50, .rodata, code_E27510] + subsegments: + - [0xE27510, c, E27510] + - [0xE27C50, .rodata, E27510] - type: code start: 0xE27C90 vram: 0x802B6000 overlay: True - subsections: + subsegments: - [0xE27C90, c] - type: code start: 0xE27F40 vram: 0x802B6000 overlay: True - subsections: - - [0xE27F40, c, code_E27F40] - - [0xE28790, .rodata, code_E27F40] + subsegments: + - [0xE27F40, c, E27F40] + - [0xE28790, .rodata, E27F40] - type: code start: 0xE287F0 vram: 0x802B6000 overlay: True - subsections: + subsegments: - [0xE287F0, c] - type: code start: 0xE28A30 vram: 0x802B6000 overlay: True - subsections: - - [0xE28A30, c, code_E28A30] - - [0xE29190, .rodata, code_E28A30] + subsegments: + - [0xE28A30, c, E28A30] + - [0xE29190, .rodata, E28A30] - type: code start: 0xE291A0 vram: 0x802B6000 overlay: True - subsections: - - [0xE291A0, c, code_E291A0] - - [0xE29450, .rodata, code_E291A0] + subsegments: + - [0xE291A0, c, E291A0] + - [0xE29450, .rodata, E291A0] - type: code start: 0xE29470 vram: 0x802B6000 overlay: True - subsections: - - [0xE29470, c, code_E29470] - - [0xE2A300, .rodata, code_E29470] + subsegments: + - [0xE29470, c, E29470] + - [0xE2A300, .rodata, E29470] - type: code start: 0xE2A340 vram: 0x802B6000 overlay: True - subsections: - - [0xE2A340, c, code_E2A340] + subsegments: + - [0xE2A340, c, E2A340] - [0xE2A690, data] - - [0xE2A6A0, .rodata, code_E2A340] + - [0xE2A6A0, .rodata, E2A340] - type: code start: 0xE2A6B0 vram: 0x802B6000 overlay: True - subsections: - - [0xE2A6B0, c, code_E2A6B0] + subsegments: + - [0xE2A6B0, c, E2A6B0] - [0xE2B420, data] - - [0xE2B440, .rodata, code_E2A6B0] + - [0xE2B440, .rodata, E2A6B0] - type: code - ld_name: entity_default + dir: entity/default start: 0xE2B530 vram: 0x802BAE00 overlay: True - subsections: - - [0xE2B530, c, code_E2B530] - - [0xE2BE40, c, code_E2BE40] + subsegments: + - [0xE2B530, c, E2B530] + - [0xE2BE40, c, E2BE40] - [0xE2C930, c] - [0xE2D410, data] - - [0xE2D680, .rodata, code_E2B530] - - [0xE2D6D0, .rodata, code_E2BE40] - - [0xE2D6F0, .rodata, code_E2C930] + - [0xE2D680, .rodata, E2B530] + - [0xE2D6D0, .rodata, E2BE40] + - [0xE2D6F0, .rodata, E2C930] - type: code - ld_name: entity_jan_iwa + dir: entity/jan_iwa start: 0xE2D730 vram: 0x802BAE00 overlay: True - subsections: + subsegments: - [0xE2D730, c] - [0xE2E5F0, c] - [0xE2EDE0, c] - [0xE2EFD0, data] - - [0xE2F6F0, .rodata, code_E2D730] - - [0xE2F740, .rodata, code_E2E5F0] + - [0xE2F6F0, .rodata, E2D730] + - [0xE2F740, .rodata, E2E5F0] - type: code - ld_name: entity_sbk_omo + dir: entity/sbk_omo start: 0xE2F750 vram: 0x802BAE00 overlay: True - subsections: - - [0xE2F750, c, code_E2F750] - - [0xE307C0, c, code_E307C0] + subsegments: + - [0xE2F750, c, E2F750] + - [0xE307C0, c, E307C0] - [0xE31380, data] - - [0xE314C0, .rodata, code_E2F750] - - [0xE314F0, .rodata, code_E307C0] + - [0xE314C0, .rodata, E2F750] + - [0xE314F0, .rodata, E307C0] - [0xE31530, bin] # unk data - type: code start: 0xEA0900 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEA0900, c] - - [0xEA0C10, c, code_EA0C10] - - [0xEA36E0, c, code_EA36E0] + - [0xEA0C10, c, EA0C10] + - [0xEA36E0, c, EA36E0] - [0xEA3A80, data] - - [0xEA6D70, .rodata, code_EA0C10] - - [0xEA6FB0, .rodata, code_EA36E0] + - [0xEA6D70, .rodata, EA0C10] + - [0xEA6FB0, .rodata, EA36E0] - type: code start: 0xEA6FD0 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEA6FD0, c] - [0xEA7010, c] - [0xEA7320, c] @@ -9692,15 +10146,15 @@ segments: start: 0xEA8AE0 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEA8AE0, c] - [0xEAA810, data] - - [0xEB0E20, .rodata, code_EA8AE0] + - [0xEB0E20, .rodata, EA8AE0] - type: code start: 0xEB0E60 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEB0E60, c] - [0xEB1170, c] - [0xEB1920, data] @@ -9708,7 +10162,7 @@ segments: start: 0xEB5130 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEB5130, c] - [0xEB5470, c] - [0xEB54C0, data] @@ -9716,38 +10170,38 @@ segments: start: 0xEB7230 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEB7230, c] - - [0xEB7540, c, code_EB7540] + - [0xEB7540, c, EB7540] - [0xEB7850, data] - - [0xEB8E40, .rodata, code_EB7540] + - [0xEB8E40, .rodata, EB7540] - type: code start: 0xEB8E50 vram: 0x80240000 overlay: True - subsections: - - [0xEB8E50, c, code_EB8E50] - - [0xEB8E90, c, code_EB8E90] + subsegments: + - [0xEB8E50, c, EB8E50] + - [0xEB8E90, c, EB8E90] - [0xEB9D90, c] - [0xEBA260, data] - - [0xEC2000, .rodata, code_EB8E50] - - [0xEC2040, .rodata, code_EB8E90] + - [0xEC2000, .rodata, EB8E50] + - [0xEC2040, .rodata, EB8E90] - type: code start: 0xEC2200 vram: 0x80240000 overlay: True - subsections: - - [0xEC2200, c, code_EC2200] - - [0xEC2240, c, code_EC2240] + subsegments: + - [0xEC2200, c, EC2200] + - [0xEC2240, c, EC2240] - [0xEC2610, c] - [0xEC2850, data] - - [0xEC7170, .rodata, code_EC2200] - - [0xEC7188, .rodata, code_EC2240] + - [0xEC7170, .rodata, EC2200] + - [0xEC7188, .rodata, EC2240] - type: code start: 0xEC71B0 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEC71B0, c] - [0xEC7590, c] - [0xEC78F0, data] @@ -9755,30 +10209,30 @@ segments: start: 0xEC9D00 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEC9D00, c] - [0xECAA40, c] - - [0xECAA80, c, code_ECAA80] + - [0xECAA80, c, ECAA80] - [0xECB930, c] - [0xECBB70, c] - [0xECBC10, data] - - [0xECFE60, .rodata, code_ECAA80] + - [0xECFE60, .rodata, ECAA80] - type: code start: 0xECFFF0 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xECFFF0, c] - [0xED0030, c] - [0xED00D0, c] - [0xED0310, c] - [0xED1840, data] - - [0xED41C0, .rodata, code_ED0310] + - [0xED41C0, .rodata, ED0310] - type: code start: 0xED4220 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xED4220, c] - [0xED4260, c] - [0xED42A0, c] @@ -9789,15 +10243,15 @@ segments: start: 0xED8E20 vram: 0x80240000 overlay: True - subsections: - - [0xED8E20, c, code_ED8E20] + subsegments: + - [0xED8E20, c, ED8E20] - [0xED9170, data] - - [0xEDBF90, .rodata, code_ED8E20] + - [0xEDBF90, .rodata, ED8E20] - type: code start: 0xEDBFE0 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEDBFE0, c] - [0xEDC020, c] - [0xEDC6D0, data] @@ -9805,18 +10259,18 @@ segments: start: 0xEDE9C0 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEDE9C0, c] - - [0xEDEA00, c, code_EDEA00] - - [0xEE2040, c, code_EE2040] + - [0xEDEA00, c, EDEA00] + - [0xEE2040, c, EE2040] - [0xEE20E0, data] - - [0xEE64B0, .rodata, code_EDEA00] - - [0xEE65A0, .rodata, code_EE2040] + - [0xEE64B0, .rodata, EDEA00] + - [0xEE65A0, .rodata, EE2040] - type: code start: 0xEE65B0 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEE65B0, c] - [0xEE70C0, c] - [0xEE8940, c] @@ -9825,29 +10279,29 @@ segments: start: 0xEED100 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEED100, c] - [0xEED140, c] - [0xEED1E0, c] - [0xEEDF50, c] - [0xEEFAA0, c] - [0xEEFAD0, data] - - [0xEF2550, .rodata, code_EEDF50] + - [0xEF2550, .rodata, EEDF50] - type: code start: 0xEF2610 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEF2610, c] - [0xEF2650, c] - - [0xEF2680, c, code_EF2680] + - [0xEF2680, c, EF2680] - [0xEF58E0, data] - - [0xEF79C0, .rodata, code_EF2680] + - [0xEF79C0, .rodata, EF2680] - type: code start: 0xEF7A80 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEF7A80, c] - [0xEF7FB0, c] - [0xEF8010, c] @@ -9856,7 +10310,7 @@ segments: start: 0xEFEB00 vram: 0x80240000 overlay: True - subsections: + subsegments: - [0xEFEB00, c] - [0xEFF440, bin] # some of this is audio-related and not part of this overlay - [0xF007C0, bin, Battle_Fanfare_02] # BGM start @@ -10020,179 +10474,12 @@ segments: - [0x19E62A0, Yay0] - start: 0x19E67B8 type: PaperMarioNpcSprites + dir: sprite + name: npc files: - - name: world_goombario - frames: - - walk1 - - still - - walk2 - - pain - - headbonk - - still_copy1 - - still_copy2 - - jump - - talk1 - - talk2 - - jump_copy - - fall - - happy1 - - happy2 - - read_paper - palettes: - - normal - - green - - inactive - - yellow - - gray - animations: - - still - - idle - - walk - - run - - jump - - fall - - headbonk # centered at 0,0,0 rather than at base of sprite - - pain - - talk - - celebrate - - read_paper - - name: world_kooper - frames: - - walk1 - - walk2 - - walk3 - - idle1 - - idle2 - - idle3 - - idle4 - - shell1 - - shell2 - - shell3 - - shell4 - - shell5 - - shell6 - - shell7 - - shell8 - - pain1 - - pain2 - - shell_start1 - - shell_start2 - - shell_start3 - - talk - - talk_wave1 - - talk_wave2 - - happy1 - - happy2 - - happy3 - - happy4 - - jump - - fall - - read_paper - - talk_sad1 - - talk_sad2 - palettes: - - normal - - green - - inactive - - yellow - - gray - animations: - - still - - happy_still - - sad_still - - idle - - walk - - walk_fast - - jump - - fall - - shell_still1 - - shell_spin - - shell_start - - shell_end - - pain - - talk - - talk_wave - - anim_0f - - celebrate - - celebrate_loop - - shell_still2 - - read_paper - - name: world_bombette - frames: - - still - - walk1 - - walk2 - - walk3 - - walk4 - - idle1 - - idle2 - - idle3 - - idle4 - - jump - - fall - - key_fall - - still_lit - - walk_lit1 - - walk_lit2 - - walk_lit3 - - charge_lit - - pain1 - - pain2 - - frame_13 - - happy1 - - happy2 - - happy3 - - happy4 - - happy5 - - happy_jump - - happy_fall - - lit_fuse1 - - lit_fuse2 - - lit_fuse3 - - lit_fuse4 - - lit_fuse5 - - lit_fuse6 - - key1 - - key2 - - key3 - - key4 - - key5 - - key6 - - key7 - - key8 - palettes: - - normal - - fuse - - red - - green - - fuse2 - - black - - inactive - - purple - - black2 - - yellow - - fuse3 - - black3 - - gray - animations: - - still - - happy - - still_lit - - idle - - happy_idle - - walk - - walk_lit - - walk_fast - - walk_fast_lit - - jump - - fall - - happy_jump - - happy_fall - - pain - - idle_fast - - celebrate - - lit_charge - - anim_11 + - world_goombario + - world_kooper + - world_bombette - world_parakarry - world_bow - world_watt @@ -10227,68 +10514,7 @@ segments: - spiked_para_jr_troopa - mage_jr_troopa - para_jr_troopa - - name: goomba - frames: - - still - - lean_left - - lean_right - - pain1 - - pain2 - - jump - - open_mouth - - open_mouth_wide - - sleep - - dizzy1 - - dizzy2 - - dizzy3 - - dizzy4 - - burn_pain1 - - burn_pain2 - - burn_dead - - tense - - fake_plant - - fake_mushroom - - electrocute - palettes: - - normal - - red # unused - - hyper - - blue # unused - - gloomba - - poisoned - - poisoned - - poisoned - - poisoned - - poisoned - - unk_purple_status - - unk_purple_status - - unk_purple_status - - unk_purple_status - - unk_purple_status - - electrified - - electrified - - electrified - - electrified - - electrified - - burnt - - fake_mushroom - - fake_plant - animations: - - still - - idle - - walk - - run - - headbonk # centered at 0,0,0 rather than at base of sprite - - pain - - dead - - dizzy - - asleep - - burn_pain - - burn_dead - - pre_headbonk # centered at 0,0,0 rather than at base of sprite - - fake_plant - - fake_mushroom - - electrocute + - goomba - spiked_goomba - paragoomba - koopa_troopa @@ -10535,405 +10761,1045 @@ segments: - 2C_quiz_questions - 2D_quiz_options - 2E_credits - ids: - - [0x19, 0x003B, kmr_03_tattle] - - [0x19, 0x0040, kmr_12_tattle] - - [0x19, 0x0060, sbk_00_tattle] - - [0x19, 0x0061, sbk_01_tattle] - - [0x19, 0x00BB, arn_07_tattle] - - [0x19, 0x00BC, arn_03_tattle] - - [0x19, 0x00BD, arn_05_tattle] - - [0x19, 0x00BE, arn_02_tattle] - - [0x19, 0x00BF, arn_04_tattle] - - [0x19, 0x00C0, dgb_00_tattle] - - [0x19, 0x00C1, dgb_01_tattle] - - [0x19, 0x00C2, dgb_02_tattle] - - [0x19, 0x00C3, dgb_03_tattle] - - [0x19, 0x00C4, dgb_04_tattle] - - [0x19, 0x00C5, dgb_05_tattle] - - [0x19, 0x00C6, dgb_06_tattle] - - [0x19, 0x00C7, dgb_07_tattle] - - [0x19, 0x00C8, dgb_08_tattle] - - [0x19, 0x00C9, dgb_09_tattle] - - [0x19, 0x00CA, dgb_10_tattle] - - [0x19, 0x00CB, dgb_11_tattle] - - [0x19, 0x00CC, dgb_12_tattle] - - [0x19, 0x00CD, dgb_13_tattle] - - [0x19, 0x00CE, dgb_14_tattle] - - [0x19, 0x00CF, dgb_15_tattle] - - [0x19, 0x00D0, dgb_16_tattle] - - [0x19, 0x00D1, dgb_17_tattle] - - [0x19, 0x00D2, dgb_18_tattle] - - [0x19, 0x00D3, arn_08_tattle] - - [0x19, 0x00D4, arn_09_tattle] - - [0x19, 0x00D5, arn_10_tattle] - - [0x19, 0x00D6, arn_12_tattle] - - [0x19, 0x00D7, arn_13_tattle] - - [0x19, 0x00D8, arn_11_tattle] - - - [0x1C, 0x0000, actor_goomba_tattle] - - [0x1C, 0x0001, actor_spiked_goomba_tattle] - - [0x1C, 0x0002, actor_paragoomba_tattle] - - [0x1C, 0x0003, actor_red_goomba_boss_tattle] - - [0x1C, 0x0004, actor_blue_goomba_boss_tattle] - - [0x1C, 0x0005, actor_goomba_king_tattle] - - [0x1C, 0x0006, actor_goomnut_tree_tattle] - - [0x1C, 0x0007, actor_koopa_troopa_tattle] - - [0x1C, 0x0008, actor_paratroopa_tattle] - - [0x1C, 0x0009, actor_fuzzy_tattle] - - [0x1C, 0x000A, actor_bob_omb_tattle] - - [0x1C, 0x000B, actor_bullet_bill_tattle] - - [0x1C, 0x000C, actor_bill_blaster_tattle] - - [0x1C, 0x000D, actor_fake_bowser_tattle] - - [0x1C, 0x000E, actor_red_ninjakoopa_tattle] - - [0x1C, 0x000F, actor_blue_ninjakoopa_tattle] - - [0x1C, 0x0010, actor_yellow_ninjakoopa_tattle] - - [0x1C, 0x0011, actor_green_ninjakoopa_tattle] - - [0x1C, 0x0012, actor_koopa_bros_tattle] - - [0x1C, 0x0013, actor_jr_troopa1_tattle] - - [0x1C, 0x0014, actor_monty_mole_tattle] - - [0x1C, 0x0015, actor_cleft_tattle] - - [0x1C, 0x0016, actor_pokey_tattle] - - [0x1C, 0x0017, actor_bandit_tattle] - - [0x1C, 0x0018, actor_pokey_mummy_tattle] - - [0x1C, 0x0019, actor_buzzy_beetle_tattle] - - [0x1C, 0x001A, actor_swooper_tattle] - - [0x1C, 0x001B, actor_buzzar_tattle] - - [0x1C, 0x001C, actor_tutankoopa_tattle] - - [0x1C, 0x001D, actor_chomp_tattle] - - [0x1C, 0x001E, actor_stone_chomp_tattle] - - [0x1C, 0x001F, actor_piranha_plant_tattle] - - [0x1C, 0x0020, actor_forest_fuzzy_tattle] - - [0x1C, 0x0021, actor_hyper_goomba_tattle] - - [0x1C, 0x0022, actor_hyper_paragoomba_tattle] - - [0x1C, 0x0023, actor_hyper_cleft_tattle] - - [0x1C, 0x0024, actor_clubba_tattle] - - [0x1C, 0x0025, actor_tubba_blubba_invincible_tattle] - - [0x1C, 0x0026, actor_tubba_heart_tattle] - - [0x1C, 0x0027, actor_tubba_blubba_tattle] - - [0x1C, 0x0028, actor_jr_troopa2_tattle] - - [0x1C, 0x0029, actor_shy_guy_tattle] - - [0x1C, 0x002A, actor_groove_guy_tattle] - - [0x1C, 0x002B, actor_spy_guy_tattle] - - [0x1C, 0x002C, actor_pyro_guy_tattle] - - [0x1C, 0x002D, actor_sky_guy_tattle] - - [0x1C, 0x002E, actor_medi_guy_tattle] - - [0x1C, 0x002F, actor_anti_guy_tattle] - - [0x1C, 0x0030, actor_big_lantern_ghost_tattle] - - [0x1C, 0x0031, actor_general_guy_tattle] - - [0x1C, 0x0032, actor_shy_squad_tattle] - - [0x1C, 0x0033, actor_shy_stack_tattle] - - [0x1C, 0x0034, actor_stilt_guy_tattle] - - [0x1C, 0x0035, actor_hurt_plant_tattle] - - [0x1C, 0x0036, actor_m_bush_tattle] - - [0x1C, 0x0037, actor_jungle_fuzzy_tattle] - - [0x1C, 0x0038, actor_spear_guy_tattle] - - [0x1C, 0x0039, actor_putrid_piranha_tattle] - - [0x1C, 0x003A, actor_lava_bubble_tattle] - - [0x1C, 0x003B, actor_spike_top_tattle] - - [0x1C, 0x003C, actor_lava_piranha_phase_1_tattle] - - [0x1C, 0x003D, actor_lava_piranha_phase_2_tattle] - - [0x1C, 0x003E, actor_lava_bud_phase_1_tattle] - - [0x1C, 0x003F, actor_lava_bud_phase_2_tattle] - - [0x1C, 0x0040, actor_petit_piranha_tattle] - - [0x1C, 0x0041, actor_jr_troopa3_tattle] - - [0x1C, 0x0042, actor_lakitu_tattle] - - [0x1C, 0x0043, actor_spiny_tattle] - - [0x1C, 0x0044, actor_bzzap_tattle] - - [0x1C, 0x0045, actor_crazee_dayzee_tattle] - - [0x1C, 0x0046, actor_amazy_dayzee_tattle] - - [0x1C, 0x0047, actor_monty_mole_boss_tattle] - - [0x1C, 0x0048, actor_spike_tattle] - - [0x1C, 0x0049, actor_ruff_puff_tattle] - - [0x1C, 0x004A, actor_huff_n_puff_tattle] - - [0x1C, 0x004B, actor_tuff_puff_tattle] - - [0x1C, 0x004C, actor_jr_troopa4_tattle] - - [0x1C, 0x004D, actor_gulpit_tattle] - - [0x1C, 0x004E, actor_gulpit_rocks_tattle] - - [0x1C, 0x004F, actor_monstar_tattle] - - [0x1C, 0x0050, actor_frost_piranha_tattle] - - [0x1C, 0x0051, actor_white_clubba_tattle] - - [0x1C, 0x0052, actor_duplighost_tattle] - - [0x1C, 0x0053, actor_ghost_watt_tattle] - - [0x1C, 0x0054, actor_ghost_kooper_tattle] - - [0x1C, 0x0055, actor_ghost_goombario_tattle] - - [0x1C, 0x0056, actor_ghost_sushie_tattle] - - [0x1C, 0x0057, actor_ghost_lakilester_tattle] - - [0x1C, 0x0058, actor_ghost_parakarry_tattle] - - [0x1C, 0x0059, actor_ghost_bombette_tattle] - - [0x1C, 0x005A, actor_ghost_bow_tattle] - - [0x1C, 0x005B, actor_albino_dino_tattle] - - [0x1C, 0x005C, actor_swoopula_tattle] - - [0x1C, 0x005D, actor_crystal_king_tattle] - - [0x1C, 0x005E, actor_crystal_clone_tattle] - - [0x1C, 0x005F, actor_crystal_bit_tattle] - - [0x1C, 0x0060, actor_ember_tattle] - - [0x1C, 0x0061, actor_dry_bones_tattle] - - [0x1C, 0x0062, actor_bony_beetle_tattle] - - [0x1C, 0x0063, actor_magikoopa_tattle] - - [0x1C, 0x0064, actor_magiclone_tattle] - - [0x1C, 0x0065, actor_magikoopa_dup_tattle] - - [0x1C, 0x0066, actor_magiclone_dup_tattle] - - [0x1C, 0x0067, actor_koopatrol_tattle] - - [0x1C, 0x0068, actor_hammer_bros_tattle] - - [0x1C, 0x0069, actor_bombshell_bill_tattle] - - [0x1C, 0x006A, actor_bombshell_blaster_tattle] - - [0x1C, 0x006B, actor_jr_troopa5_tattle] - - [0x1C, 0x006C, actor_bowser_phase_1_tattle] - - [0x1C, 0x006D, actor_bowser_phase_2_tattle] - - [0x1C, 0x006E, actor_bowser_phase_3_tattle] - - [0x1C, 0x006F, actor_kent_c_koopa_tattle] - - [0x1C, 0x0070, actor_blooper_tattle] - - [0x1C, 0x0071, actor_electro_blooper_tattle] - - [0x1C, 0x0072, actor_super_blooper_tattle] - - [0x1C, 0x0073, actor_blooper_baby_tattle] - - [0x1C, 0x0074, actor_the_master_1_tattle] - - [0x1C, 0x0075, actor_the_master_2_tattle] - - [0x1C, 0x0076, actor_the_master_3_tattle] - - [0x1C, 0x0077, actor_chan_tattle] - - [0x1C, 0x0078, actor_lee_tattle] - - [0x1C, 0x0079, actor_gloomba_tattle] - - [0x1C, 0x007A, actor_paragloomba_tattle] - - [0x1C, 0x007B, actor_spiked_gloomba_tattle] - - [0x1C, 0x007C, actor_dark_koopa_tattle] - - [0x1C, 0x007D, actor_dark_paratroopa_tattle] - - [0x1C, 0x007E, actor_red_magikoopa_tattle] - - [0x1C, 0x007F, actor_flying_red_magikoopa_tattle] - - [0x1C, 0x0080, actor_green_magikoopa_tattle] - - [0x1C, 0x0081, actor_flying_green_magikoopa_tattle] - - [0x1C, 0x0082, actor_yellow_magikoopa_tattle] - - [0x1C, 0x0083, actor_flying_yellow_magikoopa_tattle] - - [0x1C, 0x0084, actor_gray_magikoopa_tattle] - - [0x1C, 0x0085, actor_flying_gray_magikoopa_tattle] - - [0x1C, 0x0086, actor_flying_white_magikoopa_tattle] - - [0x1C, 0x0087, actor_white_magikoopa_tattle] - - [0x1C, 0x0088, actor_magikoopa_boss_tattle] - - [0x1C, 0x0089, actor_magikoopa_boss_dup_tattle] - - [0x1C, 0x008A, actor_lee_watt_tattle] - - [0x1C, 0x008B, actor_lee_kooper_tattle] - - [0x1C, 0x008C, actor_lee_goombario_tattle] - - [0x1C, 0x008D, actor_lee_sushie_tattle] - - [0x1C, 0x008E, actor_lee_lakilester_tattle] - - [0x1C, 0x008F, actor_lee_parakarry_tattle] - - [0x1C, 0x0090, actor_lee_bombette_tattle] - - [0x1C, 0x0091, actor_lee_bow_tattle] - - [0x1C, 0x0092, actor_mario_tattle] - - [0x1C, 0x0093, actor_slot_machine_start_tattle] - - [0x1C, 0x0094, actor_slot_machine_stop_tattle] - - [0x1C, 0x0095, actor_whacka_tattle] - - - [0x1D, 0x0007, party_goombario] - - [0x1D, 0x0008, party_kooper] - - [0x1D, 0x0009, party_bombette] - - [0x1D, 0x000A, party_parakarry] - - [0x1D, 0x000B, party_goompa] - - [0x1D, 0x000C, party_watt] - - [0x1D, 0x000D, party_sushie] - - [0x1D, 0x000E, party_lakilester] - - [0x1D, 0x000F, party_bow] - - [0x1D, 0x0010, party_goombaria] - - [0x1D, 0x0011, party_twink] - - [0x1D, 0x0012, party_peach] - - [0x1D, 0x0013, party_mario] - - - [0x1D, 0x0071, merlee_increase_atk, battle_popup] - - [0x1D, 0x0072, merlee_increase_dmg, battle_popup] - - [0x1D, 0x0073, merlee_increase_star_points, battle_popup] - - [0x1D, 0x0074, merlee_increase_coins, battle_popup] - - [0x1D, 0x0075, merlee_end, battle_popup] - - [0x1D, 0x0076, charge_hammer, battle_popup] - - [0x1D, 0x0077, charge_hammer_more, battle_popup] - - [0x1D, 0x0078, charge_jump, battle_popup] - - [0x1D, 0x0079, charge_jump_more, battle_popup] - - [0x1D, 0x007A, charge_max, battle_popup] - - [0x1D, 0x007B, enemy_missed, battle_popup] - - [0x1D, 0x007C, partner_dazed, battle_popup] - - [0x1D, 0x007D, charge_goombario, battle_popup] - - [0x1D, 0x007E, charge_goombario_more, battle_popup] - - [0x1D, 0x007F, star_energy_increased, battle_popup] - - [0x1D, 0x0080, star_energy_filled, battle_popup] - - [0x1D, 0x0081, star_energy_max, battle_popup] - - [0x1D, 0x0082, atk_up_n, battle_popup] - - [0x1D, 0x0083, def_up_n, battle_popup] - - - [0x1D, 0x0086, enemy_transparent, battle_popup] - - [0x1D, 0x0087, enemy_electric_charge, battle_popup] - - - [0x1D, 0x0088, player_dazed, battle_popup] - - [0x1D, 0x0089, player_poisoned, battle_popup] - - [0x1D, 0x008A, player_frozen, battle_popup] - - [0x1D, 0x008B, player_slept, battle_popup] - - [0x1D, 0x008C, player_shrunk, battle_popup] - - [0x1D, 0x008D, player_paralyzed, battle_popup] - - [0x1D, 0x008E, player_electrified, battle_popup] - - [0x1D, 0x008F, player_transparent, battle_popup] - - [0x1D, 0x0090, enemy_dazed, battle_popup] - - [0x1D, 0x0091, enemy_poisoned, battle_popup] - - [0x1D, 0x0092, enemy_frozen, battle_popup] - - [0x1D, 0x0093, enemy_slept, battle_popup] - - [0x1D, 0x0094, enemy_shrunk, battle_popup] - - [0x1D, 0x0095, enemy_paralyzed, battle_popup] - - [0x1D, 0x0096, enemy_electrified, battle_popup] - - [0x1D, 0x0097, enemy_cannot_move, battle_popup] - - [0x1D, 0x0098, water_block_active, battle_popup] - - [0x1D, 0x0099, water_block_end, battle_popup] - - [0x1D, 0x009A, cloud_nine_active, battle_popup] - - [0x1D, 0x009B, cloud_nine_end, battle_popup] - - [0x1D, 0x009B, cloud_nine_end, battle_popup] - - [0x1D, 0x009C, atk_up_active, battle_popup] - - [0x1D, 0x009D, atk_up_end, battle_popup] - - [0x1D, 0x009E, enemy_atk_down, battle_popup] - - - [0x1D, 0x00AF, action_cmd_jump, action_command] - - [0x1D, 0x00B0, action_cmd_hammer, action_command] - - - [0x1D, 0x00C0, no_target_jump, battle_popup] - - [0x1D, 0x00C1, no_target_hammer, battle_popup] - - [0x1D, 0x00C2, no_battle_items, battle_popup] - - - [0x1D, 0x00C6, hammer_disabled, battle_popup] - - [0x1D, 0x00C7, jump_disabled, battle_popup] - - [0x1D, 0x00C8, items_disabled, battle_popup] - - [0x1D, 0x00C9, no_switch_used_turn, battle_popup] - - [0x1D, 0x00CA, no_switch_dazed, battle_popup] - - - [0x1D, 0x0168, kmr_12_sign_to_fortress] - - [0x1D, 0x0167, kmr_12_sign_trap] - - - [0x29, 0x0000, actor_goomba] - - [0x29, 0x0001, actor_spiked_goomba] - - [0x29, 0x0002, actor_paragoomba] - - [0x29, 0x0003, actor_red_goomba_boss] - - [0x29, 0x0004, actor_blue_goomba_boss] - - [0x29, 0x0005, actor_goomba_king] - - [0x29, 0x0006, actor_goomnut_tree] - - [0x29, 0x0007, actor_koopa_troopa] - - [0x29, 0x0008, actor_paratroopa] - - [0x29, 0x0009, actor_fuzzy] - - [0x29, 0x000A, actor_bob_omb] - - [0x29, 0x000B, actor_bullet_bill] - - [0x29, 0x000C, actor_bill_blaster] - - [0x29, 0x000D, actor_fake_bowser] - - [0x29, 0x000E, actor_red_ninjakoopa] - - [0x29, 0x000F, actor_blue_ninjakoopa] - - [0x29, 0x0010, actor_yellow_ninjakoopa] - - [0x29, 0x0011, actor_green_ninjakoopa] - - [0x29, 0x0012, actor_koopa_bros] - - [0x29, 0x0013, actor_jr_troopa] - - [0x29, 0x0014, actor_monty_mole] - - [0x29, 0x0015, actor_cleft] - - [0x29, 0x0016, actor_pokey] - - [0x29, 0x0017, actor_bandit] - - [0x29, 0x0018, actor_pokey_mummy] - - [0x29, 0x0019, actor_buzzy_beetle] - - [0x29, 0x001A, actor_swooper] - - [0x29, 0x001B, actor_buzzar] - - [0x29, 0x001C, actor_tutankoopa] - - [0x29, 0x001D, actor_chomp] - - [0x29, 0x001E, actor_stone_chomp] - - [0x29, 0x001F, actor_piranha_plant] - - [0x29, 0x0020, actor_forest_fuzzy] - - [0x29, 0x0021, actor_hyper_goomba] - - [0x29, 0x0022, actor_hyper_paragoomba] - - [0x29, 0x0023, actor_hyper_cleft] - - [0x29, 0x0024, actor_clubba] - - [0x29, 0x0025, actor_tubba_blubba] - - [0x29, 0x0026, actor_tubba_heart] - - [0x29, 0x0027, actor_shy_guy] - - [0x29, 0x0028, actor_groove_guy] - - [0x29, 0x0029, actor_spy_guy] - - [0x29, 0x002A, actor_pyro_guy] - - [0x29, 0x002B, actor_sky_guy] - - [0x29, 0x002C, actor_medi_guy] - - [0x29, 0x002D, actor_anti_guy] - - [0x29, 0x002E, actor_big_lantern_ghost] - - [0x29, 0x002F, actor_general_guy] - - [0x29, 0x0030, actor_shy_squad] - - [0x29, 0x0031, actor_shy_stack] - - [0x29, 0x0032, actor_stilt_guy] - - [0x29, 0x0033, actor_hurt_plant] - - [0x29, 0x0034, actor_m_bush] - - [0x29, 0x0035, actor_jungle_fuzzy] - - [0x29, 0x0036, actor_spear_guy] - - [0x29, 0x0037, actor_putrid_piranha] - - [0x29, 0x0038, actor_lava_bubble] - - [0x29, 0x0039, actor_spike_top] - - [0x29, 0x003A, actor_lava_piranha] - - [0x29, 0x003B, actor_lava_bud] - - [0x29, 0x003C, actor_petit_piranha] - - [0x29, 0x003D, actor_lakitu] - - [0x29, 0x003E, actor_spiny] - - [0x29, 0x003F, actor_bzzap] - - [0x29, 0x0040, actor_crazee_dayzee] - - [0x29, 0x0041, actor_amazy_dayzee] - - [0x29, 0x0042, actor_monty_mole_boss] - - [0x29, 0x0043, actor_spike] - - [0x29, 0x0044, actor_ruff_puff] - - [0x29, 0x0045, actor_huff_n_puff] - - [0x29, 0x0046, actor_tuff_puff] - - [0x29, 0x0047, actor_gulpit] - - [0x29, 0x0048, actor_gulpit_rocks] - - [0x29, 0x0049, actor_monstar] - - [0x29, 0x004A, actor_frost_piranha] - - [0x29, 0x004B, actor_white_clubba] - - [0x29, 0x004C, actor_duplighost] - - [0x29, 0x004D, actor_ghost_watt] - - [0x29, 0x004E, actor_ghost_kooper] - - [0x29, 0x004F, actor_ghost_goombario] - - [0x29, 0x0050, actor_ghost_sushie] - - [0x29, 0x0051, actor_ghost_lakilester] - - [0x29, 0x0052, actor_ghost_parakarry] - - [0x29, 0x0053, actor_ghost_bombette] - - [0x29, 0x0054, actor_ghost_bow] - - [0x29, 0x0055, actor_albino_dino] - - [0x29, 0x0056, actor_swoopula] - - [0x29, 0x0057, actor_crystal_king] - - [0x29, 0x0058, actor_crystal_bit] - - [0x29, 0x0059, actor_ember] - - [0x29, 0x005A, actor_dry_bones] - - [0x29, 0x005B, actor_bony_beetle] - - [0x29, 0x005C, actor_magikoopa] - - [0x29, 0x005D, actor_koopatrol] - - [0x29, 0x005E, actor_hammer_bros] - - [0x29, 0x005F, actor_bombshell_bill] - - [0x29, 0x0060, actor_bombshell_blaster] - - [0x29, 0x0061, actor_bowser] - - [0x29, 0x0062, actor_kammy_koopa] - - [0x29, 0x0063, actor_kent_c_koopa] - - [0x29, 0x0064, actor_blooper] - - [0x29, 0x0065, actor_electro_blooper] - - [0x29, 0x0066, actor_super_blooper] - - [0x29, 0x0067, actor_blooper_baby] - - [0x29, 0x0068, actor_the_master] - - [0x29, 0x0069, actor_chan] - - [0x29, 0x006A, actor_lee] - - [0x29, 0x006B, actor_gloomba] - - [0x29, 0x006C, actor_paragloomba] - - [0x29, 0x006D, actor_spiked_gloomba] - - [0x29, 0x006E, actor_dark_koopa] - - [0x29, 0x006F, actor_dark_paratroopa] - - [0x29, 0x0070, actor_red_magikoopa] - - [0x29, 0x0071, actor_green_magikoopa] - - [0x29, 0x0072, actor_yellow_magikoopa] - - [0x29, 0x0073, actor_gray_magikoopa] - - [0x29, 0x0074, actor_white_magikoopa] - - [0x29, 0x0075, actor_mario] - - [0x29, 0x0076, actor_slot_machine_start] - - [0x29, 0x0077, actor_slot_machine_stop] - - [0x29, 0x0078, actor_whacka] - - [0x29, 0x0079, actor_general_guy_dup] - - [0x29, 0x007A, actor_bulb] - - [0x29, 0x007B, actor_shy_squad_dup] - - [0x29, 0x007C, actor_fuzzipede] - - [0x29, 0x007D, actor_monty_hole] - - [0x29, 0x007E, actor_balloon] - - [0x29, 0x007F, actor_lantern] - - [0x29, 0x0080, actor_aqua_fuzzy] - - [0x29, 0x0081, actor_red_goomba] - - [0x29, 0x0082, actor_red_paragoomba] - [0x1C84D30, bin] # junk(?) - [0x1E00000, bin] # junk (player sprite data; can be zeroed out with no effect) - - [0x1E40000, PaperMarioMapFS] + - name: mapfs + type: PaperMarioMapFS + start: 0x1E40000 + files: + - dro_01_shape + - dro_01_hit + - dro_02_shape + - dro_02_hit + - hos_00_shape + - hos_00_hit + - hos_01_shape + - hos_01_hit + - hos_02_shape + - hos_02_hit + - hos_03_shape + - hos_03_hit + - hos_04_shape + - hos_04_hit + - hos_05_shape + - hos_05_hit + - hos_06_shape + - hos_06_hit + - hos_10_shape + - hos_10_hit + - hos_20_shape + - hos_20_hit + - isk_01_shape + - isk_01_hit + - isk_02_shape + - isk_02_hit + - isk_03_shape + - isk_03_hit + - isk_04_shape + - isk_04_hit + - isk_05_shape + - isk_05_hit + - isk_06_shape + - isk_06_hit + - isk_07_shape + - isk_07_hit + - isk_08_shape + - isk_08_hit + - isk_09_shape + - isk_09_hit + - isk_10_shape + - isk_10_hit + - isk_11_shape + - isk_11_hit + - isk_12_shape + - isk_12_hit + - isk_13_shape + - isk_13_hit + - isk_14_shape + - isk_14_hit + - isk_16_shape + - isk_16_hit + - isk_18_shape + - isk_18_hit + - isk_19_shape + - isk_19_hit + - iwa_00_shape + - iwa_00_hit + - iwa_01_shape + - iwa_01_hit + - iwa_02_shape + - iwa_02_hit + - iwa_03_shape + - iwa_03_hit + - iwa_04_shape + - iwa_04_hit + - iwa_10_shape + - iwa_10_hit + - iwa_11_shape + - iwa_11_hit + - osr_00_shape + - osr_00_hit + - osr_01_shape + - osr_01_hit + - osr_02_shape + - osr_02_hit + - osr_03_shape + - osr_03_hit + - kkj_00_shape + - kkj_00_hit + - kkj_01_shape + - kkj_01_hit + - kkj_02_shape + - kkj_02_hit + - kkj_03_shape + - kkj_03_hit + - kkj_10_shape + - kkj_10_hit + - kkj_11_shape + - kkj_11_hit + - kkj_12_shape + - kkj_12_hit + - kkj_13_shape + - kkj_13_hit + - kkj_14_shape + - kkj_14_hit + - kkj_15_shape + - kkj_15_hit + - kkj_16_shape + - kkj_16_hit + - kkj_17_shape + - kkj_17_hit + - kkj_18_shape + - kkj_18_hit + - kkj_19_shape + - kkj_19_hit + - kkj_20_shape + - kkj_20_hit + - kkj_21_shape + - kkj_21_hit + - kkj_22_shape + - kkj_22_hit + - kkj_23_shape + - kkj_23_hit + - kkj_24_shape + - kkj_24_hit + - kkj_25_shape + - kkj_25_hit + - kkj_26_shape + - kkj_26_hit + - kkj_27_shape + - kkj_27_hit + - kkj_28_shape + - kkj_28_hit + - kkj_29_shape + - kkj_29_hit + - kmr_00_shape + - kmr_00_hit + - kmr_02_shape + - kmr_02_hit + - kmr_03_shape + - kmr_03_hit + - kmr_04_shape + - kmr_04_hit + - kmr_05_shape + - kmr_05_hit + - kmr_06_shape + - kmr_06_hit + - kmr_07_shape + - kmr_07_hit + - kmr_09_shape + - kmr_09_hit + - kmr_10_shape + - kmr_10_hit + - kmr_11_shape + - kmr_11_hit + - kmr_12_shape + - kmr_12_hit + - kmr_20_shape + - kmr_20_hit + - kmr_30_shape + - kmr_30_hit + - kpa_01_shape + - kpa_01_hit + - kpa_03_shape + - kpa_03_hit + - kpa_04_shape + - kpa_04_hit + - kpa_08_shape + - kpa_08_hit + - kpa_09_shape + - kpa_09_hit + - kpa_10_shape + - kpa_10_hit + - kpa_11_shape + - kpa_11_hit + - kpa_12_shape + - kpa_12_hit + - kpa_13_shape + - kpa_13_hit + - kpa_14_shape + - kpa_14_hit + - kpa_15_shape + - kpa_15_hit + - kpa_16_shape + - kpa_16_hit + - kpa_17_shape + - kpa_17_hit + - kpa_32_shape + - kpa_32_hit + - kpa_33_shape + - kpa_33_hit + - kpa_40_shape + - kpa_40_hit + - kpa_41_shape + - kpa_41_hit + - kpa_50_shape + - kpa_50_hit + - kpa_52_shape + - kpa_52_hit + - kpa_60_shape + - kpa_60_hit + - kpa_61_shape + - kpa_61_hit + - kpa_62_shape + - kpa_62_hit + - kpa_63_shape + - kpa_63_hit + - kpa_70_shape + - kpa_70_hit + - kpa_80_shape + - kpa_80_hit + - kpa_90_shape + - kpa_90_hit + - kpa_91_shape + - kpa_91_hit + - kpa_94_shape + - kpa_94_hit + - kpa_95_shape + - kpa_95_hit + - kpa_96_shape + - kpa_96_hit + - kpa_102_shape + - kpa_102_hit + - kpa_111_shape + - kpa_111_hit + - kpa_112_shape + - kpa_112_hit + - kpa_113_shape + - kpa_113_hit + - kpa_115_shape + - kpa_115_hit + - kpa_116_shape + - kpa_116_hit + - kpa_117_shape + - kpa_117_hit + - kpa_118_shape + - kpa_118_hit + - kpa_119_shape + - kpa_119_hit + - kpa_121_shape + - kpa_121_hit + - kpa_130_shape + - kpa_130_hit + - kpa_133_shape + - kpa_133_hit + - kpa_134_shape + - kpa_134_hit + - machi_shape + - machi_hit + - mac_00_shape + - mac_00_hit + - mac_01_shape + - mac_01_hit + - mac_02_shape + - mac_02_hit + - mac_03_shape + - mac_03_hit + - mac_04_shape + - mac_04_hit + - mac_05_shape + - mac_05_hit + - mac_06_shape + - mac_06_hit + - tik_01_shape + - tik_01_hit + - tik_02_shape + - tik_02_hit + - tik_03_shape + - tik_03_hit + - tik_04_shape + - tik_04_hit + - tik_05_shape + - tik_05_hit + - tik_06_shape + - tik_06_hit + - tik_07_shape + - tik_07_hit + - tik_08_shape + - tik_08_hit + - tik_09_shape + - tik_09_hit + - tik_10_shape + - tik_10_hit + - tik_12_shape + - tik_12_hit + - tik_14_shape + - tik_14_hit + - tik_15_shape + - tik_15_hit + - tik_17_shape + - tik_17_hit + - tik_18_shape + - tik_18_hit + - tik_19_shape + - tik_19_hit + - tik_20_shape + - tik_20_hit + - tik_21_shape + - tik_21_hit + - tik_22_shape + - tik_22_hit + - tik_23_shape + - tik_23_hit + - tik_25_shape + - tik_25_hit + - kgr_01_shape + - kgr_01_hit + - kgr_02_shape + - kgr_02_hit + - nok_01_shape + - nok_01_hit + - nok_02_shape + - nok_02_hit + - nok_03_shape + - nok_03_hit + - nok_04_shape + - nok_04_hit + - nok_11_shape + - nok_11_hit + - nok_12_shape + - nok_12_hit + - nok_13_shape + - nok_13_hit + - nok_14_shape + - nok_14_hit + - nok_15_shape + - nok_15_hit + - sbk_00_shape + - sbk_00_hit + - sbk_01_shape + - sbk_01_hit + - sbk_02_shape + - sbk_02_hit + - sbk_03_shape + - sbk_03_hit + - sbk_04_shape + - sbk_04_hit + - sbk_05_shape + - sbk_05_hit + - sbk_06_shape + - sbk_06_hit + - sbk_10_shape + - sbk_10_hit + - sbk_11_shape + - sbk_11_hit + - sbk_12_shape + - sbk_12_hit + - sbk_13_shape + - sbk_13_hit + - sbk_14_shape + - sbk_14_hit + - sbk_15_shape + - sbk_15_hit + - sbk_16_shape + - sbk_16_hit + - sbk_20_shape + - sbk_20_hit + - sbk_21_shape + - sbk_21_hit + - sbk_22_shape + - sbk_22_hit + - sbk_23_shape + - sbk_23_hit + - sbk_24_shape + - sbk_24_hit + - sbk_25_shape + - sbk_25_hit + - sbk_26_shape + - sbk_26_hit + - sbk_30_shape + - sbk_30_hit + - sbk_31_shape + - sbk_31_hit + - sbk_32_shape + - sbk_32_hit + - sbk_33_shape + - sbk_33_hit + - sbk_34_shape + - sbk_34_hit + - sbk_35_shape + - sbk_35_hit + - sbk_36_shape + - sbk_36_hit + - sbk_40_shape + - sbk_40_hit + - sbk_41_shape + - sbk_41_hit + - sbk_42_shape + - sbk_42_hit + - sbk_43_shape + - sbk_43_hit + - sbk_44_shape + - sbk_44_hit + - sbk_45_shape + - sbk_45_hit + - sbk_46_shape + - sbk_46_hit + - sbk_50_shape + - sbk_50_hit + - sbk_51_shape + - sbk_51_hit + - sbk_52_shape + - sbk_52_hit + - sbk_53_shape + - sbk_53_hit + - sbk_54_shape + - sbk_54_hit + - sbk_55_shape + - sbk_55_hit + - sbk_56_shape + - sbk_56_hit + - sbk_60_shape + - sbk_60_hit + - sbk_61_shape + - sbk_61_hit + - sbk_62_shape + - sbk_62_hit + - sbk_63_shape + - sbk_63_hit + - sbk_64_shape + - sbk_64_hit + - sbk_65_shape + - sbk_65_hit + - sbk_66_shape + - sbk_66_hit + - sbk_99_shape + - sbk_99_hit + - trd_00_shape + - trd_00_hit + - trd_01_shape + - trd_01_hit + - trd_02_shape + - trd_02_hit + - trd_03_shape + - trd_03_hit + - trd_04_shape + - trd_04_hit + - trd_05_shape + - trd_05_hit + - trd_06_shape + - trd_06_hit + - trd_07_shape + - trd_07_hit + - trd_08_shape + - trd_08_hit + - trd_09_shape + - trd_09_hit + - trd_10_shape + - trd_10_hit + - tst_01_shape + - tst_01_hit + - tst_02_shape + - tst_02_hit + - tst_03_shape + - tst_03_hit + - tst_04_shape + - tst_04_hit + - tst_10_shape + - tst_10_hit + - tst_11_shape + - tst_11_hit + - tst_12_shape + - tst_12_hit + - tst_13_shape + - tst_13_hit + - tst_20_shape + - tst_20_hit + - jan_00_shape + - jan_00_hit + - jan_01_shape + - jan_01_hit + - jan_02_shape + - jan_02_hit + - jan_03_shape + - jan_03_hit + - jan_04_shape + - jan_04_hit + - jan_05_shape + - jan_05_hit + - jan_06_shape + - jan_06_hit + - jan_07_shape + - jan_07_hit + - jan_08_shape + - jan_08_hit + - jan_09_shape + - jan_09_hit + - jan_10_shape + - jan_10_hit + - jan_11_shape + - jan_11_hit + - jan_12_shape + - jan_12_hit + - jan_13_shape + - jan_13_hit + - jan_14_shape + - jan_14_hit + - jan_15_shape + - jan_15_hit + - jan_16_shape + - jan_16_hit + - jan_17_shape + - jan_17_hit + - jan_18_shape + - jan_18_hit + - jan_19_shape + - jan_19_hit + - jan_22_shape + - jan_22_hit + - jan_23_shape + - jan_23_hit + - mim_01_shape + - mim_01_hit + - mim_02_shape + - mim_02_hit + - mim_03_shape + - mim_03_hit + - mim_04_shape + - mim_04_hit + - mim_05_shape + - mim_05_hit + - mim_06_shape + - mim_06_hit + - mim_07_shape + - mim_07_hit + - mim_08_shape + - mim_08_hit + - mim_09_shape + - mim_09_hit + - mim_10_shape + - mim_10_hit + - mim_11_shape + - mim_11_hit + - mim_12_shape + - mim_12_hit + - obk_01_shape + - obk_01_hit + - obk_02_shape + - obk_02_hit + - obk_03_shape + - obk_03_hit + - obk_04_shape + - obk_04_hit + - obk_05_shape + - obk_05_hit + - obk_06_shape + - obk_06_hit + - obk_07_shape + - obk_07_hit + - obk_08_shape + - obk_08_hit + - obk_09_shape + - obk_09_hit + - arn_02_shape + - arn_02_hit + - arn_03_shape + - arn_03_hit + - arn_04_shape + - arn_04_hit + - arn_05_shape + - arn_05_hit + - arn_07_shape + - arn_07_hit + - arn_08_shape + - arn_08_hit + - arn_09_shape + - arn_09_hit + - arn_10_shape + - arn_10_hit + - arn_11_shape + - arn_11_hit + - arn_12_shape + - arn_12_hit + - arn_13_shape + - arn_13_hit + - arn_20_shape + - arn_20_hit + - dgb_01_shape + - dgb_01_hit + - dgb_02_shape + - dgb_02_hit + - dgb_03_shape + - dgb_03_hit + - dgb_04_shape + - dgb_04_hit + - dgb_05_shape + - dgb_05_hit + - dgb_06_shape + - dgb_06_hit + - dgb_07_shape + - dgb_07_hit + - dgb_08_shape + - dgb_08_hit + - dgb_09_shape + - dgb_09_hit + - dgb_10_shape + - dgb_10_hit + - dgb_11_shape + - dgb_11_hit + - dgb_12_shape + - dgb_12_hit + - dgb_13_shape + - dgb_13_hit + - dgb_14_shape + - dgb_14_hit + - dgb_15_shape + - dgb_15_hit + - dgb_16_shape + - dgb_16_hit + - dgb_17_shape + - dgb_17_hit + - dgb_18_shape + - dgb_18_hit + - kzn_01_shape + - kzn_01_hit + - kzn_02_shape + - kzn_02_hit + - kzn_03_shape + - kzn_03_hit + - kzn_04_shape + - kzn_04_hit + - kzn_05_shape + - kzn_05_hit + - kzn_06_shape + - kzn_06_hit + - kzn_07_shape + - kzn_07_hit + - kzn_08_shape + - kzn_08_hit + - kzn_09_shape + - kzn_09_hit + - kzn_10_shape + - kzn_10_hit + - kzn_11_shape + - kzn_11_hit + - kzn_17_shape + - kzn_17_hit + - kzn_18_shape + - kzn_18_hit + - kzn_19_shape + - kzn_19_hit + - kzn_20_shape + - kzn_20_hit + - kzn_22_shape + - kzn_22_hit + - kzn_23_shape + - kzn_23_hit + - flo_00_shape + - flo_00_hit + - flo_03_shape + - flo_03_hit + - flo_07_shape + - flo_07_hit + - flo_08_shape + - flo_08_hit + - flo_09_shape + - flo_09_hit + - flo_10_shape + - flo_10_hit + - flo_11_shape + - flo_11_hit + - flo_12_shape + - flo_12_hit + - flo_13_shape + - flo_13_hit + - flo_14_shape + - flo_14_hit + - flo_15_shape + - flo_15_hit + - flo_16_shape + - flo_16_hit + - flo_17_shape + - flo_17_hit + - flo_18_shape + - flo_18_hit + - flo_19_shape + - flo_19_hit + - flo_21_shape + - flo_21_hit + - flo_22_shape + - flo_22_hit + - flo_23_shape + - flo_23_hit + - flo_24_shape + - flo_24_hit + - flo_25_shape + - flo_25_hit + - sam_01_shape + - sam_01_hit + - sam_02_shape + - sam_02_hit + - sam_03_shape + - sam_03_hit + - sam_04_shape + - sam_04_hit + - sam_05_shape + - sam_05_hit + - sam_06_shape + - sam_06_hit + - sam_07_shape + - sam_07_hit + - sam_08_shape + - sam_08_hit + - sam_09_shape + - sam_09_hit + - sam_10_shape + - sam_10_hit + - sam_11_shape + - sam_11_hit + - sam_12_shape + - sam_12_hit + - pra_01_shape + - pra_01_hit + - pra_02_shape + - pra_02_hit + - pra_03_shape + - pra_03_hit + - pra_04_shape + - pra_04_hit + - pra_05_shape + - pra_05_hit + - pra_09_shape + - pra_09_hit + - pra_10_shape + - pra_10_hit + - pra_11_shape + - pra_11_hit + - pra_13_shape + - pra_13_hit + - pra_14_shape + - pra_14_hit + - pra_15_shape + - pra_15_hit + - pra_16_shape + - pra_16_hit + - pra_18_shape + - pra_18_hit + - pra_19_shape + - pra_19_hit + - pra_20_shape + - pra_20_hit + - pra_21_shape + - pra_21_hit + - pra_22_shape + - pra_22_hit + - pra_29_shape + - pra_29_hit + - pra_31_shape + - pra_31_hit + - pra_32_shape + - pra_32_hit + - pra_33_shape + - pra_33_hit + - pra_34_shape + - pra_34_hit + - pra_35_shape + - pra_35_hit + - pra_40_shape + - pra_40_hit + - omo_01_shape + - omo_01_hit + - omo_02_shape + - omo_02_hit + - omo_03_shape + - omo_03_hit + - omo_04_shape + - omo_04_hit + - omo_05_shape + - omo_05_hit + - omo_06_shape + - omo_06_hit + - omo_07_shape + - omo_07_hit + - omo_08_shape + - omo_08_hit + - omo_09_shape + - omo_09_hit + - omo_10_shape + - omo_10_hit + - omo_11_shape + - omo_11_hit + - omo_12_shape + - omo_12_hit + - omo_13_shape + - omo_13_hit + - omo_14_shape + - omo_14_hit + - omo_15_shape + - omo_15_hit + - omo_16_shape + - omo_16_hit + - omo_17_shape + - omo_17_hit + - end_00_shape + - end_00_hit + - end_01_shape + - end_01_hit + - mgm_00_shape + - mgm_00_hit + - mgm_01_shape + - mgm_01_hit + - mgm_02_shape + - mgm_02_hit + - mgm_03_shape + - mgm_03_hit + - gv_01_shape + - gv_01_hit + - kmr_bt03_shape + - kmr_bt03_hit + - kmr_bt04_shape + - kmr_bt04_hit + - kmr_bt05_shape + - kmr_bt05_hit + - kmr_bt06_shape + - kmr_bt06_hit + - nok_bt01_shape + - nok_bt01_hit + - nok_bt02_shape + - nok_bt02_hit + - nok_bt03_shape + - nok_bt03_hit + - nok_bt04_shape + - nok_bt04_hit + - trd_bt00_shape + - trd_bt00_hit + - trd_bt01_shape + - trd_bt01_hit + - trd_bt02_shape + - trd_bt02_hit + - trd_bt03_shape + - trd_bt03_hit + - trd_bt04_shape + - trd_bt04_hit + - trd_bt05_shape + - trd_bt05_hit + - iwa_bt01_shape + - iwa_bt01_hit + - iwa_bt02_shape + - iwa_bt02_hit + - sbk_bt02_shape + - sbk_bt02_hit + - isk_bt01_shape + - isk_bt01_hit + - isk_bt02_shape + - isk_bt02_hit + - isk_bt03_shape + - isk_bt03_hit + - isk_bt04_shape + - isk_bt04_hit + - isk_bt05_shape + - isk_bt05_hit + - isk_bt06_shape + - isk_bt06_hit + - isk_bt07_shape + - isk_bt07_hit + - isk_bt08_shape + - isk_bt08_hit + - arn_bt01_shape + - arn_bt01_hit + - arn_bt02_shape + - arn_bt02_hit + - arn_bt03_shape + - arn_bt03_hit + - arn_bt04_shape + - arn_bt04_hit + - arn_bt05_shape + - arn_bt05_hit + - arn_bt06_shape + - arn_bt06_hit + - dgb_bt01_shape + - dgb_bt01_hit + - dgb_bt02_shape + - dgb_bt02_hit + - dgb_bt03_shape + - dgb_bt03_hit + - dgb_bt04_shape + - dgb_bt04_hit + - dgb_bt05_shape + - dgb_bt05_hit + - mim_bt01_shape + - mim_bt01_hit + - omo_bt01_shape + - omo_bt01_hit + - omo_bt02_shape + - omo_bt02_hit + - omo_bt03_shape + - omo_bt03_hit + - omo_bt04_shape + - omo_bt04_hit + - omo_bt05_shape + - omo_bt05_hit + - omo_bt06_shape + - omo_bt06_hit + - omo_bt07_shape + - omo_bt07_hit + - kgr_bt01_shape + - kgr_bt01_hit + - flo_bt01_shape + - flo_bt01_hit + - flo_bt02_shape + - flo_bt02_hit + - flo_bt03_shape + - flo_bt03_hit + - flo_bt04_shape + - flo_bt04_hit + - flo_bt05_shape + - flo_bt05_hit + - flo_bt06_shape + - flo_bt06_hit + - jan_bt00_shape + - jan_bt00_hit + - jan_bt01_shape + - jan_bt01_hit + - jan_bt02_shape + - jan_bt02_hit + - jan_bt03_shape + - jan_bt03_hit + - jan_bt04_shape + - jan_bt04_hit + - kzn_bt01_shape + - kzn_bt01_hit + - kzn_bt02_shape + - kzn_bt02_hit + - kzn_bt04_shape + - kzn_bt04_hit + - kzn_bt05_shape + - kzn_bt05_hit + - sam_bt01_shape + - sam_bt01_hit + - sam_bt02_shape + - sam_bt02_hit + - sam_bt03_shape + - sam_bt03_hit + - sam_bt04_shape + - sam_bt04_hit + - tik_bt01_shape + - tik_bt01_hit + - tik_bt02_shape + - tik_bt02_hit + - tik_bt03_shape + - tik_bt03_hit + - tik_bt04_shape + - tik_bt04_hit + - tik_bt05_shape + - tik_bt05_hit + - pra_bt01_shape + - pra_bt01_hit + - pra_bt02_shape + - pra_bt02_hit + - pra_bt03_shape + - pra_bt03_hit + - pra_bt04_shape + - pra_bt04_hit + - mac_bt01_shape + - mac_bt01_hit + - mac_bt02_shape + - mac_bt02_hit + - kpa_bt01_shape + - kpa_bt01_hit + - kpa_bt02_shape + - kpa_bt02_hit + - kpa_bt03_shape + - kpa_bt03_hit + - kpa_bt04_shape + - kpa_bt04_hit + - kpa_bt05_shape + - kpa_bt05_hit + - kpa_bt07_shape + - kpa_bt07_hit + - kpa_bt08_shape + - kpa_bt08_hit + - kpa_bt09_shape + - kpa_bt09_hit + - kpa_bt11_shape + - kpa_bt11_hit + - kpa_bt13_shape + - kpa_bt13_hit + - kpa_bt14_shape + - kpa_bt14_hit + - hos_bt01_shape + - hos_bt01_hit + - hos_bt02_shape + - hos_bt02_hit + - kkj_bt01_shape + - kkj_bt01_hit + - kkj_bt02_shape + - kkj_bt02_hit + - mac_tex + - tik_tex + - kgr_tex + - kmr_tex + - iwa_tex + - sbk_tex + - dro_tex + - isk_tex + - trd_tex + - nok_tex + - hos_tex + - kpa_tex + - osr_tex + - kkj_tex + - tst_tex + - jan_tex + - mim_tex + - obk_tex + - arn_tex + - dgb_tex + - kzn_tex + - flo_tex + - sam_tex + - pra_tex + - omo_tex + - end_tex + - mgm_tex + - gv__tex + - kmr_bg + - nok_bg + - sbk_bg + - sbk3_bg + - iwa_bg + - hos_bg + - arn_bg + - obk_bg + - omo_bg + - yos_bg + - jan_bg + - fla_bg + - flb_bg + - sra_bg + - yki_bg + - sam_bg + - kpa_bg + - title_bg + - title_data + - party_kurio + - party_kameki + - party_pinki + - party_pareta + - party_resa + - party_akari + - party_opuku + - party_pokopi - type: bin start: 0x27FEE22 subalign: 2 diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 741e6c0d28..3c02f71854 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -230,27 +230,27 @@ title_draw_copyright = 0x80037E14; // type:func rom:0x13214 init_demo_data = 0x80038080; // type:func rom:0x13480 next_demo_scene = 0x800380F4; // type:func rom:0x134F4 func_8003845C = 0x8003845C; // type:func rom:0x1385C -NOP_npc_callback = 0x80038470; // type:func rom:0x13870 -mtx_ident_mirror_y = 0x80038478; // type:func rom:0x13878 -clear_npcs = 0x800384BC; // type:func rom:0x138BC -init_npc_list = 0x8003852C; // type:func rom:0x1392C -func_8003857C = 0x8003857C; // type:func rom:0x1397C -_create_npc = 0x80038598; // type:func rom:0x13998 -create_basic_npc = 0x80038844; // type:func rom:0x13C44 -create_standard_npc = 0x80038864; // type:func rom:0x13C64 -create_partner_npc = 0x80038880; // type:func rom:0x13C80 -free_npc_by_index = 0x800388A0; // type:func rom:0x13CA0 -free_npc = 0x800389CC; // type:func rom:0x13DCC +npc_callback_no_op = 0x80038470; // type:func rom:0x13870 +npc_mtx_ident_mirror_y = 0x80038478; // type:func rom:0x13878 +npc_list_clear = 0x800384BC; // type:func rom:0x138BC +npc_list_update_current = 0x8003852C; // type:func rom:0x1392C +npc_iter_no_op = 0x8003857C; // type:func rom:0x1397C +npc_create = 0x80038598; // type:func rom:0x13998 +npc_create_basic = 0x80038844; // type:func rom:0x13C44 +npc_create_standard = 0x80038864; // type:func rom:0x13C64 +npc_create_partner = 0x80038880; // type:func rom:0x13C80 +npc_free_by_index = 0x800388A0; // type:func rom:0x13CA0 +npc_free = 0x800389CC; // type:func rom:0x13DCC get_npc_by_index = 0x80038ADC; // type:func rom:0x13EDC npc_do_world_collision = 0x80038AFC; // type:func rom:0x13EFC npc_do_other_npc_collision = 0x8003900C; // type:func rom:0x1440C npc_do_player_collision = 0x800392D8; // type:func rom:0x146D8 -func_80039688 = 0x80039688; // type:func rom:0x14A88 +npc_do_gravity = 0x80039688; // type:func rom:0x14A88 func_800397E8 = 0x800397E8; // type:func rom:0x14BE8 -update_npcs = 0x80039930; // type:func rom:0x14D30 +npc_list_update = 0x80039930; // type:func rom:0x14D30 func_80039DA4 = 0x80039DA4; // type:func rom:0x151A4 -appendGfx_npc = 0x80039FD0; // type:func rom:0x153D0 -render_npcs = 0x8003A7F0; // type:func rom:0x15BF0 +npc_appendGfx = 0x80039FD0; // type:func rom:0x153D0 +npc_list_render = 0x8003A7F0; // type:func rom:0x15BF0 npc_move_heading = 0x8003AA54; // type:func rom:0x15E54 get_npc_unsafe = 0x8003AAEC; // type:func rom:0x15EEC get_npc_safe = 0x8003AB48; // type:func rom:0x15F48 @@ -297,8 +297,8 @@ func_8003CC8C = 0x8003CC8C; // type:func rom:0x1808C func_8003CCB0 = 0x8003CCB0; // type:func rom:0x180B0 func_8003CFA0 = 0x8003CFA0; // type:func rom:0x183A0 func_8003CFA8 = 0x8003CFA8; // type:func rom:0x183A8 -func_8003CFB4 = 0x8003CFB4; // type:func rom:0x183B4 -func_8003D0C4 = 0x8003D0C4; // type:func rom:0x184C4 +npc_find_near = 0x8003CFB4; // type:func rom:0x183B4 +npc_find_near_simple = 0x8003D0C4; // type:func rom:0x184C4 func_8003D1D4 = 0x8003D1D4; // type:func rom:0x185D4 func_8003D2F8 = 0x8003D2F8; // type:func rom:0x186F8 func_8003D3BC = 0x8003D3BC; // type:func rom:0x187BC @@ -318,7 +318,7 @@ func_8003E514 = 0x8003E514; // type:func rom:0x19914 update_counters = 0x8003E524; // type:func rom:0x19924 draw_encounter_ui = 0x8003E5B0; // type:func rom:0x199B0 draw_first_strike_ui = 0x8003E63C; // type:func rom:0x19A3C -func_8003E670 = 0x8003E670; // type:func rom:0x19A70 +npc_dyn_entity_draw_no_op = 0x8003E670; // type:func rom:0x19A70 make_npcs = 0x8003E678; // type:func rom:0x19A78 kill_encounter = 0x8003E730; // type:func rom:0x19B30 kill_enemy = 0x8003E7AC; // type:func rom:0x19BAC @@ -1371,6 +1371,7 @@ __osRunningThread = 0x80094660; // type:data rom:0x6FA60 osViModeTable = 0x800946A0; // rom:0x6FAA0 _osViModeNtscLan1 = 0x80095820; // type:data rom:0x70C20 _osViModeMPalLan1 = 0x80095870; // type:data rom:0x70C70 +D_80097D30 = 0x80097D30; // type:data rom:0x73130 D_80097DC8 = 0x80097DC8; // type:data rom:0x731C8 D_80097DD0 = 0x80097DD0; // type:data rom:0x731D0 D_80097DD8 = 0x80097DD8; // type:data rom:0x731D8 @@ -4423,6 +4424,10 @@ func_802BD660_319BD0 = 0x802BD660; // type:func rom:0x319BD0 func_802BE8D4_31AE44 = 0x802BE8D4; // type:func rom:0x31AE44 func_802BE90C_31AE7C = 0x802BE90C; // type:func rom:0x31AE7C func_802BE9D0_31AF40 = 0x802BE9D0; // type:func rom:0x31AF40 +D_802BEB10_31B080 = 0x802BEB10; // type:data rom:0x31B080 +D_802BEB98_31B108 = 0x802BEB98; // type:data rom:0x31B108 +D_802BEBA0_31B110 = 0x802BEBA0; // type:data rom:0x31B110 +D_802BEBA8_31B118 = 0x802BEBA8; // type:data rom:0x31B118 func_802BD100_31B120 = 0x802BD100; // type:func rom:0x31B120 func_802BD144_31B164 = 0x802BD144; // type:func rom:0x31B164 func_802BD17C_31B19C = 0x802BD17C; // type:func rom:0x31B19C @@ -4435,6 +4440,13 @@ func_802BE7E0_31C800 = 0x802BE7E0; // type:func rom:0x31C800 func_802BE818_31C838 = 0x802BE818; // type:func rom:0x31C838 func_802BEA24_31CA44 = 0x802BEA24; // type:func rom:0x31CA44 func_802BEB10_31CB30 = 0x802BEB10; // type:func rom:0x31CB30 +D_802BEBC0_31CBE0 = 0x802BEBC0; // type:data rom:0x31CBE0 +D_802BEC18_31CC38 = 0x802BEC18; // type:data rom:0x31CC38 +D_802BEC20_31CC40 = 0x802BEC20; // type:data rom:0x31CC40 +D_802BEC28_31CC48 = 0x802BEC28; // type:data rom:0x31CC48 +D_802BEC30_31CC50 = 0x802BEC30; // type:data rom:0x31CC50 +D_802BEC38_31CC58 = 0x802BEC38; // type:data rom:0x31CC58 +D_802BEC40_31CC60 = 0x802BEC40; // type:data rom:0x31CC60 func_802BD100_31CC70 = 0x802BD100; // type:func rom:0x31CC70 func_802BD180_31CCF0 = 0x802BD180; // type:func rom:0x31CCF0 func_802BD1AC_31CD1C = 0x802BD1AC; // type:func rom:0x31CD1C @@ -4463,6 +4475,11 @@ func_802BF964_3206D4 = 0x802BF964; // type:func rom:0x3206D4 func_802BF9B8_320728 = 0x802BF9B8; // type:func rom:0x320728 func_802BFA58_3207C8 = 0x802BFA58; // type:func rom:0x3207C8 func_802BFAB8_320828 = 0x802BFAB8; // type:func rom:0x320828 +D_802BFE50_320BC0 = 0x802BFE50; // type:data rom:0x320BC0 +D_802BFE58_320BC8 = 0x802BFE58; // type:data rom:0x320BC8 +D_802BFE60_320BD0 = 0x802BFE60; // type:data rom:0x320BD0 +D_802BFED0_320C40 = 0x802BFED0; // type:data rom:0x320C40 +D_802BFED8_320C48 = 0x802BFED8; // type:data rom:0x320C48 func_802BD100_320C50 = 0x802BD100; // type:func rom:0x320C50 func_802BD21C_320D6C = 0x802BD21C; // type:func rom:0x320D6C func_802BD29C_320DEC = 0x802BD29C; // type:func rom:0x320DEC @@ -4489,6 +4506,7 @@ func_802BD694_323FE4 = 0x802BD694; // type:func rom:0x323FE4 func_802BDDF0_324740 = 0x802BDDF0; // type:func rom:0x324740 func_802BDF08_324858 = 0x802BDF08; // type:func rom:0x324858 func_802BDF64_3248B4 = 0x802BDF64; // type:func rom:0x3248B4 +D_802BE060_3249B0 = 0x802BE060; // type:data rom:0x3249B0 world_goompa_init = 0x802BD100; // type:func rom:0x324A10 GoompaTakeOut = 0x802BD114; // type:func rom:0x324A24 func_802BD14C_324A5C = 0x802BD14C; // type:func rom:0x324A5C @@ -4500,6 +4518,7 @@ D_802BD58C_324E9C = 0x802BD58C; // type:data rom:0x324E9C world_goompa_update = 0x802BD590; // type:data rom:0x324EA0 world_goompa_use_ability = 0x802BD5AC; // type:data rom:0x324EBC world_goompa_put_away = 0x802BD5C8; // type:data rom:0x324ED8 +D_802BD5F0_324F00 = 0x802BD5F0; // type:data rom:0x324F00 world_goombaria_init = 0x802BD100; // type:func rom:0x324F10 GoombariaTakeOut = 0x802BD114; // type:func rom:0x324F24 GoombariaUpdate = 0x802BD14C; // type:func rom:0x324F5C @@ -7263,16 +7282,16 @@ func_8024228C_7ECF9C = 0x8024228C; // type:func rom:0x7ECF9C mac_00_UnkMusicFunc = 0x802422C0; // type:func rom:0x7ECFD0 func_802423F0_7ED100 = 0x802423F0; // type:func rom:0x7ED100 func_80242570_7ED280 = 0x80242570; // type:func rom:0x7ED280 -func_802426C8_7ED3D8 = 0x802426C8; // type:func rom:0x7ED3D8 +mac_00_UnkFunc13 = 0x802426C8; // type:func rom:0x7ED3D8 mac_00_UnkNpcAIFunc1 = 0x80242970; // type:func rom:0x7ED680 -func_80242A30_7ED740 = 0x80242A30; // type:func rom:0x7ED740 +mac_00_UnkFunc14 = 0x80242A30; // type:func rom:0x7ED740 func_80242BEC_7ED8FC = 0x80242BEC; // type:func rom:0x7ED8FC mac_00_NpcJumpFunc2 = 0x80242CA0; // type:func rom:0x7ED9B0 mac_00_NpcJumpFunc = 0x80242D14; // type:func rom:0x7EDA24 mac_00_UnkNpcAIFunc13 = 0x80242D8C; // type:func rom:0x7EDA9C -func_80242EBC_7EDBCC = 0x80242EBC; // type:func rom:0x7EDBCC +mac_00_UnkFunc15 = 0x80242EBC; // type:func rom:0x7EDBCC mac_00_UnkNpcDurationFlagFunc = 0x80242FDC; // type:func rom:0x7EDCEC -func_80243044_7EDD54 = 0x80243044; // type:func rom:0x7EDD54 +mac_00_UnkFunc16 = 0x80243044; // type:func rom:0x7EDD54 func_80243104_7EDE14 = 0x80243104; // type:func rom:0x7EDE14 func_80243400_7EE110 = 0x80243400; // type:func rom:0x7EE110 dup_mac_00_GetItemName = 0x802434B4; // type:func rom:0x7EE1C4 @@ -7309,16 +7328,16 @@ func_80240E80_801700 = 0x80240E80; // type:func rom:0x801700 func_80240ED8_801758 = 0x80240ED8; // type:func rom:0x801758 mac_01_UnkMusicFunc = 0x80240F50; // type:func rom:0x8017D0 func_80241080_801900 = 0x80241080; // type:func rom:0x801900 -func_802411D8_801A58 = 0x802411D8; // type:func rom:0x801A58 +mac_01_UnkFunc13 = 0x802411D8; // type:func rom:0x801A58 dup_mac_01_UnkNpcAIFunc1 = 0x80241480; // type:func rom:0x801D00 -func_80241540_801DC0 = 0x80241540; // type:func rom:0x801DC0 +mac_01_UnkFunc14 = 0x80241540; // type:func rom:0x801DC0 func_802416FC_801F7C = 0x802416FC; // type:func rom:0x801F7C dup_mac_01_NpcJumpFunc2 = 0x802417B0; // type:func rom:0x802030 dup_mac_01_NpcJumpFunc = 0x80241824; // type:func rom:0x8020A4 dup_mac_01_UnkNpcAIFunc13 = 0x8024189C; // type:func rom:0x80211C -func_802419CC_80224C = 0x802419CC; // type:func rom:0x80224C +mac_01_UnkFunc15 = 0x802419CC; // type:func rom:0x80224C dup_mac_01_UnkNpcDurationFlagFunc = 0x80241AEC; // type:func rom:0x80236C -func_80241B54_8023D4 = 0x80241B54; // type:func rom:0x8023D4 +mac_01_UnkFunc16 = 0x80241B54; // type:func rom:0x8023D4 func_80241C14_802494 = 0x80241C14; // type:func rom:0x802494 func_80241F10_802790 = 0x80241F10; // type:func rom:0x802790 mac_01_GetItemName = 0x80241FC4; // type:func rom:0x802844 @@ -7402,16 +7421,16 @@ func_802454B4_805D34 = 0x802454B4; // type:func rom:0x805D34 func_80245504_805D84 = 0x80245504; // type:func rom:0x805D84 func_8024552C_805DAC = 0x8024552C; // type:func rom:0x805DAC func_80245550_805DD0 = 0x80245550; // type:func rom:0x805DD0 -func_802456A8_805F28 = 0x802456A8; // type:func rom:0x805F28 +mac_01_UnkFunc13_copy = 0x802456A8; // type:func rom:0x805F28 mac_01_UnkNpcAIFunc1 = 0x80245950; // type:func rom:0x8061D0 -func_80245A10_806290 = 0x80245A10; // type:func rom:0x806290 +mac_01_UnkFunc14_copy = 0x80245A10; // type:func rom:0x806290 func_80245BCC_80644C = 0x80245BCC; // type:func rom:0x80644C mac_01_NpcJumpFunc2 = 0x80245C80; // type:func rom:0x806500 mac_01_NpcJumpFunc = 0x80245CF4; // type:func rom:0x806574 mac_01_UnkNpcAIFunc13 = 0x80245D6C; // type:func rom:0x8065EC -func_80245E9C_80671C = 0x80245E9C; // type:func rom:0x80671C +mac_01_UnkFunc15_copy = 0x80245E9C; // type:func rom:0x80671C mac_01_UnkNpcDurationFlagFunc = 0x80245FBC; // type:func rom:0x80683C -func_80246024_8068A4 = 0x80246024; // type:func rom:0x8068A4 +mac_01_UnkFunc16_copy = 0x80246024; // type:func rom:0x8068A4 func_802460E4_806964 = 0x802460E4; // type:func rom:0x806964 func_802463E0_806C60 = 0x802463E0; // type:func rom:0x806C60 mac_01_SomeMatrixOperation = 0x80246490; // type:func rom:0x806D10 @@ -7446,16 +7465,16 @@ mac_02_SomeMatrixOperation = 0x802406B0; // type:func rom:0x823970 mac_02_SomeMatrixOperation2 = 0x80240720; // type:func rom:0x8239E0 mac_02_SetEntityFlags100000 = 0x802408F0; // type:func rom:0x823BB0 func_80240930_823BF0 = 0x80240930; // type:func rom:0x823BF0 -func_80240A88_823D48 = 0x80240A88; // type:func rom:0x823D48 +mac_02_UnkFunc13 = 0x80240A88; // type:func rom:0x823D48 mac_02_UnkNpcAIFunc1 = 0x80240D30; // type:func rom:0x823FF0 -func_80240DF0_8240B0 = 0x80240DF0; // type:func rom:0x8240B0 +mac_02_UnkFunc14 = 0x80240DF0; // type:func rom:0x8240B0 func_80240FAC_82426C = 0x80240FAC; // type:func rom:0x82426C mac_02_NpcJumpFunc2 = 0x80241060; // type:func rom:0x824320 mac_02_NpcJumpFunc = 0x802410D4; // type:func rom:0x824394 mac_02_UnkNpcAIFunc13 = 0x8024114C; // type:func rom:0x82440C -func_8024127C_82453C = 0x8024127C; // type:func rom:0x82453C +mac_02_UnkFunc15 = 0x8024127C; // type:func rom:0x82453C mac_02_UnkNpcDurationFlagFunc = 0x8024139C; // type:func rom:0x82465C -func_80241404_8246C4 = 0x80241404; // type:func rom:0x8246C4 +mac_02_UnkFunc16 = 0x80241404; // type:func rom:0x8246C4 func_802414C4_824784 = 0x802414C4; // type:func rom:0x824784 func_802417C0_824A80 = 0x802417C0; // type:func rom:0x824A80 mac_02_GetItemName = 0x80241874; // type:func rom:0x824B34 @@ -7652,16 +7671,16 @@ mac_05_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x852294 func_8024030C_85247C = 0x8024030C; // type:func rom:0x85247C func_8024047C_8525EC = 0x8024047C; // type:func rom:0x8525EC func_80240490_852600 = 0x80240490; // type:func rom:0x852600 -func_802405E8_852758 = 0x802405E8; // type:func rom:0x852758 +mac_05_UnkFunc13 = 0x802405E8; // type:func rom:0x852758 mac_05_UnkNpcAIFunc1 = 0x80240890; // type:func rom:0x852A00 -func_80240950_852AC0 = 0x80240950; // type:func rom:0x852AC0 +mac_05_UnkFunc14 = 0x80240950; // type:func rom:0x852AC0 func_80240B0C_852C7C = 0x80240B0C; // type:func rom:0x852C7C mac_05_NpcJumpFunc2 = 0x80240BC0; // type:func rom:0x852D30 mac_05_NpcJumpFunc = 0x80240C34; // type:func rom:0x852DA4 mac_05_UnkNpcAIFunc13 = 0x80240CAC; // type:func rom:0x852E1C -func_80240DDC_852F4C = 0x80240DDC; // type:func rom:0x852F4C +mac_05_UnkFunc15 = 0x80240DDC; // type:func rom:0x852F4C mac_05_UnkNpcDurationFlagFunc = 0x80240EFC; // type:func rom:0x85306C -func_80240F64_8530D4 = 0x80240F64; // type:func rom:0x8530D4 +mac_05_UnkFunc16 = 0x80240F64; // type:func rom:0x8530D4 func_80241024_853194 = 0x80241024; // type:func rom:0x853194 func_80241320_853490 = 0x80241320; // type:func rom:0x853490 mac_05_GetItemName = 0x802413D4; // type:func rom:0x853544 @@ -7837,20 +7856,20 @@ tik_07_GetEntryPos = 0x802400F0; // type:func rom:0x879CD0 tik_07_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0x879DB0 tik_07_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x879E1C tik_07_SetOverrideFlags_40 = 0x802402E0; // type:func rom:0x879EC0 -func_802402FC_879EDC = 0x802402FC; // type:func rom:0x879EDC +tik_07_UnkFunc17 = 0x802402FC; // type:func rom:0x879EDC func_8024031C_879EFC = 0x8024031C; // type:func rom:0x879EFC -func_80240348_879F28 = 0x80240348; // type:func rom:0x879F28 +tik_07_UnkFunc18 = 0x80240348; // type:func rom:0x879F28 func_802403B4_879F94 = 0x802403B4; // type:func rom:0x879F94 func_80240400_879FE0 = 0x80240400; // type:func rom:0x879FE0 func_802404AC_87A08C = 0x802404AC; // type:func rom:0x87A08C func_802406FC_87A2DC = 0x802406FC; // type:func rom:0x87A2DC -func_80240728_87A308 = 0x80240728; // type:func rom:0x87A308 -func_80240760_87A340 = 0x80240760; // type:func rom:0x87A340 +tik_07_UnkFunc19 = 0x80240728; // type:func rom:0x87A308 +tik_07_UnkFunc20 = 0x80240760; // type:func rom:0x87A340 func_802407F0_87A3D0 = 0x802407F0; // type:func rom:0x87A3D0 -func_80240824_87A404 = 0x80240824; // type:func rom:0x87A404 -func_80240888_87A468 = 0x80240888; // type:func rom:0x87A468 +tik_07_UnkFunc21 = 0x80240824; // type:func rom:0x87A404 +tik_07_UnkFunc22 = 0x80240888; // type:func rom:0x87A468 func_802408E0_87A4C0 = 0x802408E0; // type:func rom:0x87A4C0 -func_80240E18_87A9F8 = 0x80240E18; // type:func rom:0x87A9F8 +tik_07_UnkFunc23 = 0x80240E18; // type:func rom:0x87A9F8 tik_07_UnkPartnerPosFunc = 0x80240F58; // type:func rom:0x87AB38 tik_07_UnkPartnerPosFunc2 = 0x80240FA0; // type:func rom:0x87AB80 func_80240FE8_87ABC8 = 0x80240FE8; // type:func rom:0x87ABC8 @@ -7859,13 +7878,13 @@ func_80241390_87AF70 = 0x80241390; // type:func rom:0x87AF70 func_802413F0_87AFD0 = 0x802413F0; // type:func rom:0x87AFD0 func_802415A0_87B180 = 0x802415A0; // type:func rom:0x87B180 tik_07_UnkNpcAIFunc1 = 0x80241BC8; // type:func rom:0x87B7A8 -func_80241C88_87B868 = 0x80241C88; // type:func rom:0x87B868 +tik_07_UnkFunc4 = 0x80241C88; // type:func rom:0x87B868 tik_07_UnkNpcAIFunc2 = 0x80241FCC; // type:func rom:0x87BBAC func_80242044_87BC24 = 0x80242044; // type:func rom:0x87BC24 tik_07_UnkNpcAIFunc14 = 0x802420B0; // type:func rom:0x87BC90 tik_07_UnkNpcAIFunc3 = 0x802421E4; // type:func rom:0x87BDC4 -func_80242248_87BE28 = 0x80242248; // type:func rom:0x87BE28 -func_802425D8_87C1B8 = 0x802425D8; // type:func rom:0x87C1B8 +tik_07_UnkFunc6 = 0x80242248; // type:func rom:0x87BE28 +tik_07_UnkFunc5 = 0x802425D8; // type:func rom:0x87C1B8 func_802426FC_87C2DC = 0x802426FC; // type:func rom:0x87C2DC D_802439F0_87D5D0 = 0x802439F0; // type:data rom:0x87D5D0 D_802439F8_87D5D8 = 0x802439F8; // type:data rom:0x87D5D8 @@ -7910,20 +7929,20 @@ tik_10_UnkTexturePanFunc = 0x80240000; // type:func rom:0x8863C0 tik_10_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0x8864E4 func_80240310_8866D0 = 0x80240310; // type:func rom:0x8866D0 tik_10_SetOverrideFlags_40 = 0x80240680; // type:func rom:0x886A40 -func_8024069C_886A5C = 0x8024069C; // type:func rom:0x886A5C +tik_10_UnkFunc17 = 0x8024069C; // type:func rom:0x886A5C func_802406BC_886A7C = 0x802406BC; // type:func rom:0x886A7C -func_802406E8_886AA8 = 0x802406E8; // type:func rom:0x886AA8 +tik_10_UnkFunc18 = 0x802406E8; // type:func rom:0x886AA8 func_80240754_886B14 = 0x80240754; // type:func rom:0x886B14 func_802407A0_886B60 = 0x802407A0; // type:func rom:0x886B60 func_8024084C_886C0C = 0x8024084C; // type:func rom:0x886C0C func_80240A9C_886E5C = 0x80240A9C; // type:func rom:0x886E5C -func_80240AC8_886E88 = 0x80240AC8; // type:func rom:0x886E88 -func_80240B00_886EC0 = 0x80240B00; // type:func rom:0x886EC0 +tik_10_UnkFunc19 = 0x80240AC8; // type:func rom:0x886E88 +tik_10_UnkFunc20 = 0x80240B00; // type:func rom:0x886EC0 func_80240B90_886F50 = 0x80240B90; // type:func rom:0x886F50 -func_80240BC4_886F84 = 0x80240BC4; // type:func rom:0x886F84 -func_80240C28_886FE8 = 0x80240C28; // type:func rom:0x886FE8 +tik_10_UnkFunc21 = 0x80240BC4; // type:func rom:0x886F84 +tik_10_UnkFunc22 = 0x80240C28; // type:func rom:0x886FE8 func_80240C80_887040 = 0x80240C80; // type:func rom:0x887040 -func_802411B8_887578 = 0x802411B8; // type:func rom:0x887578 +tik_10_UnkFunc23 = 0x802411B8; // type:func rom:0x887578 tik_10_UnkPartnerPosFunc = 0x802412F8; // type:func rom:0x8876B8 tik_10_UnkPartnerPosFunc2 = 0x80241340; // type:func rom:0x887700 func_80241388_887748 = 0x80241388; // type:func rom:0x887748 @@ -7945,20 +7964,20 @@ tik_12_GetItemName = 0x80240A14; // type:func rom:0x8895E4 tik_12_SomeItemEntityFunc = 0x80240A78; // type:func rom:0x889648 tik_12_CheckItemFlags40 = 0x80240BC8; // type:func rom:0x889798 tik_12_SetOverrideFlags_40 = 0x80240C1C; // type:func rom:0x8897EC -func_80240C38_889808 = 0x80240C38; // type:func rom:0x889808 +tik_12_UnkFunc17 = 0x80240C38; // type:func rom:0x889808 func_80240C58_889828 = 0x80240C58; // type:func rom:0x889828 -func_80240C84_889854 = 0x80240C84; // type:func rom:0x889854 +tik_12_UnkFunc18 = 0x80240C84; // type:func rom:0x889854 func_80240CF0_8898C0 = 0x80240CF0; // type:func rom:0x8898C0 func_80240D3C_88990C = 0x80240D3C; // type:func rom:0x88990C func_80240DE8_8899B8 = 0x80240DE8; // type:func rom:0x8899B8 func_80241038_889C08 = 0x80241038; // type:func rom:0x889C08 -func_80241064_889C34 = 0x80241064; // type:func rom:0x889C34 -func_8024109C_889C6C = 0x8024109C; // type:func rom:0x889C6C +tik_12_UnkFunc19 = 0x80241064; // type:func rom:0x889C34 +tik_12_UnkFunc20 = 0x8024109C; // type:func rom:0x889C6C func_8024112C_889CFC = 0x8024112C; // type:func rom:0x889CFC -func_80241160_889D30 = 0x80241160; // type:func rom:0x889D30 -func_802411C4_889D94 = 0x802411C4; // type:func rom:0x889D94 +tik_12_UnkFunc21 = 0x80241160; // type:func rom:0x889D30 +tik_12_UnkFunc22 = 0x802411C4; // type:func rom:0x889D94 func_8024121C_889DEC = 0x8024121C; // type:func rom:0x889DEC -func_80241754_88A324 = 0x80241754; // type:func rom:0x88A324 +tik_12_UnkFunc23 = 0x80241754; // type:func rom:0x88A324 tik_12_UnkPartnerPosFunc = 0x80241894; // type:func rom:0x88A464 tik_12_UnkPartnerPosFunc2 = 0x802418DC; // type:func rom:0x88A4AC func_80241924_88A4F4 = 0x80241924; // type:func rom:0x88A4F4 @@ -8003,20 +8022,20 @@ D_80242758_8922F8 = 0x80242758; // type:data rom:0x8922F8 D_802427BC_89235C = 0x802427BC; // type:data rom:0x89235C func_80240000_892A20 = 0x80240000; // type:func rom:0x892A20 tik_17_SetOverrideFlags_40 = 0x80240030; // type:func rom:0x892A50 -func_8024004C_892A6C = 0x8024004C; // type:func rom:0x892A6C +tik_17_UnkFunc17 = 0x8024004C; // type:func rom:0x892A6C func_8024006C_892A8C = 0x8024006C; // type:func rom:0x892A8C -func_80240098_892AB8 = 0x80240098; // type:func rom:0x892AB8 +tik_17_UnkFunc18 = 0x80240098; // type:func rom:0x892AB8 func_80240104_892B24 = 0x80240104; // type:func rom:0x892B24 func_80240150_892B70 = 0x80240150; // type:func rom:0x892B70 func_802401FC_892C1C = 0x802401FC; // type:func rom:0x892C1C func_8024044C_892E6C = 0x8024044C; // type:func rom:0x892E6C -func_80240478_892E98 = 0x80240478; // type:func rom:0x892E98 -func_802404B0_892ED0 = 0x802404B0; // type:func rom:0x892ED0 +tik_17_UnkFunc19 = 0x80240478; // type:func rom:0x892E98 +tik_17_UnkFunc20 = 0x802404B0; // type:func rom:0x892ED0 func_80240540_892F60 = 0x80240540; // type:func rom:0x892F60 -func_80240574_892F94 = 0x80240574; // type:func rom:0x892F94 -func_802405D8_892FF8 = 0x802405D8; // type:func rom:0x892FF8 +tik_17_UnkFunc21 = 0x80240574; // type:func rom:0x892F94 +tik_17_UnkFunc22 = 0x802405D8; // type:func rom:0x892FF8 func_80240630_893050 = 0x80240630; // type:func rom:0x893050 -func_80240B68_893588 = 0x80240B68; // type:func rom:0x893588 +tik_17_UnkFunc23 = 0x80240B68; // type:func rom:0x893588 tik_17_UnkPartnerPosFunc = 0x80240CA8; // type:func rom:0x8936C8 tik_17_UnkPartnerPosFunc2 = 0x80240CF0; // type:func rom:0x893710 func_80240D38_893758 = 0x80240D38; // type:func rom:0x893758 @@ -8045,20 +8064,20 @@ tik_19_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x89781C tik_19_UnkTexturePanFunc = 0x802402E0; // type:func rom:0x8978C0 tik_19_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0x8979E4 tik_19_SetOverrideFlags_40 = 0x802405F0; // type:func rom:0x897BD0 -func_8024060C_897BEC = 0x8024060C; // type:func rom:0x897BEC +tik_19_UnkFunc17 = 0x8024060C; // type:func rom:0x897BEC func_8024062C_897C0C = 0x8024062C; // type:func rom:0x897C0C -func_80240658_897C38 = 0x80240658; // type:func rom:0x897C38 +tik_19_UnkFunc18 = 0x80240658; // type:func rom:0x897C38 func_802406C4_897CA4 = 0x802406C4; // type:func rom:0x897CA4 func_80240710_897CF0 = 0x80240710; // type:func rom:0x897CF0 func_802407BC_897D9C = 0x802407BC; // type:func rom:0x897D9C func_80240A0C_897FEC = 0x80240A0C; // type:func rom:0x897FEC -func_80240A38_898018 = 0x80240A38; // type:func rom:0x898018 -func_80240A70_898050 = 0x80240A70; // type:func rom:0x898050 +tik_19_UnkFunc19 = 0x80240A38; // type:func rom:0x898018 +tik_19_UnkFunc20 = 0x80240A70; // type:func rom:0x898050 func_80240B00_8980E0 = 0x80240B00; // type:func rom:0x8980E0 -func_80240B34_898114 = 0x80240B34; // type:func rom:0x898114 -func_80240B98_898178 = 0x80240B98; // type:func rom:0x898178 +tik_19_UnkFunc21 = 0x80240B34; // type:func rom:0x898114 +tik_19_UnkFunc22 = 0x80240B98; // type:func rom:0x898178 func_80240BF0_8981D0 = 0x80240BF0; // type:func rom:0x8981D0 -func_80241128_898708 = 0x80241128; // type:func rom:0x898708 +tik_19_UnkFunc23 = 0x80241128; // type:func rom:0x898708 tik_19_UnkPartnerPosFunc = 0x80241268; // type:func rom:0x898848 tik_19_UnkPartnerPosFunc2 = 0x802412B0; // type:func rom:0x898890 func_802412F8_8988D8 = 0x802412F8; // type:func rom:0x8988D8 @@ -8272,9 +8291,9 @@ D_80257D48_8C7DB8 = 0x80257D48; // type:data rom:0x8C7DB8 D_80257D50_8C7DC0 = 0x80257D50; // type:data rom:0x8C7DC0 D_80257F08_8C7F78 = 0x80257F08; // type:data rom:0x8C7F78 D_80257F10_8C7F80 = 0x80257F10; // type:data rom:0x8C7F80 -func_80240000_8C7F90 = 0x80240000; // type:func rom:0x8C7F90 +kmr_03_func_80240000_8C7F90 = 0x80240000; // type:func rom:0x8C7F90 kmr_03_CheckPartnerFlags1000 = 0x80240184; // type:func rom:0x8C8114 -func_802401B0_8C8140 = 0x802401B0; // type:func rom:0x8C8140 +kmr_03_func_802401B0_8C8140 = 0x802401B0; // type:func rom:0x8C8140 kmr_03_UnkPositionFunc = 0x80240218; // type:func rom:0x8C81A8 kmr_03_UnsetCamera0MoveFlag1 = 0x80240320; // type:func rom:0x8C82B0 kmr_03_SetCamera0MoveFlag1 = 0x8024033C; // type:func rom:0x8C82CC @@ -8283,37 +8302,37 @@ kmr_03_SomeMatrixOperation = 0x80240410; // type:func rom:0x8C83A0 kmr_03_SomeMatrixOperation2 = 0x80240480; // type:func rom:0x8C8410 kmr_03_entryList = 0x80240650; // type:data rom:0x8C85E0 kmr_03_config = 0x80240680; // type:data rom:0x8C8610 -kmr_03_Script_802406C0 = 0x802406C0; // type:data rom:0x8C8650 -kmr_03_ExitWalk_802406F0 = 0x802406F0; // type:data rom:0x8C8680 -kmr_03_ExitWalk_8024074C = 0x8024074C; // type:data rom:0x8C86DC -kmr_03_Script_802407A8 = 0x802407A8; // type:data rom:0x8C8738 -kmr_03_Main = 0x802407F0; // type:data rom:0x8C8780 +kmr_03_802406C0 = 0x802406C0; // type:data rom:0x8C8650 +kmr_03_exitWalk_802406F0 = 0x802406F0; // type:data rom:0x8C8680 +kmr_03_exitWalk_8024074C = 0x8024074C; // type:data rom:0x8C86DC +kmr_03_802407A8 = 0x802407A8; // type:data rom:0x8C8738 +kmr_03_main = 0x802407F0; // type:data rom:0x8C8780 padding = 0x80240948; // type:data rom:0x8C88D8 kmr_03_npcSettings_80240950 = 0x80240950; // type:data rom:0x8C88E0 -kmr_03_Script_8024097C = 0x8024097C; // type:data rom:0x8C890C -kmr_03_NpcAI_80240B50 = 0x80240B50; // type:data rom:0x8C8AE0 -kmr_03_Hit_80240F64 = 0x80240F64; // type:data rom:0x8C8EF4 -kmr_03_Init_802411A8 = 0x802411A8; // type:data rom:0x8C9138 +kmr_03_8024097C = 0x8024097C; // type:data rom:0x8C890C +kmr_03_npcAI_80240B50 = 0x80240B50; // type:data rom:0x8C8AE0 +kmr_03_hit_80240F64 = 0x80240F64; // type:data rom:0x8C8EF4 +kmr_03_init_802411A8 = 0x802411A8; // type:data rom:0x8C9138 kmr_03_npcGroup_80241260 = 0x80241260; // type:data rom:0x8C91F0 kmr_03_npcGroupList_80241450 = 0x80241450; // type:data rom:0x8C93E0 kmr_03_padding2 = 0x80241468; // type:data rom:0x8C93F8 -kmr_03_Script_80241470 = 0x80241470; // type:data rom:0x8C9400 -kmr_03_Script_802414A8 = 0x802414A8; // type:data rom:0x8C9438 -kmr_03_Script_802414C8 = 0x802414C8; // type:data rom:0x8C9458 -kmr_03_MakeEntities = 0x80241530; // type:data rom:0x8C94C0 -kmr_03_SearchBush_802417F0 = 0x802417F0; // type:data rom:0x8C9780 -kmr_03_ShakeTree_80241B50 = 0x80241B50; // type:data rom:0x8C9AE0 +kmr_03_80241470 = 0x80241470; // type:data rom:0x8C9400 +kmr_03_802414A8 = 0x802414A8; // type:data rom:0x8C9438 +kmr_03_802414C8 = 0x802414C8; // type:data rom:0x8C9458 +kmr_03_makeEntities = 0x80241530; // type:data rom:0x8C94C0 +kmr_03_searchBush_802417F0 = 0x802417F0; // type:data rom:0x8C9780 +kmr_03_shakeTree_80241B50 = 0x80241B50; // type:data rom:0x8C9AE0 kmr_03_treeModelList_Bush1_Bush = 0x80242154; // type:data rom:0x8CA0E4 kmr_03_treeEffectVectors_Bush1 = 0x8024215C; // type:data rom:0x8CA0EC kmr_03_searchBushEvent_Bush1 = 0x8024216C; // type:data rom:0x8CA0FC kmr_03_treeModelList_Tree1_Leaves = 0x8024217C; // type:data rom:0x8CA10C kmr_03_treeModelList_Tree1_Trunk = 0x80242184; // type:data rom:0x8CA114 kmr_03_treeEffectVectors_Tree1 = 0x8024218C; // type:data rom:0x8CA11C -kmr_03_Tree1_Callback = 0x802421A8; // type:data rom:0x8CA138 +kmr_03_tree1_Callback = 0x802421A8; // type:data rom:0x8CA138 kmr_03_shakeTreeEvent_Tree1 = 0x80242294; // type:data rom:0x8CA224 kmr_03_triggerCoord_802422A8 = 0x802422A8; // type:data rom:0x8CA238 -kmr_03_Script_802422B8 = 0x802422B8; // type:data rom:0x8CA248 -kmr_03_Script_80242340 = 0x80242340; // type:data rom:0x8CA2D0 +kmr_03_802422B8 = 0x802422B8; // type:data rom:0x8CA248 +kmr_03_80242340 = 0x80242340; // type:data rom:0x8CA2D0 kmr_04_CheckPartnerFlags1000 = 0x80240000; // type:func rom:0x8CA900 func_8024002C_8CA92C = 0x8024002C; // type:func rom:0x8CA92C kmr_04_SomeMatrixOperation = 0x80240060; // type:func rom:0x8CA960 @@ -8330,13 +8349,13 @@ D_802429F4_8CD2F4 = 0x802429F4; // type:data rom:0x8CD2F4 func_80240000_8CE070 = 0x80240000; // type:func rom:0x8CE070 func_802401B0_8CE220 = 0x802401B0; // type:func rom:0x8CE220 kmr_05_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8CE848 -func_80240898_8CE908 = 0x80240898; // type:func rom:0x8CE908 +kmr_05_UnkFunc4 = 0x80240898; // type:func rom:0x8CE908 kmr_05_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8CEC4C func_80240C54_8CECC4 = 0x80240C54; // type:func rom:0x8CECC4 kmr_05_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8CED30 kmr_05_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8CEE64 -func_80240E58_8CEEC8 = 0x80240E58; // type:func rom:0x8CEEC8 -func_802411E8_8CF258 = 0x802411E8; // type:func rom:0x8CF258 +kmr_05_UnkFunc6 = 0x80240E58; // type:func rom:0x8CEEC8 +kmr_05_UnkFunc5 = 0x802411E8; // type:func rom:0x8CF258 func_8024130C_8CF37C = 0x8024130C; // type:func rom:0x8CF37C kmr_05_SomeMatrixOperation = 0x80241500; // type:func rom:0x8CF570 kmr_05_SomeMatrixOperation2 = 0x80241570; // type:func rom:0x8CF5E0 @@ -8348,13 +8367,13 @@ D_80243450_8D14C0 = 0x80243450; // type:data rom:0x8D14C0 func_80240000_8D1510 = 0x80240000; // type:func rom:0x8D1510 func_802401B0_8D16C0 = 0x802401B0; // type:func rom:0x8D16C0 kmr_06_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D1CE8 -func_80240898_8D1DA8 = 0x80240898; // type:func rom:0x8D1DA8 +kmr_06_UnkFunc4 = 0x80240898; // type:func rom:0x8D1DA8 kmr_06_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D20EC func_80240C54_8D2164 = 0x80240C54; // type:func rom:0x8D2164 kmr_06_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8D21D0 kmr_06_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8D2304 -func_80240E58_8D2368 = 0x80240E58; // type:func rom:0x8D2368 -func_802411E8_8D26F8 = 0x802411E8; // type:func rom:0x8D26F8 +kmr_06_UnkFunc6 = 0x80240E58; // type:func rom:0x8D2368 +kmr_06_UnkFunc5 = 0x802411E8; // type:func rom:0x8D26F8 func_8024130C_8D281C = 0x8024130C; // type:func rom:0x8D281C func_80241500_8D2A10 = 0x80241500; // type:func rom:0x8D2A10 func_802417A8_8D2CB8 = 0x802417A8; // type:func rom:0x8D2CB8 @@ -8385,13 +8404,13 @@ D_80241EA0_8D5C60 = 0x80241EA0; // type:data rom:0x8D5C60 func_80240000_8D5E00 = 0x80240000; // type:func rom:0x8D5E00 func_802401B0_8D5FB0 = 0x802401B0; // type:func rom:0x8D5FB0 kmr_09_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0x8D65D8 -func_80240898_8D6698 = 0x80240898; // type:func rom:0x8D6698 +kmr_09_UnkFunc4 = 0x80240898; // type:func rom:0x8D6698 kmr_09_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0x8D69DC func_80240C54_8D6A54 = 0x80240C54; // type:func rom:0x8D6A54 kmr_09_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0x8D6AC0 kmr_09_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0x8D6BF4 -func_80240E58_8D6C58 = 0x80240E58; // type:func rom:0x8D6C58 -func_802411E8_8D6FE8 = 0x802411E8; // type:func rom:0x8D6FE8 +kmr_09_UnkFunc6 = 0x80240E58; // type:func rom:0x8D6C58 +kmr_09_UnkFunc5 = 0x802411E8; // type:func rom:0x8D6FE8 func_8024130C_8D710C = 0x8024130C; // type:func rom:0x8D710C func_802414F8_8D72F8 = 0x802414F8; // type:func rom:0x8D72F8 D_8024186C_8D766C = 0x8024186C; // type:data rom:0x8D766C @@ -8624,12 +8643,12 @@ func_80242498_911B48 = 0x80242498; // type:func rom:0x911B48 iwa_01_UnkNpcAIFunc21 = 0x802425C8; // type:func rom:0x911C78 iwa_01_UnkNpcAIFunc20 = 0x80242664; // type:func rom:0x911D14 iwa_01_UnkNpcAIFunc22 = 0x802426EC; // type:func rom:0x911D9C -func_80242794_911E44 = 0x80242794; // type:func rom:0x911E44 +iwa_01_UnkFunc8 = 0x80242794; // type:func rom:0x911E44 iwa_01_UnkNpcAIFunc16 = 0x80242908; // type:func rom:0x911FB8 func_80242958_912008 = 0x80242958; // type:func rom:0x912008 -func_80242AF8_9121A8 = 0x80242AF8; // type:func rom:0x9121A8 +iwa_01_UnkFunc10 = 0x80242AF8; // type:func rom:0x9121A8 func_80242C48_9122F8 = 0x80242C48; // type:func rom:0x9122F8 -func_80242CF4_9123A4 = 0x80242CF4; // type:func rom:0x9123A4 +iwa_01_UnkFunc9 = 0x80242CF4; // type:func rom:0x9123A4 iwa_01_UnkNpcAIFunc19 = 0x80242E2C; // type:func rom:0x9124DC iwa_01_UnkNpcAIFunc17 = 0x80242EA8; // type:func rom:0x912558 dup_iwa_01_UnkDurationCheck = 0x80242F10; // type:func rom:0x9125C0 @@ -8659,12 +8678,12 @@ func_802401D4_915F44 = 0x802401D4; // type:func rom:0x915F44 iwa_02_UnkNpcAIFunc21 = 0x80240304; // type:func rom:0x916074 iwa_02_UnkNpcAIFunc20 = 0x802403A0; // type:func rom:0x916110 iwa_02_UnkNpcAIFunc22 = 0x80240428; // type:func rom:0x916198 -func_802404D0_916240 = 0x802404D0; // type:func rom:0x916240 +iwa_02_UnkFunc8 = 0x802404D0; // type:func rom:0x916240 iwa_02_UnkNpcAIFunc16 = 0x80240644; // type:func rom:0x9163B4 func_80240694_916404 = 0x80240694; // type:func rom:0x916404 -func_80240834_9165A4 = 0x80240834; // type:func rom:0x9165A4 +iwa_02_UnkFunc10 = 0x80240834; // type:func rom:0x9165A4 func_80240984_9166F4 = 0x80240984; // type:func rom:0x9166F4 -func_80240A30_9167A0 = 0x80240A30; // type:func rom:0x9167A0 +iwa_02_UnkFunc9 = 0x80240A30; // type:func rom:0x9167A0 iwa_02_UnkNpcAIFunc19 = 0x80240B68; // type:func rom:0x9168D8 iwa_02_UnkNpcAIFunc17 = 0x80240BE4; // type:func rom:0x916954 iwa_02_UnkDurationCheck = 0x80240C4C; // type:func rom:0x9169BC @@ -8688,12 +8707,12 @@ func_80240514_9190C4 = 0x80240514; // type:func rom:0x9190C4 iwa_03_UnkNpcAIFunc21 = 0x80240644; // type:func rom:0x9191F4 iwa_03_UnkNpcAIFunc20 = 0x802406E0; // type:func rom:0x919290 iwa_03_UnkNpcAIFunc22 = 0x80240768; // type:func rom:0x919318 -func_80240810_9193C0 = 0x80240810; // type:func rom:0x9193C0 +iwa_03_UnkFunc8 = 0x80240810; // type:func rom:0x9193C0 iwa_03_UnkNpcAIFunc16 = 0x80240984; // type:func rom:0x919534 func_802409D4_919584 = 0x802409D4; // type:func rom:0x919584 -func_80240B74_919724 = 0x80240B74; // type:func rom:0x919724 +iwa_03_UnkFunc10 = 0x80240B74; // type:func rom:0x919724 func_80240CC4_919874 = 0x80240CC4; // type:func rom:0x919874 -func_80240D70_919920 = 0x80240D70; // type:func rom:0x919920 +iwa_03_UnkFunc9 = 0x80240D70; // type:func rom:0x919920 iwa_03_UnkNpcAIFunc19 = 0x80240EA8; // type:func rom:0x919A58 iwa_03_UnkNpcAIFunc17 = 0x80240F24; // type:func rom:0x919AD4 iwa_03_UnkDurationCheck = 0x80240F8C; // type:func rom:0x919B3C @@ -8712,12 +8731,12 @@ func_80240254_91BB34 = 0x80240254; // type:func rom:0x91BB34 iwa_04_UnkNpcAIFunc21 = 0x80240384; // type:func rom:0x91BC64 iwa_04_UnkNpcAIFunc20 = 0x80240420; // type:func rom:0x91BD00 iwa_04_UnkNpcAIFunc22 = 0x802404A8; // type:func rom:0x91BD88 -func_80240550_91BE30 = 0x80240550; // type:func rom:0x91BE30 +iwa_04_UnkFunc8 = 0x80240550; // type:func rom:0x91BE30 iwa_04_UnkNpcAIFunc16 = 0x802406C4; // type:func rom:0x91BFA4 func_80240714_91BFF4 = 0x80240714; // type:func rom:0x91BFF4 -func_802408B4_91C194 = 0x802408B4; // type:func rom:0x91C194 +iwa_04_UnkFunc10 = 0x802408B4; // type:func rom:0x91C194 func_80240A04_91C2E4 = 0x80240A04; // type:func rom:0x91C2E4 -func_80240AB0_91C390 = 0x80240AB0; // type:func rom:0x91C390 +iwa_04_UnkFunc9 = 0x80240AB0; // type:func rom:0x91C390 iwa_04_UnkNpcAIFunc19 = 0x80240BE8; // type:func rom:0x91C4C8 iwa_04_UnkNpcAIFunc17 = 0x80240C64; // type:func rom:0x91C544 iwa_04_UnkDurationCheck = 0x80240CCC; // type:func rom:0x91C5AC @@ -8734,20 +8753,20 @@ func_80240040_91E5B0 = 0x80240040; // type:func rom:0x91E5B0 iwa_10_GetItemName = 0x802400F4; // type:func rom:0x91E664 iwa_10_UnkFloatFunc = 0x80240160; // type:func rom:0x91E6D0 iwa_10_SetOverrideFlags_40 = 0x802402F0; // type:func rom:0x91E860 -func_8024030C_91E87C = 0x8024030C; // type:func rom:0x91E87C +iwa_10_UnkFunc17 = 0x8024030C; // type:func rom:0x91E87C func_8024032C_91E89C = 0x8024032C; // type:func rom:0x91E89C -func_80240358_91E8C8 = 0x80240358; // type:func rom:0x91E8C8 +iwa_10_UnkFunc18 = 0x80240358; // type:func rom:0x91E8C8 func_802403C4_91E934 = 0x802403C4; // type:func rom:0x91E934 func_80240410_91E980 = 0x80240410; // type:func rom:0x91E980 func_802404BC_91EA2C = 0x802404BC; // type:func rom:0x91EA2C func_8024070C_91EC7C = 0x8024070C; // type:func rom:0x91EC7C -func_80240738_91ECA8 = 0x80240738; // type:func rom:0x91ECA8 -func_80240770_91ECE0 = 0x80240770; // type:func rom:0x91ECE0 +iwa_10_UnkFunc19 = 0x80240738; // type:func rom:0x91ECA8 +iwa_10_UnkFunc20 = 0x80240770; // type:func rom:0x91ECE0 func_80240800_91ED70 = 0x80240800; // type:func rom:0x91ED70 -func_80240834_91EDA4 = 0x80240834; // type:func rom:0x91EDA4 -func_80240898_91EE08 = 0x80240898; // type:func rom:0x91EE08 +iwa_10_UnkFunc21 = 0x80240834; // type:func rom:0x91EDA4 +iwa_10_UnkFunc22 = 0x80240898; // type:func rom:0x91EE08 func_802408F0_91EE60 = 0x802408F0; // type:func rom:0x91EE60 -func_80240E28_91F398 = 0x80240E28; // type:func rom:0x91F398 +iwa_10_UnkFunc23 = 0x80240E28; // type:func rom:0x91F398 iwa_10_UnkPartnerPosFunc = 0x80240F68; // type:func rom:0x91F4D8 iwa_10_UnkPartnerPosFunc2 = 0x80240FB0; // type:func rom:0x91F520 func_80240FF8_91F568 = 0x80240FF8; // type:func rom:0x91F568 @@ -8778,28 +8797,28 @@ sbk_00_SpawnSunEffect = 0x80240000; // type:func rom:0x929270 sbk_00_SetNpcB5_3 = 0x80240040; // type:func rom:0x9292B0 sbk_00_entryList = 0x80240060; // type:data rom:0x9292D0 sbk_00_config = 0x802400A0; // type:data rom:0x929310 -sbk_00_ExitWalk_802400E0 = 0x802400E0; // type:data rom:0x929350 -sbk_00_ExitWalk_8024013C = 0x8024013C; // type:data rom:0x9293AC -sbk_00_Script_80240198 = 0x80240198; // type:data rom:0x929408 -sbk_00_Main = 0x802401E0; // type:data rom:0x929450 -sbk_00_aISettings_80240300 = 0x80240300; // type:data rom:0x929570 -sbk_00_NpcAI_80240330 = 0x80240330; // type:data rom:0x9295A0 +sbk_00_exitWalk_802400E0 = 0x802400E0; // type:data rom:0x929350 +sbk_00_exitWalk_8024013C = 0x8024013C; // type:data rom:0x9293AC +sbk_00_80240198 = 0x80240198; // type:data rom:0x929408 +sbk_00_main = 0x802401E0; // type:data rom:0x929450 +sbk_00_npcAISettings_80240300 = 0x80240300; // type:data rom:0x929570 +sbk_00_npcAI_80240330 = 0x80240330; // type:data rom:0x9295A0 sbk_00_npcSettings_8024035C = 0x8024035C; // type:data rom:0x9295CC sbk_00_npcGroup_80240388 = 0x80240388; // type:data rom:0x9295F8 sbk_00_npcGroup_80240578 = 0x80240578; // type:data rom:0x9297E8 sbk_00_npcGroupList_80240768 = 0x80240768; // type:data rom:0x9299D8 -sbk_00_MakeEntities = 0x80240790; // type:data rom:0x929A00 +sbk_00_makeEntities = 0x80240790; // type:data rom:0x929A00 sbk_01_SpawnSunEffect = 0x80240000; // type:func rom:0x929A90 sbk_01_SetNpcB5_3 = 0x80240040; // type:func rom:0x929AD0 sbk_01_entryList = 0x80240060; // type:data rom:0x929AF0 sbk_01_config = 0x802400A0; // type:data rom:0x929B30 -sbk_01_ExitWalk_802400E0 = 0x802400E0; // type:data rom:0x929B70 -sbk_01_ExitWalk_8024013C = 0x8024013C; // type:data rom:0x929BCC -sbk_01_ExitWalk_80240198 = 0x80240198; // type:data rom:0x929C28 -sbk_01_Script_802401F4 = 0x802401F4; // type:data rom:0x929C84 -sbk_01_Main = 0x80240258; // type:data rom:0x929CE8 -sbk_01_aISettings_80240370 = 0x80240370; // type:data rom:0x929E00 -sbk_01_NpcAI_802403A0 = 0x802403A0; // type:data rom:0x929E30 +sbk_01_exitWalk_802400E0 = 0x802400E0; // type:data rom:0x929B70 +sbk_01_exitWalk_8024013C = 0x8024013C; // type:data rom:0x929BCC +sbk_01_exitWalk_80240198 = 0x80240198; // type:data rom:0x929C28 +sbk_01_802401F4 = 0x802401F4; // type:data rom:0x929C84 +sbk_01_main = 0x80240258; // type:data rom:0x929CE8 +sbk_01_npcAISettings_80240370 = 0x80240370; // type:data rom:0x929E00 +sbk_01_npcAI_802403A0 = 0x802403A0; // type:data rom:0x929E30 sbk_01_npcSettings_802403CC = 0x802403CC; // type:data rom:0x929E5C sbk_01_npcGroup_802403F8 = 0x802403F8; // type:data rom:0x929E88 sbk_01_npcGroup_802405E8 = 0x802405E8; // type:data rom:0x92A078 @@ -8962,20 +8981,20 @@ sbk_56_SpawnSunEffect = 0x80240000; // type:func rom:0x953FC0 func_80240038_953FF8 = 0x80240038; // type:func rom:0x953FF8 func_8024005C_95401C = 0x8024005C; // type:func rom:0x95401C sbk_56_SetOverrideFlags_40 = 0x80240080; // type:func rom:0x954040 -func_8024009C_95405C = 0x8024009C; // type:func rom:0x95405C +sbk_56_UnkFunc17 = 0x8024009C; // type:func rom:0x95405C func_802400BC_95407C = 0x802400BC; // type:func rom:0x95407C -func_802400E8_9540A8 = 0x802400E8; // type:func rom:0x9540A8 +sbk_56_UnkFunc18 = 0x802400E8; // type:func rom:0x9540A8 func_80240154_954114 = 0x80240154; // type:func rom:0x954114 func_802401A0_954160 = 0x802401A0; // type:func rom:0x954160 func_8024024C_95420C = 0x8024024C; // type:func rom:0x95420C func_8024049C_95445C = 0x8024049C; // type:func rom:0x95445C -func_802404C8_954488 = 0x802404C8; // type:func rom:0x954488 -func_80240500_9544C0 = 0x80240500; // type:func rom:0x9544C0 +sbk_56_UnkFunc19 = 0x802404C8; // type:func rom:0x954488 +sbk_56_UnkFunc20 = 0x80240500; // type:func rom:0x9544C0 func_80240590_954550 = 0x80240590; // type:func rom:0x954550 -func_802405C4_954584 = 0x802405C4; // type:func rom:0x954584 -func_80240628_9545E8 = 0x80240628; // type:func rom:0x9545E8 +sbk_56_UnkFunc21 = 0x802405C4; // type:func rom:0x954584 +sbk_56_UnkFunc22 = 0x80240628; // type:func rom:0x9545E8 func_80240680_954640 = 0x80240680; // type:func rom:0x954640 -func_80240BB8_954B78 = 0x80240BB8; // type:func rom:0x954B78 +sbk_56_UnkFunc23 = 0x80240BB8; // type:func rom:0x954B78 sbk_56_UnkPartnerPosFunc = 0x80240CF8; // type:func rom:0x954CB8 sbk_56_UnkPartnerPosFunc2 = 0x80240D40; // type:func rom:0x954D00 func_80240D88_954D48 = 0x80240D88; // type:func rom:0x954D48 @@ -9007,16 +9026,16 @@ dro_01_SomeXYZFunc2 = 0x8024023C; // type:func rom:0x95B43C func_802402E0_95B4E0 = 0x802402E0; // type:func rom:0x95B4E0 func_80240404_95B604 = 0x80240404; // type:func rom:0x95B604 func_802405E0_95B7E0 = 0x802405E0; // type:func rom:0x95B7E0 -func_80240738_95B938 = 0x80240738; // type:func rom:0x95B938 +dro_01_UnkFunc13 = 0x80240738; // type:func rom:0x95B938 dro_01_UnkNpcAIFunc1 = 0x802409E0; // type:func rom:0x95BBE0 -func_80240AA0_95BCA0 = 0x80240AA0; // type:func rom:0x95BCA0 +dro_01_UnkFunc14 = 0x80240AA0; // type:func rom:0x95BCA0 func_80240C5C_95BE5C = 0x80240C5C; // type:func rom:0x95BE5C dro_01_NpcJumpFunc2 = 0x80240D10; // type:func rom:0x95BF10 dro_01_NpcJumpFunc = 0x80240D84; // type:func rom:0x95BF84 dro_01_UnkNpcAIFunc13 = 0x80240DFC; // type:func rom:0x95BFFC -func_80240F2C_95C12C = 0x80240F2C; // type:func rom:0x95C12C +dro_01_UnkFunc15 = 0x80240F2C; // type:func rom:0x95C12C dro_01_UnkNpcDurationFlagFunc = 0x8024104C; // type:func rom:0x95C24C -func_802410B4_95C2B4 = 0x802410B4; // type:func rom:0x95C2B4 +dro_01_UnkFunc16 = 0x802410B4; // type:func rom:0x95C2B4 func_80241174_95C374 = 0x80241174; // type:func rom:0x95C374 func_80241470_95C670 = 0x80241470; // type:func rom:0x95C670 dro_01_GetItemName = 0x80241524; // type:func rom:0x95C724 @@ -9221,23 +9240,23 @@ func_802402BC_98679C = 0x802402BC; // type:func rom:0x98679C func_802402F0_9867D0 = 0x802402F0; // type:func rom:0x9867D0 D_802406F0_986BD0 = 0x802406F0; // type:data rom:0x986BD0 isk_10_SetOverrideFlags_40 = 0x80240000; // type:func rom:0x988B60 -func_8024001C_988B7C = 0x8024001C; // type:func rom:0x988B7C +isk_10_UnkFunc17 = 0x8024001C; // type:func rom:0x988B7C func_8024003C_988B9C = 0x8024003C; // type:func rom:0x988B9C -func_80240068_988BC8 = 0x80240068; // type:func rom:0x988BC8 +isk_10_UnkFunc18 = 0x80240068; // type:func rom:0x988BC8 func_802400D4_988C34 = 0x802400D4; // type:func rom:0x988C34 func_80240120_988C80 = 0x80240120; // type:func rom:0x988C80 func_802401CC_988D2C = 0x802401CC; // type:func rom:0x988D2C func_8024041C_988F7C = 0x8024041C; // type:func rom:0x988F7C -func_80240448_988FA8 = 0x80240448; // type:func rom:0x988FA8 -func_80240480_988FE0 = 0x80240480; // type:func rom:0x988FE0 +isk_10_UnkFunc19 = 0x80240448; // type:func rom:0x988FA8 +isk_10_UnkFunc20 = 0x80240480; // type:func rom:0x988FE0 func_80240510_989070 = 0x80240510; // type:func rom:0x989070 -func_80240544_9890A4 = 0x80240544; // type:func rom:0x9890A4 -func_802405A8_989108 = 0x802405A8; // type:func rom:0x989108 +isk_10_UnkFunc21 = 0x80240544; // type:func rom:0x9890A4 +isk_10_UnkFunc22 = 0x802405A8; // type:func rom:0x989108 func_80240600_989160 = 0x80240600; // type:func rom:0x989160 -func_80240B38_989698 = 0x80240B38; // type:func rom:0x989698 +isk_10_UnkFunc23 = 0x80240B38; // type:func rom:0x989698 isk_10_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0x9897D8 isk_10_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0x989820 -func_80240D08_989868 = 0x80240D08; // type:func rom:0x989868 +isk_10_UnkFunc24 = 0x80240D08; // type:func rom:0x989868 func_80240D38_989898 = 0x80240D38; // type:func rom:0x989898 D_80241100_989C60 = 0x80241100; // type:data rom:0x989C60 D_80241108_989C68 = 0x80241108; // type:data rom:0x989C68 @@ -9350,16 +9369,16 @@ trd_02_UnkNpcAIFunc12 = 0x80240290; // type:func rom:0x9A1270 trd_02_set_script_owner_npc_col_height = 0x802403F4; // type:func rom:0x9A13D4 func_80240474_9A1454 = 0x80240474; // type:func rom:0x9A1454 func_802408B4_9A1894 = 0x802408B4; // type:func rom:0x9A1894 -func_80240A0C_9A19EC = 0x80240A0C; // type:func rom:0x9A19EC +trd_02_UnkFunc13 = 0x80240A0C; // type:func rom:0x9A19EC trd_02_UnkNpcAIFunc1 = 0x80240CB4; // type:func rom:0x9A1C94 -func_80240D74_9A1D54 = 0x80240D74; // type:func rom:0x9A1D54 +trd_02_UnkFunc14 = 0x80240D74; // type:func rom:0x9A1D54 func_80240F30_9A1F10 = 0x80240F30; // type:func rom:0x9A1F10 trd_02_NpcJumpFunc2 = 0x80240FE4; // type:func rom:0x9A1FC4 trd_02_NpcJumpFunc = 0x80241058; // type:func rom:0x9A2038 trd_02_UnkNpcAIFunc13 = 0x802410D0; // type:func rom:0x9A20B0 -func_80241200_9A21E0 = 0x80241200; // type:func rom:0x9A21E0 +trd_02_UnkFunc15 = 0x80241200; // type:func rom:0x9A21E0 trd_02_UnkNpcDurationFlagFunc = 0x80241320; // type:func rom:0x9A2300 -func_80241388_9A2368 = 0x80241388; // type:func rom:0x9A2368 +trd_02_UnkFunc16 = 0x80241388; // type:func rom:0x9A2368 func_80241448_9A2428 = 0x80241448; // type:func rom:0x9A2428 func_80241744_9A2724 = 0x80241744; // type:func rom:0x9A2724 D_802432E0_9A42C0 = 0x802432E0; // type:data rom:0x9A42C0 @@ -9385,28 +9404,28 @@ trd_04_UnkNpcAIFunc12 = 0x80240660; // type:func rom:0x9A8A50 trd_04_set_script_owner_npc_col_height = 0x802407C4; // type:func rom:0x9A8BB4 func_80240844_9A8C34 = 0x80240844; // type:func rom:0x9A8C34 func_80240C84_9A9074 = 0x80240C84; // type:func rom:0x9A9074 -func_80240DDC_9A91CC = 0x80240DDC; // type:func rom:0x9A91CC +trd_04_UnkFunc13 = 0x80240DDC; // type:func rom:0x9A91CC trd_04_UnkNpcAIFunc1 = 0x80241084; // type:func rom:0x9A9474 -func_80241144_9A9534 = 0x80241144; // type:func rom:0x9A9534 +trd_04_UnkFunc14 = 0x80241144; // type:func rom:0x9A9534 func_80241300_9A96F0 = 0x80241300; // type:func rom:0x9A96F0 trd_04_NpcJumpFunc2 = 0x802413B4; // type:func rom:0x9A97A4 trd_04_NpcJumpFunc = 0x80241428; // type:func rom:0x9A9818 trd_04_UnkNpcAIFunc13 = 0x802414A0; // type:func rom:0x9A9890 -func_802415D0_9A99C0 = 0x802415D0; // type:func rom:0x9A99C0 +trd_04_UnkFunc15 = 0x802415D0; // type:func rom:0x9A99C0 trd_04_UnkNpcDurationFlagFunc = 0x802416F0; // type:func rom:0x9A9AE0 -func_80241758_9A9B48 = 0x80241758; // type:func rom:0x9A9B48 +trd_04_UnkFunc16 = 0x80241758; // type:func rom:0x9A9B48 func_80241818_9A9C08 = 0x80241818; // type:func rom:0x9A9C08 func_80241B14_9A9F04 = 0x80241B14; // type:func rom:0x9A9F04 func_80241E18_9AA208 = 0x80241E18; // type:func rom:0x9AA208 func_80241FC8_9AA3B8 = 0x80241FC8; // type:func rom:0x9AA3B8 dup_trd_04_UnkNpcAIFunc1 = 0x802425F0; // type:func rom:0x9AA9E0 -func_802426B0_9AAAA0 = 0x802426B0; // type:func rom:0x9AAAA0 +trd_04_UnkFunc4 = 0x802426B0; // type:func rom:0x9AAAA0 trd_04_UnkNpcAIFunc2 = 0x802429F4; // type:func rom:0x9AADE4 func_80242A6C_9AAE5C = 0x80242A6C; // type:func rom:0x9AAE5C trd_04_UnkNpcAIFunc14 = 0x80242AD8; // type:func rom:0x9AAEC8 trd_04_UnkNpcAIFunc3 = 0x80242C0C; // type:func rom:0x9AAFFC -func_80242C70_9AB060 = 0x80242C70; // type:func rom:0x9AB060 -func_80243000_9AB3F0 = 0x80243000; // type:func rom:0x9AB3F0 +trd_04_UnkFunc6 = 0x80242C70; // type:func rom:0x9AB060 +trd_04_UnkFunc5 = 0x80243000; // type:func rom:0x9AB3F0 func_80243124_9AB514 = 0x80243124; // type:func rom:0x9AB514 func_80243310_9AB700 = 0x80243310; // type:func rom:0x9AB700 func_80243438_9AB828 = 0x80243438; // type:func rom:0x9AB828 @@ -9454,13 +9473,13 @@ func_802406A4_9B7024 = 0x802406A4; // type:func rom:0x9B7024 func_80240AE4_9B7464 = 0x80240AE4; // type:func rom:0x9B7464 func_80240C94_9B7614 = 0x80240C94; // type:func rom:0x9B7614 trd_07_UnkNpcAIFunc1 = 0x802412BC; // type:func rom:0x9B7C3C -func_8024137C_9B7CFC = 0x8024137C; // type:func rom:0x9B7CFC +trd_07_UnkFunc4 = 0x8024137C; // type:func rom:0x9B7CFC trd_07_UnkNpcAIFunc2 = 0x802416C0; // type:func rom:0x9B8040 func_80241738_9B80B8 = 0x80241738; // type:func rom:0x9B80B8 trd_07_UnkNpcAIFunc14 = 0x802417A4; // type:func rom:0x9B8124 trd_07_UnkNpcAIFunc3 = 0x802418D8; // type:func rom:0x9B8258 -func_8024193C_9B82BC = 0x8024193C; // type:func rom:0x9B82BC -func_80241CCC_9B864C = 0x80241CCC; // type:func rom:0x9B864C +trd_07_UnkFunc6 = 0x8024193C; // type:func rom:0x9B82BC +trd_07_UnkFunc5 = 0x80241CCC; // type:func rom:0x9B864C func_80241DF0_9B8770 = 0x80241DF0; // type:func rom:0x9B8770 func_80241FDC_9B895C = 0x80241FDC; // type:func rom:0x9B895C func_80242104_9B8A84 = 0x80242104; // type:func rom:0x9B8A84 @@ -9589,16 +9608,16 @@ func_802406B0_9D76D0 = 0x802406B0; // type:func rom:0x9D76D0 func_80240750_9D7770 = 0x80240750; // type:func rom:0x9D7770 func_80240970_9D7990 = 0x80240970; // type:func rom:0x9D7990 func_80240A80_9D7AA0 = 0x80240A80; // type:func rom:0x9D7AA0 -func_80240BD8_9D7BF8 = 0x80240BD8; // type:func rom:0x9D7BF8 +nok_02_UnkFunc13 = 0x80240BD8; // type:func rom:0x9D7BF8 nok_02_UnkNpcAIFunc1 = 0x80240E80; // type:func rom:0x9D7EA0 -func_80240F40_9D7F60 = 0x80240F40; // type:func rom:0x9D7F60 +nok_02_UnkFunc14 = 0x80240F40; // type:func rom:0x9D7F60 func_802410FC_9D811C = 0x802410FC; // type:func rom:0x9D811C nok_02_NpcJumpFunc2 = 0x802411B0; // type:func rom:0x9D81D0 nok_02_NpcJumpFunc = 0x80241224; // type:func rom:0x9D8244 nok_02_UnkNpcAIFunc13 = 0x8024129C; // type:func rom:0x9D82BC -func_802413CC_9D83EC = 0x802413CC; // type:func rom:0x9D83EC +nok_02_UnkFunc15 = 0x802413CC; // type:func rom:0x9D83EC nok_02_UnkNpcDurationFlagFunc = 0x802414EC; // type:func rom:0x9D850C -func_80241554_9D8574 = 0x80241554; // type:func rom:0x9D8574 +nok_02_UnkFunc16 = 0x80241554; // type:func rom:0x9D8574 func_80241614_9D8634 = 0x80241614; // type:func rom:0x9D8634 func_80241910_9D8930 = 0x80241910; // type:func rom:0x9D8930 nok_02_GetItemName = 0x802419C4; // type:func rom:0x9D89E4 @@ -9723,13 +9742,13 @@ func_80240394_9F4DD4 = 0x80240394; // type:func rom:0x9F4DD4 func_802407D4_9F5214 = 0x802407D4; // type:func rom:0x9F5214 func_80240984_9F53C4 = 0x80240984; // type:func rom:0x9F53C4 nok_11_UnkNpcAIFunc1 = 0x80240FAC; // type:func rom:0x9F59EC -func_8024106C_9F5AAC = 0x8024106C; // type:func rom:0x9F5AAC +nok_11_UnkFunc4 = 0x8024106C; // type:func rom:0x9F5AAC nok_11_UnkNpcAIFunc2 = 0x802413B0; // type:func rom:0x9F5DF0 func_80241428_9F5E68 = 0x80241428; // type:func rom:0x9F5E68 nok_11_UnkNpcAIFunc14 = 0x80241494; // type:func rom:0x9F5ED4 nok_11_UnkNpcAIFunc3 = 0x802415C8; // type:func rom:0x9F6008 -func_8024162C_9F606C = 0x8024162C; // type:func rom:0x9F606C -func_802419BC_9F63FC = 0x802419BC; // type:func rom:0x9F63FC +nok_11_UnkFunc6 = 0x8024162C; // type:func rom:0x9F606C +nok_11_UnkFunc5 = 0x802419BC; // type:func rom:0x9F63FC func_80241AE0_9F6520 = 0x80241AE0; // type:func rom:0x9F6520 nok_11_SomeMatrixOperation = 0x80241CCC; // type:func rom:0x9F670C nok_11_SomeMatrixOperation2 = 0x80241D3C; // type:func rom:0x9F677C @@ -9753,16 +9772,16 @@ nok_12_UnkNpcAIFunc12 = 0x80240720; // type:func rom:0x9FAF10 nok_12_set_script_owner_npc_col_height = 0x80240884; // type:func rom:0x9FB074 func_80240904_9FB0F4 = 0x80240904; // type:func rom:0x9FB0F4 func_80240D44_9FB534 = 0x80240D44; // type:func rom:0x9FB534 -func_80240E9C_9FB68C = 0x80240E9C; // type:func rom:0x9FB68C +nok_12_UnkFunc13 = 0x80240E9C; // type:func rom:0x9FB68C nok_12_UnkNpcAIFunc1 = 0x80241144; // type:func rom:0x9FB934 -func_80241204_9FB9F4 = 0x80241204; // type:func rom:0x9FB9F4 +nok_12_UnkFunc14 = 0x80241204; // type:func rom:0x9FB9F4 func_802413C0_9FBBB0 = 0x802413C0; // type:func rom:0x9FBBB0 nok_12_NpcJumpFunc2 = 0x80241474; // type:func rom:0x9FBC64 nok_12_NpcJumpFunc = 0x802414E8; // type:func rom:0x9FBCD8 nok_12_UnkNpcAIFunc13 = 0x80241560; // type:func rom:0x9FBD50 -func_80241690_9FBE80 = 0x80241690; // type:func rom:0x9FBE80 +nok_12_UnkFunc15 = 0x80241690; // type:func rom:0x9FBE80 nok_12_UnkNpcDurationFlagFunc = 0x802417B0; // type:func rom:0x9FBFA0 -func_80241818_9FC008 = 0x80241818; // type:func rom:0x9FC008 +nok_12_UnkFunc16 = 0x80241818; // type:func rom:0x9FC008 func_802418D8_9FC0C8 = 0x802418D8; // type:func rom:0x9FC0C8 func_80241BD4_9FC3C4 = 0x80241BD4; // type:func rom:0x9FC3C4 func_80241EE0_9FC6D0 = 0x80241EE0; // type:func rom:0x9FC6D0 @@ -9796,13 +9815,13 @@ func_80240554_A02D94 = 0x80240554; // type:func rom:0xA02D94 func_80240994_A031D4 = 0x80240994; // type:func rom:0xA031D4 func_80240B44_A03384 = 0x80240B44; // type:func rom:0xA03384 nok_14_UnkNpcAIFunc1 = 0x8024116C; // type:func rom:0xA039AC -func_8024122C_A03A6C = 0x8024122C; // type:func rom:0xA03A6C +nok_14_UnkFunc4 = 0x8024122C; // type:func rom:0xA03A6C nok_14_UnkNpcAIFunc2 = 0x80241570; // type:func rom:0xA03DB0 func_802415E8_A03E28 = 0x802415E8; // type:func rom:0xA03E28 nok_14_UnkNpcAIFunc14 = 0x80241654; // type:func rom:0xA03E94 nok_14_UnkNpcAIFunc3 = 0x80241788; // type:func rom:0xA03FC8 -func_802417EC_A0402C = 0x802417EC; // type:func rom:0xA0402C -func_80241B7C_A043BC = 0x80241B7C; // type:func rom:0xA043BC +nok_14_UnkFunc6 = 0x802417EC; // type:func rom:0xA0402C +nok_14_UnkFunc5 = 0x80241B7C; // type:func rom:0xA043BC func_80241CA0_A044E0 = 0x80241CA0; // type:func rom:0xA044E0 func_80241E8C_A046CC = 0x80241E8C; // type:func rom:0xA046CC func_80241FB4_A047F4 = 0x80241FB4; // type:func rom:0xA047F4 @@ -9828,13 +9847,13 @@ func_80240674_A07574 = 0x80240674; // type:func rom:0xA07574 func_80240AB4_A079B4 = 0x80240AB4; // type:func rom:0xA079B4 func_80240C64_A07B64 = 0x80240C64; // type:func rom:0xA07B64 nok_15_UnkNpcAIFunc1 = 0x8024128C; // type:func rom:0xA0818C -func_8024134C_A0824C = 0x8024134C; // type:func rom:0xA0824C +nok_15_UnkFunc4 = 0x8024134C; // type:func rom:0xA0824C nok_15_UnkNpcAIFunc2 = 0x80241690; // type:func rom:0xA08590 func_80241708_A08608 = 0x80241708; // type:func rom:0xA08608 nok_15_UnkNpcAIFunc14 = 0x80241774; // type:func rom:0xA08674 nok_15_UnkNpcAIFunc3 = 0x802418A8; // type:func rom:0xA087A8 -func_8024190C_A0880C = 0x8024190C; // type:func rom:0xA0880C -func_80241C9C_A08B9C = 0x80241C9C; // type:func rom:0xA08B9C +nok_15_UnkFunc6 = 0x8024190C; // type:func rom:0xA0880C +nok_15_UnkFunc5 = 0x80241C9C; // type:func rom:0xA08B9C func_80241DC0_A08CC0 = 0x80241DC0; // type:func rom:0xA08CC0 func_80241FAC_A08EAC = 0x80241FAC; // type:func rom:0xA08EAC func_802420D4_A08FD4 = 0x802420D4; // type:func rom:0xA08FD4 @@ -9908,13 +9927,13 @@ func_80240FD0_A171F0 = 0x80240FD0; // type:func rom:0xA171F0 func_80240FF0_A17210 = 0x80240FF0; // type:func rom:0xA17210 func_802411A0_A173C0 = 0x802411A0; // type:func rom:0xA173C0 hos_02_UnkNpcAIFunc1 = 0x802417C8; // type:func rom:0xA179E8 -func_80241888_A17AA8 = 0x80241888; // type:func rom:0xA17AA8 +hos_02_UnkFunc4 = 0x80241888; // type:func rom:0xA17AA8 hos_02_UnkNpcAIFunc2 = 0x80241BCC; // type:func rom:0xA17DEC func_80241C44_A17E64 = 0x80241C44; // type:func rom:0xA17E64 hos_02_UnkNpcAIFunc14 = 0x80241CB0; // type:func rom:0xA17ED0 hos_02_UnkNpcAIFunc3 = 0x80241DE4; // type:func rom:0xA18004 -func_80241E48_A18068 = 0x80241E48; // type:func rom:0xA18068 -func_802421D8_A183F8 = 0x802421D8; // type:func rom:0xA183F8 +hos_02_UnkFunc6 = 0x80241E48; // type:func rom:0xA18068 +hos_02_UnkFunc5 = 0x802421D8; // type:func rom:0xA183F8 func_802422FC_A1851C = 0x802422FC; // type:func rom:0xA1851C hos_02_UnkNpcAIFunc13 = 0x802424E8; // type:func rom:0xA18708 func_80242618_A18838 = 0x80242618; // type:func rom:0xA18838 @@ -9951,13 +9970,13 @@ hos_03_SomeMatrixOperation2 = 0x80240AE0; // type:func rom:0xA1BBE0 func_80240CB0_A1BDB0 = 0x80240CB0; // type:func rom:0xA1BDB0 func_80240E60_A1BF60 = 0x80240E60; // type:func rom:0xA1BF60 hos_03_UnkNpcAIFunc1 = 0x80241488; // type:func rom:0xA1C588 -func_80241548_A1C648 = 0x80241548; // type:func rom:0xA1C648 +hos_03_UnkFunc4 = 0x80241548; // type:func rom:0xA1C648 hos_03_UnkNpcAIFunc2 = 0x8024188C; // type:func rom:0xA1C98C func_80241904_A1CA04 = 0x80241904; // type:func rom:0xA1CA04 hos_03_UnkNpcAIFunc14 = 0x80241970; // type:func rom:0xA1CA70 hos_03_UnkNpcAIFunc3 = 0x80241AA4; // type:func rom:0xA1CBA4 -func_80241B08_A1CC08 = 0x80241B08; // type:func rom:0xA1CC08 -func_80241E98_A1CF98 = 0x80241E98; // type:func rom:0xA1CF98 +hos_03_UnkFunc6 = 0x80241B08; // type:func rom:0xA1CC08 +hos_03_UnkFunc5 = 0x80241E98; // type:func rom:0xA1CF98 func_80241FBC_A1D0BC = 0x80241FBC; // type:func rom:0xA1D0BC hos_03_Call800E9894 = 0x802421A8; // type:func rom:0xA1D2A8 hos_03_Call800E98C4SyncStatusMenu = 0x802421C8; // type:func rom:0xA1D2C8 @@ -10319,7 +10338,7 @@ D_802438F8_A4BEB8 = 0x802438F8; // type:data rom:0xA4BEB8 D_80243918_A4BED8 = 0x80243918; // type:data rom:0xA4BED8 D_80243920_A4BEE0 = 0x80243920; // type:data rom:0xA4BEE0 D_80243928_A4BEE8 = 0x80243928; // type:data rom:0xA4BEE8 -func_80240000_A4BF60 = 0x80240000; // type:func rom:0xA4BF60 +kpa_04_UnkFunc11 = 0x80240000; // type:func rom:0xA4BF60 func_802400BC_A4C01C = 0x802400BC; // type:func rom:0xA4C01C kpa_08_UnsetCamera0MoveFlag1 = 0x80240000; // type:func rom:0xA4CA20 func_8024001C_A4CA3C = 0x8024001C; // type:func rom:0xA4CA3C @@ -10578,16 +10597,16 @@ func_80240050_A834E0 = 0x80240050; // type:func rom:0xA834E0 D_802432F0_A86780 = 0x802432F0; // type:data rom:0xA86780 D_80243300_A86790 = 0x80243300; // type:data rom:0xA86790 func_80240000_A86A50 = 0x80240000; // type:func rom:0xA86A50 -func_80240158_A86BA8 = 0x80240158; // type:func rom:0xA86BA8 +kpa_91_UnkFunc13 = 0x80240158; // type:func rom:0xA86BA8 kpa_91_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xA86E50 -func_802404C0_A86F10 = 0x802404C0; // type:func rom:0xA86F10 +kpa_91_UnkFunc14 = 0x802404C0; // type:func rom:0xA86F10 func_8024067C_A870CC = 0x8024067C; // type:func rom:0xA870CC kpa_91_NpcJumpFunc2 = 0x80240730; // type:func rom:0xA87180 kpa_91_NpcJumpFunc = 0x802407A4; // type:func rom:0xA871F4 kpa_91_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xA8726C -func_8024094C_A8739C = 0x8024094C; // type:func rom:0xA8739C +kpa_91_UnkFunc15 = 0x8024094C; // type:func rom:0xA8739C kpa_91_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xA874BC -func_80240AD4_A87524 = 0x80240AD4; // type:func rom:0xA87524 +kpa_91_UnkFunc16 = 0x80240AD4; // type:func rom:0xA87524 func_80240B94_A875E4 = 0x80240B94; // type:func rom:0xA875E4 kpa_91_set_script_owner_npc_anim = 0x80240E90; // type:func rom:0xA878E0 func_80240F0C_A8795C = 0x80240F0C; // type:func rom:0xA8795C @@ -10614,16 +10633,16 @@ D_80245BD0_A8C620 = 0x80245BD0; // type:data rom:0xA8C620 kpa_95_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA8CA80 kpa_95_GetEntityPosition = 0x80240034; // type:func rom:0xA8CAB4 func_802400E0_A8CB60 = 0x802400E0; // type:func rom:0xA8CB60 -func_80240238_A8CCB8 = 0x80240238; // type:func rom:0xA8CCB8 +kpa_95_UnkFunc13 = 0x80240238; // type:func rom:0xA8CCB8 kpa_95_UnkNpcAIFunc1 = 0x802404E0; // type:func rom:0xA8CF60 -func_802405A0_A8D020 = 0x802405A0; // type:func rom:0xA8D020 +kpa_95_UnkFunc14 = 0x802405A0; // type:func rom:0xA8D020 func_8024075C_A8D1DC = 0x8024075C; // type:func rom:0xA8D1DC kpa_95_NpcJumpFunc2 = 0x80240810; // type:func rom:0xA8D290 kpa_95_NpcJumpFunc = 0x80240884; // type:func rom:0xA8D304 kpa_95_UnkNpcAIFunc13 = 0x802408FC; // type:func rom:0xA8D37C -func_80240A2C_A8D4AC = 0x80240A2C; // type:func rom:0xA8D4AC +kpa_95_UnkFunc15 = 0x80240A2C; // type:func rom:0xA8D4AC kpa_95_UnkNpcDurationFlagFunc = 0x80240B4C; // type:func rom:0xA8D5CC -func_80240BB4_A8D634 = 0x80240BB4; // type:func rom:0xA8D634 +kpa_95_UnkFunc16 = 0x80240BB4; // type:func rom:0xA8D634 func_80240C74_A8D6F4 = 0x80240C74; // type:func rom:0xA8D6F4 kpa_95_set_script_owner_npc_anim = 0x80240F70; // type:func rom:0xA8D9F0 func_80240FEC_A8DA6C = 0x80240FEC; // type:func rom:0xA8DA6C @@ -10701,8 +10720,8 @@ D_80245D80_A994C0 = 0x80245D80; // type:data rom:0xA994C0 D_80245D88_A994C8 = 0x80245D88; // type:data rom:0xA994C8 D_80245D90_A994D0 = 0x80245D90; // type:data rom:0xA994D0 D_80245D98_A994D8 = 0x80245D98; // type:data rom:0xA994D8 -func_80240000_A99590 = 0x80240000; // type:func rom:0xA99590 -func_802400BC_A9964C = 0x802400BC; // type:func rom:0xA9964C +kpa_111_UnkFunc11 = 0x80240000; // type:func rom:0xA99590 +kpa_111_UnkFunc12 = 0x802400BC; // type:func rom:0xA9964C func_80240170_A99700 = 0x80240170; // type:func rom:0xA99700 func_80240360_A998F0 = 0x80240360; // type:func rom:0xA998F0 func_802404A4_A99A34 = 0x802404A4; // type:func rom:0xA99A34 @@ -10719,8 +10738,8 @@ D_80243250_A9C7E0 = 0x80243250; // type:data rom:0xA9C7E0 D_80243258_A9C7E8 = 0x80243258; // type:data rom:0xA9C7E8 D_80243260_A9C7F0 = 0x80243260; // type:data rom:0xA9C7F0 kpa_113_SetEntityFlags100000 = 0x80240000; // type:func rom:0xA9CC30 -func_80240040_A9CC70 = 0x80240040; // type:func rom:0xA9CC70 -func_802400FC_A9CD2C = 0x802400FC; // type:func rom:0xA9CD2C +kpa_113_UnkFunc11 = 0x80240040; // type:func rom:0xA9CC70 +kpa_113_UnkFunc12 = 0x802400FC; // type:func rom:0xA9CD2C kpa_113_set_script_owner_npc_anim = 0x802401B0; // type:func rom:0xA9CDE0 func_8024022C_A9CE5C = 0x8024022C; // type:func rom:0xA9CE5C kpa_113_UnkNpcAIFunc12 = 0x80240360; // type:func rom:0xA9CF90 @@ -10733,8 +10752,8 @@ D_80241CF0_A9E920 = 0x80241CF0; // type:data rom:0xA9E920 func_80240000_A9E980 = 0x80240000; // type:func rom:0xA9E980 D_80240390_A9ED10 = 0x80240390; // type:data rom:0xA9ED10 D_802403A0_A9ED20 = 0x802403A0; // type:data rom:0xA9ED20 -func_80240000_A9ED40 = 0x80240000; // type:func rom:0xA9ED40 -func_802400BC_A9EDFC = 0x802400BC; // type:func rom:0xA9EDFC +kpa_115_UnkFunc11 = 0x80240000; // type:func rom:0xA9ED40 +kpa_115_UnkFunc12 = 0x802400BC; // type:func rom:0xA9EDFC func_80240170_A9EEB0 = 0x80240170; // type:func rom:0xA9EEB0 func_80240360_A9F0A0 = 0x80240360; // type:func rom:0xA9F0A0 func_802404A4_A9F1E4 = 0x802404A4; // type:func rom:0xA9F1E4 @@ -10813,16 +10832,16 @@ D_80241FC0_ABB270 = 0x80241FC0; // type:data rom:0xABB270 func_80240000_ABB290 = 0x80240000; // type:func rom:0xABB290 func_80240040_ABB2D0 = 0x80240040; // type:func rom:0xABB2D0 func_802400B0_ABB340 = 0x802400B0; // type:func rom:0xABB340 -func_80240208_ABB498 = 0x80240208; // type:func rom:0xABB498 +kkj_00_UnkFunc13 = 0x80240208; // type:func rom:0xABB498 kkj_00_UnkNpcAIFunc1 = 0x802404B0; // type:func rom:0xABB740 -func_80240570_ABB800 = 0x80240570; // type:func rom:0xABB800 +kkj_00_UnkFunc14 = 0x80240570; // type:func rom:0xABB800 func_8024072C_ABB9BC = 0x8024072C; // type:func rom:0xABB9BC kkj_00_NpcJumpFunc2 = 0x802407E0; // type:func rom:0xABBA70 kkj_00_NpcJumpFunc = 0x80240854; // type:func rom:0xABBAE4 kkj_00_UnkNpcAIFunc13 = 0x802408CC; // type:func rom:0xABBB5C -func_802409FC_ABBC8C = 0x802409FC; // type:func rom:0xABBC8C +kkj_00_UnkFunc15 = 0x802409FC; // type:func rom:0xABBC8C kkj_00_UnkNpcDurationFlagFunc = 0x80240B1C; // type:func rom:0xABBDAC -func_80240B84_ABBE14 = 0x80240B84; // type:func rom:0xABBE14 +kkj_00_UnkFunc16 = 0x80240B84; // type:func rom:0xABBE14 func_80240C44_ABBED4 = 0x80240C44; // type:func rom:0xABBED4 func_80240F40_ABC1D0 = 0x80240F40; // type:func rom:0xABC1D0 D_8024160C_ABC89C = 0x8024160C; // type:data rom:0xABC89C @@ -10830,16 +10849,16 @@ D_8024162C_ABC8BC = 0x8024162C; // type:data rom:0xABC8BC D_80249D30_AC4FC0 = 0x80249D30; // type:data rom:0xAC4FC0 D_80249D38_AC4FC8 = 0x80249D38; // type:data rom:0xAC4FC8 func_80240000_AC5170 = 0x80240000; // type:func rom:0xAC5170 -func_80240158_AC52C8 = 0x80240158; // type:func rom:0xAC52C8 +kkj_01_UnkFunc13 = 0x80240158; // type:func rom:0xAC52C8 kkj_01_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xAC5570 -func_802404C0_AC5630 = 0x802404C0; // type:func rom:0xAC5630 +kkj_01_UnkFunc14 = 0x802404C0; // type:func rom:0xAC5630 func_8024067C_AC57EC = 0x8024067C; // type:func rom:0xAC57EC kkj_01_NpcJumpFunc2 = 0x80240730; // type:func rom:0xAC58A0 kkj_01_NpcJumpFunc = 0x802407A4; // type:func rom:0xAC5914 kkj_01_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xAC598C -func_8024094C_AC5ABC = 0x8024094C; // type:func rom:0xAC5ABC +kkj_01_UnkFunc15 = 0x8024094C; // type:func rom:0xAC5ABC kkj_01_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xAC5BDC -func_80240AD4_AC5C44 = 0x80240AD4; // type:func rom:0xAC5C44 +kkj_01_UnkFunc16 = 0x80240AD4; // type:func rom:0xAC5C44 func_80240B94_AC5D04 = 0x80240B94; // type:func rom:0xAC5D04 D_80243A10_AC8B80 = 0x80243A10; // type:data rom:0xAC8B80 D_80243A18_AC8B88 = 0x80243A18; // type:data rom:0xAC8B88 @@ -11155,16 +11174,16 @@ func_8024033C_B2C7AC = 0x8024033C; // type:func rom:0xB2C7AC func_80240360_B2C7D0 = 0x80240360; // type:func rom:0xB2C7D0 func_802403F8_B2C868 = 0x802403F8; // type:func rom:0xB2C868 func_80240430_B2C8A0 = 0x80240430; // type:func rom:0xB2C8A0 -func_80240588_B2C9F8 = 0x80240588; // type:func rom:0xB2C9F8 +jan_02_UnkFunc13 = 0x80240588; // type:func rom:0xB2C9F8 jan_02_UnkNpcAIFunc1 = 0x80240830; // type:func rom:0xB2CCA0 -func_802408F0_B2CD60 = 0x802408F0; // type:func rom:0xB2CD60 +jan_02_UnkFunc14 = 0x802408F0; // type:func rom:0xB2CD60 func_80240AAC_B2CF1C = 0x80240AAC; // type:func rom:0xB2CF1C jan_02_NpcJumpFunc2 = 0x80240B60; // type:func rom:0xB2CFD0 jan_02_NpcJumpFunc = 0x80240BD4; // type:func rom:0xB2D044 jan_02_UnkNpcAIFunc13 = 0x80240C4C; // type:func rom:0xB2D0BC -func_80240D7C_B2D1EC = 0x80240D7C; // type:func rom:0xB2D1EC +jan_02_UnkFunc15 = 0x80240D7C; // type:func rom:0xB2D1EC jan_02_UnkNpcDurationFlagFunc = 0x80240E9C; // type:func rom:0xB2D30C -func_80240F04_B2D374 = 0x80240F04; // type:func rom:0xB2D374 +jan_02_UnkFunc16 = 0x80240F04; // type:func rom:0xB2D374 func_80240FC4_B2D434 = 0x80240FC4; // type:func rom:0xB2D434 jan_02_GetNpcCollisionHeight = 0x802412C0; // type:func rom:0xB2D730 jan_02_SomeXYZFuncTodoRename = 0x8024131C; // type:func rom:0xB2D78C @@ -11219,16 +11238,16 @@ jan_03_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xB34EB0 jan_03_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xB34FD4 func_802405EC_B351BC = 0x802405EC; // type:func rom:0xB351BC func_80240620_B351F0 = 0x80240620; // type:func rom:0xB351F0 -func_80240778_B35348 = 0x80240778; // type:func rom:0xB35348 +jan_03_UnkFunc13 = 0x80240778; // type:func rom:0xB35348 jan_03_UnkNpcAIFunc1 = 0x80240A20; // type:func rom:0xB355F0 -func_80240AE0_B356B0 = 0x80240AE0; // type:func rom:0xB356B0 +jan_03_UnkFunc14 = 0x80240AE0; // type:func rom:0xB356B0 func_80240C9C_B3586C = 0x80240C9C; // type:func rom:0xB3586C jan_03_NpcJumpFunc2 = 0x80240D50; // type:func rom:0xB35920 jan_03_NpcJumpFunc = 0x80240DC4; // type:func rom:0xB35994 jan_03_UnkNpcAIFunc13 = 0x80240E3C; // type:func rom:0xB35A0C -func_80240F6C_B35B3C = 0x80240F6C; // type:func rom:0xB35B3C +jan_03_UnkFunc15 = 0x80240F6C; // type:func rom:0xB35B3C jan_03_UnkNpcDurationFlagFunc = 0x8024108C; // type:func rom:0xB35C5C -func_802410F4_B35CC4 = 0x802410F4; // type:func rom:0xB35CC4 +jan_03_UnkFunc16 = 0x802410F4; // type:func rom:0xB35CC4 func_802411B4_B35D84 = 0x802411B4; // type:func rom:0xB35D84 jan_03_Call800E9894 = 0x802414B0; // type:func rom:0xB36080 jan_03_Call800E98C4SyncStatusMenu = 0x802414D0; // type:func rom:0xB360A0 @@ -11337,7 +11356,7 @@ jan_05_UnkNpcAIFunc7 = 0x80241938; // type:func rom:0xB4C3A8 jan_05_UnkNpcAIFunc8 = 0x802419A8; // type:func rom:0xB4C418 jan_05_UnkNpcAIFunc5 = 0x80241A80; // type:func rom:0xB4C4F0 func_80241AD4_B4C544 = 0x80241AD4; // type:func rom:0xB4C544 -func_80241C88_B4C6F8 = 0x80241C88; // type:func rom:0xB4C6F8 +jan_05_UnkFunc7 = 0x80241C88; // type:func rom:0xB4C6F8 func_80241EE8_B4C958 = 0x80241EE8; // type:func rom:0xB4C958 func_8024219C_B4CC0C = 0x8024219C; // type:func rom:0xB4CC0C dup_jan_05_SomeMatrixOperation = 0x80242450; // type:func rom:0xB4CEC0 @@ -11368,7 +11387,7 @@ jan_06_UnkNpcAIFunc7 = 0x80241888; // type:func rom:0xB540B8 jan_06_UnkNpcAIFunc8 = 0x802418F8; // type:func rom:0xB54128 jan_06_UnkNpcAIFunc5 = 0x802419D0; // type:func rom:0xB54200 func_80241A24_B54254 = 0x80241A24; // type:func rom:0xB54254 -func_80241BD8_B54408 = 0x80241BD8; // type:func rom:0xB54408 +jan_06_UnkFunc7 = 0x80241BD8; // type:func rom:0xB54408 func_80241E38_B54668 = 0x80241E38; // type:func rom:0xB54668 func_802420EC_B5491C = 0x802420EC; // type:func rom:0xB5491C dup_jan_06_SomeMatrixOperation = 0x802423A0; // type:func rom:0xB54BD0 @@ -11382,7 +11401,7 @@ jan_07_UnkNpcAIFunc7 = 0x80240280; // type:func rom:0xB59AF0 jan_07_UnkNpcAIFunc8 = 0x802402F0; // type:func rom:0xB59B60 jan_07_UnkNpcAIFunc5 = 0x802403C8; // type:func rom:0xB59C38 func_8024041C_B59C8C = 0x8024041C; // type:func rom:0xB59C8C -func_802405D0_B59E40 = 0x802405D0; // type:func rom:0xB59E40 +jan_07_UnkFunc7 = 0x802405D0; // type:func rom:0xB59E40 func_80240830_B5A0A0 = 0x80240830; // type:func rom:0xB5A0A0 func_80240AE4_B5A354 = 0x80240AE4; // type:func rom:0xB5A354 jan_07_SomeMatrixOperation = 0x80240DA0; // type:func rom:0xB5A610 @@ -11397,20 +11416,20 @@ jan_08_SomeMatrixOperation2 = 0x80240380; // type:func rom:0xB5E630 func_8024054C_B5E7FC = 0x8024054C; // type:func rom:0xB5E7FC func_802405A8_B5E858 = 0x802405A8; // type:func rom:0xB5E858 jan_08_SetOverrideFlags_40 = 0x80240660; // type:func rom:0xB5E910 -func_8024067C_B5E92C = 0x8024067C; // type:func rom:0xB5E92C +jan_08_UnkFunc17 = 0x8024067C; // type:func rom:0xB5E92C func_8024069C_B5E94C = 0x8024069C; // type:func rom:0xB5E94C -func_802406C8_B5E978 = 0x802406C8; // type:func rom:0xB5E978 +jan_08_UnkFunc18 = 0x802406C8; // type:func rom:0xB5E978 func_80240734_B5E9E4 = 0x80240734; // type:func rom:0xB5E9E4 func_80240780_B5EA30 = 0x80240780; // type:func rom:0xB5EA30 func_8024082C_B5EADC = 0x8024082C; // type:func rom:0xB5EADC func_80240A7C_B5ED2C = 0x80240A7C; // type:func rom:0xB5ED2C -func_80240AA8_B5ED58 = 0x80240AA8; // type:func rom:0xB5ED58 -func_80240AE0_B5ED90 = 0x80240AE0; // type:func rom:0xB5ED90 +jan_08_UnkFunc19 = 0x80240AA8; // type:func rom:0xB5ED58 +jan_08_UnkFunc20 = 0x80240AE0; // type:func rom:0xB5ED90 func_80240B70_B5EE20 = 0x80240B70; // type:func rom:0xB5EE20 -func_80240BA4_B5EE54 = 0x80240BA4; // type:func rom:0xB5EE54 -func_80240C08_B5EEB8 = 0x80240C08; // type:func rom:0xB5EEB8 +jan_08_UnkFunc21 = 0x80240BA4; // type:func rom:0xB5EE54 +jan_08_UnkFunc22 = 0x80240C08; // type:func rom:0xB5EEB8 func_80240C60_B5EF10 = 0x80240C60; // type:func rom:0xB5EF10 -func_80241198_B5F448 = 0x80241198; // type:func rom:0xB5F448 +jan_08_UnkFunc23 = 0x80241198; // type:func rom:0xB5F448 jan_08_UnkPartnerPosFunc = 0x802412D8; // type:func rom:0xB5F588 jan_08_UnkPartnerPosFunc2 = 0x80241320; // type:func rom:0xB5F5D0 func_80241368_B5F618 = 0x80241368; // type:func rom:0xB5F618 @@ -11422,7 +11441,7 @@ jan_08_UnkNpcAIFunc7 = 0x802416D4; // type:func rom:0xB5F984 jan_08_UnkNpcAIFunc8 = 0x80241744; // type:func rom:0xB5F9F4 jan_08_UnkNpcAIFunc5 = 0x8024181C; // type:func rom:0xB5FACC func_80241870_B5FB20 = 0x80241870; // type:func rom:0xB5FB20 -func_80241A24_B5FCD4 = 0x80241A24; // type:func rom:0xB5FCD4 +jan_08_UnkFunc7 = 0x80241A24; // type:func rom:0xB5FCD4 func_80241C84_B5FF34 = 0x80241C84; // type:func rom:0xB5FF34 func_80241F38_B601E8 = 0x80241F38; // type:func rom:0xB601E8 dup_jan_08_SomeMatrixOperation = 0x802421F0; // type:func rom:0xB604A0 @@ -11452,7 +11471,7 @@ jan_09_UnkNpcAIFunc7 = 0x80240BC0; // type:func rom:0xB66670 jan_09_UnkNpcAIFunc8 = 0x80240C30; // type:func rom:0xB666E0 jan_09_UnkNpcAIFunc5 = 0x80240D08; // type:func rom:0xB667B8 func_80240D5C_B6680C = 0x80240D5C; // type:func rom:0xB6680C -func_80240F10_B669C0 = 0x80240F10; // type:func rom:0xB669C0 +jan_09_UnkFunc7 = 0x80240F10; // type:func rom:0xB669C0 func_80241170_B66C20 = 0x80241170; // type:func rom:0xB66C20 func_80241424_B66ED4 = 0x80241424; // type:func rom:0xB66ED4 dup_jan_09_SomeMatrixOperation = 0x802416E0; // type:func rom:0xB67190 @@ -11499,7 +11518,7 @@ jan_12_UnkNpcAIFunc7 = 0x80240740; // type:func rom:0xB737F0 jan_12_UnkNpcAIFunc8 = 0x802407B0; // type:func rom:0xB73860 jan_12_UnkNpcAIFunc5 = 0x80240888; // type:func rom:0xB73938 func_802408DC_B7398C = 0x802408DC; // type:func rom:0xB7398C -func_80240A90_B73B40 = 0x80240A90; // type:func rom:0xB73B40 +jan_12_UnkFunc7 = 0x80240A90; // type:func rom:0xB73B40 func_80240CF0_B73DA0 = 0x80240CF0; // type:func rom:0xB73DA0 func_80240FA4_B74054 = 0x80240FA4; // type:func rom:0xB74054 D_802433B0_B76460 = 0x802433B0; // type:data rom:0xB76460 @@ -11541,16 +11560,16 @@ jan_16_SomeMatrixOperation2 = 0x80240370; // type:func rom:0xB80370 func_80240000_B837C0 = 0x80240000; // type:func rom:0xB837C0 func_80240000_B83E60 = 0x80240000; // type:func rom:0xB83E60 func_80240000_B84180 = 0x80240000; // type:func rom:0xB84180 -func_80240158_B842D8 = 0x80240158; // type:func rom:0xB842D8 +jan_22_UnkFunc13 = 0x80240158; // type:func rom:0xB842D8 jan_22_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xB84580 -func_802404C0_B84640 = 0x802404C0; // type:func rom:0xB84640 +jan_22_UnkFunc14 = 0x802404C0; // type:func rom:0xB84640 func_8024067C_B847FC = 0x8024067C; // type:func rom:0xB847FC jan_22_NpcJumpFunc2 = 0x80240730; // type:func rom:0xB848B0 jan_22_NpcJumpFunc = 0x802407A4; // type:func rom:0xB84924 jan_22_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xB8499C -func_8024094C_B84ACC = 0x8024094C; // type:func rom:0xB84ACC +jan_22_UnkFunc15 = 0x8024094C; // type:func rom:0xB84ACC jan_22_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xB84BEC -func_80240AD4_B84C54 = 0x80240AD4; // type:func rom:0xB84C54 +jan_22_UnkFunc16 = 0x80240AD4; // type:func rom:0xB84C54 func_80240B94_B84D14 = 0x80240B94; // type:func rom:0xB84D14 func_80240E90_B85010 = 0x80240E90; // type:func rom:0xB85010 jan_22_GetItemName = 0x80240F44; // type:func rom:0xB850C4 @@ -11579,7 +11598,7 @@ mim_01_UnkNpcAIFunc7 = 0x8024056C; // type:func rom:0xB939AC mim_01_UnkNpcAIFunc8 = 0x802405DC; // type:func rom:0xB93A1C mim_01_UnkNpcAIFunc5 = 0x802406B4; // type:func rom:0xB93AF4 func_80240708_B93B48 = 0x80240708; // type:func rom:0xB93B48 -func_802408BC_B93CFC = 0x802408BC; // type:func rom:0xB93CFC +mim_01_UnkFunc7 = 0x802408BC; // type:func rom:0xB93CFC func_80240B1C_B93F5C = 0x80240B1C; // type:func rom:0xB93F5C func_80240DD0_B94210 = 0x80240DD0; // type:func rom:0xB94210 func_80240E3C_B9427C = 0x80240E3C; // type:func rom:0xB9427C @@ -11642,7 +11661,7 @@ mim_05_UnkNpcAIFunc7 = 0x802400DC; // type:func rom:0xBA080C mim_05_UnkNpcAIFunc8 = 0x8024014C; // type:func rom:0xBA087C mim_05_UnkNpcAIFunc5 = 0x80240224; // type:func rom:0xBA0954 func_80240278_BA09A8 = 0x80240278; // type:func rom:0xBA09A8 -func_8024042C_BA0B5C = 0x8024042C; // type:func rom:0xBA0B5C +mim_05_UnkFunc7 = 0x8024042C; // type:func rom:0xBA0B5C func_8024068C_BA0DBC = 0x8024068C; // type:func rom:0xBA0DBC func_80240940_BA1070 = 0x80240940; // type:func rom:0xBA1070 func_802409AC_BA10DC = 0x802409AC; // type:func rom:0xBA10DC @@ -11668,7 +11687,7 @@ mim_06_UnkNpcAIFunc7 = 0x802405DC; // type:func rom:0xBA4D5C mim_06_UnkNpcAIFunc8 = 0x8024064C; // type:func rom:0xBA4DCC mim_06_UnkNpcAIFunc5 = 0x80240724; // type:func rom:0xBA4EA4 func_80240778_BA4EF8 = 0x80240778; // type:func rom:0xBA4EF8 -func_8024092C_BA50AC = 0x8024092C; // type:func rom:0xBA50AC +mim_06_UnkFunc7 = 0x8024092C; // type:func rom:0xBA50AC func_80240B8C_BA530C = 0x80240B8C; // type:func rom:0xBA530C func_80240E40_BA55C0 = 0x80240E40; // type:func rom:0xBA55C0 func_80240EAC_BA562C = 0x80240EAC; // type:func rom:0xBA562C @@ -11716,20 +11735,20 @@ func_80240068_BAD9A8 = 0x80240068; // type:func rom:0xBAD9A8 func_802400A0_BAD9E0 = 0x802400A0; // type:func rom:0xBAD9E0 func_80240250_BADB90 = 0x80240250; // type:func rom:0xBADB90 mim_08_UnkNpcAIFunc1 = 0x80240878; // type:func rom:0xBAE1B8 -func_80240938_BAE278 = 0x80240938; // type:func rom:0xBAE278 +mim_08_UnkFunc4 = 0x80240938; // type:func rom:0xBAE278 mim_08_UnkNpcAIFunc2 = 0x80240C7C; // type:func rom:0xBAE5BC func_80240CF4_BAE634 = 0x80240CF4; // type:func rom:0xBAE634 mim_08_UnkNpcAIFunc14 = 0x80240D60; // type:func rom:0xBAE6A0 mim_08_UnkNpcAIFunc3 = 0x80240E94; // type:func rom:0xBAE7D4 -func_80240EF8_BAE838 = 0x80240EF8; // type:func rom:0xBAE838 -func_80241288_BAEBC8 = 0x80241288; // type:func rom:0xBAEBC8 +mim_08_UnkFunc6 = 0x80240EF8; // type:func rom:0xBAE838 +mim_08_UnkFunc5 = 0x80241288; // type:func rom:0xBAEBC8 func_802413AC_BAECEC = 0x802413AC; // type:func rom:0xBAECEC mim_08_UnkNpcAIFunc6 = 0x80241598; // type:func rom:0xBAEED8 mim_08_UnkNpcAIFunc7 = 0x80241604; // type:func rom:0xBAEF44 mim_08_UnkNpcAIFunc8 = 0x80241674; // type:func rom:0xBAEFB4 mim_08_UnkNpcAIFunc5 = 0x8024174C; // type:func rom:0xBAF08C func_802417A0_BAF0E0 = 0x802417A0; // type:func rom:0xBAF0E0 -func_80241954_BAF294 = 0x80241954; // type:func rom:0xBAF294 +mim_08_UnkFunc7 = 0x80241954; // type:func rom:0xBAF294 func_80241BB4_BAF4F4 = 0x80241BB4; // type:func rom:0xBAF4F4 func_80241E68_BAF7A8 = 0x80241E68; // type:func rom:0xBAF7A8 func_80241ED4_BAF814 = 0x80241ED4; // type:func rom:0xBAF814 @@ -11955,23 +11974,23 @@ arn_02_UnkDurationCheck = 0x80240C4C; // type:func rom:0xBDDDFC arn_02_func_80240C90_BDDE40 = 0x80240C90; // type:func rom:0xBDDE40 arn_02_entryList = 0x80240FE0; // type:data rom:0xBDE190 arn_02_config = 0x80241000; // type:data rom:0xBDE1B0 -arn_02_PlayMusic = 0x80241040; // type:data rom:0xBDE1F0 -arn_02_Exit1 = 0x802410F0; // type:data rom:0xBDE2A0 -arn_02_Exit2 = 0x8024114C; // type:data rom:0xBDE2FC -arn_02_BindExits = 0x802411A8; // type:data rom:0xBDE358 -arn_02_Main = 0x802411F0; // type:data rom:0xBDE3A0 +arn_02_80241040 = 0x80241040; // type:data rom:0xBDE1F0 +arn_02_exitWalk_802410F0 = 0x802410F0; // type:data rom:0xBDE2A0 +arn_02_exitWalk_8024114C = 0x8024114C; // type:data rom:0xBDE2FC +arn_02_802411A8 = 0x802411A8; // type:data rom:0xBDE358 +arn_02_main = 0x802411F0; // type:data rom:0xBDE3A0 arn_02_padding = 0x802412C4; // type:data rom:0xBDE474 -arn_02_MakeEntities = 0x802412D0; // type:data rom:0xBDE480 -arn_02_goombaAISettings = 0x802413D0; // type:data rom:0xBDE580 -arn_02_GoombaAI = 0x80241400; // type:data rom:0xBDE5B0 -arn_02_goombaNpcSettings = 0x80241420; // type:data rom:0xBDE5D0 -arn_02_cleftAISettings = 0x8024144C; // type:data rom:0xBDE5FC -arn_02_CleftAI = 0x8024147C; // type:data rom:0xBDE62C -arn_02_cleftNpcSettings = 0x802414A0; // type:data rom:0xBDE650 -arn_02_CleftNPC1 = 0x802414CC; // type:data rom:0xBDE67C -arn_02_CleftNPC2 = 0x802416BC; // type:data rom:0xBDE86C -arn_02_GoombaNPC = 0x802418AC; // type:data rom:0xBDEA5C -arn_02_npcGroupList = 0x80241A9C; // type:data rom:0xBDEC4C +arn_02_makeEntities = 0x802412D0; // type:data rom:0xBDE480 +arn_02_npcAISettings_802413D0 = 0x802413D0; // type:data rom:0xBDE580 +arn_02_npcAI_80241400 = 0x80241400; // type:data rom:0xBDE5B0 +arn_02_npcSettings_80241420 = 0x80241420; // type:data rom:0xBDE5D0 +arn_02_npcAISettings_8024144C = 0x8024144C; // type:data rom:0xBDE5FC +arn_02_npcAI_8024147C = 0x8024147C; // type:data rom:0xBDE62C +arn_02_npcSettings_802414A0 = 0x802414A0; // type:data rom:0xBDE650 +arn_02_npcGroup_802414CC = 0x802414CC; // type:data rom:0xBDE67C +arn_02_npcGroup_802416BC = 0x802416BC; // type:data rom:0xBDE86C +arn_02_npcGroup_802418AC = 0x802418AC; // type:data rom:0xBDEA5C +arn_02_npcGroupList_80241A9C = 0x80241A9C; // type:data rom:0xBDEC4C D_80241AE0_BDEC90 = 0x80241AE0; // type:data rom:0xBDEC90 D_80241AE8_BDEC98 = 0x80241AE8; // type:data rom:0xBDEC98 D_80241AF0_BDECA0 = 0x80241AF0; // type:data rom:0xBDECA0 @@ -12001,54 +12020,54 @@ arn_03_func_80241648_BE03D8 = 0x80241648; // type:func rom:0xBE03D8 func_80241680_BE0410 = 0x80241680; // type:func rom:0xBE0410 arn_03_entryList = 0x80241720; // type:data rom:0xBE04B0 arn_03_config = 0x80241740; // type:data rom:0xBE04D0 -arn_03_PlayMusic = 0x80241780; // type:data rom:0xBE0510 -arn_03_Exit1 = 0x80241830; // type:data rom:0xBE05C0 -arn_03_Exit2 = 0x8024188C; // type:data rom:0xBE061C -arn_03_BindExits = 0x802418E8; // type:data rom:0xBE0678 -arn_03_EnterWalk = 0x80241930; // type:data rom:0xBE06C0 -arn_03_Main = 0x80241A58; // type:data rom:0xBE07E8 +arn_03_80241780 = 0x80241780; // type:data rom:0xBE0510 +arn_03_exitWalk_80241830 = 0x80241830; // type:data rom:0xBE05C0 +arn_03_exitWalk_8024188C = 0x8024188C; // type:data rom:0xBE061C +arn_03_802418E8 = 0x802418E8; // type:data rom:0xBE0678 +arn_03_enterWalk_80241930 = 0x80241930; // type:data rom:0xBE06C0 +arn_03_main = 0x80241A58; // type:data rom:0xBE07E8 arn_03_padding1 = 0x80241BB8; // type:data rom:0xBE0948 -arn_03_BooAISettings1 = 0x80241BC0; // type:data rom:0xBE0950 -arn_03_BooAI = 0x80241BF0; // type:data rom:0xBE0980 -arn_03_BooSettings1 = 0x80241C10; // type:data rom:0xBE09A0 -arn_03_BooSettings2 = 0x80241C3C; // type:data rom:0xBE09CC -D_80241C68_BE09F8 = 0x80241C68; // type:data rom:0xBE09F8 -arn_03_ShowItemPackage = 0x80241C6C; // type:data rom:0xBE09FC -arn_03_D_80241C9C_BE0A2C = 0x80241C9C; // type:data rom:0xBE0A2C -D_80241CCC_BE0A5C = 0x80241CCC; // type:data rom:0xBE0A5C -D_80241CD0_BE0A60 = 0x80241CD0; // type:data rom:0xBE0A60 -arn_03_D_80241CD4_BE0A64 = 0x80241CD4; // type:data rom:0xBE0A64 -arn_03_D_80241E18_BE0BA8 = 0x80241E18; // type:data rom:0xBE0BA8 -arn_03_D_80241E68_BE0BF8 = 0x80241E68; // type:data rom:0xBE0BF8 -arn_03_D_80241EB0_BE0C40 = 0x80241EB0; // type:data rom:0xBE0C40 -arn_03_D_80242064_BE0DF4 = 0x80242064; // type:data rom:0xBE0DF4 -arn_03_Boo0Init = 0x802424E0; // type:data rom:0xBE1270 -arn_03_Boo1Interact = 0x8024254C; // type:data rom:0xBE12DC -arn_03_Boo1Init = 0x802428A8; // type:data rom:0xBE1638 -arn_03_D_802428CC_BE165C = 0x802428CC; // type:data rom:0xBE165C -arn_03_D_802429D4_BE1764 = 0x802429D4; // type:data rom:0xBE1764 -arn_03_D_80242B0C_BE189C = 0x80242B0C; // type:data rom:0xBE189C -arn_03_D_80242C60_BE19F0 = 0x80242C60; // type:data rom:0xBE19F0 -arn_03_Boo2Interact = 0x80242DC4; // type:data rom:0xBE1B54 -arn_03_Boo2Init = 0x802431A4; // type:data rom:0xBE1F34 -arn_03_Boo3Interact = 0x802431C8; // type:data rom:0xBE1F58 -arn_03_Boo3Init = 0x80243328; // type:data rom:0xBE20B8 -arn_03_Boo4Init = 0x8024334C; // type:data rom:0xBE20DC -arn_03_Boo0 = 0x80243378; // type:data rom:0xBE2108 -arn_03_Boo1 = 0x80243568; // type:data rom:0xBE22F8 -arn_03_Boo2 = 0x80243758; // type:data rom:0xBE24E8 -arn_03_Boo3 = 0x80243948; // type:data rom:0xBE26D8 -arn_03_Boo4 = 0x80243B38; // type:data rom:0xBE28C8 -arn_03_BooIdle = 0x80243D28; // type:data rom:0xBE2AB8 -arn_03_Boo5Init = 0x80243E90; // type:data rom:0xBE2C20 -arn_03_Boo6Init = 0x80243ECC; // type:data rom:0xBE2C5C -arn_03_Boo7Init = 0x80243F08; // type:data rom:0xBE2C98 -arn_03_Boo8Init = 0x80243F44; // type:data rom:0xBE2CD4 -arn_03_BooGroup = 0x80243F80; // type:data rom:0xBE2D10 -arn_03_npcGroupList1 = 0x80244740; // type:data rom:0xBE34D0 -arn_03_npcGroupList2 = 0x80244788; // type:data rom:0xBE3518 +arn_03_npcAISettings_80241BC0 = 0x80241BC0; // type:data rom:0xBE0950 +arn_03_npcAI_80241BF0 = 0x80241BF0; // type:data rom:0xBE0980 +arn_03_npcSettings_80241C10 = 0x80241C10; // type:data rom:0xBE09A0 +arn_03_npcSettings_80241C3C = 0x80241C3C; // type:data rom:0xBE09CC +arn_03_D_80241C68_BE09F8 = 0x80241C68; // type:data rom:0xBE09F8 +arn_03_80241C6C = 0x80241C6C; // type:data rom:0xBE09FC +arn_03_80241C9C = 0x80241C9C; // type:data rom:0xBE0A2C +arn_03_D_80241CCC_BE0A5C = 0x80241CCC; // type:data rom:0xBE0A5C +arn_03_D_80241CD0_BE0A60 = 0x80241CD0; // type:data rom:0xBE0A60 +arn_03_80241CD4 = 0x80241CD4; // type:data rom:0xBE0A64 +arn_03_80241E18 = 0x80241E18; // type:data rom:0xBE0BA8 +arn_03_80241E68 = 0x80241E68; // type:data rom:0xBE0BF8 +arn_03_interact_80241EB0 = 0x80241EB0; // type:data rom:0xBE0C40 +arn_03_idle_80242064 = 0x80242064; // type:data rom:0xBE0DF4 +arn_03_init_802424E0 = 0x802424E0; // type:data rom:0xBE1270 +arn_03_interact_8024254C = 0x8024254C; // type:data rom:0xBE12DC +arn_03_init_802428A8 = 0x802428A8; // type:data rom:0xBE1638 +arn_03_802428CC = 0x802428CC; // type:data rom:0xBE165C +arn_03_802429D4 = 0x802429D4; // type:data rom:0xBE1764 +arn_03_80242B0C = 0x80242B0C; // type:data rom:0xBE189C +arn_03_80242C60 = 0x80242C60; // type:data rom:0xBE19F0 +arn_03_interact_80242DC4 = 0x80242DC4; // type:data rom:0xBE1B54 +arn_03_init_802431A4 = 0x802431A4; // type:data rom:0xBE1F34 +arn_03_interact_802431C8 = 0x802431C8; // type:data rom:0xBE1F58 +arn_03_init_80243328 = 0x80243328; // type:data rom:0xBE20B8 +arn_03_init_8024334C = 0x8024334C; // type:data rom:0xBE20DC +arn_03_npcGroup_80243378 = 0x80243378; // type:data rom:0xBE2108 +arn_03_npcGroup_80243568 = 0x80243568; // type:data rom:0xBE22F8 +arn_03_npcGroup_80243758 = 0x80243758; // type:data rom:0xBE24E8 +arn_03_npcGroup_80243948 = 0x80243948; // type:data rom:0xBE26D8 +arn_03_npcGroup_80243B38 = 0x80243B38; // type:data rom:0xBE28C8 +arn_03_idle_80243D28 = 0x80243D28; // type:data rom:0xBE2AB8 +arn_03_init_80243E90 = 0x80243E90; // type:data rom:0xBE2C20 +arn_03_init_80243ECC = 0x80243ECC; // type:data rom:0xBE2C5C +arn_03_init_80243F08 = 0x80243F08; // type:data rom:0xBE2C98 +arn_03_init_80243F44 = 0x80243F44; // type:data rom:0xBE2CD4 +arn_03_npcGroup_80243F80 = 0x80243F80; // type:data rom:0xBE2D10 +arn_03_npcGroupList_80244740 = 0x80244740; // type:data rom:0xBE34D0 +arn_03_npcGroupList_80244788 = 0x80244788; // type:data rom:0xBE3518 arn_03_padding3 = 0x802447DC; // type:data rom:0xBE356C -arn_03_D_802447E0_BE3570 = 0x802447E0; // type:data rom:0xBE3570 +arn_03_makeEntities = 0x802447E0; // type:data rom:0xBE3570 D_80244860_BE35F0 = 0x80244860; // type:data rom:0xBE35F0 D_80244868_BE35F8 = 0x80244868; // type:data rom:0xBE35F8 arn_04_func_80240000_BE37B0 = 0x80240000; // type:func rom:0xBE37B0 @@ -12074,7 +12093,7 @@ arn_04_UnkNpcAIFunc3 = 0x80241C84; // type:func rom:0xBE5434 arn_04_func_80241CE8_BE5498 = 0x80241CE8; // type:func rom:0xBE5498 arn_04_func_80242078_BE5828 = 0x80242078; // type:func rom:0xBE5828 arn_04_func_8024219C_BE594C = 0x8024219C; // type:func rom:0xBE594C -func_80242388_BE5B38 = 0x80242388; // type:func rom:0xBE5B38 +arn_04_func_80242388_BE5B38 = 0x80242388; // type:func rom:0xBE5B38 arn_04_UnkNpcAIFunc18 = 0x802424E8; // type:func rom:0xBE5C98 arn_04_func_8024255C_BE5D0C = 0x8024255C; // type:func rom:0xBE5D0C arn_04_UnkNpcAIFunc21 = 0x8024268C; // type:func rom:0xBE5E3C @@ -12092,32 +12111,31 @@ arn_04_UnkDurationCheck = 0x80242FD4; // type:func rom:0xBE6784 arn_04_func_80243018_BE67C8 = 0x80243018; // type:func rom:0xBE67C8 arn_04_entryList = 0x80243370; // type:data rom:0xBE6B20 arn_04_config = 0x80243390; // type:data rom:0xBE6B40 -arn_04_PlayMusic = 0x802433D0; // type:data rom:0xBE6B80 -arn_04_Exit1 = 0x80243480; // type:data rom:0xBE6C30 -arn_04_Exit2 = 0x802434DC; // type:data rom:0xBE6C8C -arn_04_ExitWalk = 0x80243538; // type:data rom:0xBE6CE8 +arn_04_802433D0 = 0x802433D0; // type:data rom:0xBE6B80 +arn_04_exitWalk_80243480 = 0x80243480; // type:data rom:0xBE6C30 +arn_04_exitWalk_802434DC = 0x802434DC; // type:data rom:0xBE6C8C +arn_04_80243538 = 0x80243538; // type:data rom:0xBE6CE8 arn_04_main = 0x80243580; // type:data rom:0xBE6D30 arn_04_padding1 = 0x80243654; // type:data rom:0xBE6E04 -arn_04_goombaAISettings = 0x80243660; // type:data rom:0xBE6E10 -arn_04_goombaAI = 0x80243690; // type:data rom:0xBE6E40 -arn_04_goombaSettings = 0x802436B0; // type:data rom:0xBE6E60 +arn_04_npcAISettings_80243660 = 0x80243660; // type:data rom:0xBE6E10 +arn_04_npcAI_80243690 = 0x80243690; // type:data rom:0xBE6E40 +arn_04_npcSettings_802436B0 = 0x802436B0; // type:data rom:0xBE6E60 arn_04_D_802436DC_BE6E8C = 0x802436DC; // type:data rom:0xBE6E8C -arn_04_paragoombaAISettings = 0x802436F4; // type:data rom:0xBE6EA4 -arn_04_paragoombaAI = 0x80243724; // type:data rom:0xBE6ED4 -arn_04_paragoombaSettings = 0x80243794; // type:data rom:0xBE6F44 -arn_04_cleftAISettings = 0x802437C0; // type:data rom:0xBE6F70 -arn_04_cleftAI = 0x802437F0; // type:data rom:0xBE6FA0 -arn_04_cleftSettings = 0x80243814; // type:data rom:0xBE6FC4 -arn_04_Paragoomba = 0x80243840; // type:data rom:0xBE6FF0 -arn_04_Goomba = 0x80243A30; // type:data rom:0xBE71E0 -arn_04_Cleft1 = 0x80243C20; // type:data rom:0xBE73D0 -arn_04_Cleft2 = 0x80243E10; // type:data rom:0xBE75C0 -arn_04_npcGroupList = 0x80244000; // type:data rom:0xBE77B0 +arn_04_npcAISettings_802436F4 = 0x802436F4; // type:data rom:0xBE6EA4 +arn_04_npcAI_80243724 = 0x80243724; // type:data rom:0xBE6ED4 +arn_04_npcSettings_80243794 = 0x80243794; // type:data rom:0xBE6F44 +arn_04_npcAISettings_802437C0 = 0x802437C0; // type:data rom:0xBE6F70 +arn_04_npcAI_802437F0 = 0x802437F0; // type:data rom:0xBE6FA0 +arn_04_npcSettings_80243814 = 0x80243814; // type:data rom:0xBE6FC4 +arn_04_npcGroup_80243840 = 0x80243840; // type:data rom:0xBE6FF0 +arn_04_npcGroup_80243A30 = 0x80243A30; // type:data rom:0xBE71E0 +arn_04_npcGroup_80243C20 = 0x80243C20; // type:data rom:0xBE73D0 +arn_04_npcGroup_80243E10 = 0x80243E10; // type:data rom:0xBE75C0 +arn_04_npcGroupList_80244000 = 0x80244000; // type:data rom:0xBE77B0 arn_04_padding2 = 0x8024403C; // type:data rom:0xBE77EC arn_04_makeEntities = 0x80244040; // type:data rom:0xBE77F0 D_80244130_BE78E0 = 0x80244130; // type:data rom:0xBE78E0 D_80244138_BE78E8 = 0x80244138; // type:data rom:0xBE78E8 -D_802442D0_BE7A80 = 0x802442D0; // type:data rom:0xBE7A80 D_802442D8_BE7A88 = 0x802442D8; // type:data rom:0xBE7A88 D_802442E0_BE7A90 = 0x802442E0; // type:data rom:0xBE7A90 D_80244328_BE7AD8 = 0x80244328; // type:data rom:0xBE7AD8 @@ -12125,304 +12143,1158 @@ D_80244330_BE7AE0 = 0x80244330; // type:data rom:0xBE7AE0 D_80244338_BE7AE8 = 0x80244338; // type:data rom:0xBE7AE8 D_80244340_BE7AF0 = 0x80244340; // type:data rom:0xBE7AF0 D_80244348_BE7AF8 = 0x80244348; // type:data rom:0xBE7AF8 -func_80240000_BE7BE0 = 0x80240000; // type:func rom:0xBE7BE0 -func_80240158_BE7D38 = 0x80240158; // type:func rom:0xBE7D38 +arn_05_func_80240000_BE7BE0 = 0x80240000; // type:func rom:0xBE7BE0 +arn_05_func_80240158_BE7D38 = 0x80240158; // type:func rom:0xBE7D38 arn_05_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xBE7FE0 -func_802404C0_BE80A0 = 0x802404C0; // type:func rom:0xBE80A0 -func_8024067C_BE825C = 0x8024067C; // type:func rom:0xBE825C +arn_05_func_802404C0_BE80A0 = 0x802404C0; // type:func rom:0xBE80A0 +arn_05_func_8024067C_BE825C = 0x8024067C; // type:func rom:0xBE825C arn_05_NpcJumpFunc2 = 0x80240730; // type:func rom:0xBE8310 arn_05_NpcJumpFunc = 0x802407A4; // type:func rom:0xBE8384 arn_05_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xBE83FC -func_8024094C_BE852C = 0x8024094C; // type:func rom:0xBE852C +arn_05_func_8024094C_BE852C = 0x8024094C; // type:func rom:0xBE852C arn_05_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xBE864C -func_80240AD4_BE86B4 = 0x80240AD4; // type:func rom:0xBE86B4 -func_80240B94_BE8774 = 0x80240B94; // type:func rom:0xBE8774 -func_80240E90_BE8A70 = 0x80240E90; // type:func rom:0xBE8A70 -func_80241068_BE8C48 = 0x80241068; // type:func rom:0xBE8C48 -func_8024113C_BE8D1C = 0x8024113C; // type:func rom:0xBE8D1C -func_802412B0_BE8E90 = 0x802412B0; // type:func rom:0xBE8E90 -func_802412C8_BE8EA8 = 0x802412C8; // type:func rom:0xBE8EA8 +arn_05_func_80240AD4_BE86B4 = 0x80240AD4; // type:func rom:0xBE86B4 +arn_05_func_80240B94_BE8774 = 0x80240B94; // type:func rom:0xBE8774 +arn_05_func_80240E90_BE8A70 = 0x80240E90; // type:func rom:0xBE8A70 +arn_05_func_80241068_BE8C48 = 0x80241068; // type:func rom:0xBE8C48 +arn_05_func_8024113C_BE8D1C = 0x8024113C; // type:func rom:0xBE8D1C +arn_05_func_802412B0_BE8E90 = 0x802412B0; // type:func rom:0xBE8E90 +arn_05_func_802412C8_BE8EA8 = 0x802412C8; // type:func rom:0xBE8EA8 +arn_05_entryList = 0x80241300; // type:data rom:0xBE8EE0 +arn_05_config = 0x80241320; // type:data rom:0xBE8F00 +arn_05_80241360 = 0x80241360; // type:data rom:0xBE8F40 +arn_05_exitWalk_80241430 = 0x80241430; // type:data rom:0xBE9010 +arn_05_exitWalk_8024148C = 0x8024148C; // type:data rom:0xBE906C +arn_05_802414E8 = 0x802414E8; // type:data rom:0xBE90C8 +arn_05_enterWalk_80241530 = 0x80241530; // type:data rom:0xBE9110 +arn_05_main = 0x802415B0; // type:data rom:0xBE9190 +arn_05_npcSettings_802416B0 = 0x802416B0; // type:data rom:0xBE9290 +arn_05_npcAISettings_802416DC = 0x802416DC; // type:data rom:0xBE92BC +arn_05_npcAI_8024170C = 0x8024170C; // type:data rom:0xBE92EC +arn_05_npcSettings_8024172C = 0x8024172C; // type:data rom:0xBE930C +arn_05_npcSettings_80241758 = 0x80241758; // type:data rom:0xBE9338 +arn_05_idle_80241784 = 0x80241784; // type:data rom:0xBE9364 +arn_05_interact_80241794 = 0x80241794; // type:data rom:0xBE9374 +arn_05_interact_802418F4 = 0x802418F4; // type:data rom:0xBE94D4 +arn_05_interact_80241924 = 0x80241924; // type:data rom:0xBE9504 +arn_05_interact_80241A84 = 0x80241A84; // type:data rom:0xBE9664 +arn_05_interact_80241AB4 = 0x80241AB4; // type:data rom:0xBE9694 +arn_05_interact_80241D88 = 0x80241D88; // type:data rom:0xBE9968 +arn_05_interact_80241E28 = 0x80241E28; // type:data rom:0xBE9A08 +arn_05_interact_80241F88 = 0x80241F88; // type:data rom:0xBE9B68 +arn_05_init_80241FB8 = 0x80241FB8; // type:data rom:0xBE9B98 +arn_05_init_80242008 = 0x80242008; // type:data rom:0xBE9BE8 +arn_05_init_8024202C = 0x8024202C; // type:data rom:0xBE9C0C +arn_05_init_8024212C = 0x8024212C; // type:data rom:0xBE9D0C +arn_05_init_802421EC = 0x802421EC; // type:data rom:0xBE9DCC +arn_05_npcGroup_8024223C = 0x8024223C; // type:data rom:0xBE9E1C +arn_05_80242BEC = 0x80242BEC; // type:data rom:0xBEA7CC +arn_05_80242C50 = 0x80242C50; // type:data rom:0xBEA830 +arn_05_802441FC = 0x802441FC; // type:data rom:0xBEBDDC +arn_05_init_80244358 = 0x80244358; // type:data rom:0xBEBF38 +arn_05_extraAnimationList_80244390 = 0x80244390; // type:data rom:0xBEBF70 +arn_05_npcGroup_802443AC = 0x802443AC; // type:data rom:0xBEBF8C +arn_05_idle_8024459C = 0x8024459C; // type:data rom:0xBEC17C +arn_05_init_80244704 = 0x80244704; // type:data rom:0xBEC2E4 +arn_05_init_8024473C = 0x8024473C; // type:data rom:0xBEC31C +arn_05_init_80244774 = 0x80244774; // type:data rom:0xBEC354 +arn_05_init_802447AC = 0x802447AC; // type:data rom:0xBEC38C +arn_05_npcGroup_802447E4 = 0x802447E4; // type:data rom:0xBEC3C4 +arn_05_npcGroupList_80244FA4 = 0x80244FA4; // type:data rom:0xBECB84 +arn_05_npcGroupList_80244FC8 = 0x80244FC8; // type:data rom:0xBECBA8 +arn_05_makeEntities = 0x80245000; // type:data rom:0xBECBE0 D_80245050_BECC30 = 0x80245050; // type:data rom:0xBECC30 D_80245058_BECC38 = 0x80245058; // type:data rom:0xBECC38 -func_80240000_BECDF0 = 0x80240000; // type:func rom:0xBECDF0 -func_8024004C_BECE3C = 0x8024004C; // type:func rom:0xBECE3C -func_802401AC_BECF9C = 0x802401AC; // type:func rom:0xBECF9C -func_802405BC_BED3AC = 0x802405BC; // type:func rom:0xBED3AC -func_802405FC_BED3EC = 0x802405FC; // type:func rom:0xBED3EC -func_80240708_BED4F8 = 0x80240708; // type:func rom:0xBED4F8 -func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0 +arn_07_func_80240000_BECDF0 = 0x80240000; // type:func rom:0xBECDF0 +arn_07_func_8024004C_BECE3C = 0x8024004C; // type:func rom:0xBECE3C +arn_07_func_802401AC_BECF9C = 0x802401AC; // type:func rom:0xBECF9C +arn_07_func_802405BC_BED3AC = 0x802405BC; // type:func rom:0xBED3AC +arn_07_func_802405FC_BED3EC = 0x802405FC; // type:func rom:0xBED3EC +arn_07_func_80240708_BED4F8 = 0x80240708; // type:func rom:0xBED4F8 +arn_07_func_80240800_BED5F0 = 0x80240800; // type:func rom:0xBED5F0 arn_07_SetEntityFlags100000 = 0x80240870; // type:func rom:0xBED660 arn_07_GetEntityPosition = 0x802408A4; // type:func rom:0xBED694 -func_80240950_BED740 = 0x80240950; // type:func rom:0xBED740 +arn_07_func_80240950_BED740 = 0x80240950; // type:func rom:0xBED740 func_80240B00_BED8F0 = 0x80240B00; // type:func rom:0xBED8F0 arn_07_UnkNpcAIFunc1 = 0x80241128; // type:func rom:0xBEDF18 -func_802411E8_BEDFD8 = 0x802411E8; // type:func rom:0xBEDFD8 +arn_07_func_802411E8_BEDFD8 = 0x802411E8; // type:func rom:0xBEDFD8 arn_07_UnkNpcAIFunc2 = 0x8024152C; // type:func rom:0xBEE31C -func_802415A4_BEE394 = 0x802415A4; // type:func rom:0xBEE394 +arn_07_func_802415A4_BEE394 = 0x802415A4; // type:func rom:0xBEE394 arn_07_UnkNpcAIFunc14 = 0x80241610; // type:func rom:0xBEE400 arn_07_UnkNpcAIFunc3 = 0x80241744; // type:func rom:0xBEE534 -func_802417A8_BEE598 = 0x802417A8; // type:func rom:0xBEE598 -func_80241B38_BEE928 = 0x80241B38; // type:func rom:0xBEE928 -func_80241C5C_BEEA4C = 0x80241C5C; // type:func rom:0xBEEA4C +arn_07_func_802417A8_BEE598 = 0x802417A8; // type:func rom:0xBEE598 +arn_07_func_80241B38_BEE928 = 0x80241B38; // type:func rom:0xBEE928 +arn_07_func_80241C5C_BEEA4C = 0x80241C5C; // type:func rom:0xBEEA4C PostChapter3StatUpdate = 0x80241E48; // type:func rom:0xBEEC38 -D_80243BC0_BF09B0 = 0x80243BC0; // type:data rom:0xBF09B0 +arn_07_entryList = 0x80241E90; // type:data rom:0xBEEC80 +arn_07_config = 0x80241ED0; // type:data rom:0xBEECC0 +arn_07_80241F10 = 0x80241F10; // type:data rom:0xBEED00 +arn_07_itemList_80242040 = 0x80242040; // type:data rom:0xBEEE30 +arn_07_80242048 = 0x80242048; // type:data rom:0xBEEE38 +arn_07_80242498 = 0x80242498; // type:data rom:0xBEF288 +arn_07_exitSingleDoor_802428D4 = 0x802428D4; // type:data rom:0xBEF6C4 +arn_07_exitWalk_80242978 = 0x80242978; // type:data rom:0xBEF768 +arn_07_exitWalk_802429D4 = 0x802429D4; // type:data rom:0xBEF7C4 +arn_07_80242A30 = 0x80242A30; // type:data rom:0xBEF820 +arn_07_802433C8 = 0x802433C8; // type:data rom:0xBF01B8 +arn_07_enterWalk_8024346C = 0x8024346C; // type:data rom:0xBF025C +arn_07_main = 0x802435A8; // type:data rom:0xBF0398 +arn_07_80243790 = 0x80243790; // type:data rom:0xBF0580 +arn_07_802437AC = 0x802437AC; // type:data rom:0xBF059C +arn_07_802439B0 = 0x802439B0; // type:data rom:0xBF07A0 +arn_07_80243B28 = 0x80243B28; // type:data rom:0xBF0918 +arn_07_makeEntities = 0x80243B54; // type:data rom:0xBF0944 +arn_07_D_80243BC0_BF09B0 = 0x80243BC0; // type:data rom:0xBF09B0 +arn_07_npcAISettings_80243BD8 = 0x80243BD8; // type:data rom:0xBF09C8 +arn_07_npcAI_80243C08 = 0x80243C08; // type:data rom:0xBF09F8 +arn_07_npcSettings_80243C78 = 0x80243C78; // type:data rom:0xBF0A68 +arn_07_80243CA4 = 0x80243CA4; // type:data rom:0xBF0A94 +arn_07_80243CB4 = 0x80243CB4; // type:data rom:0xBF0AA4 +arn_07_npcSettings_80243CC4 = 0x80243CC4; // type:data rom:0xBF0AB4 +arn_07_npcSettings_80243CF0 = 0x80243CF0; // type:data rom:0xBF0AE0 +arn_07_npcSettings_80243D1C = 0x80243D1C; // type:data rom:0xBF0B0C +arn_07_npcSettings_80243D48 = 0x80243D48; // type:data rom:0xBF0B38 +arn_07_npcSettings_80243D74 = 0x80243D74; // type:data rom:0xBF0B64 +arn_07_npcSettings_80243DA0 = 0x80243DA0; // type:data rom:0xBF0B90 +arn_07_80243DCC = 0x80243DCC; // type:data rom:0xBF0BBC +arn_07_80243E24 = 0x80243E24; // type:data rom:0xBF0C14 +arn_07_80243FE8 = 0x80243FE8; // type:data rom:0xBF0DD8 +arn_07_idle_80244C54 = 0x80244C54; // type:data rom:0xBF1A44 +arn_07_idle_80244CC8 = 0x80244CC8; // type:data rom:0xBF1AB8 +arn_07_defeat_80244FB8 = 0x80244FB8; // type:data rom:0xBF1DA8 +arn_07_init_80245058 = 0x80245058; // type:data rom:0xBF1E48 +arn_07_init_80245090 = 0x80245090; // type:data rom:0xBF1E80 +arn_07_init_80245104 = 0x80245104; // type:data rom:0xBF1EF4 +arn_07_init_80245164 = 0x80245164; // type:data rom:0xBF1F54 +arn_07_init_8024519C = 0x8024519C; // type:data rom:0xBF1F8C +arn_07_extraAnimationList_802451D4 = 0x802451D4; // type:data rom:0xBF1FC4 +arn_07_extraAnimationList_802451F8 = 0x802451F8; // type:data rom:0xBF1FE8 +arn_07_extraAnimationList_80245200 = 0x80245200; // type:data rom:0xBF1FF0 +arn_07_extraAnimationList_80245208 = 0x80245208; // type:data rom:0xBF1FF8 +arn_07_idle_80245210 = 0x80245210; // type:data rom:0xBF2000 +arn_07_80245304 = 0x80245304; // type:data rom:0xBF20F4 +arn_07_init_80245C9C = 0x80245C9C; // type:data rom:0xBF2A8C +arn_07_npcGroup_80245D0C = 0x80245D0C; // type:data rom:0xBF2AFC +arn_07_npcGroup_802460EC = 0x802460EC; // type:data rom:0xBF2EDC +arn_07_npcGroup_80246C8C = 0x80246C8C; // type:data rom:0xBF3A7C +arn_07_npcGroup_80246E7C = 0x80246E7C; // type:data rom:0xBF3C6C +arn_07_init_8024706C = 0x8024706C; // type:data rom:0xBF3E5C +arn_07_npcGroup_802470BC = 0x802470BC; // type:data rom:0xBF3EAC +arn_07_npcGroup_802472AC = 0x802472AC; // type:data rom:0xBF409C +arn_07_npcGroup_8024749C = 0x8024749C; // type:data rom:0xBF428C +arn_07_npcGroup_8024768C = 0x8024768C; // type:data rom:0xBF447C +arn_07_npcGroupList_8024787C = 0x8024787C; // type:data rom:0xBF466C +arn_07_npcGroupList_802478B8 = 0x802478B8; // type:data rom:0xBF46A8 +arn_07_npcGroupList_802478E8 = 0x802478E8; // type:data rom:0xBF46D8 D_80247940_BF4730 = 0x80247940; // type:data rom:0xBF4730 D_80247950_BF4740 = 0x80247950; // type:data rom:0xBF4740 D_80247958_BF4748 = 0x80247958; // type:data rom:0xBF4748 D_80247960_BF4750 = 0x80247960; // type:data rom:0xBF4750 -func_80240000_BF47A0 = 0x80240000; // type:func rom:0xBF47A0 -func_8024008C_BF482C = 0x8024008C; // type:func rom:0xBF482C -func_802400C0_BF4860 = 0x802400C0; // type:func rom:0xBF4860 -func_802400D4_BF4874 = 0x802400D4; // type:func rom:0xBF4874 -func_802400F4_BF4894 = 0x802400F4; // type:func rom:0xBF4894 -func_8024019C_BF493C = 0x8024019C; // type:func rom:0xBF493C -D_80241188_BF5928 = 0x80241188; // type:data rom:0xBF5928 -func_80240000_BF6060 = 0x80240000; // type:func rom:0xBF6060 -func_80240000_BFA0A0 = 0x80240000; // type:func rom:0xBFA0A0 -func_80240060_BFA100 = 0x80240060; // type:func rom:0xBFA100 +arn_08_func_80240000_BF47A0 = 0x80240000; // type:func rom:0xBF47A0 +arn_08_func_8024008C_BF482C = 0x8024008C; // type:func rom:0xBF482C +arn_08_func_802400C0_BF4860 = 0x802400C0; // type:func rom:0xBF4860 +arn_08_func_802400D4_BF4874 = 0x802400D4; // type:func rom:0xBF4874 +arn_08_func_802400F4_BF4894 = 0x802400F4; // type:func rom:0xBF4894 +arn_08_func_8024019C_BF493C = 0x8024019C; // type:func rom:0xBF493C +arn_08_entryList = 0x80240290; // type:data rom:0xBF4A30 +arn_08_config = 0x802402C0; // type:data rom:0xBF4A60 +arn_08_80240300 = 0x80240300; // type:data rom:0xBF4AA0 +arn_08_802403B0 = 0x802403B0; // type:data rom:0xBF4B50 +arn_08_80240470 = 0x80240470; // type:data rom:0xBF4C10 +arn_08_8024049C = 0x8024049C; // type:data rom:0xBF4C3C +arn_08_main = 0x802408F4; // type:data rom:0xBF5094 +arn_08_80240A70 = 0x80240A70; // type:data rom:0xBF5210 +arn_08_80240B50 = 0x80240B50; // type:data rom:0xBF52F0 +arn_08_80240BA0 = 0x80240BA0; // type:data rom:0xBF5340 +arn_08_80240CC0 = 0x80240CC0; // type:data rom:0xBF5460 +arn_08_802410AC = 0x802410AC; // type:data rom:0xBF584C +arn_08_8024116C = 0x8024116C; // type:data rom:0xBF590C +arn_08_D_80241188_BF5928 = 0x80241188; // type:data rom:0xBF5928 +arn_08_8024118C = 0x8024118C; // type:data rom:0xBF592C +arn_08_80241200 = 0x80241200; // type:data rom:0xBF59A0 +arn_08_80241210 = 0x80241210; // type:data rom:0xBF59B0 +arn_08_npcSettings_80241220 = 0x80241220; // type:data rom:0xBF59C0 +arn_08_npcSettings_8024124C = 0x8024124C; // type:data rom:0xBF59EC +arn_08_idle_80241278 = 0x80241278; // type:data rom:0xBF5A18 +arn_08_init_80241288 = 0x80241288; // type:data rom:0xBF5A28 +arn_08_interact_802412E8 = 0x802412E8; // type:data rom:0xBF5A88 +arn_08_init_802413E8 = 0x802413E8; // type:data rom:0xBF5B88 +arn_08_npcGroup_80241448 = 0x80241448; // type:data rom:0xBF5BE8 +arn_08_npcGroup_80241638 = 0x80241638; // type:data rom:0xBF5DD8 +arn_08_npcGroupList_80241828 = 0x80241828; // type:data rom:0xBF5FC8 +arn_08_makeEntities = 0x80241850; // type:data rom:0xBF5FF0 +arn_09_func_80240000_BF6060 = 0x80240000; // type:func rom:0xBF6060 +arn_09_entryList = 0x80240040; // type:data rom:0xBF60A0 +arn_09_config = 0x80240060; // type:data rom:0xBF60C0 +arn_09_802400A0 = 0x802400A0; // type:data rom:0xBF6100 +arn_09_80240140 = 0x80240140; // type:data rom:0xBF61A0 +arn_09_802401F4 = 0x802401F4; // type:data rom:0xBF6254 +arn_09_80240220 = 0x80240220; // type:data rom:0xBF6280 +arn_09_main = 0x802402C0; // type:data rom:0xBF6320 +arn_09_802403A0 = 0x802403A0; // type:data rom:0xBF6400 +arn_09_makeEntities = 0x80240488; // type:data rom:0xBF64E8 +arn_09_802404D0 = 0x802404D0; // type:data rom:0xBF6530 +arn_09_802405B0 = 0x802405B0; // type:data rom:0xBF6610 +arn_09_802405C0 = 0x802405C0; // type:data rom:0xBF6620 +arn_09_npcSettings_802405D0 = 0x802405D0; // type:data rom:0xBF6630 +arn_09_idle_802405FC = 0x802405FC; // type:data rom:0xBF665C +arn_09_init_80240730 = 0x80240730; // type:data rom:0xBF6790 +arn_09_npcGroup_80240784 = 0x80240784; // type:data rom:0xBF67E4 +arn_09_npcGroupList_80240974 = 0x80240974; // type:data rom:0xBF69D4 +arn_10_entryList = 0x80240000; // type:data rom:0xBF6A00 +arn_10_config = 0x80240020; // type:data rom:0xBF6A20 +arn_10_80240060 = 0x80240060; // type:data rom:0xBF6A60 +arn_10_exitSingleDoor_80240100 = 0x80240100; // type:data rom:0xBF6B00 +arn_10_exitSingleDoor_802401A4 = 0x802401A4; // type:data rom:0xBF6BA4 +arn_10_80240248 = 0x80240248; // type:data rom:0xBF6C48 +arn_10_enterSingleDoor_80240290 = 0x80240290; // type:data rom:0xBF6C90 +arn_10_main = 0x8024034C; // type:data rom:0xBF6D4C +arn_10_80240430 = 0x80240430; // type:data rom:0xBF6E30 +arn_10_80240440 = 0x80240440; // type:data rom:0xBF6E40 +arn_10_npcSettings_80240450 = 0x80240450; // type:data rom:0xBF6E50 +arn_10_npcAISettings_8024047C = 0x8024047C; // type:data rom:0xBF6E7C +arn_10_npcAI_802404AC = 0x802404AC; // type:data rom:0xBF6EAC +arn_10_npcSettings_802404CC = 0x802404CC; // type:data rom:0xBF6ECC +arn_10_idle_802404F8 = 0x802404F8; // type:data rom:0xBF6EF8 +arn_10_defeat_802406F4 = 0x802406F4; // type:data rom:0xBF70F4 +arn_10_init_80240720 = 0x80240720; // type:data rom:0xBF7120 +arn_10_init_8024076C = 0x8024076C; // type:data rom:0xBF716C +arn_10_npcGroup_802407D8 = 0x802407D8; // type:data rom:0xBF71D8 +arn_10_npcGroup_802409C8 = 0x802409C8; // type:data rom:0xBF73C8 +arn_10_npcGroupList_80240BB8 = 0x80240BB8; // type:data rom:0xBF75B8 +arn_10_80240BE0 = 0x80240BE0; // type:data rom:0xBF75E0 +arn_10_makeEntities = 0x80240C28; // type:data rom:0xBF7628 +arn_11_entryList = 0x80240000; // type:data rom:0xBF7680 +arn_11_config = 0x80240010; // type:data rom:0xBF7690 +arn_11_80240050 = 0x80240050; // type:data rom:0xBF76D0 +arn_11_802400F0 = 0x802400F0; // type:data rom:0xBF7770 +arn_11_802401BC = 0x802401BC; // type:data rom:0xBF783C +arn_11_exitSingleDoor_80240428 = 0x80240428; // type:data rom:0xBF7AA8 +arn_11_802404CC = 0x802404CC; // type:data rom:0xBF7B4C +arn_11_enterSingleDoor_802404F8 = 0x802404F8; // type:data rom:0xBF7B78 +arn_11_main = 0x802405A8; // type:data rom:0xBF7C28 +arn_11_80240680 = 0x80240680; // type:data rom:0xBF7D00 +arn_11_80240690 = 0x80240690; // type:data rom:0xBF7D10 +arn_11_npcSettings_802406A0 = 0x802406A0; // type:data rom:0xBF7D20 +arn_11_idle_802406CC = 0x802406CC; // type:data rom:0xBF7D4C +arn_11_8024081C = 0x8024081C; // type:data rom:0xBF7E9C +arn_11_802408D8 = 0x802408D8; // type:data rom:0xBF7F58 +arn_11_intTable_80240988 = 0x80240988; // type:data rom:0xBF8008 +arn_11_defeat_802409DC = 0x802409DC; // type:data rom:0xBF805C +arn_11_init_80240E70 = 0x80240E70; // type:data rom:0xBF84F0 +arn_11_npcGroup_80240EEC = 0x80240EEC; // type:data rom:0xBF856C +arn_11_npcGroupList_802410DC = 0x802410DC; // type:data rom:0xBF875C +arn_12_entryList = 0x80240000; // type:data rom:0xBF8790 +arn_12_config = 0x80240020; // type:data rom:0xBF87B0 +arn_12_80240060 = 0x80240060; // type:data rom:0xBF87F0 +arn_12_exitSingleDoor_80240100 = 0x80240100; // type:data rom:0xBF8890 +arn_12_exitSingleDoor_802401A4 = 0x802401A4; // type:data rom:0xBF8934 +arn_12_80240248 = 0x80240248; // type:data rom:0xBF89D8 +arn_12_enterSingleDoor_80240290 = 0x80240290; // type:data rom:0xBF8A20 +arn_12_main = 0x8024034C; // type:data rom:0xBF8ADC +arn_12_80240420 = 0x80240420; // type:data rom:0xBF8BB0 +arn_12_80240430 = 0x80240430; // type:data rom:0xBF8BC0 +arn_12_npcSettings_80240440 = 0x80240440; // type:data rom:0xBF8BD0 +arn_12_npcAISettings_8024046C = 0x8024046C; // type:data rom:0xBF8BFC +arn_12_npcAI_8024049C = 0x8024049C; // type:data rom:0xBF8C2C +arn_12_npcSettings_802404BC = 0x802404BC; // type:data rom:0xBF8C4C +arn_12_idle_802404E8 = 0x802404E8; // type:data rom:0xBF8C78 +arn_12_defeat_802406E4 = 0x802406E4; // type:data rom:0xBF8E74 +arn_12_init_80240710 = 0x80240710; // type:data rom:0xBF8EA0 +arn_12_init_8024075C = 0x8024075C; // type:data rom:0xBF8EEC +arn_12_npcGroup_802407DC = 0x802407DC; // type:data rom:0xBF8F6C +arn_12_npcGroup_802409CC = 0x802409CC; // type:data rom:0xBF915C +arn_12_npcGroupList_80240BBC = 0x80240BBC; // type:data rom:0xBF934C +arn_12_80240BE0 = 0x80240BE0; // type:data rom:0xBF9370 +arn_12_makeEntities = 0x80240C28; // type:data rom:0xBF93B8 +arn_13_entryList = 0x80240000; // type:data rom:0xBF9410 +arn_13_config = 0x80240020; // type:data rom:0xBF9430 +arn_13_80240060 = 0x80240060; // type:data rom:0xBF9470 +arn_13_exitSingleDoor_80240100 = 0x80240100; // type:data rom:0xBF9510 +arn_13_exitSingleDoor_802401A4 = 0x802401A4; // type:data rom:0xBF95B4 +arn_13_80240248 = 0x80240248; // type:data rom:0xBF9658 +arn_13_enterSingleDoor_80240290 = 0x80240290; // type:data rom:0xBF96A0 +arn_13_main = 0x8024034C; // type:data rom:0xBF975C +arn_13_80240430 = 0x80240430; // type:data rom:0xBF9840 +arn_13_80240440 = 0x80240440; // type:data rom:0xBF9850 +arn_13_npcSettings_80240450 = 0x80240450; // type:data rom:0xBF9860 +arn_13_npcAISettings_8024047C = 0x8024047C; // type:data rom:0xBF988C +arn_13_npcAI_802404AC = 0x802404AC; // type:data rom:0xBF98BC +arn_13_npcSettings_802404CC = 0x802404CC; // type:data rom:0xBF98DC +arn_13_idle_802404F8 = 0x802404F8; // type:data rom:0xBF9908 +arn_13_defeat_802406F4 = 0x802406F4; // type:data rom:0xBF9B04 +arn_13_init_80240720 = 0x80240720; // type:data rom:0xBF9B30 +arn_13_init_8024076C = 0x8024076C; // type:data rom:0xBF9B7C +arn_13_npcGroup_802407EC = 0x802407EC; // type:data rom:0xBF9BFC +arn_13_npcGroup_802409DC = 0x802409DC; // type:data rom:0xBF9DEC +arn_13_npcGroupList_80240BCC = 0x80240BCC; // type:data rom:0xBF9FDC +arn_13_80240BF0 = 0x80240BF0; // type:data rom:0xBFA000 +arn_13_makeEntities = 0x80240C38; // type:data rom:0xBFA048 +dgb_00_func_80240000_BFA0A0 = 0x80240000; // type:func rom:0xBFA0A0 +dgb_00_func_80240060_BFA100 = 0x80240060; // type:func rom:0xBFA100 +dgb_00_entryList = 0x802400B0; // type:data rom:0xBFA150 +dgb_00_config = 0x802400D0; // type:data rom:0xBFA170 +dgb_00_80240110 = 0x80240110; // type:data rom:0xBFA1B0 +dgb_00_exitWalk_802401C0 = 0x802401C0; // type:data rom:0xBFA260 +dgb_00_exitDoubleDoor_8024021C = 0x8024021C; // type:data rom:0xBFA2BC +dgb_00_802402D0 = 0x802402D0; // type:data rom:0xBFA370 +dgb_00_enterDoubleDoor_8024038C = 0x8024038C; // type:data rom:0xBFA42C +dgb_00_main = 0x80240520; // type:data rom:0xBFA5C0 +dgb_00_npcSettings_80240640 = 0x80240640; // type:data rom:0xBFA6E0 +dgb_00_npcSettings_8024066C = 0x8024066C; // type:data rom:0xBFA70C +dgb_00_80240698 = 0x80240698; // type:data rom:0xBFA738 +dgb_00_8024079C = 0x8024079C; // type:data rom:0xBFA83C +dgb_00_802408A0 = 0x802408A0; // type:data rom:0xBFA940 +dgb_00_802408F8 = 0x802408F8; // type:data rom:0xBFA998 +dgb_00_80240950 = 0x80240950; // type:data rom:0xBFA9F0 +dgb_00_802409A8 = 0x802409A8; // type:data rom:0xBFAA48 +dgb_00_80240A00 = 0x80240A00; // type:data rom:0xBFAAA0 +dgb_00_80240A58 = 0x80240A58; // type:data rom:0xBFAAF8 +dgb_00_80240AB0 = 0x80240AB0; // type:data rom:0xBFAB50 +dgb_00_80240B08 = 0x80240B08; // type:data rom:0xBFABA8 +dgb_00_80240B74 = 0x80240B74; // type:data rom:0xBFAC14 +dgb_00_80240BE0 = 0x80240BE0; // type:data rom:0xBFAC80 +dgb_00_80240C4C = 0x80240C4C; // type:data rom:0xBFACEC +dgb_00_80240CB8 = 0x80240CB8; // type:data rom:0xBFAD58 +dgb_00_80240D24 = 0x80240D24; // type:data rom:0xBFADC4 +dgb_00_80240D90 = 0x80240D90; // type:data rom:0xBFAE30 +dgb_00_80240DDC = 0x80240DDC; // type:data rom:0xBFAE7C +dgb_00_80240F50 = 0x80240F50; // type:data rom:0xBFAFF0 +dgb_00_8024103C = 0x8024103C; // type:data rom:0xBFB0DC +dgb_00_802413F4 = 0x802413F4; // type:data rom:0xBFB494 +dgb_00_80241AA0 = 0x80241AA0; // type:data rom:0xBFBB40 +dgb_00_interact_80241CD8 = 0x80241CD8; // type:data rom:0xBFBD78 +dgb_00_init_80241F70 = 0x80241F70; // type:data rom:0xBFC010 +dgb_00_init_80241F94 = 0x80241F94; // type:data rom:0xBFC034 +dgb_00_init_80241FA4 = 0x80241FA4; // type:data rom:0xBFC044 +dgb_00_init_80241FB4 = 0x80241FB4; // type:data rom:0xBFC054 +dgb_00_init_80241FC4 = 0x80241FC4; // type:data rom:0xBFC064 +dgb_00_init_80241FD4 = 0x80241FD4; // type:data rom:0xBFC074 +dgb_00_npcGroup_80241FE4 = 0x80241FE4; // type:data rom:0xBFC084 +dgb_00_npcGroup_802421D4 = 0x802421D4; // type:data rom:0xBFC274 +dgb_00_npcGroup_802423C4 = 0x802423C4; // type:data rom:0xBFC464 +dgb_00_npcGroup_802425B4 = 0x802425B4; // type:data rom:0xBFC654 +dgb_00_npcGroup_802427A4 = 0x802427A4; // type:data rom:0xBFC844 +dgb_00_npcGroup_80242994 = 0x80242994; // type:data rom:0xBFCA34 +dgb_00_80242B84 = 0x80242B84; // type:data rom:0xBFCC24 +dgb_00_init_802434EC = 0x802434EC; // type:data rom:0xBFD58C +dgb_00_npcGroup_802434FC = 0x802434FC; // type:data rom:0xBFD59C +dgb_00_npcGroupList_802436EC = 0x802436EC; // type:data rom:0xBFD78C +dgb_00_npcGroupList_80243740 = 0x80243740; // type:data rom:0xBFD7E0 +dgb_00_makeEntities = 0x80243760; // type:data rom:0xBFD800 D_802437A0_BFD840 = 0x802437A0; // type:data rom:0xBFD840 D_802437B0_BFD850 = 0x802437B0; // type:data rom:0xBFD850 D_802437BC_BFD85C = 0x802437BC; // type:data rom:0xBFD85C -func_80240000_BFD880 = 0x80240000; // type:func rom:0xBFD880 +dgb_01_func_80240000_BFD880 = 0x80240000; // type:func rom:0xBFD880 dgb_01_SetEntityFlags100000 = 0x80240040; // type:func rom:0xBFD8C0 dgb_01_GetEntityPosition = 0x80240074; // type:func rom:0xBFD8F4 -func_80240120_BFD9A0 = 0x80240120; // type:func rom:0xBFD9A0 +dgb_01_func_80240120_BFD9A0 = 0x80240120; // type:func rom:0xBFD9A0 func_802402D0_BFDB50 = 0x802402D0; // type:func rom:0xBFDB50 dgb_01_UnkNpcAIFunc1 = 0x802408F8; // type:func rom:0xBFE178 -func_802409B8_BFE238 = 0x802409B8; // type:func rom:0xBFE238 +dgb_01_func_802409B8_BFE238 = 0x802409B8; // type:func rom:0xBFE238 dgb_01_UnkNpcAIFunc2 = 0x80240CFC; // type:func rom:0xBFE57C -func_80240D74_BFE5F4 = 0x80240D74; // type:func rom:0xBFE5F4 +dgb_01_func_80240D74_BFE5F4 = 0x80240D74; // type:func rom:0xBFE5F4 dgb_01_UnkNpcAIFunc14 = 0x80240DE0; // type:func rom:0xBFE660 dgb_01_UnkNpcAIFunc3 = 0x80240F14; // type:func rom:0xBFE794 -func_80240F78_BFE7F8 = 0x80240F78; // type:func rom:0xBFE7F8 -func_80241308_BFEB88 = 0x80241308; // type:func rom:0xBFEB88 -func_8024142C_BFECAC = 0x8024142C; // type:func rom:0xBFECAC -func_80241618_BFEE98 = 0x80241618; // type:func rom:0xBFEE98 -func_80241770_BFEFF0 = 0x80241770; // type:func rom:0xBFEFF0 -func_80241874_BFF0F4 = 0x80241874; // type:func rom:0xBFF0F4 -func_80241954_BFF1D4 = 0x80241954; // type:func rom:0xBFF1D4 -func_80241BF0_BFF470 = 0x80241BF0; // type:func rom:0xBFF470 -func_80241CA8_BFF528 = 0x80241CA8; // type:func rom:0xBFF528 -func_80241E28_BFF6A8 = 0x80241E28; // type:func rom:0xBFF6A8 -func_80241E70_BFF6F0 = 0x80241E70; // type:func rom:0xBFF6F0 -func_80241EF0_BFF770 = 0x80241EF0; // type:func rom:0xBFF770 -func_80241F98_BFF818 = 0x80241F98; // type:func rom:0xBFF818 -func_802422B0_BFFB30 = 0x802422B0; // type:func rom:0xBFFB30 -func_8024252C_BFFDAC = 0x8024252C; // type:func rom:0xBFFDAC -func_80242684_BFFF04 = 0x80242684; // type:func rom:0xBFFF04 -dup_dgb_01_UnkNpcAIFunc1 = 0x8024292C; // type:func rom:0xC001AC -func_802429EC_C0026C = 0x802429EC; // type:func rom:0xC0026C -func_80242BA8_C00428 = 0x80242BA8; // type:func rom:0xC00428 +dgb_01_func_80240F78_BFE7F8 = 0x80240F78; // type:func rom:0xBFE7F8 +dgb_01_func_80241308_BFEB88 = 0x80241308; // type:func rom:0xBFEB88 +dgb_01_func_8024142C_BFECAC = 0x8024142C; // type:func rom:0xBFECAC +dgb_01_func_80241618_BFEE98 = 0x80241618; // type:func rom:0xBFEE98 +dgb_01_func_80241770_BFEFF0 = 0x80241770; // type:func rom:0xBFEFF0 +dgb_01_func_80241874_BFF0F4 = 0x80241874; // type:func rom:0xBFF0F4 +dgb_01_func_80241954_BFF1D4 = 0x80241954; // type:func rom:0xBFF1D4 +dgb_01_func_80241BF0_BFF470 = 0x80241BF0; // type:func rom:0xBFF470 +dgb_01_func_80241CA8_BFF528 = 0x80241CA8; // type:func rom:0xBFF528 +dgb_01_func_80241E28_BFF6A8 = 0x80241E28; // type:func rom:0xBFF6A8 +dgb_01_func_80241E70_BFF6F0 = 0x80241E70; // type:func rom:0xBFF6F0 +dgb_01_func_80241EF0_BFF770 = 0x80241EF0; // type:func rom:0xBFF770 +dgb_01_func_80241F98_BFF818 = 0x80241F98; // type:func rom:0xBFF818 +dgb_01_func_802422B0_BFFB30 = 0x802422B0; // type:func rom:0xBFFB30 +dgb_01_func_8024252C_BFFDAC = 0x8024252C; // type:func rom:0xBFFDAC +dgb_01_func_80242684_BFFF04 = 0x80242684; // type:func rom:0xBFFF04 +dgb_01_UnkNpcAIFunc1_copy = 0x8024292C; // type:func rom:0xC001AC +dgb_01_func_802429EC_C0026C = 0x802429EC; // type:func rom:0xC0026C +dgb_01_func_80242BA8_C00428 = 0x80242BA8; // type:func rom:0xC00428 dgb_01_NpcJumpFunc2 = 0x80242C5C; // type:func rom:0xC004DC dgb_01_NpcJumpFunc = 0x80242CD0; // type:func rom:0xC00550 dgb_01_UnkNpcAIFunc13 = 0x80242D48; // type:func rom:0xC005C8 -func_80242E78_C006F8 = 0x80242E78; // type:func rom:0xC006F8 +dgb_01_func_80242E78_C006F8 = 0x80242E78; // type:func rom:0xC006F8 dgb_01_UnkNpcDurationFlagFunc = 0x80242F98; // type:func rom:0xC00818 -func_80243000_C00880 = 0x80243000; // type:func rom:0xC00880 -func_802430C0_C00940 = 0x802430C0; // type:func rom:0xC00940 +dgb_01_func_80243000_C00880 = 0x80243000; // type:func rom:0xC00880 +dgb_01_func_802430C0_C00940 = 0x802430C0; // type:func rom:0xC00940 dgb_01_UnkFunc1 = 0x802433BC; // type:func rom:0xC00C3C -D_80244CD0_C02550 = 0x80244CD0; // type:data rom:0xC02550 +dgb_01_entryList = 0x802433F0; // type:data rom:0xC00C70 +dgb_01_config = 0x80243460; // type:data rom:0xC00CE0 +dgb_01_802434A0 = 0x802434A0; // type:data rom:0xC00D20 +dgb_01_exitDoubleDoor_80243550 = 0x80243550; // type:data rom:0xC00DD0 +dgb_01_exitDoubleDoor_80243604 = 0x80243604; // type:data rom:0xC00E84 +dgb_01_exitDoubleDoor_802436B8 = 0x802436B8; // type:data rom:0xC00F38 +dgb_01_exitDoubleDoor_8024376C = 0x8024376C; // type:data rom:0xC00FEC +dgb_01_exitDoubleDoor_80243820 = 0x80243820; // type:data rom:0xC010A0 +dgb_01_exitDoubleDoor_802438D4 = 0x802438D4; // type:data rom:0xC01154 +dgb_01_exitDoubleDoor_80243988 = 0x80243988; // type:data rom:0xC01208 +dgb_01_enterDoubleDoor_80243A3C = 0x80243A3C; // type:data rom:0xC012BC +dgb_01_itemList_80243C40 = 0x80243C40; // type:data rom:0xC014C0 +dgb_01_main = 0x80243C48; // type:data rom:0xC014C8 +dgb_01_80243EF0 = 0x80243EF0; // type:data rom:0xC01770 +dgb_01_802449C4 = 0x802449C4; // type:data rom:0xC02244 +dgb_01_80244AD0 = 0x80244AD0; // type:data rom:0xC02350 +dgb_01_80244C38 = 0x80244C38; // type:data rom:0xC024B8 +dgb_01_makeEntities = 0x80244C64; // type:data rom:0xC024E4 +dgb_01_D_80244CD0_C02550 = 0x80244CD0; // type:data rom:0xC02550 +dgb_01_80244CE8 = 0x80244CE8; // type:data rom:0xC02568 +dgb_01_npcAISettings_80244D24 = 0x80244D24; // type:data rom:0xC025A4 +dgb_01_npcAI_80244D54 = 0x80244D54; // type:data rom:0xC025D4 +dgb_01_8024517C = 0x8024517C; // type:data rom:0xC029FC +dgb_01_80245208 = 0x80245208; // type:data rom:0xC02A88 +dgb_01_npcSettings_8024526C = 0x8024526C; // type:data rom:0xC02AEC +dgb_01_npcAISettings_80245298 = 0x80245298; // type:data rom:0xC02B18 +dgb_01_npcAI_802452C8 = 0x802452C8; // type:data rom:0xC02B48 +dgb_01_npcSettings_802452E8 = 0x802452E8; // type:data rom:0xC02B68 +dgb_01_npcSettings_80245314 = 0x80245314; // type:data rom:0xC02B94 +dgb_01_npcSettings_80245340 = 0x80245340; // type:data rom:0xC02BC0 +dgb_01_idle_8024536C = 0x8024536C; // type:data rom:0xC02BEC +dgb_01_init_80245784 = 0x80245784; // type:data rom:0xC03004 +dgb_01_defeat_802457D8 = 0x802457D8; // type:data rom:0xC03058 +dgb_01_init_80245814 = 0x80245814; // type:data rom:0xC03094 +dgb_01_idle_8024598C = 0x8024598C; // type:data rom:0xC0320C +dgb_01_defeat_80245CB4 = 0x80245CB4; // type:data rom:0xC03534 +dgb_01_init_80245CF0 = 0x80245CF0; // type:data rom:0xC03570 +dgb_01_init_80245D80 = 0x80245D80; // type:data rom:0xC03600 +dgb_01_init_80245E44 = 0x80245E44; // type:data rom:0xC036C4 +dgb_01_init_80245F08 = 0x80245F08; // type:data rom:0xC03788 +dgb_01_init_80245FCC = 0x80245FCC; // type:data rom:0xC0384C +dgb_01_npcGroup_80246090 = 0x80246090; // type:data rom:0xC03910 +dgb_01_npcGroup_80246280 = 0x80246280; // type:data rom:0xC03B00 +dgb_01_npcGroup_80246470 = 0x80246470; // type:data rom:0xC03CF0 +dgb_01_npcGroup_80246660 = 0x80246660; // type:data rom:0xC03EE0 +dgb_01_extraAnimationList_80246850 = 0x80246850; // type:data rom:0xC040D0 +dgb_01_npcGroup_80246880 = 0x80246880; // type:data rom:0xC04100 +dgb_01_npcGroup_80246A70 = 0x80246A70; // type:data rom:0xC042F0 +dgb_01_npcGroup_80246C60 = 0x80246C60; // type:data rom:0xC044E0 +dgb_01_npcGroupList_80246E50 = 0x80246E50; // type:data rom:0xC046D0 +dgb_01_npcGroupList_80246E8C = 0x80246E8C; // type:data rom:0xC0470C +dgb_01_npcGroupList_80246ED4 = 0x80246ED4; // type:data rom:0xC04754 +dgb_01_npcGroupList_80246F1C = 0x80246F1C; // type:data rom:0xC0479C +D_00C057F0_1 = 0x80247F70; // type:data rom:0xC057F0 +D_00C06870_1 = 0x80248FF0; // type:data rom:0xC06870 +D_00C070F0_1 = 0x80249870; // type:data rom:0xC070F0 +D_00C07570_1 = 0x80249CF0; // type:data rom:0xC07570 +D_00C079F0_1 = 0x8024A170; // type:data rom:0xC079F0 +D_00C07E70_1 = 0x8024A5F0; // type:data rom:0xC07E70 +D_00C07E70_11 = 0x8024AE70; // type:data rom:0xC086F0 +D_8024B6F0_1 = 0x8024B6F0; // type:data rom:0xC08F70 +D_8024B770_1 = 0x8024B770; // type:data rom:0xC08FF0 +D_8024B8F8_1 = 0x8024B8F8; // type:data rom:0xC09178 +D_8024BAA0_1 = 0x8024BAA0; // type:data rom:0xC09320 +D_8024BC48_1 = 0x8024BC48; // type:data rom:0xC094C8 +D_8024BCF8_1 = 0x8024BCF8; // type:data rom:0xC09578 +D_8024BD80_1 = 0x8024BD80; // type:data rom:0xC09600 +D_8024BDC8_1 = 0x8024BDC8; // type:data rom:0xC09648 +D_8024BE28_1 = 0x8024BE28; // type:data rom:0xC096A8 +D_8024BE60_1 = 0x8024BE60; // type:data rom:0xC096E0 +D_8024BEC0_1 = 0x8024BEC0; // type:data rom:0xC09740 +D_8024BEF8_1 = 0x8024BEF8; // type:data rom:0xC09778 +D_8024BF58_1 = 0x8024BF58; // type:data rom:0xC097D8 +D_8024BF90_1 = 0x8024BF90; // type:data rom:0xC09810 +D_8024BFC8_1 = 0x8024BFC8; // type:data rom:0xC09848 +D_8024C030_1 = 0x8024C030; // type:data rom:0xC098B0 +D_8024C098_1 = 0x8024C098; // type:data rom:0xC09918 +D_8024C100_1 = 0x8024C100; // type:data rom:0xC09980 +D_8024C1F0_1 = 0x8024C1F0; // type:data rom:0xC09A70 +D_8024C2E0_1 = 0x8024C2E0; // type:data rom:0xC09B60 +D_8024C3D0_1 = 0x8024C3D0; // type:data rom:0xC09C50 +D_8024C420_1 = 0x8024C420; // type:data rom:0xC09CA0 +D_8024C4C0_1 = 0x8024C4C0; // type:data rom:0xC09D40 +D_8024C560_1 = 0x8024C560; // type:data rom:0xC09DE0 +D_8024C600_1 = 0x8024C600; // type:data rom:0xC09E80 +D_8024C638_1 = 0x8024C638; // type:data rom:0xC09EB8 +D_8024C670_1 = 0x8024C670; // type:data rom:0xC09EF0 +D_8024C7D0_1 = 0x8024C7D0; // type:data rom:0xC0A050 +D_8024C808_1 = 0x8024C808; // type:data rom:0xC0A088 +D_8024C8E0_1 = 0x8024C8E0; // type:data rom:0xC0A160 +D_8024C918_1 = 0x8024C918; // type:data rom:0xC0A198 +D_8024C998_1 = 0x8024C998; // type:data rom:0xC0A218 +D_8024CAA8_1 = 0x8024CAA8; // type:data rom:0xC0A328 +D_8024CAF0_1 = 0x8024CAF0; // type:data rom:0xC0A370 +D_8024CB68_1 = 0x8024CB68; // type:data rom:0xC0A3E8 +D_8024CC28_1 = 0x8024CC28; // type:data rom:0xC0A4A8 +D_8024CCA0_1 = 0x8024CCA0; // type:data rom:0xC0A520 +D_8024CD10_1 = 0x8024CD10; // type:data rom:0xC0A590 +D_8024CD98_1 = 0x8024CD98; // type:data rom:0xC0A618 +D_8024CE08_1 = 0x8024CE08; // type:data rom:0xC0A688 +D_8024CFF8_1 = 0x8024CFF8; // type:data rom:0xC0A878 +D_8024D060_1 = 0x8024D060; // type:data rom:0xC0A8E0 +D_8024D280_1 = 0x8024D280; // type:data rom:0xC0AB00 +D_8024D2B8_1 = 0x8024D2B8; // type:data rom:0xC0AB38 +D_8024D390_1 = 0x8024D390; // type:data rom:0xC0AC10 +D_8024D3C8_1 = 0x8024D3C8; // type:data rom:0xC0AC48 +D_8024D448_1 = 0x8024D448; // type:data rom:0xC0ACC8 +D_8024D538_1 = 0x8024D538; // type:data rom:0xC0ADB8 +D_8024D580_1 = 0x8024D580; // type:data rom:0xC0AE00 +D_8024D608_1 = 0x8024D608; // type:data rom:0xC0AE88 +D_8024D680_1 = 0x8024D680; // type:data rom:0xC0AF00 +D_8024D700_1 = 0x8024D700; // type:data rom:0xC0AF80 +D_8024D788_1 = 0x8024D788; // type:data rom:0xC0B008 +D_8024D828_1 = 0x8024D828; // type:data rom:0xC0B0A8 +D_8024D8D0_1 = 0x8024D8D0; // type:data rom:0xC0B150 +D_8024DBB0_1 = 0x8024DBB0; // type:data rom:0xC0B430 +D_8024DC18_1 = 0x8024DC18; // type:data rom:0xC0B498 +D_8024DC50_1 = 0x8024DC50; // type:data rom:0xC0B4D0 +D_8024DD28_1 = 0x8024DD28; // type:data rom:0xC0B5A8 +D_8024DD60_1 = 0x8024DD60; // type:data rom:0xC0B5E0 +D_8024DEC0_1 = 0x8024DEC0; // type:data rom:0xC0B740 +D_8024DEF8_1 = 0x8024DEF8; // type:data rom:0xC0B778 +D_8024DFA0_1 = 0x8024DFA0; // type:data rom:0xC0B820 +D_8024E020_1 = 0x8024E020; // type:data rom:0xC0B8A0 +D_8024E0A8_1 = 0x8024E0A8; // type:data rom:0xC0B928 +D_8024E120_1 = 0x8024E120; // type:data rom:0xC0B9A0 +D_8024E1A8_1 = 0x8024E1A8; // type:data rom:0xC0BA28 +D_8024E440_1 = 0x8024E440; // type:data rom:0xC0BCC0 +D_8024E4A0_1 = 0x8024E4A0; // type:data rom:0xC0BD20 +D_8024E4D8_1 = 0x8024E4D8; // type:data rom:0xC0BD58 +D_8024E5B0_1 = 0x8024E5B0; // type:data rom:0xC0BE30 +D_8024E6A0_1 = 0x8024E6A0; // type:data rom:0xC0BF20 +D_8024E6D8_1 = 0x8024E6D8; // type:data rom:0xC0BF58 +D_8024E7C8_1 = 0x8024E7C8; // type:data rom:0xC0C048 +D_8024E800_1 = 0x8024E800; // type:data rom:0xC0C080 +D_8024E888_1 = 0x8024E888; // type:data rom:0xC0C108 +D_8024E8C0_1 = 0x8024E8C0; // type:data rom:0xC0C140 +D_8024E930_1 = 0x8024E930; // type:data rom:0xC0C1B0 +D_8024E968_1 = 0x8024E968; // type:data rom:0xC0C1E8 +D_8024E9D8_1 = 0x8024E9D8; // type:data rom:0xC0C258 +D_8024EA60_1 = 0x8024EA60; // type:data rom:0xC0C2E0 +D_8024EAD0_1 = 0x8024EAD0; // type:data rom:0xC0C350 +D_8024EC00_1 = 0x8024EC00; // type:data rom:0xC0C480 +D_8024EC68_1 = 0x8024EC68; // type:data rom:0xC0C4E8 +D_8024ECB0_1 = 0x8024ECB0; // type:data rom:0xC0C530 +D_8024EE18_1 = 0x8024EE18; // type:data rom:0xC0C698 +D_8024EE98_1 = 0x8024EE98; // type:data rom:0xC0C718 +D_8024EEC8_1 = 0x8024EEC8; // type:data rom:0xC0C748 +D_8024EF00_1 = 0x8024EF00; // type:data rom:0xC0C780 +D_8024EF60_1 = 0x8024EF60; // type:data rom:0xC0C7E0 +D_8024EF98_1 = 0x8024EF98; // type:data rom:0xC0C818 +D_8024EFF8_1 = 0x8024EFF8; // type:data rom:0xC0C878 +D_8024F030_1 = 0x8024F030; // type:data rom:0xC0C8B0 +D_8024F090_1 = 0x8024F090; // type:data rom:0xC0C910 +D_8024F0C8_1 = 0x8024F0C8; // type:data rom:0xC0C948 +D_8024F128_1 = 0x8024F128; // type:data rom:0xC0C9A8 +D_8024F160_1 = 0x8024F160; // type:data rom:0xC0C9E0 +D_8024F1C0_1 = 0x8024F1C0; // type:data rom:0xC0CA40 +D_8024F1F8_1 = 0x8024F1F8; // type:data rom:0xC0CA78 +D_8024F258_1 = 0x8024F258; // type:data rom:0xC0CAD8 +D_8024F290_1 = 0x8024F290; // type:data rom:0xC0CB10 +D_8024F2F0_1 = 0x8024F2F0; // type:data rom:0xC0CB70 +D_8024F328_1 = 0x8024F328; // type:data rom:0xC0CBA8 +D_8024F388_1 = 0x8024F388; // type:data rom:0xC0CC08 +D_8024F3C0_1 = 0x8024F3C0; // type:data rom:0xC0CC40 +D_8024F420_1 = 0x8024F420; // type:data rom:0xC0CCA0 +D_8024F458_1 = 0x8024F458; // type:data rom:0xC0CCD8 +D_8024F4C0_1 = 0x8024F4C0; // type:data rom:0xC0CD40 +D_8024F520_1 = 0x8024F520; // type:data rom:0xC0CDA0 +D_8024F558_1 = 0x8024F558; // type:data rom:0xC0CDD8 +D_8024F5B8_1 = 0x8024F5B8; // type:data rom:0xC0CE38 +D_8024F5F0_1 = 0x8024F5F0; // type:data rom:0xC0CE70 +D_8024F650_1 = 0x8024F650; // type:data rom:0xC0CED0 +D_8024F688_1 = 0x8024F688; // type:data rom:0xC0CF08 +D_8024F6E8_1 = 0x8024F6E8; // type:data rom:0xC0CF68 +D_8024F720_1 = 0x8024F720; // type:data rom:0xC0CFA0 +D_8024F780_1 = 0x8024F780; // type:data rom:0xC0D000 +D_8024F7B8_1 = 0x8024F7B8; // type:data rom:0xC0D038 +D_8024F818_1 = 0x8024F818; // type:data rom:0xC0D098 +D_8024F850_1 = 0x8024F850; // type:data rom:0xC0D0D0 +D_8024F8B0_1 = 0x8024F8B0; // type:data rom:0xC0D130 +D_8024F8E8_1 = 0x8024F8E8; // type:data rom:0xC0D168 +D_8024F948_1 = 0x8024F948; // type:data rom:0xC0D1C8 +D_8024F980_1 = 0x8024F980; // type:data rom:0xC0D200 +D_8024F9E0_1 = 0x8024F9E0; // type:data rom:0xC0D260 +D_8024FA18_1 = 0x8024FA18; // type:data rom:0xC0D298 +D_8024FA78_1 = 0x8024FA78; // type:data rom:0xC0D2F8 +D_8024FAB0_1 = 0x8024FAB0; // type:data rom:0xC0D330 +D_8024FB10_1 = 0x8024FB10; // type:data rom:0xC0D390 +D_8024FB48_1 = 0x8024FB48; // type:data rom:0xC0D3C8 +D_8024FBC0_1 = 0x8024FBC0; // type:data rom:0xC0D440 +D_8024FC48_1 = 0x8024FC48; // type:data rom:0xC0D4C8 +D_8024FEB0_1 = 0x8024FEB0; // type:data rom:0xC0D730 +D_8024FEE0_1 = 0x8024FEE0; // type:data rom:0xC0D760 +D_802500A0_1 = 0x802500A0; // type:data rom:0xC0D920 +D_802500C8_1 = 0x802500C8; // type:data rom:0xC0D948 +D_80250108_1 = 0x80250108; // type:data rom:0xC0D988 +D_80250168_1 = 0x80250168; // type:data rom:0xC0D9E8 +D_80250220_1 = 0x80250220; // type:data rom:0xC0DAA0 +D_80250290_1 = 0x80250290; // type:data rom:0xC0DB10 +D_802502F8_1 = 0x802502F8; // type:data rom:0xC0DB78 +D_80250360_1 = 0x80250360; // type:data rom:0xC0DBE0 +D_80250648_1 = 0x80250648; // type:data rom:0xC0DEC8 +D_80250698_1 = 0x80250698; // type:data rom:0xC0DF18 +D_80250720_1 = 0x80250720; // type:data rom:0xC0DFA0 +D_80250798_1 = 0x80250798; // type:data rom:0xC0E018 +D_80250820_1 = 0x80250820; // type:data rom:0xC0E0A0 +D_80250898_1 = 0x80250898; // type:data rom:0xC0E118 +D_80250910_1 = 0x80250910; // type:data rom:0xC0E190 +D_80250D58_1 = 0x80250D58; // type:data rom:0xC0E5D8 +D_80250DA8_1 = 0x80250DA8; // type:data rom:0xC0E628 +D_80250DE0_1 = 0x80250DE0; // type:data rom:0xC0E660 +D_80250E88_1 = 0x80250E88; // type:data rom:0xC0E708 +D_80250F40_1 = 0x80250F40; // type:data rom:0xC0E7C0 +D_80250FC8_1 = 0x80250FC8; // type:data rom:0xC0E848 +D_80251050_1 = 0x80251050; // type:data rom:0xC0E8D0 +D_802510C8_1 = 0x802510C8; // type:data rom:0xC0E948 +D_80251528_1 = 0x80251528; // type:data rom:0xC0EDA8 +D_80251578_1 = 0x80251578; // type:data rom:0xC0EDF8 +D_802515B0_1 = 0x802515B0; // type:data rom:0xC0EE30 +D_80251638_1 = 0x80251638; // type:data rom:0xC0EEB8 +D_802516A8_1 = 0x802516A8; // type:data rom:0xC0EF28 +D_80251710_1 = 0x80251710; // type:data rom:0xC0EF90 +D_80251798_1 = 0x80251798; // type:data rom:0xC0F018 +D_80251958_1 = 0x80251958; // type:data rom:0xC0F1D8 +D_802519A0_1 = 0x802519A0; // type:data rom:0xC0F220 +D_802519F0_1 = 0x802519F0; // type:data rom:0xC0F270 +D_80251A28_1 = 0x80251A28; // type:data rom:0xC0F2A8 +D_80251A50_1 = 0x80251A50; // type:data rom:0xC0F2D0 +dgb_01_D_80251A80_C0F300 = 0x80251A80; // type:data rom:0xC0F300 +dgb_01_D_80251AAC_C0F32C = 0x80251AAC; // type:data rom:0xC0F32C +dgb_01_D_80251AD8_C0F358 = 0x80251AD8; // type:data rom:0xC0F358 +dgb_01_D_80251B04_C0F384 = 0x80251B04; // type:data rom:0xC0F384 +dgb_01_D_80251B30_C0F3B0 = 0x80251B30; // type:data rom:0xC0F3B0 +dgb_01_D_80251B5C_C0F3DC = 0x80251B5C; // type:data rom:0xC0F3DC +dgb_01_D_80251B88_C0F408 = 0x80251B88; // type:data rom:0xC0F408 +dgb_01_D_80251BB4_C0F434 = 0x80251BB4; // type:data rom:0xC0F434 +dgb_01_D_80251BE0_C0F460 = 0x80251BE0; // type:data rom:0xC0F460 +dgb_01_D_80251C0C_C0F48C = 0x80251C0C; // type:data rom:0xC0F48C +dgb_01_D_80251C38_C0F4B8 = 0x80251C38; // type:data rom:0xC0F4B8 +dgb_01_D_80251C64_C0F4E4 = 0x80251C64; // type:data rom:0xC0F4E4 +dgb_01_D_80251C90_C0F510 = 0x80251C90; // type:data rom:0xC0F510 +dgb_01_D_80251CBC_C0F53C = 0x80251CBC; // type:data rom:0xC0F53C +dgb_01_D_80251CE8_C0F568 = 0x80251CE8; // type:data rom:0xC0F568 +dgb_01_D_80251D14_C0F594 = 0x80251D14; // type:data rom:0xC0F594 +dgb_01_D_80251D40_C0F5C0 = 0x80251D40; // type:data rom:0xC0F5C0 +dgb_01_D_80251D6C_C0F5EC = 0x80251D6C; // type:data rom:0xC0F5EC +dgb_01_D_80251D98_C0F618 = 0x80251D98; // type:data rom:0xC0F618 +dgb_01_D_80251DC4_C0F644 = 0x80251DC4; // type:data rom:0xC0F644 +dgb_01_D_80251DF0_C0F670 = 0x80251DF0; // type:data rom:0xC0F670 +dgb_01_D_80251E1C_C0F69C = 0x80251E1C; // type:data rom:0xC0F69C +dgb_01_D_80251E48_C0F6C8 = 0x80251E48; // type:data rom:0xC0F6C8 +dgb_01_D_80251E74_C0F6F4 = 0x80251E74; // type:data rom:0xC0F6F4 +dgb_01_D_80251EA0_C0F720 = 0x80251EA0; // type:data rom:0xC0F720 +dgb_01_D_80251ECC_C0F74C = 0x80251ECC; // type:data rom:0xC0F74C +dgb_01_D_80251EF8_C0F778 = 0x80251EF8; // type:data rom:0xC0F778 +dgb_01_D_80251F24_C0F7A4 = 0x80251F24; // type:data rom:0xC0F7A4 +dgb_01_D_80251F50_C0F7D0 = 0x80251F50; // type:data rom:0xC0F7D0 +dgb_01_D_80251F7C_C0F7FC = 0x80251F7C; // type:data rom:0xC0F7FC +dgb_01_D_80251FA8_C0F828 = 0x80251FA8; // type:data rom:0xC0F828 +dgb_01_D_80251FD4_C0F854 = 0x80251FD4; // type:data rom:0xC0F854 +dgb_01_D_80252000_C0F880 = 0x80252000; // type:data rom:0xC0F880 +dgb_01_D_8025202C_C0F8AC = 0x8025202C; // type:data rom:0xC0F8AC +dgb_01_D_80252058_C0F8D8 = 0x80252058; // type:data rom:0xC0F8D8 +dgb_01_D_80252084_C0F904 = 0x80252084; // type:data rom:0xC0F904 +dgb_01_D_802520B0_C0F930 = 0x802520B0; // type:data rom:0xC0F930 +dgb_01_D_802520DC_C0F95C = 0x802520DC; // type:data rom:0xC0F95C +dgb_01_D_80252108_C0F988 = 0x80252108; // type:data rom:0xC0F988 +dgb_01_D_80252134_C0F9B4 = 0x80252134; // type:data rom:0xC0F9B4 +dgb_01_D_80252160_C0F9E0 = 0x80252160; // type:data rom:0xC0F9E0 +dgb_01_D_8025218C_C0FA0C = 0x8025218C; // type:data rom:0xC0FA0C +dgb_01_D_802521B8_C0FA38 = 0x802521B8; // type:data rom:0xC0FA38 +dgb_01_D_802521E4_C0FA64 = 0x802521E4; // type:data rom:0xC0FA64 +dgb_01_D_80252210_C0FA90 = 0x80252210; // type:data rom:0xC0FA90 +dgb_01_D_8025223C_C0FABC = 0x8025223C; // type:data rom:0xC0FABC +dgb_01_D_80252268_C0FAE8 = 0x80252268; // type:data rom:0xC0FAE8 +dgb_01_D_80252294_C0FB14 = 0x80252294; // type:data rom:0xC0FB14 +dgb_01_D_802522C0_C0FB40 = 0x802522C0; // type:data rom:0xC0FB40 +dgb_01_D_802522EC_C0FB6C = 0x802522EC; // type:data rom:0xC0FB6C +dgb_01_D_80252318_C0FB98 = 0x80252318; // type:data rom:0xC0FB98 +dgb_01_D_80252344_C0FBC4 = 0x80252344; // type:data rom:0xC0FBC4 +dgb_01_D_80252370_C0FBF0 = 0x80252370; // type:data rom:0xC0FBF0 +dgb_01_D_8025239C_C0FC1C = 0x8025239C; // type:data rom:0xC0FC1C +dgb_01_D_802523C8_C0FC48 = 0x802523C8; // type:data rom:0xC0FC48 +dgb_01_D_802523F4_C0FC74 = 0x802523F4; // type:data rom:0xC0FC74 +dgb_01_D_80252420_C0FCA0 = 0x80252420; // type:data rom:0xC0FCA0 +dgb_01_D_8025244C_C0FCCC = 0x8025244C; // type:data rom:0xC0FCCC +dgb_01_D_80252478_C0FCF8 = 0x80252478; // type:data rom:0xC0FCF8 +dgb_01_D_802524A4_C0FD24 = 0x802524A4; // type:data rom:0xC0FD24 +dgb_01_D_802524D0_C0FD50 = 0x802524D0; // type:data rom:0xC0FD50 +dgb_01_D_802524FC_C0FD7C = 0x802524FC; // type:data rom:0xC0FD7C +dgb_01_D_80252528_C0FDA8 = 0x80252528; // type:data rom:0xC0FDA8 +dgb_01_D_80252554_C0FDD4 = 0x80252554; // type:data rom:0xC0FDD4 +dgb_01_D_80252580_C0FE00 = 0x80252580; // type:data rom:0xC0FE00 +dgb_01_D_802525AC_C0FE2C = 0x802525AC; // type:data rom:0xC0FE2C +dgb_01_D_802525D8_C0FE58 = 0x802525D8; // type:data rom:0xC0FE58 +dgb_01_D_80252604_C0FE84 = 0x80252604; // type:data rom:0xC0FE84 +dgb_01_D_80252630_C0FEB0 = 0x80252630; // type:data rom:0xC0FEB0 +dgb_01_D_8025265C_C0FEDC = 0x8025265C; // type:data rom:0xC0FEDC +dgb_01_D_80252688_C0FF08 = 0x80252688; // type:data rom:0xC0FF08 +dgb_01_D_802526B4_C0FF34 = 0x802526B4; // type:data rom:0xC0FF34 +dgb_01_D_802526E0_C0FF60 = 0x802526E0; // type:data rom:0xC0FF60 +dgb_01_D_8025270C_C0FF8C = 0x8025270C; // type:data rom:0xC0FF8C +dgb_01_D_80252738_C0FFB8 = 0x80252738; // type:data rom:0xC0FFB8 +dgb_01_D_80252764_C0FFE4 = 0x80252764; // type:data rom:0xC0FFE4 +dgb_01_D_80252790_C10010 = 0x80252790; // type:data rom:0xC10010 +dgb_01_D_802527BC_C1003C = 0x802527BC; // type:data rom:0xC1003C +dgb_01_D_802527E8_C10068 = 0x802527E8; // type:data rom:0xC10068 +dgb_01_D_80252814_C10094 = 0x80252814; // type:data rom:0xC10094 +dgb_01_D_80252840_C100C0 = 0x80252840; // type:data rom:0xC100C0 +dgb_01_D_8025286C_C100EC = 0x8025286C; // type:data rom:0xC100EC +dgb_01_D_80252898_C10118 = 0x80252898; // type:data rom:0xC10118 +dgb_01_D_802528C4_C10144 = 0x802528C4; // type:data rom:0xC10144 +dgb_01_D_802528F0_C10170 = 0x802528F0; // type:data rom:0xC10170 +dgb_01_D_8025291C_C1019C = 0x8025291C; // type:data rom:0xC1019C +dgb_01_D_80252948_C101C8 = 0x80252948; // type:data rom:0xC101C8 +dgb_01_D_80252974_C101F4 = 0x80252974; // type:data rom:0xC101F4 +dgb_01_D_802529A0_C10220 = 0x802529A0; // type:data rom:0xC10220 +dgb_01_D_802529CC_C1024C = 0x802529CC; // type:data rom:0xC1024C +dgb_01_D_802529F8_C10278 = 0x802529F8; // type:data rom:0xC10278 +dgb_01_D_80252A24_C102A4 = 0x80252A24; // type:data rom:0xC102A4 +dgb_01_D_80252A50_C102D0 = 0x80252A50; // type:data rom:0xC102D0 +dgb_01_D_80252A7C_C102FC = 0x80252A7C; // type:data rom:0xC102FC +dgb_01_D_80252AA8_C10328 = 0x80252AA8; // type:data rom:0xC10328 +dgb_01_D_80252AD4_C10354 = 0x80252AD4; // type:data rom:0xC10354 +dgb_01_D_80252B00_C10380 = 0x80252B00; // type:data rom:0xC10380 +dgb_01_D_80252B2C_C103AC = 0x80252B2C; // type:data rom:0xC103AC +dgb_01_D_80252B58_C103D8 = 0x80252B58; // type:data rom:0xC103D8 +dgb_01_D_80252B84_C10404 = 0x80252B84; // type:data rom:0xC10404 +dgb_01_D_80252BB0_C10430 = 0x80252BB0; // type:data rom:0xC10430 +dgb_01_D_80252BDC_C1045C = 0x80252BDC; // type:data rom:0xC1045C +dgb_01_D_80252C08_C10488 = 0x80252C08; // type:data rom:0xC10488 +dgb_01_D_80252C34_C104B4 = 0x80252C34; // type:data rom:0xC104B4 +dgb_01_D_80252C60_C104E0 = 0x80252C60; // type:data rom:0xC104E0 +dgb_01_D_80252C8C_C1050C = 0x80252C8C; // type:data rom:0xC1050C +dgb_01_D_80252CB8_C10538 = 0x80252CB8; // type:data rom:0xC10538 +dgb_01_D_80252CE4_C10564 = 0x80252CE4; // type:data rom:0xC10564 +dgb_01_D_80252D10_C10590 = 0x80252D10; // type:data rom:0xC10590 +dgb_01_D_80252D3C_C105BC = 0x80252D3C; // type:data rom:0xC105BC +dgb_01_D_80252D68_C105E8 = 0x80252D68; // type:data rom:0xC105E8 +dgb_01_D_80252D94_C10614 = 0x80252D94; // type:data rom:0xC10614 +dgb_01_D_80252DC0_C10640 = 0x80252DC0; // type:data rom:0xC10640 +dgb_01_D_80252DEC_C1066C = 0x80252DEC; // type:data rom:0xC1066C +dgb_01_D_80252E18_C10698 = 0x80252E18; // type:data rom:0xC10698 +dgb_01_D_80252E44_C106C4 = 0x80252E44; // type:data rom:0xC106C4 +dgb_01_D_80252E70_C106F0 = 0x80252E70; // type:data rom:0xC106F0 +dgb_01_D_80252E9C_C1071C = 0x80252E9C; // type:data rom:0xC1071C +dgb_01_D_80252EC8_C10748 = 0x80252EC8; // type:data rom:0xC10748 +dgb_01_D_80252EF4_C10774 = 0x80252EF4; // type:data rom:0xC10774 +dgb_01_D_80252F20_C107A0 = 0x80252F20; // type:data rom:0xC107A0 +dgb_01_D_80252F4C_C107CC = 0x80252F4C; // type:data rom:0xC107CC +dgb_01_D_80253140_C109C0 = 0x80253140; // type:data rom:0xC109C0 +dgb_01_D_80253148_C109C8 = 0x80253148; // type:data rom:0xC109C8 +dgb_01_D_80253160_C109E0 = 0x80253160; // type:data rom:0xC109E0 +dgb_01_D_802531A0_C10A20 = 0x802531A0; // type:data rom:0xC10A20 +dgb_01_D_802531E0_C10A60 = 0x802531E0; // type:data rom:0xC10A60 +dgb_01_D_80253220_C10AA0 = 0x80253220; // type:data rom:0xC10AA0 +dgb_01_D_80253260_C10AE0 = 0x80253260; // type:data rom:0xC10AE0 +dgb_01_D_802532A0_C10B20 = 0x802532A0; // type:data rom:0xC10B20 +dgb_01_D_802532E0_C10B60 = 0x802532E0; // type:data rom:0xC10B60 +dgb_01_D_80253320_C10BA0 = 0x80253320; // type:data rom:0xC10BA0 +dgb_01_D_80253360_C10BE0 = 0x80253360; // type:data rom:0xC10BE0 +dgb_01_D_802533A0_C10C20 = 0x802533A0; // type:data rom:0xC10C20 +dgb_01_D_802533E0_C10C60 = 0x802533E0; // type:data rom:0xC10C60 +dgb_01_D_80253420_C10CA0 = 0x80253420; // type:data rom:0xC10CA0 +dgb_01_D_80253460_C10CE0 = 0x80253460; // type:data rom:0xC10CE0 +dgb_01_D_802534A0_C10D20 = 0x802534A0; // type:data rom:0xC10D20 +dgb_01_D_802534E0_C10D60 = 0x802534E0; // type:data rom:0xC10D60 +dgb_01_D_80253520_C10DA0 = 0x80253520; // type:data rom:0xC10DA0 +dgb_01_D_80253560_C10DE0 = 0x80253560; // type:data rom:0xC10DE0 +dgb_01_D_802535A0_C10E20 = 0x802535A0; // type:data rom:0xC10E20 +dgb_01_D_802535E0_C10E60 = 0x802535E0; // type:data rom:0xC10E60 +dgb_01_D_80253620_C10EA0 = 0x80253620; // type:data rom:0xC10EA0 +dgb_01_D_80253660_C10EE0 = 0x80253660; // type:data rom:0xC10EE0 +dgb_01_D_802536A0_C10F20 = 0x802536A0; // type:data rom:0xC10F20 +dgb_01_D_802536E0_C10F60 = 0x802536E0; // type:data rom:0xC10F60 +dgb_01_D_80253720_C10FA0 = 0x80253720; // type:data rom:0xC10FA0 +dgb_01_D_80253760_C10FE0 = 0x80253760; // type:data rom:0xC10FE0 +dgb_01_D_802537A0_C11020 = 0x802537A0; // type:data rom:0xC11020 +dgb_01_D_802537E0_C11060 = 0x802537E0; // type:data rom:0xC11060 +dgb_01_D_80253820_C110A0 = 0x80253820; // type:data rom:0xC110A0 +dgb_01_D_80253860_C110E0 = 0x80253860; // type:data rom:0xC110E0 +dgb_01_D_802538A0_C11120 = 0x802538A0; // type:data rom:0xC11120 +dgb_01_D_802538E0_C11160 = 0x802538E0; // type:data rom:0xC11160 +dgb_01_D_80253920_C111A0 = 0x80253920; // type:data rom:0xC111A0 +dgb_01_D_80253960_C111E0 = 0x80253960; // type:data rom:0xC111E0 +dgb_01_D_802539A0_C11220 = 0x802539A0; // type:data rom:0xC11220 D_80263420_C20CA0 = 0x80263420; // type:data rom:0xC20CA0 D_80263428_C20CA8 = 0x80263428; // type:data rom:0xC20CA8 D_80263430_C20CB0 = 0x80263430; // type:data rom:0xC20CB0 D_80263478_C20CF8 = 0x80263478; // type:data rom:0xC20CF8 D_80263480_C20D00 = 0x80263480; // type:data rom:0xC20D00 +dgb_01_dgb_00_name_hack = 0x80263508; // type:data rom:0xC20D88 D_80263510_C20D90 = 0x80263510; // type:data rom:0xC20D90 D_80263518_C20D98 = 0x80263518; // type:data rom:0xC20D98 +dgb_01_dgb_08_name_hack = 0x802636B0; // type:data rom:0xC20F30 dgb_02_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC2EBA0 dgb_02_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC2EC0C dgb_02_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC2EC7C dgb_02_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC2ED54 -func_80240208_C2EDA8 = 0x80240208; // type:func rom:0xC2EDA8 -update_starpoints_display_C2EF5C = 0x802403BC; // type:func rom:0xC2EF5C -func_8024061C_C2F1BC = 0x8024061C; // type:func rom:0xC2F1BC -func_802408D0_C2F470 = 0x802408D0; // type:func rom:0xC2F470 -func_80240958_C2F4F8 = 0x80240958; // type:func rom:0xC2F4F8 -func_80240C10_C2F7B0 = 0x80240C10; // type:func rom:0xC2F7B0 -func_80240C74_C2F814 = 0x80240C74; // type:func rom:0xC2F814 -func_80240D1C_C2F8BC = 0x80240D1C; // type:func rom:0xC2F8BC -func_80240E54_C2F9F4 = 0x80240E54; // type:func rom:0xC2F9F4 -func_80240F00_C2FAA0 = 0x80240F00; // type:func rom:0xC2FAA0 -func_80241078_C2FC18 = 0x80241078; // type:func rom:0xC2FC18 -func_802410D4_C2FC74 = 0x802410D4; // type:func rom:0xC2FC74 +dgb_02_func_80240208_C2EDA8 = 0x80240208; // type:func rom:0xC2EDA8 +dgb_02_update_starpoints_display_C2EF5C = 0x802403BC; // type:func rom:0xC2EF5C +dgb_02_func_8024061C_C2F1BC = 0x8024061C; // type:func rom:0xC2F1BC +dgb_02_func_802408D0_C2F470 = 0x802408D0; // type:func rom:0xC2F470 +dgb_02_func_80240958_C2F4F8 = 0x80240958; // type:func rom:0xC2F4F8 +dgb_02_func_80240C10_C2F7B0 = 0x80240C10; // type:func rom:0xC2F7B0 +dgb_02_func_80240C74_C2F814 = 0x80240C74; // type:func rom:0xC2F814 +dgb_02_func_80240D1C_C2F8BC = 0x80240D1C; // type:func rom:0xC2F8BC +dgb_02_func_80240E54_C2F9F4 = 0x80240E54; // type:func rom:0xC2F9F4 +dgb_02_func_80240F00_C2FAA0 = 0x80240F00; // type:func rom:0xC2FAA0 +dgb_02_func_80241078_C2FC18 = 0x80241078; // type:func rom:0xC2FC18 +dgb_02_func_802410D4_C2FC74 = 0x802410D4; // type:func rom:0xC2FC74 +dgb_02_entryList = 0x80241430; // type:data rom:0xC2FFD0 +dgb_02_config = 0x80241470; // type:data rom:0xC30010 +dgb_02_802414B0 = 0x802414B0; // type:data rom:0xC30050 +dgb_02_exitDoubleDoor_80241550 = 0x80241550; // type:data rom:0xC300F0 +dgb_02_exitDoubleDoor_80241604 = 0x80241604; // type:data rom:0xC301A4 +dgb_02_exitSingleDoor_802416B8 = 0x802416B8; // type:data rom:0xC30258 +dgb_02_exitSingleDoor_8024176C = 0x8024176C; // type:data rom:0xC3030C +dgb_02_enterSingleDoor_80241820 = 0x80241820; // type:data rom:0xC303C0 +dgb_02_main = 0x80241974; // type:data rom:0xC30514 +dgb_02_80241AB0 = 0x80241AB0; // type:data rom:0xC30650 +dgb_02_extraAnimationList_80241B6C = 0x80241B6C; // type:data rom:0xC3070C +dgb_02_extraAnimationList_80241B94 = 0x80241B94; // type:data rom:0xC30734 +dgb_02_npcAISettings_80241B9C = 0x80241B9C; // type:data rom:0xC3073C +dgb_02_npcAI_80241BCC = 0x80241BCC; // type:data rom:0xC3076C +dgb_02_npcSettings_80241C3C = 0x80241C3C; // type:data rom:0xC307DC +dgb_02_npcAISettings_80241C68 = 0x80241C68; // type:data rom:0xC30808 +dgb_02_npcAI_80241C98 = 0x80241C98; // type:data rom:0xC30838 +dgb_02_npcSettings_80241D08 = 0x80241D08; // type:data rom:0xC308A8 +dgb_02_npcAI_80241D34 = 0x80241D34; // type:data rom:0xC308D4 +dgb_02_npcSettings_80241DDC = 0x80241DDC; // type:data rom:0xC3097C +dgb_02_npcGroup_80241E08 = 0x80241E08; // type:data rom:0xC309A8 +dgb_02_npcGroup_802421E8 = 0x802421E8; // type:data rom:0xC30D88 +dgb_02_npcGroupList_802425C8 = 0x802425C8; // type:data rom:0xC31168 D_80242610_C311B0 = 0x80242610; // type:data rom:0xC311B0 D_802427A8_C31348 = 0x802427A8; // type:data rom:0xC31348 -func_80240000_C314E0 = 0x80240000; // type:func rom:0xC314E0 -func_802400BC_C3159C = 0x802400BC; // type:func rom:0xC3159C +dgb_03_func_80240000_C314E0 = 0x80240000; // type:func rom:0xC314E0 +dgb_03_func_802400BC_C3159C = 0x802400BC; // type:func rom:0xC3159C dgb_03_SetEntityFlags100000 = 0x80240170; // type:func rom:0xC31650 dgb_03_GetEntityPosition = 0x802401A4; // type:func rom:0xC31684 dgb_03_UnkNpcAIFunc6 = 0x80240250; // type:func rom:0xC31730 dgb_03_UnkNpcAIFunc7 = 0x802402BC; // type:func rom:0xC3179C dgb_03_UnkNpcAIFunc8 = 0x8024032C; // type:func rom:0xC3180C dgb_03_UnkNpcAIFunc5 = 0x80240404; // type:func rom:0xC318E4 -func_80240458_C31938 = 0x80240458; // type:func rom:0xC31938 -func_8024060C_C31AEC = 0x8024060C; // type:func rom:0xC31AEC -func_8024086C_C31D4C = 0x8024086C; // type:func rom:0xC31D4C -func_80240B20_C32000 = 0x80240B20; // type:func rom:0xC32000 -func_80240C78_C32158 = 0x80240C78; // type:func rom:0xC32158 +dgb_03_func_80240458_C31938 = 0x80240458; // type:func rom:0xC31938 +dgb_03_func_8024060C_C31AEC = 0x8024060C; // type:func rom:0xC31AEC +dgb_03_func_8024086C_C31D4C = 0x8024086C; // type:func rom:0xC31D4C +dgb_03_func_80240B20_C32000 = 0x80240B20; // type:func rom:0xC32000 +dgb_03_func_80240C78_C32158 = 0x80240C78; // type:func rom:0xC32158 dgb_03_UnkNpcAIFunc1 = 0x80240F20; // type:func rom:0xC32400 -func_80240FE0_C324C0 = 0x80240FE0; // type:func rom:0xC324C0 -func_8024119C_C3267C = 0x8024119C; // type:func rom:0xC3267C +dgb_03_func_80240FE0_C324C0 = 0x80240FE0; // type:func rom:0xC324C0 +dgb_03_func_8024119C_C3267C = 0x8024119C; // type:func rom:0xC3267C dgb_03_NpcJumpFunc2 = 0x80241250; // type:func rom:0xC32730 dgb_03_NpcJumpFunc = 0x802412C4; // type:func rom:0xC327A4 dgb_03_UnkNpcAIFunc13 = 0x8024133C; // type:func rom:0xC3281C -func_8024146C_C3294C = 0x8024146C; // type:func rom:0xC3294C +dgb_03_func_8024146C_C3294C = 0x8024146C; // type:func rom:0xC3294C dgb_03_UnkNpcDurationFlagFunc = 0x8024158C; // type:func rom:0xC32A6C -func_802415F4_C32AD4 = 0x802415F4; // type:func rom:0xC32AD4 -func_802416B4_C32B94 = 0x802416B4; // type:func rom:0xC32B94 -func_802419B0_C32E90 = 0x802419B0; // type:func rom:0xC32E90 -func_80241C7C_C3315C = 0x80241C7C; // type:func rom:0xC3315C -func_80241D04_C331E4 = 0x80241D04; // type:func rom:0xC331E4 -func_80241FBC_C3349C = 0x80241FBC; // type:func rom:0xC3349C -func_80242020_C33500 = 0x80242020; // type:func rom:0xC33500 -func_802420C8_C335A8 = 0x802420C8; // type:func rom:0xC335A8 -func_80242200_C336E0 = 0x80242200; // type:func rom:0xC336E0 -func_802422AC_C3378C = 0x802422AC; // type:func rom:0xC3378C -func_80242424_C33904 = 0x80242424; // type:func rom:0xC33904 -func_80242480_C33960 = 0x80242480; // type:func rom:0xC33960 +dgb_03_func_802415F4_C32AD4 = 0x802415F4; // type:func rom:0xC32AD4 +dgb_03_func_802416B4_C32B94 = 0x802416B4; // type:func rom:0xC32B94 +dgb_03_func_802419B0_C32E90 = 0x802419B0; // type:func rom:0xC32E90 +dgb_03_func_80241C7C_C3315C = 0x80241C7C; // type:func rom:0xC3315C +dgb_03_func_80241D04_C331E4 = 0x80241D04; // type:func rom:0xC331E4 +dgb_03_func_80241FBC_C3349C = 0x80241FBC; // type:func rom:0xC3349C +dgb_03_func_80242020_C33500 = 0x80242020; // type:func rom:0xC33500 +dgb_03_func_802420C8_C335A8 = 0x802420C8; // type:func rom:0xC335A8 +dgb_03_func_80242200_C336E0 = 0x80242200; // type:func rom:0xC336E0 +dgb_03_func_802422AC_C3378C = 0x802422AC; // type:func rom:0xC3378C +dgb_03_func_80242424_C33904 = 0x80242424; // type:func rom:0xC33904 +dgb_03_func_80242480_C33960 = 0x80242480; // type:func rom:0xC33960 +dgb_03_entryList = 0x802427D0; // type:data rom:0xC33CB0 +dgb_03_config = 0x80242830; // type:data rom:0xC33D10 +dgb_03_80242870 = 0x80242870; // type:data rom:0xC33D50 +dgb_03_exitDoubleDoor_80242910 = 0x80242910; // type:data rom:0xC33DF0 +dgb_03_exitDoubleDoor_802429C4 = 0x802429C4; // type:data rom:0xC33EA4 +dgb_03_exitDoubleDoor_80242A78 = 0x80242A78; // type:data rom:0xC33F58 +dgb_03_exitWalk_80242B2C = 0x80242B2C; // type:data rom:0xC3400C +dgb_03_exitSingleDoor_80242B88 = 0x80242B88; // type:data rom:0xC34068 +dgb_03_exitDoubleDoor_80242C3C = 0x80242C3C; // type:data rom:0xC3411C +dgb_03_80242CF0 = 0x80242CF0; // type:data rom:0xC341D0 +dgb_03_enterDoubleDoor_80242D1C = 0x80242D1C; // type:data rom:0xC341FC +dgb_03_itemList_80242F28 = 0x80242F28; // type:data rom:0xC34408 +dgb_03_main = 0x80242F30; // type:data rom:0xC34410 +dgb_03_802430E0 = 0x802430E0; // type:data rom:0xC345C0 +dgb_03_80243470 = 0x80243470; // type:data rom:0xC34950 +dgb_03_8024353C = 0x8024353C; // type:data rom:0xC34A1C +dgb_03_80243608 = 0x80243608; // type:data rom:0xC34AE8 +dgb_03_80243740 = 0x80243740; // type:data rom:0xC34C20 +dgb_03_802438A8 = 0x802438A8; // type:data rom:0xC34D88 +dgb_03_makeEntities = 0x802438D4; // type:data rom:0xC34DB4 +dgb_03_80243970 = 0x80243970; // type:data rom:0xC34E50 +dgb_03_unk_missing_80243A2C = 0x80243A2C; // type:data rom:0xC34F0C +dgb_03_extraAnimationList_80243A54 = 0x80243A54; // type:data rom:0xC34F34 +dgb_03_npcAISettings_80243A5C = 0x80243A5C; // type:data rom:0xC34F3C +dgb_03_npcAI_80243A8C = 0x80243A8C; // type:data rom:0xC34F6C +dgb_03_npcSettings_80243AFC = 0x80243AFC; // type:data rom:0xC34FDC +dgb_03_npcAISettings_80243B28 = 0x80243B28; // type:data rom:0xC35008 +dgb_03_npcAI_80243B58 = 0x80243B58; // type:data rom:0xC35038 +dgb_03_npcSettings_80243BC8 = 0x80243BC8; // type:data rom:0xC350A8 +dgb_03_npcAISettings_80243BF4 = 0x80243BF4; // type:data rom:0xC350D4 +dgb_03_npcAI_80243C24 = 0x80243C24; // type:data rom:0xC35104 +dgb_03_npcSettings_80243C94 = 0x80243C94; // type:data rom:0xC35174 +dgb_03_npcAI_80243CC0 = 0x80243CC0; // type:data rom:0xC351A0 +dgb_03_npcSettings_80243D68 = 0x80243D68; // type:data rom:0xC35248 +dgb_03_init_80243D94 = 0x80243D94; // type:data rom:0xC35274 +dgb_03_npcGroup_80243DE8 = 0x80243DE8; // type:data rom:0xC352C8 +dgb_03_npcGroup_802441C8 = 0x802441C8; // type:data rom:0xC356A8 +dgb_03_npcGroup_802445A8 = 0x802445A8; // type:data rom:0xC35A88 +dgb_03_npcGroupList_80244988 = 0x80244988; // type:data rom:0xC35E68 D_802449F0_C35ED0 = 0x802449F0; // type:data rom:0xC35ED0 D_80244B88_C36068 = 0x80244B88; // type:data rom:0xC36068 D_80244B90_C36070 = 0x80244B90; // type:data rom:0xC36070 D_80244EB8_C36398 = 0x80244EB8; // type:data rom:0xC36398 -func_80240000_C36530 = 0x80240000; // type:func rom:0xC36530 -func_802401B0_C366E0 = 0x802401B0; // type:func rom:0xC366E0 +dgb_04_func_80240000_C36530 = 0x80240000; // type:func rom:0xC36530 +dgb_04_func_802401B0_C366E0 = 0x802401B0; // type:func rom:0xC366E0 dgb_04_UnkNpcAIFunc1 = 0x802407D8; // type:func rom:0xC36D08 -func_80240898_C36DC8 = 0x80240898; // type:func rom:0xC36DC8 +dgb_04_func_80240898_C36DC8 = 0x80240898; // type:func rom:0xC36DC8 dgb_04_UnkNpcAIFunc2 = 0x80240BDC; // type:func rom:0xC3710C -func_80240C54_C37184 = 0x80240C54; // type:func rom:0xC37184 +dgb_04_func_80240C54_C37184 = 0x80240C54; // type:func rom:0xC37184 dgb_04_UnkNpcAIFunc14 = 0x80240CC0; // type:func rom:0xC371F0 dgb_04_UnkNpcAIFunc3 = 0x80240DF4; // type:func rom:0xC37324 -func_80240E58_C37388 = 0x80240E58; // type:func rom:0xC37388 -func_802411E8_C37718 = 0x802411E8; // type:func rom:0xC37718 -func_8024130C_C3783C = 0x8024130C; // type:func rom:0xC3783C -func_802414F8_C37A28 = 0x802414F8; // type:func rom:0xC37A28 -func_80241650_C37B80 = 0x80241650; // type:func rom:0xC37B80 -func_80241754_C37C84 = 0x80241754; // type:func rom:0xC37C84 -func_802417F8_C37D28 = 0x802417F8; // type:func rom:0xC37D28 -func_80241A94_C37FC4 = 0x80241A94; // type:func rom:0xC37FC4 -func_80241B4C_C3807C = 0x80241B4C; // type:func rom:0xC3807C -func_80241CCC_C381FC = 0x80241CCC; // type:func rom:0xC381FC -func_80241D14_C38244 = 0x80241D14; // type:func rom:0xC38244 -func_80241D94_C382C4 = 0x80241D94; // type:func rom:0xC382C4 -func_80241E3C_C3836C = 0x80241E3C; // type:func rom:0xC3836C -func_80242154_C38684 = 0x80242154; // type:func rom:0xC38684 +dgb_04_func_80240E58_C37388 = 0x80240E58; // type:func rom:0xC37388 +dgb_04_func_802411E8_C37718 = 0x802411E8; // type:func rom:0xC37718 +dgb_04_func_8024130C_C3783C = 0x8024130C; // type:func rom:0xC3783C +dgb_04_func_802414F8_C37A28 = 0x802414F8; // type:func rom:0xC37A28 +dgb_04_func_80241650_C37B80 = 0x80241650; // type:func rom:0xC37B80 +dgb_04_func_80241754_C37C84 = 0x80241754; // type:func rom:0xC37C84 +dgb_04_func_802417F8_C37D28 = 0x802417F8; // type:func rom:0xC37D28 +dgb_04_func_80241A94_C37FC4 = 0x80241A94; // type:func rom:0xC37FC4 +dgb_04_func_80241B4C_C3807C = 0x80241B4C; // type:func rom:0xC3807C +dgb_04_func_80241CCC_C381FC = 0x80241CCC; // type:func rom:0xC381FC +dgb_04_func_80241D14_C38244 = 0x80241D14; // type:func rom:0xC38244 +dgb_04_func_80241D94_C382C4 = 0x80241D94; // type:func rom:0xC382C4 +dgb_04_func_80241E3C_C3836C = 0x80241E3C; // type:func rom:0xC3836C +dgb_04_func_80242154_C38684 = 0x80242154; // type:func rom:0xC38684 dgb_04_SetOverrideFlags_40 = 0x802423D0; // type:func rom:0xC38900 -func_802423EC_C3891C = 0x802423EC; // type:func rom:0xC3891C -func_8024240C_C3893C = 0x8024240C; // type:func rom:0xC3893C -func_80242438_C38968 = 0x80242438; // type:func rom:0xC38968 -func_802424A4_C389D4 = 0x802424A4; // type:func rom:0xC389D4 -func_802424F0_C38A20 = 0x802424F0; // type:func rom:0xC38A20 -func_8024259C_C38ACC = 0x8024259C; // type:func rom:0xC38ACC -func_802427EC_C38D1C = 0x802427EC; // type:func rom:0xC38D1C -func_80242818_C38D48 = 0x80242818; // type:func rom:0xC38D48 -func_80242850_C38D80 = 0x80242850; // type:func rom:0xC38D80 -func_802428E0_C38E10 = 0x802428E0; // type:func rom:0xC38E10 -func_80242914_C38E44 = 0x80242914; // type:func rom:0xC38E44 -func_80242978_C38EA8 = 0x80242978; // type:func rom:0xC38EA8 -func_802429D0_C38F00 = 0x802429D0; // type:func rom:0xC38F00 -func_80242F08_C39438 = 0x80242F08; // type:func rom:0xC39438 +dgb_04_func_802423EC_C3891C = 0x802423EC; // type:func rom:0xC3891C +dgb_04_func_8024240C_C3893C = 0x8024240C; // type:func rom:0xC3893C +dgb_04_func_80242438_C38968 = 0x80242438; // type:func rom:0xC38968 +dgb_04_func_802424A4_C389D4 = 0x802424A4; // type:func rom:0xC389D4 +dgb_04_func_802424F0_C38A20 = 0x802424F0; // type:func rom:0xC38A20 +dgb_04_func_8024259C_C38ACC = 0x8024259C; // type:func rom:0xC38ACC +dgb_04_func_802427EC_C38D1C = 0x802427EC; // type:func rom:0xC38D1C +dgb_04_func_80242818_C38D48 = 0x80242818; // type:func rom:0xC38D48 +dgb_04_func_80242850_C38D80 = 0x80242850; // type:func rom:0xC38D80 +dgb_04_func_802428E0_C38E10 = 0x802428E0; // type:func rom:0xC38E10 +dgb_04_func_80242914_C38E44 = 0x80242914; // type:func rom:0xC38E44 +dgb_04_func_80242978_C38EA8 = 0x80242978; // type:func rom:0xC38EA8 +dgb_04_func_802429D0_C38F00 = 0x802429D0; // type:func rom:0xC38F00 +dgb_04_func_80242F08_C39438 = 0x80242F08; // type:func rom:0xC39438 dgb_04_UnkPartnerPosFunc = 0x80243048; // type:func rom:0xC39578 dgb_04_UnkPartnerPosFunc2 = 0x80243090; // type:func rom:0xC395C0 -func_802430D8_C39608 = 0x802430D8; // type:func rom:0xC39608 -D_80243560_C39A90 = 0x80243560; // type:data rom:0xC39A90 -D_80243D30_C3A260 = 0x80243D30; // type:data rom:0xC3A260 -D_80243D38_C3A268 = 0x80243D38; // type:data rom:0xC3A268 -D_80243D48_C3A278 = 0x80243D48; // type:data rom:0xC3A278 -D_80243D88_C3A2B8 = 0x80243D88; // type:data rom:0xC3A2B8 +dgb_04_func_802430D8_C39608 = 0x802430D8; // type:func rom:0xC39608 +dgb_04_entryList = 0x80243110; // type:data rom:0xC39640 +dgb_04_config = 0x80243130; // type:data rom:0xC39660 +dgb_04_80243170 = 0x80243170; // type:data rom:0xC396A0 +dgb_04_exitSingleDoor_80243210 = 0x80243210; // type:data rom:0xC39740 +dgb_04_exitDoubleDoor_802432C4 = 0x802432C4; // type:data rom:0xC397F4 +dgb_04_enterSingleDoor_80243378 = 0x80243378; // type:data rom:0xC398A8 +dgb_04_main = 0x8024343C; // type:data rom:0xC3996C +dgb_04_D_80243560_C39A90 = 0x80243560; // type:data rom:0xC39A90 +dgb_04_80243578 = 0x80243578; // type:data rom:0xC39AA8 +dgb_04_npcAISettings_802435B4 = 0x802435B4; // type:data rom:0xC39AE4 +dgb_04_npcAI_802435E4 = 0x802435E4; // type:data rom:0xC39B14 +dgb_04_80243A0C = 0x80243A0C; // type:data rom:0xC39F3C +dgb_04_80243A98 = 0x80243A98; // type:data rom:0xC39FC8 +dgb_04_npcSettings_80243AFC = 0x80243AFC; // type:data rom:0xC3A02C +dgb_04_npcGroup_80243B28 = 0x80243B28; // type:data rom:0xC3A058 +dgb_04_npcGroupList_80243D18 = 0x80243D18; // type:data rom:0xC3A248 +dgb_04_D_80243D30_C3A260 = 0x80243D30; // type:data rom:0xC3A260 +dgb_04_D_80243D38_C3A268 = 0x80243D38; // type:data rom:0xC3A268 +dgb_04_D_80243D48_C3A278 = 0x80243D48; // type:data rom:0xC3A278 +dgb_04_D_80243D88_C3A2B8 = 0x80243D88; // type:data rom:0xC3A2B8 +dgb_04_80243D94 = 0x80243D94; // type:data rom:0xC3A2C4 +dgb_04_80243EF8 = 0x80243EF8; // type:data rom:0xC3A428 +dgb_04_makeEntities = 0x80244378; // type:data rom:0xC3A8A8 D_802443F0_C3A920 = 0x802443F0; // type:data rom:0xC3A920 D_802443F8_C3A928 = 0x802443F8; // type:data rom:0xC3A928 D_80244400_C3A930 = 0x80244400; // type:data rom:0xC3A930 D_80244448_C3A978 = 0x80244448; // type:data rom:0xC3A978 D_80244450_C3A980 = 0x80244450; // type:data rom:0xC3A980 -func_80240000_C3AA10 = 0x80240000; // type:func rom:0xC3AA10 -func_80240030_C3AA40 = 0x80240030; // type:func rom:0xC3AA40 +dgb_04_dgb_00_name_hack = 0x802444D8; // type:data rom:0xC3AA08 +dgb_05_func_80240000_C3AA10 = 0x80240000; // type:func rom:0xC3AA10 +dgb_05_func_80240030_C3AA40 = 0x80240030; // type:func rom:0xC3AA40 dgb_05_UnkNpcAIFunc6 = 0x80240060; // type:func rom:0xC3AA70 dgb_05_UnkNpcAIFunc7 = 0x802400CC; // type:func rom:0xC3AADC dgb_05_UnkNpcAIFunc8 = 0x8024013C; // type:func rom:0xC3AB4C dgb_05_UnkNpcAIFunc5 = 0x80240214; // type:func rom:0xC3AC24 -func_80240268_C3AC78 = 0x80240268; // type:func rom:0xC3AC78 -func_8024041C_C3AE2C = 0x8024041C; // type:func rom:0xC3AE2C -func_8024067C_C3B08C = 0x8024067C; // type:func rom:0xC3B08C -func_80240704_C3B114 = 0x80240704; // type:func rom:0xC3B114 -func_802409BC_C3B3CC = 0x802409BC; // type:func rom:0xC3B3CC -func_80240A20_C3B430 = 0x80240A20; // type:func rom:0xC3B430 -func_80240AC8_C3B4D8 = 0x80240AC8; // type:func rom:0xC3B4D8 -func_80240C00_C3B610 = 0x80240C00; // type:func rom:0xC3B610 -func_80240CAC_C3B6BC = 0x80240CAC; // type:func rom:0xC3B6BC -func_80240E24_C3B834 = 0x80240E24; // type:func rom:0xC3B834 -func_80240E80_C3B890 = 0x80240E80; // type:func rom:0xC3B890 -func_802411D0_C3BBE0 = 0x802411D0; // type:func rom:0xC3BBE0 +dgb_05_func_80240268_C3AC78 = 0x80240268; // type:func rom:0xC3AC78 +dgb_05_func_8024041C_C3AE2C = 0x8024041C; // type:func rom:0xC3AE2C +dgb_05_func_8024067C_C3B08C = 0x8024067C; // type:func rom:0xC3B08C +dgb_05_func_80240704_C3B114 = 0x80240704; // type:func rom:0xC3B114 +dgb_05_func_802409BC_C3B3CC = 0x802409BC; // type:func rom:0xC3B3CC +dgb_05_func_80240A20_C3B430 = 0x80240A20; // type:func rom:0xC3B430 +dgb_05_func_80240AC8_C3B4D8 = 0x80240AC8; // type:func rom:0xC3B4D8 +dgb_05_func_80240C00_C3B610 = 0x80240C00; // type:func rom:0xC3B610 +dgb_05_func_80240CAC_C3B6BC = 0x80240CAC; // type:func rom:0xC3B6BC +dgb_05_func_80240E24_C3B834 = 0x80240E24; // type:func rom:0xC3B834 +dgb_05_func_80240E80_C3B890 = 0x80240E80; // type:func rom:0xC3B890 +dgb_05_func_802411D0_C3BBE0 = 0x802411D0; // type:func rom:0xC3BBE0 +dgb_05_entryList = 0x80241490; // type:data rom:0xC3BEA0 +dgb_05_config = 0x802414A0; // type:data rom:0xC3BEB0 +dgb_05_802414E0 = 0x802414E0; // type:data rom:0xC3BEF0 +dgb_05_exitSingleDoor_80241580 = 0x80241580; // type:data rom:0xC3BF90 +dgb_05_enterSingleDoor_80241634 = 0x80241634; // type:data rom:0xC3C044 +dgb_05_main = 0x802416B0; // type:data rom:0xC3C0C0 +dgb_05_802417F0 = 0x802417F0; // type:data rom:0xC3C200 +dgb_05_makeEntities = 0x80241870; // type:data rom:0xC3C280 +dgb_05_802418C0 = 0x802418C0; // type:data rom:0xC3C2D0 +dgb_05_unk_missing_8024197C = 0x8024197C; // type:data rom:0xC3C38C +dgb_05_extraAnimationList_802419A4 = 0x802419A4; // type:data rom:0xC3C3B4 +dgb_05_npcAISettings_802419AC = 0x802419AC; // type:data rom:0xC3C3BC +dgb_05_npcAI_802419DC = 0x802419DC; // type:data rom:0xC3C3EC +dgb_05_npcSettings_80241A4C = 0x80241A4C; // type:data rom:0xC3C45C +dgb_05_npcAI_80241A78 = 0x80241A78; // type:data rom:0xC3C488 +dgb_05_npcSettings_80241B20 = 0x80241B20; // type:data rom:0xC3C530 +dgb_05_npcGroup_80241B4C = 0x80241B4C; // type:data rom:0xC3C55C +dgb_05_npcGroup_80241F2C = 0x80241F2C; // type:data rom:0xC3C93C +dgb_05_npcGroupList_8024230C = 0x8024230C; // type:data rom:0xC3CD1C D_80242340_C3CD50 = 0x80242340; // type:data rom:0xC3CD50 D_80242348_C3CD58 = 0x80242348; // type:data rom:0xC3CD58 -func_80240000_C3D080 = 0x80240000; // type:func rom:0xC3D080 +dgb_06_func_80240000_C3D080 = 0x80240000; // type:func rom:0xC3D080 dgb_06_GetItemName = 0x802400B4; // type:func rom:0xC3D134 dgb_06_SomeItemEntityFunc = 0x80240118; // type:func rom:0xC3D198 dgb_06_CheckItemFlags40 = 0x80240268; // type:func rom:0xC3D2E8 -D_80240620_C3D6A0 = 0x80240620; // type:data rom:0xC3D6A0 +dgb_06_entryList = 0x802402C0; // type:data rom:0xC3D340 +dgb_06_config = 0x802402E0; // type:data rom:0xC3D360 +dgb_06_80240320 = 0x80240320; // type:data rom:0xC3D3A0 +dgb_06_exitSingleDoor_802403C0 = 0x802403C0; // type:data rom:0xC3D440 +dgb_06_enterSingleDoor_80240474 = 0x80240474; // type:data rom:0xC3D4F4 +dgb_06_main = 0x802404F0; // type:data rom:0xC3D570 +dgb_06_D_80240620_C3D6A0 = 0x80240620; // type:data rom:0xC3D6A0 +dgb_06_80240624 = 0x80240624; // type:data rom:0xC3D6A4 +dgb_06_8024068C = 0x8024068C; // type:data rom:0xC3D70C +dgb_06_8024076C = 0x8024076C; // type:data rom:0xC3D7EC +dgb_06_makeEntities = 0x802407B8; // type:data rom:0xC3D838 +dgb_06_npcSettings_80240840 = 0x80240840; // type:data rom:0xC3D8C0 +dgb_06_interact_8024086C = 0x8024086C; // type:data rom:0xC3D8EC +dgb_06_init_802408FC = 0x802408FC; // type:data rom:0xC3D97C +dgb_06_npcGroup_80240954 = 0x80240954; // type:data rom:0xC3D9D4 +dgb_06_npcGroupList_80240B44 = 0x80240B44; // type:data rom:0xC3DBC4 dgb_07_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC3DBF0 dgb_07_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC3DC5C dgb_07_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC3DCCC dgb_07_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC3DDA4 -func_80240208_C3DDF8 = 0x80240208; // type:func rom:0xC3DDF8 -update_starpoints_display_C3DFAC = 0x802403BC; // type:func rom:0xC3DFAC -func_8024061C_C3E20C = 0x8024061C; // type:func rom:0xC3E20C -func_802406A4_C3E294 = 0x802406A4; // type:func rom:0xC3E294 -func_8024095C_C3E54C = 0x8024095C; // type:func rom:0xC3E54C -func_802409C0_C3E5B0 = 0x802409C0; // type:func rom:0xC3E5B0 -func_80240A68_C3E658 = 0x80240A68; // type:func rom:0xC3E658 -func_80240BA0_C3E790 = 0x80240BA0; // type:func rom:0xC3E790 -func_80240C4C_C3E83C = 0x80240C4C; // type:func rom:0xC3E83C -func_80240DC4_C3E9B4 = 0x80240DC4; // type:func rom:0xC3E9B4 -func_80240E20_C3EA10 = 0x80240E20; // type:func rom:0xC3EA10 -func_80241170_C3ED60 = 0x80241170; // type:func rom:0xC3ED60 +dgb_07_func_80240208_C3DDF8 = 0x80240208; // type:func rom:0xC3DDF8 +dgb_07_update_starpoints_display_C3DFAC = 0x802403BC; // type:func rom:0xC3DFAC +dgb_07_func_8024061C_C3E20C = 0x8024061C; // type:func rom:0xC3E20C +dgb_07_func_802406A4_C3E294 = 0x802406A4; // type:func rom:0xC3E294 +dgb_07_func_8024095C_C3E54C = 0x8024095C; // type:func rom:0xC3E54C +dgb_07_func_802409C0_C3E5B0 = 0x802409C0; // type:func rom:0xC3E5B0 +dgb_07_func_80240A68_C3E658 = 0x80240A68; // type:func rom:0xC3E658 +dgb_07_func_80240BA0_C3E790 = 0x80240BA0; // type:func rom:0xC3E790 +dgb_07_func_80240C4C_C3E83C = 0x80240C4C; // type:func rom:0xC3E83C +dgb_07_func_80240DC4_C3E9B4 = 0x80240DC4; // type:func rom:0xC3E9B4 +dgb_07_func_80240E20_C3EA10 = 0x80240E20; // type:func rom:0xC3EA10 +dgb_07_func_80241170_C3ED60 = 0x80241170; // type:func rom:0xC3ED60 +dgb_07_entryList = 0x80241430; // type:data rom:0xC3F020 +dgb_07_config = 0x80241450; // type:data rom:0xC3F040 +dgb_07_80241490 = 0x80241490; // type:data rom:0xC3F080 +dgb_07_exitSingleDoor_80241530 = 0x80241530; // type:data rom:0xC3F120 +dgb_07_enterSingleDoor_802415E4 = 0x802415E4; // type:data rom:0xC3F1D4 +dgb_07_main = 0x80241660; // type:data rom:0xC3F250 +dgb_07_makeEntities = 0x80241760; // type:data rom:0xC3F350 +dgb_07_802417F0 = 0x802417F0; // type:data rom:0xC3F3E0 +dgb_07_extraAnimationList_802418AC = 0x802418AC; // type:data rom:0xC3F49C +dgb_07_extraAnimationList_802418D4 = 0x802418D4; // type:data rom:0xC3F4C4 +dgb_07_npcAISettings_802418DC = 0x802418DC; // type:data rom:0xC3F4CC +dgb_07_npcAI_8024190C = 0x8024190C; // type:data rom:0xC3F4FC +dgb_07_npcSettings_8024197C = 0x8024197C; // type:data rom:0xC3F56C +dgb_07_npcAI_802419A8 = 0x802419A8; // type:data rom:0xC3F598 +dgb_07_npcSettings_80241A50 = 0x80241A50; // type:data rom:0xC3F640 +dgb_07_npcGroup_80241A7C = 0x80241A7C; // type:data rom:0xC3F66C +dgb_07_npcGroupList_80241E5C = 0x80241E5C; // type:data rom:0xC3FA4C D_80241E90_C3FA80 = 0x80241E90; // type:data rom:0xC3FA80 D_80241E98_C3FA88 = 0x80241E98; // type:data rom:0xC3FA88 -func_80240000_C3FDB0 = 0x80240000; // type:func rom:0xC3FDB0 -func_80240158_C3FF08 = 0x80240158; // type:func rom:0xC3FF08 +dgb_08_func_80240000_C3FDB0 = 0x80240000; // type:func rom:0xC3FDB0 +dgb_08_func_80240158_C3FF08 = 0x80240158; // type:func rom:0xC3FF08 dgb_08_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC401B0 -func_802404C0_C40270 = 0x802404C0; // type:func rom:0xC40270 -func_8024067C_C4042C = 0x8024067C; // type:func rom:0xC4042C +dgb_08_func_802404C0_C40270 = 0x802404C0; // type:func rom:0xC40270 +dgb_08_func_8024067C_C4042C = 0x8024067C; // type:func rom:0xC4042C dgb_08_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC404E0 dgb_08_NpcJumpFunc = 0x802407A4; // type:func rom:0xC40554 dgb_08_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC405CC -func_8024094C_C406FC = 0x8024094C; // type:func rom:0xC406FC +dgb_08_func_8024094C_C406FC = 0x8024094C; // type:func rom:0xC406FC dgb_08_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xC4081C -func_80240AD4_C40884 = 0x80240AD4; // type:func rom:0xC40884 -func_80240B94_C40944 = 0x80240B94; // type:func rom:0xC40944 +dgb_08_func_80240AD4_C40884 = 0x80240AD4; // type:func rom:0xC40884 +dgb_08_func_80240B94_C40944 = 0x80240B94; // type:func rom:0xC40944 dgb_08_UnkNpcAIFunc6 = 0x80240E90; // type:func rom:0xC40C40 dgb_08_UnkNpcAIFunc7 = 0x80240EFC; // type:func rom:0xC40CAC dgb_08_UnkNpcAIFunc8 = 0x80240F6C; // type:func rom:0xC40D1C dgb_08_UnkNpcAIFunc5 = 0x80241044; // type:func rom:0xC40DF4 -func_80241098_C40E48 = 0x80241098; // type:func rom:0xC40E48 -func_8024124C_C40FFC = 0x8024124C; // type:func rom:0xC40FFC -func_802414AC_C4125C = 0x802414AC; // type:func rom:0xC4125C -func_80241760_C41510 = 0x80241760; // type:func rom:0xC41510 +dgb_08_func_80241098_C40E48 = 0x80241098; // type:func rom:0xC40E48 +dgb_08_func_8024124C_C40FFC = 0x8024124C; // type:func rom:0xC40FFC +dgb_08_func_802414AC_C4125C = 0x802414AC; // type:func rom:0xC4125C +dgb_08_func_80241760_C41510 = 0x80241760; // type:func rom:0xC41510 func_80241910_C416C0 = 0x80241910; // type:func rom:0xC416C0 -dup_dgb_08_UnkNpcAIFunc1 = 0x80241F38; // type:func rom:0xC41CE8 -func_80241FF8_C41DA8 = 0x80241FF8; // type:func rom:0xC41DA8 +dgb_08_UnkNpcAIFunc1_copy = 0x80241F38; // type:func rom:0xC41CE8 +dgb_08_func_80241FF8_C41DA8 = 0x80241FF8; // type:func rom:0xC41DA8 dgb_08_UnkNpcAIFunc2 = 0x8024233C; // type:func rom:0xC420EC -func_802423B4_C42164 = 0x802423B4; // type:func rom:0xC42164 +dgb_08_func_802423B4_C42164 = 0x802423B4; // type:func rom:0xC42164 dgb_08_UnkNpcAIFunc14 = 0x80242420; // type:func rom:0xC421D0 dgb_08_UnkNpcAIFunc3 = 0x80242554; // type:func rom:0xC42304 -func_802425B8_C42368 = 0x802425B8; // type:func rom:0xC42368 -func_80242948_C426F8 = 0x80242948; // type:func rom:0xC426F8 -func_80242A6C_C4281C = 0x80242A6C; // type:func rom:0xC4281C -func_80242C58_C42A08 = 0x80242C58; // type:func rom:0xC42A08 -func_80242DB0_C42B60 = 0x80242DB0; // type:func rom:0xC42B60 -func_80242EB4_C42C64 = 0x80242EB4; // type:func rom:0xC42C64 -func_80242F94_C42D44 = 0x80242F94; // type:func rom:0xC42D44 -func_80243230_C42FE0 = 0x80243230; // type:func rom:0xC42FE0 -func_802432E8_C43098 = 0x802432E8; // type:func rom:0xC43098 -func_80243468_C43218 = 0x80243468; // type:func rom:0xC43218 -func_802434B0_C43260 = 0x802434B0; // type:func rom:0xC43260 -func_80243530_C432E0 = 0x80243530; // type:func rom:0xC432E0 -func_802435D8_C43388 = 0x802435D8; // type:func rom:0xC43388 -func_802438F0_C436A0 = 0x802438F0; // type:func rom:0xC436A0 +dgb_08_func_802425B8_C42368 = 0x802425B8; // type:func rom:0xC42368 +dgb_08_func_80242948_C426F8 = 0x80242948; // type:func rom:0xC426F8 +dgb_08_func_80242A6C_C4281C = 0x80242A6C; // type:func rom:0xC4281C +dgb_08_func_80242C58_C42A08 = 0x80242C58; // type:func rom:0xC42A08 +dgb_08_func_80242DB0_C42B60 = 0x80242DB0; // type:func rom:0xC42B60 +dgb_08_func_80242EB4_C42C64 = 0x80242EB4; // type:func rom:0xC42C64 +dgb_08_func_80242F94_C42D44 = 0x80242F94; // type:func rom:0xC42D44 +dgb_08_func_80243230_C42FE0 = 0x80243230; // type:func rom:0xC42FE0 +dgb_08_func_802432E8_C43098 = 0x802432E8; // type:func rom:0xC43098 +dgb_08_func_80243468_C43218 = 0x80243468; // type:func rom:0xC43218 +dgb_08_func_802434B0_C43260 = 0x802434B0; // type:func rom:0xC43260 +dgb_08_func_80243530_C432E0 = 0x80243530; // type:func rom:0xC432E0 +dgb_08_func_802435D8_C43388 = 0x802435D8; // type:func rom:0xC43388 +dgb_08_func_802438F0_C436A0 = 0x802438F0; // type:func rom:0xC436A0 dgb_08_UnkFunc1 = 0x80243B6C; // type:func rom:0xC4391C -func_80243B98_C43948 = 0x80243B98; // type:func rom:0xC43948 -func_80243C10_C439C0 = 0x80243C10; // type:func rom:0xC439C0 -func_80243C50_C43A00 = 0x80243C50; // type:func rom:0xC43A00 -D_80244460_C44210 = 0x80244460; // type:data rom:0xC44210 +dgb_08_func_80243B98_C43948 = 0x80243B98; // type:func rom:0xC43948 +dgb_08_func_80243C10_C439C0 = 0x80243C10; // type:func rom:0xC439C0 +dgb_08_func_80243C50_C43A00 = 0x80243C50; // type:func rom:0xC43A00 +dgb_08_entryList = 0x80243C90; // type:data rom:0xC43A40 +dgb_08_config = 0x80243CB0; // type:data rom:0xC43A60 +dgb_08_80243CF0 = 0x80243CF0; // type:data rom:0xC43AA0 +dgb_08_exitDoubleDoor_80243D90 = 0x80243D90; // type:data rom:0xC43B40 +dgb_08_exitDoubleDoor_80243E44 = 0x80243E44; // type:data rom:0xC43BF4 +dgb_08_enterDoubleDoor_80243EF8 = 0x80243EF8; // type:data rom:0xC43CA8 +dgb_08_main = 0x80243FAC; // type:data rom:0xC43D5C +dgb_08_npcAI_80244100 = 0x80244100; // type:data rom:0xC43EB0 +dgb_08_80244130 = 0x80244130; // type:data rom:0xC43EE0 +dgb_08_npcSettings_80244150 = 0x80244150; // type:data rom:0xC43F00 +dgb_08_npcSettings_8024417C = 0x8024417C; // type:data rom:0xC43F2C +dgb_08_npcSettings_802441A8 = 0x802441A8; // type:data rom:0xC43F58 +dgb_08_802441D4 = 0x802441D4; // type:data rom:0xC43F84 +dgb_08_extraAnimationList_80244290 = 0x80244290; // type:data rom:0xC44040 +dgb_08_extraAnimationList_802442B8 = 0x802442B8; // type:data rom:0xC44068 +dgb_08_npcAISettings_802442C0 = 0x802442C0; // type:data rom:0xC44070 +dgb_08_npcAI_802442F0 = 0x802442F0; // type:data rom:0xC440A0 +dgb_08_npcSettings_80244360 = 0x80244360; // type:data rom:0xC44110 +dgb_08_npcAI_8024438C = 0x8024438C; // type:data rom:0xC4413C +dgb_08_npcSettings_80244434 = 0x80244434; // type:data rom:0xC441E4 +dgb_08_D_80244460_C44210 = 0x80244460; // type:data rom:0xC44210 +dgb_08_80244478 = 0x80244478; // type:data rom:0xC44228 +dgb_08_npcAISettings_802444B4 = 0x802444B4; // type:data rom:0xC44264 +dgb_08_npcAI_802444E4 = 0x802444E4; // type:data rom:0xC44294 +dgb_08_8024490C = 0x8024490C; // type:data rom:0xC446BC +dgb_08_80244998 = 0x80244998; // type:data rom:0xC44748 +dgb_08_npcSettings_802449FC = 0x802449FC; // type:data rom:0xC447AC +dgb_08_npcSettings_80244A28 = 0x80244A28; // type:data rom:0xC447D8 +dgb_08_idle_80244A54 = 0x80244A54; // type:data rom:0xC44804 +dgb_08_80244D08 = 0x80244D08; // type:data rom:0xC44AB8 +dgb_08_npcAI_80244D7C = 0x80244D7C; // type:data rom:0xC44B2C +dgb_08_defeat_80244E58 = 0x80244E58; // type:data rom:0xC44C08 +dgb_08_init_80244E94 = 0x80244E94; // type:data rom:0xC44C44 +dgb_08_npcGroup_802450A0 = 0x802450A0; // type:data rom:0xC44E50 +dgb_08_npcGroup_80245290 = 0x80245290; // type:data rom:0xC45040 +dgb_08_npcGroup_80245670 = 0x80245670; // type:data rom:0xC45420 +dgb_08_npcGroup_80245A50 = 0x80245A50; // type:data rom:0xC45800 +dgb_08_npcGroup_80245E30 = 0x80245E30; // type:data rom:0xC45BE0 +dgb_08_npcGroup_80246020 = 0x80246020; // type:data rom:0xC45DD0 +dgb_08_idle_80246210 = 0x80246210; // type:data rom:0xC45FC0 +dgb_08_interact_80246310 = 0x80246310; // type:data rom:0xC460C0 +dgb_08_init_802464C4 = 0x802464C4; // type:data rom:0xC46274 +dgb_08_npcGroup_80246528 = 0x80246528; // type:data rom:0xC462D8 +dgb_08_idle_80246718 = 0x80246718; // type:data rom:0xC464C8 +dgb_08_init_80246728 = 0x80246728; // type:data rom:0xC464D8 +dgb_08_npcGroup_80246768 = 0x80246768; // type:data rom:0xC46518 +dgb_08_npcGroupList_80246958 = 0x80246958; // type:data rom:0xC46708 +dgb_08_npcGroupList_802469AC = 0x802469AC; // type:data rom:0xC4675C +dgb_08_npcGroupList_802469C4 = 0x802469C4; // type:data rom:0xC46774 +dgb_08_802469E0 = 0x802469E0; // type:data rom:0xC46790 +dgb_08_pad_XXXX = 0x802469F8; // type:data rom:0xC467A8 D_80246A00_C467B0 = 0x80246A00; // type:data rom:0xC467B0 D_80246A08_C467B8 = 0x80246A08; // type:data rom:0xC467B8 D_80246BA0_C46950 = 0x80246BA0; // type:data rom:0xC46950 @@ -12431,45 +13303,82 @@ D_80246D40_C46AF0 = 0x80246D40; // type:data rom:0xC46AF0 D_80246D48_C46AF8 = 0x80246D48; // type:data rom:0xC46AF8 D_80246D90_C46B40 = 0x80246D90; // type:data rom:0xC46B40 D_80246D98_C46B48 = 0x80246D98; // type:data rom:0xC46B48 +dgb_08_dgb_00_name_hack = 0x80246E20; // type:data rom:0xC46BD0 +dgb_08_dgb_01_name_hack = 0x80246E28; // type:data rom:0xC46BD8 dgb_09_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC46BE0 dgb_09_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC46C4C dgb_09_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC46CBC dgb_09_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC46D94 -func_80240208_C46DE8 = 0x80240208; // type:func rom:0xC46DE8 -update_starpoints_display_C46F9C = 0x802403BC; // type:func rom:0xC46F9C -func_8024061C_C471FC = 0x8024061C; // type:func rom:0xC471FC -func_802408D0_C474B0 = 0x802408D0; // type:func rom:0xC474B0 -func_80240958_C47538 = 0x80240958; // type:func rom:0xC47538 -func_80240C10_C477F0 = 0x80240C10; // type:func rom:0xC477F0 -func_80240C74_C47854 = 0x80240C74; // type:func rom:0xC47854 -func_80240D1C_C478FC = 0x80240D1C; // type:func rom:0xC478FC -func_80240E54_C47A34 = 0x80240E54; // type:func rom:0xC47A34 -func_80240F00_C47AE0 = 0x80240F00; // type:func rom:0xC47AE0 -func_80241078_C47C58 = 0x80241078; // type:func rom:0xC47C58 -func_802410D4_C47CB4 = 0x802410D4; // type:func rom:0xC47CB4 -func_80241424_C48004 = 0x80241424; // type:func rom:0xC48004 -func_802415D4_C481B4 = 0x802415D4; // type:func rom:0xC481B4 +dgb_09_func_80240208_C46DE8 = 0x80240208; // type:func rom:0xC46DE8 +dgb_09_update_starpoints_display_C46F9C = 0x802403BC; // type:func rom:0xC46F9C +dgb_09_func_8024061C_C471FC = 0x8024061C; // type:func rom:0xC471FC +dgb_09_func_802408D0_C474B0 = 0x802408D0; // type:func rom:0xC474B0 +dgb_09_func_80240958_C47538 = 0x80240958; // type:func rom:0xC47538 +dgb_09_func_80240C10_C477F0 = 0x80240C10; // type:func rom:0xC477F0 +dgb_09_func_80240C74_C47854 = 0x80240C74; // type:func rom:0xC47854 +dgb_09_func_80240D1C_C478FC = 0x80240D1C; // type:func rom:0xC478FC +dgb_09_func_80240E54_C47A34 = 0x80240E54; // type:func rom:0xC47A34 +dgb_09_func_80240F00_C47AE0 = 0x80240F00; // type:func rom:0xC47AE0 +dgb_09_func_80241078_C47C58 = 0x80241078; // type:func rom:0xC47C58 +dgb_09_func_802410D4_C47CB4 = 0x802410D4; // type:func rom:0xC47CB4 +dgb_09_func_80241424_C48004 = 0x80241424; // type:func rom:0xC48004 +dgb_09_func_802415D4_C481B4 = 0x802415D4; // type:func rom:0xC481B4 dgb_09_UnkNpcAIFunc1 = 0x80241BFC; // type:func rom:0xC487DC -func_80241CBC_C4889C = 0x80241CBC; // type:func rom:0xC4889C +dgb_09_func_80241CBC_C4889C = 0x80241CBC; // type:func rom:0xC4889C dgb_09_UnkNpcAIFunc2 = 0x80242000; // type:func rom:0xC48BE0 -func_80242078_C48C58 = 0x80242078; // type:func rom:0xC48C58 +dgb_09_func_80242078_C48C58 = 0x80242078; // type:func rom:0xC48C58 dgb_09_UnkNpcAIFunc14 = 0x802420E4; // type:func rom:0xC48CC4 dgb_09_UnkNpcAIFunc3 = 0x80242218; // type:func rom:0xC48DF8 -func_8024227C_C48E5C = 0x8024227C; // type:func rom:0xC48E5C -func_8024260C_C491EC = 0x8024260C; // type:func rom:0xC491EC -func_80242730_C49310 = 0x80242730; // type:func rom:0xC49310 -func_8024291C_C494FC = 0x8024291C; // type:func rom:0xC494FC -func_80242A74_C49654 = 0x80242A74; // type:func rom:0xC49654 -func_80242B78_C49758 = 0x80242B78; // type:func rom:0xC49758 -func_80242C1C_C497FC = 0x80242C1C; // type:func rom:0xC497FC -func_80242EB8_C49A98 = 0x80242EB8; // type:func rom:0xC49A98 -func_80242F70_C49B50 = 0x80242F70; // type:func rom:0xC49B50 -func_802430F0_C49CD0 = 0x802430F0; // type:func rom:0xC49CD0 -func_80243138_C49D18 = 0x80243138; // type:func rom:0xC49D18 -func_802431B8_C49D98 = 0x802431B8; // type:func rom:0xC49D98 -func_80243260_C49E40 = 0x80243260; // type:func rom:0xC49E40 -func_80243578_C4A158 = 0x80243578; // type:func rom:0xC4A158 -D_80244358_C4AF38 = 0x80244358; // type:data rom:0xC4AF38 +dgb_09_func_8024227C_C48E5C = 0x8024227C; // type:func rom:0xC48E5C +dgb_09_func_8024260C_C491EC = 0x8024260C; // type:func rom:0xC491EC +dgb_09_func_80242730_C49310 = 0x80242730; // type:func rom:0xC49310 +dgb_09_func_8024291C_C494FC = 0x8024291C; // type:func rom:0xC494FC +dgb_09_func_80242A74_C49654 = 0x80242A74; // type:func rom:0xC49654 +dgb_09_func_80242B78_C49758 = 0x80242B78; // type:func rom:0xC49758 +dgb_09_func_80242C1C_C497FC = 0x80242C1C; // type:func rom:0xC497FC +dgb_09_func_80242EB8_C49A98 = 0x80242EB8; // type:func rom:0xC49A98 +dgb_09_func_80242F70_C49B50 = 0x80242F70; // type:func rom:0xC49B50 +dgb_09_func_802430F0_C49CD0 = 0x802430F0; // type:func rom:0xC49CD0 +dgb_09_func_80243138_C49D18 = 0x80243138; // type:func rom:0xC49D18 +dgb_09_func_802431B8_C49D98 = 0x802431B8; // type:func rom:0xC49D98 +dgb_09_func_80243260_C49E40 = 0x80243260; // type:func rom:0xC49E40 +dgb_09_func_80243578_C4A158 = 0x80243578; // type:func rom:0xC4A158 +dgb_09_entryList = 0x80243800; // type:data rom:0xC4A3E0 +dgb_09_config = 0x80243840; // type:data rom:0xC4A420 +dgb_09_80243880 = 0x80243880; // type:data rom:0xC4A460 +dgb_09_exitDoubleDoor_80243920 = 0x80243920; // type:data rom:0xC4A500 +dgb_09_exitDoubleDoor_802439D4 = 0x802439D4; // type:data rom:0xC4A5B4 +dgb_09_exitSingleDoor_80243A88 = 0x80243A88; // type:data rom:0xC4A668 +dgb_09_exitWalk_80243B3C = 0x80243B3C; // type:data rom:0xC4A71C +dgb_09_80243B98 = 0x80243B98; // type:data rom:0xC4A778 +dgb_09_enterWalk_80243BC4 = 0x80243BC4; // type:data rom:0xC4A7A4 +dgb_09_main = 0x80243D28; // type:data rom:0xC4A908 +dgb_09_triggerCoord_80243E50 = 0x80243E50; // type:data rom:0xC4AA30 +dgb_09_80243E60 = 0x80243E60; // type:data rom:0xC4AA40 +dgb_09_80243F6C = 0x80243F6C; // type:data rom:0xC4AB4C +dgb_09_80244000 = 0x80244000; // type:data rom:0xC4ABE0 +dgb_09_extraAnimationList_802440BC = 0x802440BC; // type:data rom:0xC4AC9C +dgb_09_extraAnimationList_802440E4 = 0x802440E4; // type:data rom:0xC4ACC4 +dgb_09_npcAISettings_802440EC = 0x802440EC; // type:data rom:0xC4ACCC +dgb_09_npcAI_8024411C = 0x8024411C; // type:data rom:0xC4ACFC +dgb_09_npcSettings_8024418C = 0x8024418C; // type:data rom:0xC4AD6C +dgb_09_npcAISettings_802441B8 = 0x802441B8; // type:data rom:0xC4AD98 +dgb_09_npcAI_802441E8 = 0x802441E8; // type:data rom:0xC4ADC8 +dgb_09_npcSettings_80244258 = 0x80244258; // type:data rom:0xC4AE38 +dgb_09_npcAI_80244284 = 0x80244284; // type:data rom:0xC4AE64 +dgb_09_npcSettings_8024432C = 0x8024432C; // type:data rom:0xC4AF0C +dgb_09_D_80244358_C4AF38 = 0x80244358; // type:data rom:0xC4AF38 +dgb_09_80244370 = 0x80244370; // type:data rom:0xC4AF50 +dgb_09_npcAISettings_802443AC = 0x802443AC; // type:data rom:0xC4AF8C +dgb_09_npcAI_802443DC = 0x802443DC; // type:data rom:0xC4AFBC +dgb_09_80244804 = 0x80244804; // type:data rom:0xC4B3E4 +dgb_09_80244890 = 0x80244890; // type:data rom:0xC4B470 +dgb_09_npcSettings_802448F4 = 0x802448F4; // type:data rom:0xC4B4D4 +dgb_09_npcGroup_80244920 = 0x80244920; // type:data rom:0xC4B500 +dgb_09_init_80244D00 = 0x80244D00; // type:data rom:0xC4B8E0 +dgb_09_npcGroup_80244D6C = 0x80244D6C; // type:data rom:0xC4B94C +dgb_09_npcGroup_8024514C = 0x8024514C; // type:data rom:0xC4BD2C +dgb_09_npcGroupList_8024533C = 0x8024533C; // type:data rom:0xC4BF1C D_80245390_C4BF70 = 0x80245390; // type:data rom:0xC4BF70 D_80245528_C4C108 = 0x80245528; // type:data rom:0xC4C108 D_802456C0_C4C2A0 = 0x802456C0; // type:data rom:0xC4C2A0 @@ -12477,80 +13386,234 @@ D_802456C8_C4C2A8 = 0x802456C8; // type:data rom:0xC4C2A8 D_802456D0_C4C2B0 = 0x802456D0; // type:data rom:0xC4C2B0 D_80245718_C4C2F8 = 0x80245718; // type:data rom:0xC4C2F8 D_80245720_C4C300 = 0x80245720; // type:data rom:0xC4C300 -func_80240000_C4C390 = 0x80240000; // type:func rom:0xC4C390 -func_802400A0_C4C430 = 0x802400A0; // type:func rom:0xC4C430 -func_8024013C_C4C4CC = 0x8024013C; // type:func rom:0xC4C4CC -func_802401C0_C4C550 = 0x802401C0; // type:func rom:0xC4C550 -func_80240000_C4D3E0 = 0x80240000; // type:func rom:0xC4D3E0 -func_80240000_C4DEF0 = 0x80240000; // type:func rom:0xC4DEF0 +dgb_09_dgb_00_name_hack = 0x802457A8; // type:data rom:0xC4C388 +dgb_10_func_80240000_C4C390 = 0x80240000; // type:func rom:0xC4C390 +dgb_10_func_802400A0_C4C430 = 0x802400A0; // type:func rom:0xC4C430 +dgb_10_func_8024013C_C4C4CC = 0x8024013C; // type:func rom:0xC4C4CC +dgb_10_func_802401C0_C4C550 = 0x802401C0; // type:func rom:0xC4C550 +dgb_10_entryList = 0x802401F0; // type:data rom:0xC4C580 +dgb_10_config = 0x80240210; // type:data rom:0xC4C5A0 +dgb_10_80240250 = 0x80240250; // type:data rom:0xC4C5E0 +dgb_10_exitWalk_802402F0 = 0x802402F0; // type:data rom:0xC4C680 +dgb_10_8024034C = 0x8024034C; // type:data rom:0xC4C6DC +dgb_10_enterWalk_80240378 = 0x80240378; // type:data rom:0xC4C708 +dgb_10_main = 0x8024050C; // type:data rom:0xC4C89C +dgb_10_80240670 = 0x80240670; // type:data rom:0xC4CA00 +dgb_10_80240770 = 0x80240770; // type:data rom:0xC4CB00 +dgb_10_80240860 = 0x80240860; // type:data rom:0xC4CBF0 +dgb_10_80240AF4 = 0x80240AF4; // type:data rom:0xC4CE84 +dgb_10_80240CB8 = 0x80240CB8; // type:data rom:0xC4D048 +dgb_10_80240E68 = 0x80240E68; // type:data rom:0xC4D1F8 +dgb_10_80240EE0 = 0x80240EE0; // type:data rom:0xC4D270 +dgb_10_80240F00 = 0x80240F00; // type:data rom:0xC4D290 +dgb_10_80240F20 = 0x80240F20; // type:data rom:0xC4D2B0 +dgb_10_makeEntities = 0x80240F40; // type:data rom:0xC4D2D0 +dgb_11_func_80240000_C4D3E0 = 0x80240000; // type:func rom:0xC4D3E0 +dgb_11_entryList = 0x80240050; // type:data rom:0xC4D430 +dgb_11_config = 0x80240090; // type:data rom:0xC4D470 +dgb_11_802400D0 = 0x802400D0; // type:data rom:0xC4D4B0 +dgb_11_exitSingleDoor_80240170 = 0x80240170; // type:data rom:0xC4D550 +dgb_11_enterSingleDoor_80240224 = 0x80240224; // type:data rom:0xC4D604 +dgb_11_main = 0x80240498; // type:data rom:0xC4D878 +dgb_11_80240570 = 0x80240570; // type:data rom:0xC4D950 +dgb_11_80240600 = 0x80240600; // type:data rom:0xC4D9E0 +dgb_11_8024062C = 0x8024062C; // type:data rom:0xC4DA0C +dgb_11_makeEntities = 0x80240A84; // type:data rom:0xC4DE64 +dgb_12_func_80240000_C4DEF0 = 0x80240000; // type:func rom:0xC4DEF0 dgb_12_GetItemName = 0x802400B4; // type:func rom:0xC4DFA4 dgb_12_SomeItemEntityFunc = 0x80240118; // type:func rom:0xC4E008 dgb_12_CheckItemFlags40 = 0x80240268; // type:func rom:0xC4E158 -D_80240870_C4E760 = 0x80240870; // type:data rom:0xC4E760 +dgb_12_entryList = 0x802402C0; // type:data rom:0xC4E1B0 +dgb_12_config = 0x802402D0; // type:data rom:0xC4E1C0 +dgb_12_80240310 = 0x80240310; // type:data rom:0xC4E200 +dgb_12_exitSingleDoor_802403B0 = 0x802403B0; // type:data rom:0xC4E2A0 +dgb_12_enterSingleDoor_80240464 = 0x80240464; // type:data rom:0xC4E354 +dgb_12_main = 0x802404E0; // type:data rom:0xC4E3D0 +dgb_12_lavaResetList_802405C0 = 0x802405C0; // type:data rom:0xC4E4B0 +dgb_12_802405E0 = 0x802405E0; // type:data rom:0xC4E4D0 +dgb_12_D_80240870_C4E760 = 0x80240870; // type:data rom:0xC4E760 +dgb_12_80240874 = 0x80240874; // type:data rom:0xC4E764 +dgb_12_802408DC = 0x802408DC; // type:data rom:0xC4E7CC +dgb_12_802409BC = 0x802409BC; // type:data rom:0xC4E8AC +dgb_12_makeEntities = 0x80240A08; // type:data rom:0xC4E8F8 +dgb_13_entryList = 0x80240000; // type:data rom:0xC4E960 +dgb_13_config = 0x80240010; // type:data rom:0xC4E970 +dgb_13_80240050 = 0x80240050; // type:data rom:0xC4E9B0 +dgb_13_exitWalk_802400F0 = 0x802400F0; // type:data rom:0xC4EA50 +dgb_13_8024014C = 0x8024014C; // type:data rom:0xC4EAAC +dgb_13_main = 0x80240178; // type:data rom:0xC4EAD8 +dgb_13_80240270 = 0x80240270; // type:data rom:0xC4EBD0 +dgb_13_80240380 = 0x80240380; // type:data rom:0xC4ECE0 +dgb_13_80240424 = 0x80240424; // type:data rom:0xC4ED84 +dgb_13_802404C8 = 0x802404C8; // type:data rom:0xC4EE28 +dgb_13_8024056C = 0x8024056C; // type:data rom:0xC4EECC +dgb_13_80240610 = 0x80240610; // type:data rom:0xC4EF70 +dgb_13_80240680 = 0x80240680; // type:data rom:0xC4EFE0 +dgb_14_entryList = 0x80240000; // type:data rom:0xC4F030 +dgb_14_config = 0x80240020; // type:data rom:0xC4F050 +dgb_14_80240060 = 0x80240060; // type:data rom:0xC4F090 +dgb_14_exitDoubleDoor_80240100 = 0x80240100; // type:data rom:0xC4F130 +dgb_14_exitDoubleDoor_802401B4 = 0x802401B4; // type:data rom:0xC4F1E4 +dgb_14_enterDoubleDoor_80240268 = 0x80240268; // type:data rom:0xC4F298 +dgb_14_main = 0x8024038C; // type:data rom:0xC4F3BC +dgb_14_makeEntities = 0x80240480; // type:data rom:0xC4F4B0 dgb_15_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC4F510 dgb_15_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC4F57C dgb_15_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC4F5EC dgb_15_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC4F6C4 -func_80240208_C4F718 = 0x80240208; // type:func rom:0xC4F718 -update_starpoints_display_C4F8CC = 0x802403BC; // type:func rom:0xC4F8CC -func_8024061C_C4FB2C = 0x8024061C; // type:func rom:0xC4FB2C -func_802408D0_C4FDE0 = 0x802408D0; // type:func rom:0xC4FDE0 -func_80240A28_C4FF38 = 0x80240A28; // type:func rom:0xC4FF38 +dgb_15_func_80240208_C4F718 = 0x80240208; // type:func rom:0xC4F718 +dgb_15_update_starpoints_display_C4F8CC = 0x802403BC; // type:func rom:0xC4F8CC +dgb_15_func_8024061C_C4FB2C = 0x8024061C; // type:func rom:0xC4FB2C +dgb_15_func_802408D0_C4FDE0 = 0x802408D0; // type:func rom:0xC4FDE0 +dgb_15_func_80240A28_C4FF38 = 0x80240A28; // type:func rom:0xC4FF38 dgb_15_UnkNpcAIFunc1 = 0x80240CD0; // type:func rom:0xC501E0 -func_80240D90_C502A0 = 0x80240D90; // type:func rom:0xC502A0 -func_80240F4C_C5045C = 0x80240F4C; // type:func rom:0xC5045C +dgb_15_func_80240D90_C502A0 = 0x80240D90; // type:func rom:0xC502A0 +dgb_15_func_80240F4C_C5045C = 0x80240F4C; // type:func rom:0xC5045C dgb_15_NpcJumpFunc2 = 0x80241000; // type:func rom:0xC50510 dgb_15_NpcJumpFunc = 0x80241074; // type:func rom:0xC50584 dgb_15_UnkNpcAIFunc13 = 0x802410EC; // type:func rom:0xC505FC -func_8024121C_C5072C = 0x8024121C; // type:func rom:0xC5072C +dgb_15_func_8024121C_C5072C = 0x8024121C; // type:func rom:0xC5072C dgb_15_UnkNpcDurationFlagFunc = 0x8024133C; // type:func rom:0xC5084C -func_802413A4_C508B4 = 0x802413A4; // type:func rom:0xC508B4 -func_80241464_C50974 = 0x80241464; // type:func rom:0xC50974 +dgb_15_func_802413A4_C508B4 = 0x802413A4; // type:func rom:0xC508B4 +dgb_15_func_80241464_C50974 = 0x80241464; // type:func rom:0xC50974 dgb_15_UnkFunc1 = 0x80241760; // type:func rom:0xC50C70 dgb_15_GetEntityPosition = 0x80241790; // type:func rom:0xC50CA0 dgb_15_SetEntityFlags100000 = 0x80241830; // type:func rom:0xC50D40 +dgb_15_entryList = 0x80241870; // type:data rom:0xC50D80 +dgb_15_config = 0x802418A0; // type:data rom:0xC50DB0 +dgb_15_802418E0 = 0x802418E0; // type:data rom:0xC50DF0 +dgb_15_itemList_802419C0 = 0x802419C0; // type:data rom:0xC50ED0 +dgb_15_exitDoubleDoor_802419C8 = 0x802419C8; // type:data rom:0xC50ED8 +dgb_15_exitDoubleDoor_80241A7C = 0x80241A7C; // type:data rom:0xC50F8C +dgb_15_exitSingleDoor_80241B30 = 0x80241B30; // type:data rom:0xC51040 +dgb_15_80241BE4 = 0x80241BE4; // type:data rom:0xC510F4 +dgb_15_enterSingleDoor_80241C88 = 0x80241C88; // type:data rom:0xC51198 +dgb_15_main = 0x80241DA0; // type:data rom:0xC512B0 +dgb_15_80241EA0 = 0x80241EA0; // type:data rom:0xC513B0 +dgb_15_unk_missing_80241F5C = 0x80241F5C; // type:data rom:0xC5146C +dgb_15_D_80241F8C_C5149C = 0x80241F8C; // type:data rom:0xC5149C +dgb_15_80241FBC = 0x80241FBC; // type:data rom:0xC514CC +dgb_15_unk_missing_8024202C = 0x8024202C; // type:data rom:0xC5153C +dgb_15_80242058 = 0x80242058; // type:data rom:0xC51568 +dgb_15_unk_missing_80242100 = 0x80242100; // type:data rom:0xC51610 +dgb_15_npcSettings_8024212C = 0x8024212C; // type:data rom:0xC5163C +dgb_15_unk_missing_80242158 = 0x80242158; // type:data rom:0xC51668 +dgb_15_80242184 = 0x80242184; // type:data rom:0xC51694 +dgb_15_idle_80242238 = 0x80242238; // type:data rom:0xC51748 +dgb_15_802424E8 = 0x802424E8; // type:data rom:0xC519F8 +dgb_15_npcAISettings_8024271C = 0x8024271C; // type:data rom:0xC51C2C +dgb_15_npcAI_8024274C = 0x8024274C; // type:data rom:0xC51C5C +dgb_15_defeat_802427B0 = 0x802427B0; // type:data rom:0xC51CC0 +dgb_15_init_802427EC = 0x802427EC; // type:data rom:0xC51CFC +dgb_15_npcGroup_802428C0 = 0x802428C0; // type:data rom:0xC51DD0 +dgb_15_npcGroupList_80242AB0 = 0x80242AB0; // type:data rom:0xC51FC0 +dgb_15_80242AD0 = 0x80242AD0; // type:data rom:0xC51FE0 +dgb_15_80242C38 = 0x80242C38; // type:data rom:0xC52148 +dgb_15_makeEntities = 0x80242C64; // type:data rom:0xC52174 +dgb_15_pad_XXXX = 0x80242CE8; // type:data rom:0xC521F8 D_80242CF0_C52200 = 0x80242CF0; // type:data rom:0xC52200 D_80242E88_C52398 = 0x80242E88; // type:data rom:0xC52398 D_80242E90_C523A0 = 0x80242E90; // type:data rom:0xC523A0 +dgb_15_dgb_14_name_hack = 0x80243028; // type:data rom:0xC52538 dgb_16_UnkNpcAIFunc6 = 0x80240000; // type:func rom:0xC52540 dgb_16_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xC525AC dgb_16_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xC5261C dgb_16_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xC526F4 -func_80240208_C52748 = 0x80240208; // type:func rom:0xC52748 -update_starpoints_display_C528FC = 0x802403BC; // type:func rom:0xC528FC -func_8024061C_C52B5C = 0x8024061C; // type:func rom:0xC52B5C -func_802406A4_C52BE4 = 0x802406A4; // type:func rom:0xC52BE4 -func_8024095C_C52E9C = 0x8024095C; // type:func rom:0xC52E9C -func_802409C0_C52F00 = 0x802409C0; // type:func rom:0xC52F00 -func_80240A68_C52FA8 = 0x80240A68; // type:func rom:0xC52FA8 -func_80240BA0_C530E0 = 0x80240BA0; // type:func rom:0xC530E0 -func_80240C4C_C5318C = 0x80240C4C; // type:func rom:0xC5318C -func_80240DC4_C53304 = 0x80240DC4; // type:func rom:0xC53304 -func_80240E20_C53360 = 0x80240E20; // type:func rom:0xC53360 -func_80241170_C536B0 = 0x80241170; // type:func rom:0xC536B0 +dgb_16_func_80240208_C52748 = 0x80240208; // type:func rom:0xC52748 +dgb_16_update_starpoints_display_C528FC = 0x802403BC; // type:func rom:0xC528FC +dgb_16_func_8024061C_C52B5C = 0x8024061C; // type:func rom:0xC52B5C +dgb_16_func_802406A4_C52BE4 = 0x802406A4; // type:func rom:0xC52BE4 +dgb_16_func_8024095C_C52E9C = 0x8024095C; // type:func rom:0xC52E9C +dgb_16_func_802409C0_C52F00 = 0x802409C0; // type:func rom:0xC52F00 +dgb_16_func_80240A68_C52FA8 = 0x80240A68; // type:func rom:0xC52FA8 +dgb_16_func_80240BA0_C530E0 = 0x80240BA0; // type:func rom:0xC530E0 +dgb_16_func_80240C4C_C5318C = 0x80240C4C; // type:func rom:0xC5318C +dgb_16_func_80240DC4_C53304 = 0x80240DC4; // type:func rom:0xC53304 +dgb_16_func_80240E20_C53360 = 0x80240E20; // type:func rom:0xC53360 +dgb_16_func_80241170_C536B0 = 0x80241170; // type:func rom:0xC536B0 +dgb_16_entryList = 0x80241430; // type:data rom:0xC53970 +dgb_16_config = 0x80241440; // type:data rom:0xC53980 +dgb_16_80241480 = 0x80241480; // type:data rom:0xC539C0 +dgb_16_exitSingleDoor_80241520 = 0x80241520; // type:data rom:0xC53A60 +dgb_16_enterSingleDoor_802415D4 = 0x802415D4; // type:data rom:0xC53B14 +dgb_16_main = 0x80241688; // type:data rom:0xC53BC8 +dgb_16_80241780 = 0x80241780; // type:data rom:0xC53CC0 +dgb_16_802417C0 = 0x802417C0; // type:data rom:0xC53D00 +dgb_16_extraAnimationList_8024187C = 0x8024187C; // type:data rom:0xC53DBC +dgb_16_extraAnimationList_802418A4 = 0x802418A4; // type:data rom:0xC53DE4 +dgb_16_npcAISettings_802418AC = 0x802418AC; // type:data rom:0xC53DEC +dgb_16_npcAI_802418DC = 0x802418DC; // type:data rom:0xC53E1C +dgb_16_npcSettings_8024194C = 0x8024194C; // type:data rom:0xC53E8C +dgb_16_npcAI_80241978 = 0x80241978; // type:data rom:0xC53EB8 +dgb_16_npcSettings_80241A20 = 0x80241A20; // type:data rom:0xC53F60 +dgb_16_npcGroup_80241A4C = 0x80241A4C; // type:data rom:0xC53F8C +dgb_16_npcGroup_80241E2C = 0x80241E2C; // type:data rom:0xC5436C +dgb_16_npcGroup_8024220C = 0x8024220C; // type:data rom:0xC5474C +dgb_16_npcGroup_802425EC = 0x802425EC; // type:data rom:0xC54B2C +dgb_16_npcGroup_802429CC = 0x802429CC; // type:data rom:0xC54F0C +dgb_16_npcGroup_80242DAC = 0x80242DAC; // type:data rom:0xC552EC +dgb_16_npcGroupList_8024318C = 0x8024318C; // type:data rom:0xC556CC +dgb_16_pad_XXX = 0x802431E8; // type:data rom:0xC55728 D_802431F0_C55730 = 0x802431F0; // type:data rom:0xC55730 D_802431F8_C55738 = 0x802431F8; // type:data rom:0xC55738 -func_80240000_C55F40 = 0x80240000; // type:func rom:0xC55F40 -func_80240158_C56098 = 0x80240158; // type:func rom:0xC56098 +dgb_17_entryList = 0x80240000; // type:data rom:0xC55A60 +dgb_17_config = 0x80240020; // type:data rom:0xC55A80 +dgb_17_80240060 = 0x80240060; // type:data rom:0xC55AC0 +dgb_17_exitDoubleDoor_80240100 = 0x80240100; // type:data rom:0xC55B60 +dgb_17_exitDoubleDoor_802401B4 = 0x802401B4; // type:data rom:0xC55C14 +dgb_17_80240268 = 0x80240268; // type:data rom:0xC55CC8 +dgb_17_enterDoubleDoor_802402B0 = 0x802402B0; // type:data rom:0xC55D10 +dgb_17_main = 0x802403B8; // type:data rom:0xC55E18 +dgb_17_makeEntities = 0x80240470; // type:data rom:0xC55ED0 +dgb_18_func_80240000_C55F40 = 0x80240000; // type:func rom:0xC55F40 +dgb_18_func_80240158_C56098 = 0x80240158; // type:func rom:0xC56098 dgb_18_UnkNpcAIFunc1 = 0x80240400; // type:func rom:0xC56340 -func_802404C0_C56400 = 0x802404C0; // type:func rom:0xC56400 -func_8024067C_C565BC = 0x8024067C; // type:func rom:0xC565BC +dgb_18_func_802404C0_C56400 = 0x802404C0; // type:func rom:0xC56400 +dgb_18_func_8024067C_C565BC = 0x8024067C; // type:func rom:0xC565BC dgb_18_NpcJumpFunc2 = 0x80240730; // type:func rom:0xC56670 dgb_18_NpcJumpFunc = 0x802407A4; // type:func rom:0xC566E4 dgb_18_UnkNpcAIFunc13 = 0x8024081C; // type:func rom:0xC5675C -func_8024094C_C5688C = 0x8024094C; // type:func rom:0xC5688C +dgb_18_func_8024094C_C5688C = 0x8024094C; // type:func rom:0xC5688C dgb_18_UnkNpcDurationFlagFunc = 0x80240A6C; // type:func rom:0xC569AC -func_80240AD4_C56A14 = 0x80240AD4; // type:func rom:0xC56A14 -func_80240B94_C56AD4 = 0x80240B94; // type:func rom:0xC56AD4 +dgb_18_func_80240AD4_C56A14 = 0x80240AD4; // type:func rom:0xC56A14 +dgb_18_func_80240B94_C56AD4 = 0x80240B94; // type:func rom:0xC56AD4 dgb_18_UnkFunc1 = 0x80240E90; // type:func rom:0xC56DD0 -func_80240EBC_C56DFC = 0x80240EBC; // type:func rom:0xC56DFC -func_80240FB0_C56EF0 = 0x80240FB0; // type:func rom:0xC56EF0 +dgb_18_func_80240EBC_C56DFC = 0x80240EBC; // type:func rom:0xC56DFC +dgb_18_func_80240FB0_C56EF0 = 0x80240FB0; // type:func rom:0xC56EF0 dgb_18_GetItemName = 0x80241064; // type:func rom:0xC56FA4 dgb_18_SomeItemEntityFunc = 0x802410C8; // type:func rom:0xC57008 dgb_18_CheckItemFlags40 = 0x80241218; // type:func rom:0xC57158 -D_802436E0_C59620 = 0x802436E0; // type:data rom:0xC59620 +dgb_18_entryList = 0x80241270; // type:data rom:0xC571B0 +dgb_18_config = 0x80241280; // type:data rom:0xC571C0 +dgb_18_802412C0 = 0x802412C0; // type:data rom:0xC57200 +dgb_18_exitDoubleDoor_80241360 = 0x80241360; // type:data rom:0xC572A0 +dgb_18_enterDoubleDoor_80241414 = 0x80241414; // type:data rom:0xC57354 +dgb_18_main = 0x80241490; // type:data rom:0xC573D0 +dgb_18_npcAISettings_80241580 = 0x80241580; // type:data rom:0xC574C0 +dgb_18_802415B0 = 0x802415B0; // type:data rom:0xC574F0 +dgb_18_npcSettings_802415D0 = 0x802415D0; // type:data rom:0xC57510 +dgb_18_npcSettings_802415FC = 0x802415FC; // type:data rom:0xC5753C +dgb_18_npcSettings_80241628 = 0x80241628; // type:data rom:0xC57568 +dgb_18_idle_80241654 = 0x80241654; // type:data rom:0xC57594 +dgb_18_idle_80242494 = 0x80242494; // type:data rom:0xC583D4 +dgb_18_npcAI_802426B0 = 0x802426B0; // type:data rom:0xC585F0 +dgb_18_npcAI_80242834 = 0x80242834; // type:data rom:0xC58774 +dgb_18_defeat_802428E8 = 0x802428E8; // type:data rom:0xC58828 +dgb_18_init_80242924 = 0x80242924; // type:data rom:0xC58864 +dgb_18_idle_80242A24 = 0x80242A24; // type:data rom:0xC58964 +dgb_18_init_8024329C = 0x8024329C; // type:data rom:0xC591DC +dgb_18_npcGroup_802432D4 = 0x802432D4; // type:data rom:0xC59214 +dgb_18_npcGroup_802434C4 = 0x802434C4; // type:data rom:0xC59404 +dgb_18_npcGroupList_802436B4 = 0x802436B4; // type:data rom:0xC595F4 +dgb_18_D_802436E0_C59620 = 0x802436E0; // type:data rom:0xC59620 +dgb_18_802436E4 = 0x802436E4; // type:data rom:0xC59624 +dgb_18_8024374C = 0x8024374C; // type:data rom:0xC5968C +dgb_18_8024382C = 0x8024382C; // type:data rom:0xC5976C +dgb_18_makeEntities = 0x80243874; // type:data rom:0xC597B4 +dgb_18_pad_XXX = 0x802438D8; // type:data rom:0xC59818 D_802438E0_C59820 = 0x802438E0; // type:data rom:0xC59820 D_802438E8_C59828 = 0x802438E8; // type:data rom:0xC59828 +dgb_18_dgb_01_name_hack = 0x80243A80; // type:data rom:0xC599C0 kzn_01_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC599D0 kzn_01_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC59AF4 kzn_02_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC5A740 @@ -12562,13 +13625,13 @@ func_802403DC_C5AB1C = 0x802403DC; // type:func rom:0xC5AB1C func_802404E0_C5AC20 = 0x802404E0; // type:func rom:0xC5AC20 func_80240690_C5ADD0 = 0x80240690; // type:func rom:0xC5ADD0 kzn_02_UnkNpcAIFunc1 = 0x80240CB8; // type:func rom:0xC5B3F8 -func_80240D78_C5B4B8 = 0x80240D78; // type:func rom:0xC5B4B8 +kzn_02_UnkFunc4 = 0x80240D78; // type:func rom:0xC5B4B8 kzn_02_UnkNpcAIFunc2 = 0x802410BC; // type:func rom:0xC5B7FC func_80241134_C5B874 = 0x80241134; // type:func rom:0xC5B874 kzn_02_UnkNpcAIFunc14 = 0x802411A0; // type:func rom:0xC5B8E0 kzn_02_UnkNpcAIFunc3 = 0x802412D4; // type:func rom:0xC5BA14 -func_80241338_C5BA78 = 0x80241338; // type:func rom:0xC5BA78 -func_802416C8_C5BE08 = 0x802416C8; // type:func rom:0xC5BE08 +kzn_02_UnkFunc6 = 0x80241338; // type:func rom:0xC5BA78 +kzn_02_UnkFunc5 = 0x802416C8; // type:func rom:0xC5BE08 func_802417EC_C5BF2C = 0x802417EC; // type:func rom:0xC5BF2C kzn_02_UnkNpcAIFunc13 = 0x802419D8; // type:func rom:0xC5C118 func_80241B08_C5C248 = 0x80241B08; // type:func rom:0xC5C248 @@ -12610,7 +13673,7 @@ kzn_03_UnkNpcAIFunc7 = 0x80240C64; // type:func rom:0xC61974 kzn_03_UnkNpcAIFunc8 = 0x80240CD4; // type:func rom:0xC619E4 kzn_03_UnkNpcAIFunc5 = 0x80240DAC; // type:func rom:0xC61ABC func_80240E00_C61B10 = 0x80240E00; // type:func rom:0xC61B10 -func_80240FB4_C61CC4 = 0x80240FB4; // type:func rom:0xC61CC4 +kzn_03_UnkFunc7 = 0x80240FB4; // type:func rom:0xC61CC4 func_80241214_C61F24 = 0x80241214; // type:func rom:0xC61F24 func_802414C8_C621D8 = 0x802414C8; // type:func rom:0xC621D8 func_80241534_C62244 = 0x80241534; // type:func rom:0xC62244 @@ -12653,20 +13716,20 @@ D_80247410_C68120 = 0x80247410; // type:data rom:0xC68120 kzn_04_UnkTexturePanFunc = 0x80240000; // type:func rom:0xC68130 kzn_04_UnkTexturePanFunc2 = 0x80240124; // type:func rom:0xC68254 kzn_04_SetOverrideFlags_40 = 0x80240310; // type:func rom:0xC68440 -func_8024032C_C6845C = 0x8024032C; // type:func rom:0xC6845C +kzn_04_UnkFunc17 = 0x8024032C; // type:func rom:0xC6845C func_8024034C_C6847C = 0x8024034C; // type:func rom:0xC6847C -func_80240378_C684A8 = 0x80240378; // type:func rom:0xC684A8 +kzn_04_UnkFunc18 = 0x80240378; // type:func rom:0xC684A8 func_802403E4_C68514 = 0x802403E4; // type:func rom:0xC68514 func_80240430_C68560 = 0x80240430; // type:func rom:0xC68560 func_802404DC_C6860C = 0x802404DC; // type:func rom:0xC6860C func_8024072C_C6885C = 0x8024072C; // type:func rom:0xC6885C -func_80240758_C68888 = 0x80240758; // type:func rom:0xC68888 -func_80240790_C688C0 = 0x80240790; // type:func rom:0xC688C0 +kzn_04_UnkFunc19 = 0x80240758; // type:func rom:0xC68888 +kzn_04_UnkFunc20 = 0x80240790; // type:func rom:0xC688C0 func_80240820_C68950 = 0x80240820; // type:func rom:0xC68950 -func_80240854_C68984 = 0x80240854; // type:func rom:0xC68984 -func_802408B8_C689E8 = 0x802408B8; // type:func rom:0xC689E8 +kzn_04_UnkFunc21 = 0x80240854; // type:func rom:0xC68984 +kzn_04_UnkFunc22 = 0x802408B8; // type:func rom:0xC689E8 func_80240910_C68A40 = 0x80240910; // type:func rom:0xC68A40 -func_80240E48_C68F78 = 0x80240E48; // type:func rom:0xC68F78 +kzn_04_UnkFunc23 = 0x80240E48; // type:func rom:0xC68F78 kzn_04_UnkPartnerPosFunc = 0x80240F88; // type:func rom:0xC690B8 kzn_04_UnkPartnerPosFunc2 = 0x80240FD0; // type:func rom:0xC69100 func_80241018_C69148 = 0x80241018; // type:func rom:0xC69148 @@ -12699,13 +13762,13 @@ func_802407F4_C6EB24 = 0x802407F4; // type:func rom:0xC6EB24 func_80240820_C6EB50 = 0x80240820; // type:func rom:0xC6EB50 func_802409D0_C6ED00 = 0x802409D0; // type:func rom:0xC6ED00 kzn_07_UnkNpcAIFunc1 = 0x80240FF8; // type:func rom:0xC6F328 -func_802410B8_C6F3E8 = 0x802410B8; // type:func rom:0xC6F3E8 +kzn_07_UnkFunc4 = 0x802410B8; // type:func rom:0xC6F3E8 kzn_07_UnkNpcAIFunc2 = 0x802413FC; // type:func rom:0xC6F72C func_80241474_C6F7A4 = 0x80241474; // type:func rom:0xC6F7A4 kzn_07_UnkNpcAIFunc14 = 0x802414E0; // type:func rom:0xC6F810 kzn_07_UnkNpcAIFunc3 = 0x80241614; // type:func rom:0xC6F944 -func_80241678_C6F9A8 = 0x80241678; // type:func rom:0xC6F9A8 -func_80241A08_C6FD38 = 0x80241A08; // type:func rom:0xC6FD38 +kzn_07_UnkFunc6 = 0x80241678; // type:func rom:0xC6F9A8 +kzn_07_UnkFunc5 = 0x80241A08; // type:func rom:0xC6FD38 func_80241B2C_C6FE5C = 0x80241B2C; // type:func rom:0xC6FE5C kzn_07_UnkNpcAIFunc13 = 0x80241D18; // type:func rom:0xC70048 func_80241E48_C70178 = 0x80241E48; // type:func rom:0xC70178 @@ -12731,13 +13794,13 @@ kzn_08_CheckItemFlags40 = 0x802409F8; // type:func rom:0xC71E78 func_80240A50_C71ED0 = 0x80240A50; // type:func rom:0xC71ED0 func_80240C00_C72080 = 0x80240C00; // type:func rom:0xC72080 kzn_08_UnkNpcAIFunc1 = 0x80241228; // type:func rom:0xC726A8 -func_802412E8_C72768 = 0x802412E8; // type:func rom:0xC72768 +kzn_08_UnkFunc4 = 0x802412E8; // type:func rom:0xC72768 kzn_08_UnkNpcAIFunc2 = 0x8024162C; // type:func rom:0xC72AAC func_802416A4_C72B24 = 0x802416A4; // type:func rom:0xC72B24 kzn_08_UnkNpcAIFunc14 = 0x80241710; // type:func rom:0xC72B90 kzn_08_UnkNpcAIFunc3 = 0x80241844; // type:func rom:0xC72CC4 -func_802418A8_C72D28 = 0x802418A8; // type:func rom:0xC72D28 -func_80241C38_C730B8 = 0x80241C38; // type:func rom:0xC730B8 +kzn_08_UnkFunc6 = 0x802418A8; // type:func rom:0xC72D28 +kzn_08_UnkFunc5 = 0x80241C38; // type:func rom:0xC730B8 func_80241D5C_C731DC = 0x80241D5C; // type:func rom:0xC731DC kzn_08_UnkNpcAIFunc13 = 0x80241F48; // type:func rom:0xC733C8 func_80242078_C734F8 = 0x80242078; // type:func rom:0xC734F8 @@ -12748,7 +13811,7 @@ kzn_08_UnkNpcAIFunc7 = 0x802425A8; // type:func rom:0xC73A28 kzn_08_UnkNpcAIFunc8 = 0x80242618; // type:func rom:0xC73A98 kzn_08_UnkNpcAIFunc5 = 0x802426F0; // type:func rom:0xC73B70 func_80242744_C73BC4 = 0x80242744; // type:func rom:0xC73BC4 -func_802428F8_C73D78 = 0x802428F8; // type:func rom:0xC73D78 +kzn_08_UnkFunc7 = 0x802428F8; // type:func rom:0xC73D78 func_80242B58_C73FD8 = 0x80242B58; // type:func rom:0xC73FD8 func_80242E0C_C7428C = 0x80242E0C; // type:func rom:0xC7428C func_80242E78_C742F8 = 0x80242E78; // type:func rom:0xC742F8 @@ -12775,20 +13838,20 @@ D_80245848_C76CC8 = 0x80245848; // type:data rom:0xC76CC8 D_80245850_C76CD0 = 0x80245850; // type:data rom:0xC76CD0 D_80245858_C76CD8 = 0x80245858; // type:data rom:0xC76CD8 kzn_09_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xC76CE0 -func_8024001C_C76CFC = 0x8024001C; // type:func rom:0xC76CFC +kzn_09_UnkFunc17 = 0x8024001C; // type:func rom:0xC76CFC func_8024003C_C76D1C = 0x8024003C; // type:func rom:0xC76D1C -func_80240068_C76D48 = 0x80240068; // type:func rom:0xC76D48 +kzn_09_UnkFunc18 = 0x80240068; // type:func rom:0xC76D48 func_802400D4_C76DB4 = 0x802400D4; // type:func rom:0xC76DB4 func_80240120_C76E00 = 0x80240120; // type:func rom:0xC76E00 func_802401CC_C76EAC = 0x802401CC; // type:func rom:0xC76EAC func_8024041C_C770FC = 0x8024041C; // type:func rom:0xC770FC -func_80240448_C77128 = 0x80240448; // type:func rom:0xC77128 -func_80240480_C77160 = 0x80240480; // type:func rom:0xC77160 +kzn_09_UnkFunc19 = 0x80240448; // type:func rom:0xC77128 +kzn_09_UnkFunc20 = 0x80240480; // type:func rom:0xC77160 func_80240510_C771F0 = 0x80240510; // type:func rom:0xC771F0 -func_80240544_C77224 = 0x80240544; // type:func rom:0xC77224 -func_802405A8_C77288 = 0x802405A8; // type:func rom:0xC77288 +kzn_09_UnkFunc21 = 0x80240544; // type:func rom:0xC77224 +kzn_09_UnkFunc22 = 0x802405A8; // type:func rom:0xC77288 func_80240600_C772E0 = 0x80240600; // type:func rom:0xC772E0 -func_80240B38_C77818 = 0x80240B38; // type:func rom:0xC77818 +kzn_09_UnkFunc23 = 0x80240B38; // type:func rom:0xC77818 kzn_09_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xC77958 kzn_09_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xC779A0 func_80240D08_C779E8 = 0x80240D08; // type:func rom:0xC779E8 @@ -12801,7 +13864,7 @@ kzn_09_UnkNpcAIFunc7 = 0x8024108C; // type:func rom:0xC77D6C kzn_09_UnkNpcAIFunc8 = 0x802410FC; // type:func rom:0xC77DDC kzn_09_UnkNpcAIFunc5 = 0x802411D4; // type:func rom:0xC77EB4 func_80241228_C77F08 = 0x80241228; // type:func rom:0xC77F08 -func_802413DC_C780BC = 0x802413DC; // type:func rom:0xC780BC +kzn_09_UnkFunc7 = 0x802413DC; // type:func rom:0xC780BC func_8024163C_C7831C = 0x8024163C; // type:func rom:0xC7831C func_802418F0_C785D0 = 0x802418F0; // type:func rom:0xC785D0 func_8024195C_C7863C = 0x8024195C; // type:func rom:0xC7863C @@ -12867,13 +13930,13 @@ func_80240434_C805D4 = 0x80240434; // type:func rom:0xC805D4 func_80240460_C80600 = 0x80240460; // type:func rom:0xC80600 func_80240610_C807B0 = 0x80240610; // type:func rom:0xC807B0 kzn_11_UnkNpcAIFunc1 = 0x80240C38; // type:func rom:0xC80DD8 -func_80240CF8_C80E98 = 0x80240CF8; // type:func rom:0xC80E98 +kzn_11_UnkFunc4 = 0x80240CF8; // type:func rom:0xC80E98 kzn_11_UnkNpcAIFunc2 = 0x8024103C; // type:func rom:0xC811DC func_802410B4_C81254 = 0x802410B4; // type:func rom:0xC81254 kzn_11_UnkNpcAIFunc14 = 0x80241120; // type:func rom:0xC812C0 kzn_11_UnkNpcAIFunc3 = 0x80241254; // type:func rom:0xC813F4 -func_802412B8_C81458 = 0x802412B8; // type:func rom:0xC81458 -func_80241648_C817E8 = 0x80241648; // type:func rom:0xC817E8 +kzn_11_UnkFunc6 = 0x802412B8; // type:func rom:0xC81458 +kzn_11_UnkFunc5 = 0x80241648; // type:func rom:0xC817E8 func_8024176C_C8190C = 0x8024176C; // type:func rom:0xC8190C kzn_11_UnkNpcAIFunc13 = 0x80241958; // type:func rom:0xC81AF8 func_80241A88_C81C28 = 0x80241A88; // type:func rom:0xC81C28 @@ -12895,7 +13958,7 @@ kzn_17_UnkNpcAIFunc7 = 0x8024037C; // type:func rom:0xC85E2C kzn_17_UnkNpcAIFunc8 = 0x802403EC; // type:func rom:0xC85E9C kzn_17_UnkNpcAIFunc5 = 0x802404C4; // type:func rom:0xC85F74 func_80240518_C85FC8 = 0x80240518; // type:func rom:0xC85FC8 -func_802406CC_C8617C = 0x802406CC; // type:func rom:0xC8617C +kzn_17_UnkFunc7 = 0x802406CC; // type:func rom:0xC8617C func_8024092C_C863DC = 0x8024092C; // type:func rom:0xC863DC func_80240BE0_C86690 = 0x80240BE0; // type:func rom:0xC86690 func_80240C4C_C866FC = 0x80240C4C; // type:func rom:0xC866FC @@ -13020,16 +14083,16 @@ func_80240520_C9C820 = 0x80240520; // type:func rom:0xC9C820 D_80241C10_C9DF10 = 0x80241C10; // type:data rom:0xC9DF10 func_80240000_C9DF20 = 0x80240000; // type:func rom:0xC9DF20 func_80240040_C9DF60 = 0x80240040; // type:func rom:0xC9DF60 -func_80240198_C9E0B8 = 0x80240198; // type:func rom:0xC9E0B8 +flo_00_UnkFunc13 = 0x80240198; // type:func rom:0xC9E0B8 flo_00_UnkNpcAIFunc1 = 0x80240440; // type:func rom:0xC9E360 -func_80240500_C9E420 = 0x80240500; // type:func rom:0xC9E420 +flo_00_UnkFunc14 = 0x80240500; // type:func rom:0xC9E420 func_802406BC_C9E5DC = 0x802406BC; // type:func rom:0xC9E5DC flo_00_NpcJumpFunc2 = 0x80240770; // type:func rom:0xC9E690 flo_00_NpcJumpFunc = 0x802407E4; // type:func rom:0xC9E704 flo_00_UnkNpcAIFunc13 = 0x8024085C; // type:func rom:0xC9E77C -func_8024098C_C9E8AC = 0x8024098C; // type:func rom:0xC9E8AC +flo_00_UnkFunc15 = 0x8024098C; // type:func rom:0xC9E8AC flo_00_UnkNpcDurationFlagFunc = 0x80240AAC; // type:func rom:0xC9E9CC -func_80240B14_C9EA34 = 0x80240B14; // type:func rom:0xC9EA34 +flo_00_UnkFunc16 = 0x80240B14; // type:func rom:0xC9EA34 func_80240BD4_C9EAF4 = 0x80240BD4; // type:func rom:0xC9EAF4 PostChapter6StatUpdate = 0x80240ED0; // type:func rom:0xC9EDF0 func_80240F10_C9EE30 = 0x80240F10; // type:func rom:0xC9EE30 @@ -13059,20 +14122,20 @@ func_8024061C_CAC80C = 0x8024061C; // type:func rom:0xCAC80C flo_07_GetItemName = 0x802406D0; // type:func rom:0xCAC8C0 D_80241BB0_CADDA0 = 0x80241BB0; // type:data rom:0xCADDA0 flo_08_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xCAED40 -func_8024001C_CAED5C = 0x8024001C; // type:func rom:0xCAED5C +flo_08_UnkFunc17 = 0x8024001C; // type:func rom:0xCAED5C func_8024003C_CAED7C = 0x8024003C; // type:func rom:0xCAED7C -func_80240068_CAEDA8 = 0x80240068; // type:func rom:0xCAEDA8 +flo_08_UnkFunc18 = 0x80240068; // type:func rom:0xCAEDA8 func_802400D4_CAEE14 = 0x802400D4; // type:func rom:0xCAEE14 func_80240120_CAEE60 = 0x80240120; // type:func rom:0xCAEE60 func_802401CC_CAEF0C = 0x802401CC; // type:func rom:0xCAEF0C func_8024041C_CAF15C = 0x8024041C; // type:func rom:0xCAF15C -func_80240448_CAF188 = 0x80240448; // type:func rom:0xCAF188 -func_80240480_CAF1C0 = 0x80240480; // type:func rom:0xCAF1C0 +flo_08_UnkFunc19 = 0x80240448; // type:func rom:0xCAF188 +flo_08_UnkFunc20 = 0x80240480; // type:func rom:0xCAF1C0 func_80240510_CAF250 = 0x80240510; // type:func rom:0xCAF250 -func_80240544_CAF284 = 0x80240544; // type:func rom:0xCAF284 -func_802405A8_CAF2E8 = 0x802405A8; // type:func rom:0xCAF2E8 +flo_08_UnkFunc21 = 0x80240544; // type:func rom:0xCAF284 +flo_08_UnkFunc22 = 0x802405A8; // type:func rom:0xCAF2E8 func_80240600_CAF340 = 0x80240600; // type:func rom:0xCAF340 -func_80240B38_CAF878 = 0x80240B38; // type:func rom:0xCAF878 +flo_08_UnkFunc23 = 0x80240B38; // type:func rom:0xCAF878 flo_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xCAF9B8 flo_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xCAFA00 func_80240D08_CAFA48 = 0x80240D08; // type:func rom:0xCAFA48 @@ -13105,13 +14168,13 @@ flo_09_SomeMatrixOperation2 = 0x80240150; // type:func rom:0xCB5150 func_80240320_CB5320 = 0x80240320; // type:func rom:0xCB5320 func_802404D0_CB54D0 = 0x802404D0; // type:func rom:0xCB54D0 flo_09_UnkNpcAIFunc1 = 0x80240AF8; // type:func rom:0xCB5AF8 -func_80240BB8_CB5BB8 = 0x80240BB8; // type:func rom:0xCB5BB8 +flo_09_UnkFunc4 = 0x80240BB8; // type:func rom:0xCB5BB8 flo_09_UnkNpcAIFunc2 = 0x80240EFC; // type:func rom:0xCB5EFC func_80240F74_CB5F74 = 0x80240F74; // type:func rom:0xCB5F74 flo_09_UnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xCB5FE0 flo_09_UnkNpcAIFunc3 = 0x80241114; // type:func rom:0xCB6114 -func_80241178_CB6178 = 0x80241178; // type:func rom:0xCB6178 -func_80241508_CB6508 = 0x80241508; // type:func rom:0xCB6508 +flo_09_UnkFunc6 = 0x80241178; // type:func rom:0xCB6178 +flo_09_UnkFunc5 = 0x80241508; // type:func rom:0xCB6508 func_8024162C_CB662C = 0x8024162C; // type:func rom:0xCB662C D_8024362C_CB862C = 0x8024362C; // type:data rom:0xCB862C D_802441A0_CB91A0 = 0x802441A0; // type:data rom:0xCB91A0 @@ -13154,13 +14217,13 @@ func_80240040_CC3850 = 0x80240040; // type:func rom:0xCC3850 func_802401C4_CC39D4 = 0x802401C4; // type:func rom:0xCC39D4 func_80240374_CC3B84 = 0x80240374; // type:func rom:0xCC3B84 flo_13_UnkNpcAIFunc1 = 0x8024099C; // type:func rom:0xCC41AC -func_80240A5C_CC426C = 0x80240A5C; // type:func rom:0xCC426C +flo_13_UnkFunc4 = 0x80240A5C; // type:func rom:0xCC426C flo_13_UnkNpcAIFunc2 = 0x80240DA0; // type:func rom:0xCC45B0 func_80240E18_CC4628 = 0x80240E18; // type:func rom:0xCC4628 flo_13_UnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xCC4694 flo_13_UnkNpcAIFunc3 = 0x80240FB8; // type:func rom:0xCC47C8 -func_8024101C_CC482C = 0x8024101C; // type:func rom:0xCC482C -func_802413AC_CC4BBC = 0x802413AC; // type:func rom:0xCC4BBC +flo_13_UnkFunc6 = 0x8024101C; // type:func rom:0xCC482C +flo_13_UnkFunc5 = 0x802413AC; // type:func rom:0xCC4BBC func_802414D0_CC4CE0 = 0x802414D0; // type:func rom:0xCC4CE0 func_802416BC_CC4ECC = 0x802416BC; // type:func rom:0xCC4ECC func_80241704_CC4F14 = 0x80241704; // type:func rom:0xCC4F14 @@ -13195,13 +14258,13 @@ func_802407D4_CCBAE4 = 0x802407D4; // type:func rom:0xCCBAE4 func_80240B10_CCBE20 = 0x80240B10; // type:func rom:0xCCBE20 func_80240CC0_CCBFD0 = 0x80240CC0; // type:func rom:0xCCBFD0 flo_14_UnkNpcAIFunc1 = 0x802412E8; // type:func rom:0xCCC5F8 -func_802413A8_CCC6B8 = 0x802413A8; // type:func rom:0xCCC6B8 +flo_14_UnkFunc4 = 0x802413A8; // type:func rom:0xCCC6B8 flo_14_UnkNpcAIFunc2 = 0x802416EC; // type:func rom:0xCCC9FC func_80241764_CCCA74 = 0x80241764; // type:func rom:0xCCCA74 flo_14_UnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xCCCAE0 flo_14_UnkNpcAIFunc3 = 0x80241904; // type:func rom:0xCCCC14 -func_80241968_CCCC78 = 0x80241968; // type:func rom:0xCCCC78 -func_80241CF8_CCD008 = 0x80241CF8; // type:func rom:0xCCD008 +flo_14_UnkFunc6 = 0x80241968; // type:func rom:0xCCCC78 +flo_14_UnkFunc5 = 0x80241CF8; // type:func rom:0xCCD008 func_80241E1C_CCD12C = 0x80241E1C; // type:func rom:0xCCD12C flo_14_GetNpcCollisionHeight = 0x80242008; // type:func rom:0xCCD318 flo_14_SomeXYZFuncTodoRename = 0x80242064; // type:func rom:0xCCD374 @@ -13227,34 +14290,34 @@ D_80245360_CD0670 = 0x80245360; // type:data rom:0xCD0670 func_80240000_CD1E30 = 0x80240000; // type:func rom:0xCD1E30 func_80240040_CD1E70 = 0x80240040; // type:func rom:0xCD1E70 flo_16_SetOverrideFlags_40 = 0x802400E0; // type:func rom:0xCD1F10 -func_802400FC_CD1F2C = 0x802400FC; // type:func rom:0xCD1F2C +flo_16_UnkFunc17 = 0x802400FC; // type:func rom:0xCD1F2C func_8024011C_CD1F4C = 0x8024011C; // type:func rom:0xCD1F4C -func_80240148_CD1F78 = 0x80240148; // type:func rom:0xCD1F78 +flo_16_UnkFunc18 = 0x80240148; // type:func rom:0xCD1F78 func_802401B4_CD1FE4 = 0x802401B4; // type:func rom:0xCD1FE4 func_80240200_CD2030 = 0x80240200; // type:func rom:0xCD2030 func_802402AC_CD20DC = 0x802402AC; // type:func rom:0xCD20DC func_802404FC_CD232C = 0x802404FC; // type:func rom:0xCD232C -func_80240528_CD2358 = 0x80240528; // type:func rom:0xCD2358 -func_80240560_CD2390 = 0x80240560; // type:func rom:0xCD2390 +flo_16_UnkFunc19 = 0x80240528; // type:func rom:0xCD2358 +flo_16_UnkFunc20 = 0x80240560; // type:func rom:0xCD2390 func_802405F0_CD2420 = 0x802405F0; // type:func rom:0xCD2420 -func_80240624_CD2454 = 0x80240624; // type:func rom:0xCD2454 -func_80240688_CD24B8 = 0x80240688; // type:func rom:0xCD24B8 +flo_16_UnkFunc21 = 0x80240624; // type:func rom:0xCD2454 +flo_16_UnkFunc22 = 0x80240688; // type:func rom:0xCD24B8 func_802406E0_CD2510 = 0x802406E0; // type:func rom:0xCD2510 -func_80240C18_CD2A48 = 0x80240C18; // type:func rom:0xCD2A48 +flo_16_UnkFunc23 = 0x80240C18; // type:func rom:0xCD2A48 flo_16_UnkPartnerPosFunc = 0x80240D58; // type:func rom:0xCD2B88 flo_16_UnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xCD2BD0 -func_80240DE8_CD2C18 = 0x80240DE8; // type:func rom:0xCD2C18 +flo_16_UnkFunc24 = 0x80240DE8; // type:func rom:0xCD2C18 func_80240E18_CD2C48 = 0x80240E18; // type:func rom:0xCD2C48 func_80240E50_CD2C80 = 0x80240E50; // type:func rom:0xCD2C80 func_80241000_CD2E30 = 0x80241000; // type:func rom:0xCD2E30 flo_16_UnkNpcAIFunc1 = 0x80241628; // type:func rom:0xCD3458 -func_802416E8_CD3518 = 0x802416E8; // type:func rom:0xCD3518 +flo_16_UnkFunc4 = 0x802416E8; // type:func rom:0xCD3518 flo_16_UnkNpcAIFunc2 = 0x80241A2C; // type:func rom:0xCD385C func_80241AA4_CD38D4 = 0x80241AA4; // type:func rom:0xCD38D4 flo_16_UnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xCD3940 flo_16_UnkNpcAIFunc3 = 0x80241C44; // type:func rom:0xCD3A74 -func_80241CA8_CD3AD8 = 0x80241CA8; // type:func rom:0xCD3AD8 -func_80242038_CD3E68 = 0x80242038; // type:func rom:0xCD3E68 +flo_16_UnkFunc6 = 0x80241CA8; // type:func rom:0xCD3AD8 +flo_16_UnkFunc5 = 0x80242038; // type:func rom:0xCD3E68 func_8024215C_CD3F8C = 0x8024215C; // type:func rom:0xCD3F8C flo_16_UnkNpcAIFunc13 = 0x80242348; // type:func rom:0xCD4178 func_80242478_CD42A8 = 0x80242478; // type:func rom:0xCD42A8 @@ -13275,13 +14338,13 @@ func_80240040_CD7320 = 0x80240040; // type:func rom:0xCD7320 func_80240070_CD7350 = 0x80240070; // type:func rom:0xCD7350 func_80240220_CD7500 = 0x80240220; // type:func rom:0xCD7500 flo_17_UnkNpcAIFunc1 = 0x80240848; // type:func rom:0xCD7B28 -func_80240908_CD7BE8 = 0x80240908; // type:func rom:0xCD7BE8 +flo_17_UnkFunc4 = 0x80240908; // type:func rom:0xCD7BE8 flo_17_UnkNpcAIFunc2 = 0x80240C4C; // type:func rom:0xCD7F2C func_80240CC4_CD7FA4 = 0x80240CC4; // type:func rom:0xCD7FA4 flo_17_UnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xCD8010 flo_17_UnkNpcAIFunc3 = 0x80240E64; // type:func rom:0xCD8144 -func_80240EC8_CD81A8 = 0x80240EC8; // type:func rom:0xCD81A8 -func_80241258_CD8538 = 0x80241258; // type:func rom:0xCD8538 +flo_17_UnkFunc6 = 0x80240EC8; // type:func rom:0xCD81A8 +flo_17_UnkFunc5 = 0x80241258; // type:func rom:0xCD8538 func_8024137C_CD865C = 0x8024137C; // type:func rom:0xCD865C func_80241568_CD8848 = 0x80241568; // type:func rom:0xCD8848 func_802415B0_CD8890 = 0x802415B0; // type:func rom:0xCD8890 @@ -13357,13 +14420,13 @@ func_80240000_CF2BD0 = 0x80240000; // type:func rom:0xCF2BD0 func_80240040_CF2C10 = 0x80240040; // type:func rom:0xCF2C10 func_802401F0_CF2DC0 = 0x802401F0; // type:func rom:0xCF2DC0 flo_25_UnkNpcAIFunc1 = 0x80240818; // type:func rom:0xCF33E8 -func_802408D8_CF34A8 = 0x802408D8; // type:func rom:0xCF34A8 +flo_25_UnkFunc4 = 0x802408D8; // type:func rom:0xCF34A8 flo_25_UnkNpcAIFunc2 = 0x80240C1C; // type:func rom:0xCF37EC func_80240C94_CF3864 = 0x80240C94; // type:func rom:0xCF3864 flo_25_UnkNpcAIFunc14 = 0x80240D00; // type:func rom:0xCF38D0 flo_25_UnkNpcAIFunc3 = 0x80240E34; // type:func rom:0xCF3A04 -func_80240E98_CF3A68 = 0x80240E98; // type:func rom:0xCF3A68 -func_80241228_CF3DF8 = 0x80241228; // type:func rom:0xCF3DF8 +flo_25_UnkFunc6 = 0x80240E98; // type:func rom:0xCF3A68 +flo_25_UnkFunc5 = 0x80241228; // type:func rom:0xCF3DF8 func_8024134C_CF3F1C = 0x8024134C; // type:func rom:0xCF3F1C flo_25_UnkNpcAIFunc13 = 0x80241538; // type:func rom:0xCF4108 func_80241668_CF4238 = 0x80241668; // type:func rom:0xCF4238 @@ -13496,7 +14559,7 @@ sam_03_UnkNpcAIFunc7 = 0x802400BC; // type:func rom:0xD1117C sam_03_UnkNpcAIFunc8 = 0x8024012C; // type:func rom:0xD111EC sam_03_UnkNpcAIFunc5 = 0x80240204; // type:func rom:0xD112C4 func_80240258_D11318 = 0x80240258; // type:func rom:0xD11318 -func_8024040C_D114CC = 0x8024040C; // type:func rom:0xD114CC +sam_03_UnkFunc7 = 0x8024040C; // type:func rom:0xD114CC func_8024066C_D1172C = 0x8024066C; // type:func rom:0xD1172C D_80242370_D13430 = 0x80242370; // type:data rom:0xD13430 sam_04_SomeMatrixOperation = 0x80240000; // type:func rom:0xD135D0 @@ -13515,7 +14578,7 @@ sam_05_UnkNpcAIFunc7 = 0x8024006C; // type:func rom:0xD1884C sam_05_UnkNpcAIFunc8 = 0x802400DC; // type:func rom:0xD188BC sam_05_UnkNpcAIFunc5 = 0x802401B4; // type:func rom:0xD18994 func_80240208_D189E8 = 0x80240208; // type:func rom:0xD189E8 -update_starpoints_display_D18B9C = 0x802403BC; // type:func rom:0xD18B9C +sam_05_UnkFunc7 = 0x802403BC; // type:func rom:0xD18B9C func_8024061C_D18DFC = 0x8024061C; // type:func rom:0xD18DFC func_802408D0_D190B0 = 0x802408D0; // type:func rom:0xD190B0 func_8024093C_D1911C = 0x8024093C; // type:func rom:0xD1911C @@ -13542,13 +14605,13 @@ sam_06_SomeMatrixOperation2 = 0x8024037C; // type:func rom:0xD2020C func_80240550_D203E0 = 0x80240550; // type:func rom:0xD203E0 func_80240700_D20590 = 0x80240700; // type:func rom:0xD20590 sam_06_UnkNpcAIFunc1 = 0x80240D28; // type:func rom:0xD20BB8 -func_80240DE8_D20C78 = 0x80240DE8; // type:func rom:0xD20C78 +sam_06_UnkFunc4 = 0x80240DE8; // type:func rom:0xD20C78 sam_06_UnkNpcAIFunc2 = 0x8024112C; // type:func rom:0xD20FBC func_802411A4_D21034 = 0x802411A4; // type:func rom:0xD21034 sam_06_UnkNpcAIFunc14 = 0x80241210; // type:func rom:0xD210A0 sam_06_UnkNpcAIFunc3 = 0x80241344; // type:func rom:0xD211D4 -func_802413A8_D21238 = 0x802413A8; // type:func rom:0xD21238 -func_80241738_D215C8 = 0x80241738; // type:func rom:0xD215C8 +sam_06_UnkFunc6 = 0x802413A8; // type:func rom:0xD21238 +sam_06_UnkFunc5 = 0x80241738; // type:func rom:0xD215C8 func_8024185C_D216EC = 0x8024185C; // type:func rom:0xD216EC func_80241A48_D218D8 = 0x80241A48; // type:func rom:0xD218D8 sam_06_GetItemName = 0x80241AFC; // type:func rom:0xD2198C @@ -13592,7 +14655,7 @@ sam_07_UnkNpcAIFunc7 = 0x802406BC; // type:func rom:0xD2C3EC sam_07_UnkNpcAIFunc8 = 0x8024072C; // type:func rom:0xD2C45C sam_07_UnkNpcAIFunc5 = 0x80240804; // type:func rom:0xD2C534 func_80240858_D2C588 = 0x80240858; // type:func rom:0xD2C588 -func_80240A0C_D2C73C = 0x80240A0C; // type:func rom:0xD2C73C +sam_07_UnkFunc7 = 0x80240A0C; // type:func rom:0xD2C73C func_80240C6C_D2C99C = 0x80240C6C; // type:func rom:0xD2C99C func_80240F20_D2CC50 = 0x80240F20; // type:func rom:0xD2CC50 func_80240F8C_D2CCBC = 0x80240F8C; // type:func rom:0xD2CCBC @@ -13611,20 +14674,20 @@ D_80243F30_D2FC60 = 0x80243F30; // type:data rom:0xD2FC60 D_80243F38_D2FC68 = 0x80243F38; // type:data rom:0xD2FC68 D_80243F40_D2FC70 = 0x80243F40; // type:data rom:0xD2FC70 sam_08_SetOverrideFlags_40 = 0x80240000; // type:func rom:0xD2FC80 -func_8024001C_D2FC9C = 0x8024001C; // type:func rom:0xD2FC9C +sam_08_UnkFunc17 = 0x8024001C; // type:func rom:0xD2FC9C func_8024003C_D2FCBC = 0x8024003C; // type:func rom:0xD2FCBC -func_80240068_D2FCE8 = 0x80240068; // type:func rom:0xD2FCE8 +sam_08_UnkFunc18 = 0x80240068; // type:func rom:0xD2FCE8 func_802400D4_D2FD54 = 0x802400D4; // type:func rom:0xD2FD54 func_80240120_D2FDA0 = 0x80240120; // type:func rom:0xD2FDA0 func_802401CC_D2FE4C = 0x802401CC; // type:func rom:0xD2FE4C func_8024041C_D3009C = 0x8024041C; // type:func rom:0xD3009C -func_80240448_D300C8 = 0x80240448; // type:func rom:0xD300C8 -func_80240480_D30100 = 0x80240480; // type:func rom:0xD30100 +sam_08_UnkFunc19 = 0x80240448; // type:func rom:0xD300C8 +sam_08_UnkFunc20 = 0x80240480; // type:func rom:0xD30100 func_80240510_D30190 = 0x80240510; // type:func rom:0xD30190 -func_80240544_D301C4 = 0x80240544; // type:func rom:0xD301C4 -func_802405A8_D30228 = 0x802405A8; // type:func rom:0xD30228 +sam_08_UnkFunc21 = 0x80240544; // type:func rom:0xD301C4 +sam_08_UnkFunc22 = 0x802405A8; // type:func rom:0xD30228 func_80240600_D30280 = 0x80240600; // type:func rom:0xD30280 -func_80240B38_D307B8 = 0x80240B38; // type:func rom:0xD307B8 +sam_08_UnkFunc23 = 0x80240B38; // type:func rom:0xD307B8 sam_08_UnkPartnerPosFunc = 0x80240C78; // type:func rom:0xD308F8 sam_08_UnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xD30940 func_80240D08_D30988 = 0x80240D08; // type:func rom:0xD30988 @@ -13633,7 +14696,7 @@ sam_08_UnkNpcAIFunc7 = 0x80240DAC; // type:func rom:0xD30A2C sam_08_UnkNpcAIFunc8 = 0x80240E1C; // type:func rom:0xD30A9C sam_08_UnkNpcAIFunc5 = 0x80240EF4; // type:func rom:0xD30B74 func_80240F48_D30BC8 = 0x80240F48; // type:func rom:0xD30BC8 -func_802410FC_D30D7C = 0x802410FC; // type:func rom:0xD30D7C +sam_08_UnkFunc7 = 0x802410FC; // type:func rom:0xD30D7C func_8024135C_D30FDC = 0x8024135C; // type:func rom:0xD30FDC func_80241610_D31290 = 0x80241610; // type:func rom:0xD31290 func_802416A4_D31324 = 0x802416A4; // type:func rom:0xD31324 @@ -13661,7 +14724,7 @@ sam_10_UnkNpcAIFunc7 = 0x8024043C; // type:func rom:0xD37C3C sam_10_UnkNpcAIFunc8 = 0x802404AC; // type:func rom:0xD37CAC sam_10_UnkNpcAIFunc5 = 0x80240584; // type:func rom:0xD37D84 func_802405D8_D37DD8 = 0x802405D8; // type:func rom:0xD37DD8 -func_8024078C_D37F8C = 0x8024078C; // type:func rom:0xD37F8C +sam_10_UnkFunc7 = 0x8024078C; // type:func rom:0xD37F8C func_802409EC_D381EC = 0x802409EC; // type:func rom:0xD381EC D_80241040_D38840 = 0x80241040; // type:data rom:0xD38840 D_80242C30_D3A430 = 0x80242C30; // type:data rom:0xD3A430 @@ -14035,7 +15098,7 @@ pra_21_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD77F20 func_80240020_D77F40 = 0x80240020; // type:func rom:0xD77F40 func_802400AC_D77FCC = 0x802400AC; // type:func rom:0xD77FCC pra_22_SetGameStatusUnk84_1 = 0x80240000; // type:func rom:0xD78880 -func_80240020_D788A0 = 0x80240020; // type:func rom:0xD788A0 +pra_22_UnkFunc11 = 0x80240020; // type:func rom:0xD788A0 func_802400DC_D7895C = 0x802400DC; // type:func rom:0xD7895C func_802401D0_D78A50 = 0x802401D0; // type:func rom:0xD78A50 func_8024025C_D78ADC = 0x8024025C; // type:func rom:0xD78ADC @@ -14113,7 +15176,7 @@ func_80240894_D7F5F4 = 0x80240894; // type:func rom:0xD7F5F4 func_80240A3C_D7F79C = 0x80240A3C; // type:func rom:0xD7F79C delete_actor_D7F91C = 0x80240BBC; // type:func rom:0xD7F91C func_80240C70_D7F9D0 = 0x80240C70; // type:func rom:0xD7F9D0 -func_80240DBC_D7FB1C = 0x80240DBC; // type:func rom:0xD7FB1C +pra_31_UnkFunc12 = 0x80240DBC; // type:func rom:0xD7FB1C func_80240E70_D7FBD0 = 0x80240E70; // type:func rom:0xD7FBD0 func_80240F2C_D7FC8C = 0x80240F2C; // type:func rom:0xD7FC8C func_80240FD0_D7FD30 = 0x80240FD0; // type:func rom:0xD7FD30 @@ -14180,23 +15243,23 @@ pra_35_SetPartnerFlagsA0000 = 0x80240E84; // type:func rom:0xD8E0D4 pra_35_SetPartnerFlags80000 = 0x80240EB8; // type:func rom:0xD8E108 pra_35_SetPartnerFlags20000 = 0x80240EEC; // type:func rom:0xD8E13C func_80240F20_D8E170 = 0x80240F20; // type:func rom:0xD8E170 -func_80241078_D8E2C8 = 0x80241078; // type:func rom:0xD8E2C8 +pra_35_UnkFunc13 = 0x80241078; // type:func rom:0xD8E2C8 pra_35_UnkNpcAIFunc1 = 0x80241320; // type:func rom:0xD8E570 -func_802413E0_D8E630 = 0x802413E0; // type:func rom:0xD8E630 +pra_35_UnkFunc14 = 0x802413E0; // type:func rom:0xD8E630 func_8024159C_D8E7EC = 0x8024159C; // type:func rom:0xD8E7EC pra_35_NpcJumpFunc2 = 0x80241650; // type:func rom:0xD8E8A0 pra_35_NpcJumpFunc = 0x802416C4; // type:func rom:0xD8E914 pra_35_UnkNpcAIFunc13 = 0x8024173C; // type:func rom:0xD8E98C -func_8024186C_D8EABC = 0x8024186C; // type:func rom:0xD8EABC +pra_35_UnkFunc15 = 0x8024186C; // type:func rom:0xD8EABC pra_35_UnkNpcDurationFlagFunc = 0x8024198C; // type:func rom:0xD8EBDC -func_802419F4_D8EC44 = 0x802419F4; // type:func rom:0xD8EC44 +pra_35_UnkFunc16 = 0x802419F4; // type:func rom:0xD8EC44 func_80241AB4_D8ED04 = 0x80241AB4; // type:func rom:0xD8ED04 pra_35_UnkNpcAIFunc6 = 0x80241DB0; // type:func rom:0xD8F000 pra_35_UnkNpcAIFunc7 = 0x80241E1C; // type:func rom:0xD8F06C pra_35_UnkNpcAIFunc8 = 0x80241E8C; // type:func rom:0xD8F0DC pra_35_UnkNpcAIFunc5 = 0x80241F64; // type:func rom:0xD8F1B4 func_80241FB8_D8F208 = 0x80241FB8; // type:func rom:0xD8F208 -func_8024216C_D8F3BC = 0x8024216C; // type:func rom:0xD8F3BC +pra_35_UnkFunc7 = 0x8024216C; // type:func rom:0xD8F3BC func_802423CC_D8F61C = 0x802423CC; // type:func rom:0xD8F61C func_80242698_D8F8E8 = 0x80242698; // type:func rom:0xD8F8E8 func_80242950_D8FBA0 = 0x80242950; // type:func rom:0xD8FBA0 @@ -14242,7 +15305,7 @@ pra_37_UnkNpcAIFunc7 = 0x80240FBC; // type:func rom:0xD93EFC pra_37_UnkNpcAIFunc8 = 0x8024102C; // type:func rom:0xD93F6C pra_37_UnkNpcAIFunc5 = 0x80241104; // type:func rom:0xD94044 func_80241158_D94098 = 0x80241158; // type:func rom:0xD94098 -func_8024130C_D9424C = 0x8024130C; // type:func rom:0xD9424C +pra_37_UnkFunc7 = 0x8024130C; // type:func rom:0xD9424C func_8024156C_D944AC = 0x8024156C; // type:func rom:0xD944AC D_802424E0_D95420 = 0x802424E0; // type:data rom:0xD95420 D_802424F0_D95430 = 0x802424F0; // type:data rom:0xD95430 @@ -14370,13 +15433,13 @@ func_802402F4_DAD6F4 = 0x802402F4; // type:func rom:0xDAD6F4 func_802403A0_DAD7A0 = 0x802403A0; // type:func rom:0xDAD7A0 func_80240550_DAD950 = 0x80240550; // type:func rom:0xDAD950 omo_04_UnkNpcAIFunc1 = 0x80240B78; // type:func rom:0xDADF78 -func_80240C38_DAE038 = 0x80240C38; // type:func rom:0xDAE038 +omo_04_UnkFunc4 = 0x80240C38; // type:func rom:0xDAE038 omo_04_UnkNpcAIFunc2 = 0x80240F7C; // type:func rom:0xDAE37C func_80240FF4_DAE3F4 = 0x80240FF4; // type:func rom:0xDAE3F4 omo_04_UnkNpcAIFunc14 = 0x80241060; // type:func rom:0xDAE460 omo_04_UnkNpcAIFunc3 = 0x80241194; // type:func rom:0xDAE594 -func_802411F8_DAE5F8 = 0x802411F8; // type:func rom:0xDAE5F8 -func_80241588_DAE988 = 0x80241588; // type:func rom:0xDAE988 +omo_04_UnkFunc6 = 0x802411F8; // type:func rom:0xDAE5F8 +omo_04_UnkFunc5 = 0x80241588; // type:func rom:0xDAE988 func_802416AC_DAEAAC = 0x802416AC; // type:func rom:0xDAEAAC func_80241898_DAEC98 = 0x80241898; // type:func rom:0xDAEC98 func_80241908_DAED08 = 0x80241908; // type:func rom:0xDAED08 @@ -14404,13 +15467,13 @@ func_80240780_DB2A40 = 0x80240780; // type:func rom:0xDB2A40 func_80240A54_DB2D14 = 0x80240A54; // type:func rom:0xDB2D14 func_80240C04_DB2EC4 = 0x80240C04; // type:func rom:0xDB2EC4 omo_05_UnkNpcAIFunc1 = 0x8024122C; // type:func rom:0xDB34EC -func_802412EC_DB35AC = 0x802412EC; // type:func rom:0xDB35AC +omo_05_UnkFunc4 = 0x802412EC; // type:func rom:0xDB35AC omo_05_UnkNpcAIFunc2 = 0x80241630; // type:func rom:0xDB38F0 func_802416A8_DB3968 = 0x802416A8; // type:func rom:0xDB3968 omo_05_UnkNpcAIFunc14 = 0x80241714; // type:func rom:0xDB39D4 omo_05_UnkNpcAIFunc3 = 0x80241848; // type:func rom:0xDB3B08 -func_802418AC_DB3B6C = 0x802418AC; // type:func rom:0xDB3B6C -func_80241C3C_DB3EFC = 0x80241C3C; // type:func rom:0xDB3EFC +omo_05_UnkFunc6 = 0x802418AC; // type:func rom:0xDB3B6C +omo_05_UnkFunc5 = 0x80241C3C; // type:func rom:0xDB3EFC func_80241D60_DB4020 = 0x80241D60; // type:func rom:0xDB4020 omo_05_GetNpcCollisionHeight = 0x80241F4C; // type:func rom:0xDB420C omo_05_SomeXYZFuncTodoRename = 0x80241FA8; // type:func rom:0xDB4268 @@ -14452,16 +15515,16 @@ func_80240140_DBD3F0 = 0x80240140; // type:func rom:0xDBD3F0 func_802401D8_DBD488 = 0x802401D8; // type:func rom:0xDBD488 func_80240238_DBD4E8 = 0x80240238; // type:func rom:0xDBD4E8 func_8024056C_DBD81C = 0x8024056C; // type:func rom:0xDBD81C -func_802406C4_DBD974 = 0x802406C4; // type:func rom:0xDBD974 +omo_07_UnkFunc13 = 0x802406C4; // type:func rom:0xDBD974 omo_07_UnkNpcAIFunc1 = 0x8024096C; // type:func rom:0xDBDC1C -func_80240A2C_DBDCDC = 0x80240A2C; // type:func rom:0xDBDCDC +omo_07_UnkFunc14 = 0x80240A2C; // type:func rom:0xDBDCDC func_80240BE8_DBDE98 = 0x80240BE8; // type:func rom:0xDBDE98 omo_07_NpcJumpFunc2 = 0x80240C9C; // type:func rom:0xDBDF4C omo_07_NpcJumpFunc = 0x80240D10; // type:func rom:0xDBDFC0 omo_07_UnkNpcAIFunc13 = 0x80240D88; // type:func rom:0xDBE038 -func_80240EB8_DBE168 = 0x80240EB8; // type:func rom:0xDBE168 +omo_07_UnkFunc15 = 0x80240EB8; // type:func rom:0xDBE168 omo_07_UnkNpcDurationFlagFunc = 0x80240FD8; // type:func rom:0xDBE288 -func_80241040_DBE2F0 = 0x80241040; // type:func rom:0xDBE2F0 +omo_07_UnkFunc16 = 0x80241040; // type:func rom:0xDBE2F0 func_80241100_DBE3B0 = 0x80241100; // type:func rom:0xDBE3B0 func_802413FC_DBE6AC = 0x802413FC; // type:func rom:0xDBE6AC func_8024146C_DBE71C = 0x8024146C; // type:func rom:0xDBE71C @@ -14471,13 +15534,13 @@ func_80241634_DBE8E4 = 0x80241634; // type:func rom:0xDBE8E4 func_80241978_DBEC28 = 0x80241978; // type:func rom:0xDBEC28 func_80241B28_DBEDD8 = 0x80241B28; // type:func rom:0xDBEDD8 dup_omo_07_UnkNpcAIFunc1 = 0x80242150; // type:func rom:0xDBF400 -func_80242210_DBF4C0 = 0x80242210; // type:func rom:0xDBF4C0 +omo_07_UnkFunc4 = 0x80242210; // type:func rom:0xDBF4C0 omo_07_UnkNpcAIFunc2 = 0x80242554; // type:func rom:0xDBF804 func_802425CC_DBF87C = 0x802425CC; // type:func rom:0xDBF87C omo_07_UnkNpcAIFunc14 = 0x80242638; // type:func rom:0xDBF8E8 omo_07_UnkNpcAIFunc3 = 0x8024276C; // type:func rom:0xDBFA1C -func_802427D0_DBFA80 = 0x802427D0; // type:func rom:0xDBFA80 -func_80242B60_DBFE10 = 0x80242B60; // type:func rom:0xDBFE10 +omo_07_UnkFunc6 = 0x802427D0; // type:func rom:0xDBFA80 +omo_07_UnkFunc5 = 0x80242B60; // type:func rom:0xDBFE10 func_80242C84_DBFF34 = 0x80242C84; // type:func rom:0xDBFF34 func_80242E70_DC0120 = 0x80242E70; // type:func rom:0xDC0120 func_80242E8C_DC013C = 0x80242E8C; // type:func rom:0xDC013C @@ -14533,16 +15596,16 @@ func_80240B20_DCD7F0 = 0x80240B20; // type:func rom:0xDCD7F0 func_80240BB8_DCD888 = 0x80240BB8; // type:func rom:0xDCD888 func_80240C18_DCD8E8 = 0x80240C18; // type:func rom:0xDCD8E8 func_80240F4C_DCDC1C = 0x80240F4C; // type:func rom:0xDCDC1C -func_802410A4_DCDD74 = 0x802410A4; // type:func rom:0xDCDD74 +omo_09_UnkFunc13 = 0x802410A4; // type:func rom:0xDCDD74 omo_09_UnkNpcAIFunc1 = 0x8024134C; // type:func rom:0xDCE01C -func_8024140C_DCE0DC = 0x8024140C; // type:func rom:0xDCE0DC +omo_09_UnkFunc14 = 0x8024140C; // type:func rom:0xDCE0DC func_802415C8_DCE298 = 0x802415C8; // type:func rom:0xDCE298 omo_09_NpcJumpFunc2 = 0x8024167C; // type:func rom:0xDCE34C omo_09_NpcJumpFunc = 0x802416F0; // type:func rom:0xDCE3C0 omo_09_UnkNpcAIFunc13 = 0x80241768; // type:func rom:0xDCE438 -func_80241898_DCE568 = 0x80241898; // type:func rom:0xDCE568 +omo_09_UnkFunc15 = 0x80241898; // type:func rom:0xDCE568 omo_09_UnkNpcDurationFlagFunc = 0x802419B8; // type:func rom:0xDCE688 -func_80241A20_DCE6F0 = 0x80241A20; // type:func rom:0xDCE6F0 +omo_09_UnkFunc16 = 0x80241A20; // type:func rom:0xDCE6F0 func_80241AE0_DCE7B0 = 0x80241AE0; // type:func rom:0xDCE7B0 func_80241DDC_DCEAAC = 0x80241DDC; // type:func rom:0xDCEAAC func_80241E4C_DCEB1C = 0x80241E4C; // type:func rom:0xDCEB1C @@ -14593,20 +15656,20 @@ omo_10_UnkTexturePanFunc2 = 0x80240680; // type:func rom:0xDD8030 func_80240000_DDC830 = 0x80240000; // type:func rom:0xDDC830 func_802401A0_DDC9D0 = 0x802401A0; // type:func rom:0xDDC9D0 omo_11_SetOverrideFlags_40 = 0x80240790; // type:func rom:0xDDCFC0 -func_802407AC_DDCFDC = 0x802407AC; // type:func rom:0xDDCFDC +omo_11_UnkFunc17 = 0x802407AC; // type:func rom:0xDDCFDC func_802407CC_DDCFFC = 0x802407CC; // type:func rom:0xDDCFFC -func_802407F8_DDD028 = 0x802407F8; // type:func rom:0xDDD028 +omo_11_UnkFunc18 = 0x802407F8; // type:func rom:0xDDD028 func_80240864_DDD094 = 0x80240864; // type:func rom:0xDDD094 func_802408B0_DDD0E0 = 0x802408B0; // type:func rom:0xDDD0E0 func_8024095C_DDD18C = 0x8024095C; // type:func rom:0xDDD18C func_80240BAC_DDD3DC = 0x80240BAC; // type:func rom:0xDDD3DC -func_80240BD8_DDD408 = 0x80240BD8; // type:func rom:0xDDD408 -func_80240C10_DDD440 = 0x80240C10; // type:func rom:0xDDD440 +omo_11_UnkFunc19 = 0x80240BD8; // type:func rom:0xDDD408 +omo_11_UnkFunc20 = 0x80240C10; // type:func rom:0xDDD440 func_80240CA0_DDD4D0 = 0x80240CA0; // type:func rom:0xDDD4D0 -func_80240CD4_DDD504 = 0x80240CD4; // type:func rom:0xDDD504 -func_80240D38_DDD568 = 0x80240D38; // type:func rom:0xDDD568 +omo_11_UnkFunc21 = 0x80240CD4; // type:func rom:0xDDD504 +omo_11_UnkFunc22 = 0x80240D38; // type:func rom:0xDDD568 func_80240D90_DDD5C0 = 0x80240D90; // type:func rom:0xDDD5C0 -func_802412C8_DDDAF8 = 0x802412C8; // type:func rom:0xDDDAF8 +omo_11_UnkFunc23 = 0x802412C8; // type:func rom:0xDDDAF8 omo_11_UnkPartnerPosFunc = 0x80241408; // type:func rom:0xDDDC38 omo_11_UnkPartnerPosFunc2 = 0x80241450; // type:func rom:0xDDDC80 func_80241498_DDDCC8 = 0x80241498; // type:func rom:0xDDDCC8 @@ -14691,13 +15754,13 @@ func_80240CE0_DEFB80 = 0x80240CE0; // type:func rom:0xDEFB80 func_80240FB4_DEFE54 = 0x80240FB4; // type:func rom:0xDEFE54 func_80241164_DF0004 = 0x80241164; // type:func rom:0xDF0004 omo_17_UnkNpcAIFunc1 = 0x8024178C; // type:func rom:0xDF062C -func_8024184C_DF06EC = 0x8024184C; // type:func rom:0xDF06EC +omo_17_UnkFunc4 = 0x8024184C; // type:func rom:0xDF06EC omo_17_UnkNpcAIFunc2 = 0x80241B90; // type:func rom:0xDF0A30 func_80241C08_DF0AA8 = 0x80241C08; // type:func rom:0xDF0AA8 omo_17_UnkNpcAIFunc14 = 0x80241C74; // type:func rom:0xDF0B14 omo_17_UnkNpcAIFunc3 = 0x80241DA8; // type:func rom:0xDF0C48 -func_80241E0C_DF0CAC = 0x80241E0C; // type:func rom:0xDF0CAC -func_8024219C_DF103C = 0x8024219C; // type:func rom:0xDF103C +omo_17_UnkFunc6 = 0x80241E0C; // type:func rom:0xDF0CAC +omo_17_UnkFunc5 = 0x8024219C; // type:func rom:0xDF103C func_802422C0_DF1160 = 0x802422C0; // type:func rom:0xDF1160 func_802424AC_DF134C = 0x802424AC; // type:func rom:0xDF134C func_8024269C_DF153C = 0x8024269C; // type:func rom:0xDF153C @@ -14809,16 +15872,16 @@ mgm_00_GetEntryPos = 0x802400F0; // type:func rom:0xE0E890 mgm_00_GetCurrentCameraYawClamped180 = 0x802401D0; // type:func rom:0xE0E970 mgm_00_SomeXYZFunc2 = 0x8024023C; // type:func rom:0xE0E9DC func_802402E0_E0EA80 = 0x802402E0; // type:func rom:0xE0EA80 -func_80240438_E0EBD8 = 0x80240438; // type:func rom:0xE0EBD8 +mgm_00_UnkFunc13 = 0x80240438; // type:func rom:0xE0EBD8 mgm_00_UnkNpcAIFunc1 = 0x802406E0; // type:func rom:0xE0EE80 -func_802407A0_E0EF40 = 0x802407A0; // type:func rom:0xE0EF40 +mgm_00_UnkFunc14 = 0x802407A0; // type:func rom:0xE0EF40 func_8024095C_E0F0FC = 0x8024095C; // type:func rom:0xE0F0FC mgm_00_NpcJumpFunc2 = 0x80240A10; // type:func rom:0xE0F1B0 mgm_00_NpcJumpFunc = 0x80240A84; // type:func rom:0xE0F224 mgm_00_UnkNpcAIFunc13 = 0x80240AFC; // type:func rom:0xE0F29C -func_80240C2C_E0F3CC = 0x80240C2C; // type:func rom:0xE0F3CC +mgm_00_UnkFunc15 = 0x80240C2C; // type:func rom:0xE0F3CC mgm_00_UnkNpcDurationFlagFunc = 0x80240D4C; // type:func rom:0xE0F4EC -func_80240DB4_E0F554 = 0x80240DB4; // type:func rom:0xE0F554 +mgm_00_UnkFunc16 = 0x80240DB4; // type:func rom:0xE0F554 func_80240E74_E0F614 = 0x80240E74; // type:func rom:0xE0F614 func_80241170_E0F910 = 0x80241170; // type:func rom:0xE0F910 func_802411E0_E0F980 = 0x802411E0; // type:func rom:0xE0F980 @@ -14915,7 +15978,7 @@ gv_01_UnkTexturePanFunc = 0x802402E0; // type:func rom:0xE1E740 gv_01_UnkTexturePanFunc2 = 0x80240404; // type:func rom:0xE1E864 func_802405EC_E1EA4C = 0x802405EC; // type:func rom:0xE1EA4C func_80240688_E1EAE8 = 0x80240688; // type:func rom:0xE1EAE8 -code_E20110_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110 +E20110_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20110 func_802B70B4_E201C4 = 0x802B70B4; // type:func rom:0xE201C4 func_802B71E8_E202F8 = 0x802B71E8; // type:func rom:0xE202F8 func_802B7450_E20560 = 0x802B7450; // type:func rom:0xE20560 @@ -14928,7 +15991,7 @@ D_802B7C40_E20D50 = 0x802B7C40; // type:data rom:0xE20D50 D_802B7CB8_E20DC8 = 0x802B7CB8; // type:data rom:0xE20DC8 D_802B7D88_E20E98 = 0x802B7D88; // type:data rom:0xE20E98 D_802B7D90_E20EA0 = 0x802B7D90; // type:data rom:0xE20EA0 -code_e20eb0_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20EB0 +e20eb0_UnkAngleFunc1 = 0x802B7000; // type:func rom:0xE20EB0 func_802B70B4 = 0x802B70B4; // type:func rom:0xE20F64 func_802B71C8 = 0x802B71C8; // type:func rom:0xE21078 func_802B742C = 0x802B742C; // type:func rom:0xE212DC @@ -15148,8 +16211,8 @@ D_802BCBC0_E31510 = 0x802BCBC0; // type:data rom:0xE31510 D_802BCBC8_E31518 = 0x802BCBC8; // type:data rom:0xE31518 D_802BCBD0_E31520 = 0x802BCBD0; // type:data rom:0xE31520 D_802BCBD8_E31528 = 0x802BCBD8; // type:data rom:0xE31528 -code_EA0900_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEA0900 -code_EA0900_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA0A24 +EA0900_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEA0900 +EA0900_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA0A24 func_80240310_EA0C10 = 0x80240310; // type:func rom:0xEA0C10 func_8024037C_EA0C7C = 0x8024037C; // type:func rom:0xEA0C7C func_802403EC_EA0CEC = 0x802403EC; // type:func rom:0xEA0CEC @@ -15213,8 +16276,8 @@ func_80240164_EA7134 = 0x80240164; // type:func rom:0xEA7134 func_80240350_EA7320 = 0x80240350; // type:func rom:0xEA7320 func_8024036C_EA733C = 0x8024036C; // type:func rom:0xEA733C func_80240388_EA7358 = 0x80240388; // type:func rom:0xEA7358 -code_EA8AE0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEA8AE0 -code_EA8AE0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA8C04 +EA8AE0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEA8AE0 +EA8AE0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEA8C04 func_8024030C_EA8DEC = 0x8024030C; // type:func rom:0xEA8DEC func_80240358_EA8E38 = 0x80240358; // type:func rom:0xEA8E38 func_802404B8_EA8F98 = 0x802404B8; // type:func rom:0xEA8F98 @@ -15247,8 +16310,8 @@ D_80243D74_EAC854 = 0x80243D74; // type:data rom:0xEAC854 D_80243DD8_EAC8B8 = 0x80243DD8; // type:data rom:0xEAC8B8 D_80243DDC_EAC8BC = 0x80243DDC; // type:data rom:0xEAC8BC D_80248370_EB0E50 = 0x80248370; // type:data rom:0xEB0E50 -code_EB0E60_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB0E60 -code_EB0E60_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB0F84 +EB0E60_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB0E60 +EB0E60_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB0F84 func_80240310_EB1170 = 0x80240310; // type:func rom:0xEB1170 func_802403C4_EB1224 = 0x802403C4; // type:func rom:0xEB1224 func_80240428_EB1288 = 0x80240428; // type:func rom:0xEB1288 @@ -15265,13 +16328,13 @@ func_80240A8C_EB18EC = 0x80240A8C; // type:func rom:0xEB18EC D_80241780_EB25E0 = 0x80241780; // type:data rom:0xEB25E0 D_802417E4_EB2644 = 0x802417E4; // type:data rom:0xEB2644 D_802417E8_EB2648 = 0x802417E8; // type:data rom:0xEB2648 -code_EB5130_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB5130 -code_EB5130_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB5254 +EB5130_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB5130 +EB5130_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB5254 func_8024030C_EB543C = 0x8024030C; // type:func rom:0xEB543C func_80240340_EB5470 = 0x80240340; // type:func rom:0xEB5470 func_8024036C_EB549C = 0x8024036C; // type:func rom:0xEB549C -code_EB7230_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB7230 -code_EB7230_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB7354 +EB7230_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEB7230 +EB7230_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEB7354 func_80240310_EB7540 = 0x80240310; // type:func rom:0xEB7540 func_802403D8_EB7608 = 0x802403D8; // type:func rom:0xEB7608 func_80240478_EB76A8 = 0x80240478; // type:func rom:0xEB76A8 @@ -15301,7 +16364,7 @@ func_802413CC_EBA21C = 0x802413CC; // type:func rom:0xEBA21C func_802413EC_EBA23C = 0x802413EC; // type:func rom:0xEBA23C D_802491F0_EC2040 = 0x802491F0; // type:data rom:0xEC2040 D_802491F8_EC2048 = 0x802491F8; // type:data rom:0xEC2048 -code_EC2200_DeadUnk1 = 0x80240000; // type:func rom:0xEC2200 +EC2200_DeadUnk1 = 0x80240000; // type:func rom:0xEC2200 func_80240040_EC2240 = 0x80240040; // type:func rom:0xEC2240 func_802400F4_EC22F4 = 0x802400F4; // type:func rom:0xEC22F4 func_80240158_EC2358 = 0x80240158; // type:func rom:0xEC2358 @@ -15311,8 +16374,8 @@ D_80240F28_EC3128 = 0x80240F28; // type:data rom:0xEC3128 D_80244F88_EC7188 = 0x80244F88; // type:data rom:0xEC7188 D_80244F90_EC7190 = 0x80244F90; // type:data rom:0xEC7190 D_80244F98_EC7198 = 0x80244F98; // type:data rom:0xEC7198 -code_EC71B0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEC71B0 -code_EC71B0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEC72D4 +EC71B0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEC71B0 +EC71B0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEC72D4 func_8024030C_EC74BC = 0x8024030C; // type:func rom:0xEC74BC func_80240344_EC74F4 = 0x80240344; // type:func rom:0xEC74F4 func_802403E0_EC7590 = 0x802403E0; // type:func rom:0xEC7590 @@ -15335,10 +16398,10 @@ func_80240544_ECA244 = 0x80240544; // type:func rom:0xECA244 func_802405A8_ECA2A8 = 0x802405A8; // type:func rom:0xECA2A8 func_80240600_ECA300 = 0x80240600; // type:func rom:0xECA300 func_80240B38_ECA838 = 0x80240B38; // type:func rom:0xECA838 -code_EC9D00_DeadUnkPartnerPosFunc = 0x80240C78; // type:func rom:0xECA978 -code_EC9D00_DeadUnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xECA9C0 +EC9D00_DeadUnkPartnerPosFunc = 0x80240C78; // type:func rom:0xECA978 +EC9D00_DeadUnkPartnerPosFunc2 = 0x80240CC0; // type:func rom:0xECA9C0 func_80240D08_ECAA08 = 0x80240D08; // type:func rom:0xECAA08 -code_ECAA40_DeadUnk1 = 0x80240D40; // type:func rom:0xECAA40 +ECAA40_DeadUnk1 = 0x80240D40; // type:func rom:0xECAA40 func_80240D80_ECAA80 = 0x80240D80; // type:func rom:0xECAA80 func_80241364_ECB064 = 0x80241364; // type:func rom:0xECB064 func_802414C8_ECB1C8 = 0x802414C8; // type:func rom:0xECB1C8 @@ -15360,7 +16423,7 @@ D_80241FF8_ECBCF8 = 0x80241FF8; // type:data rom:0xECBCF8 D_80242038_ECBD38 = 0x80242038; // type:data rom:0xECBD38 D_802430B8_ECCDB8 = 0x802430B8; // type:data rom:0xECCDB8 D_802430BC_ECCDBC = 0x802430BC; // type:data rom:0xECCDBC -code_ECFFF0_DeadUnk1 = 0x80240000; // type:func rom:0xECFFF0 +ECFFF0_DeadUnk1 = 0x80240000; // type:func rom:0xECFFF0 func_80240040_ED0030 = 0x80240040; // type:func rom:0xED0030 func_802400E0_ED00D0 = 0x802400E0; // type:func rom:0xED00D0 func_80240150_ED0140 = 0x80240150; // type:func rom:0xED0140 @@ -15370,7 +16433,7 @@ func_80240AF8_ED0AE8 = 0x80240AF8; // type:func rom:0xED0AE8 func_80240BB8_ED0BA8 = 0x80240BB8; // type:func rom:0xED0BA8 func_80240EFC_ED0EEC = 0x80240EFC; // type:func rom:0xED0EEC func_80240F74_ED0F64 = 0x80240F74; // type:func rom:0xED0F64 -code_ED0310_DeadUnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xED0FD0 +ED0310_DeadUnkNpcAIFunc14 = 0x80240FE0; // type:func rom:0xED0FD0 func_80241114_ED1104 = 0x80241114; // type:func rom:0xED1104 func_80241178_ED1168 = 0x80241178; // type:func rom:0xED1168 func_80241508_ED14F8 = 0x80241508; // type:func rom:0xED14F8 @@ -15380,7 +16443,7 @@ D_802441D0_ED41C0 = 0x802441D0; // type:data rom:0xED41C0 D_802441D8_ED41C8 = 0x802441D8; // type:data rom:0xED41C8 D_802441E0_ED41D0 = 0x802441E0; // type:data rom:0xED41D0 func_80240000_ED4220 = 0x80240000; // type:func rom:0xED4220 -code_ED4260_DeadUnk1 = 0x80240040; // type:func rom:0xED4260 +ED4260_DeadUnk1 = 0x80240040; // type:func rom:0xED4260 func_80240080_ED42A0 = 0x80240080; // type:func rom:0xED42A0 func_80240134_ED4354 = 0x80240134; // type:func rom:0xED4354 func_80240198_ED43B8 = 0x80240198; // type:func rom:0xED43B8 @@ -15422,7 +16485,7 @@ func_8024099C_EDF35C = 0x8024099C; // type:func rom:0xEDF35C func_80240A5C_EDF41C = 0x80240A5C; // type:func rom:0xEDF41C func_80240DA0_EDF760 = 0x80240DA0; // type:func rom:0xEDF760 func_80240E18_EDF7D8 = 0x80240E18; // type:func rom:0xEDF7D8 -code_EDEA00_DeadUnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xEDF844 +EDEA00_DeadUnkNpcAIFunc14 = 0x80240E84; // type:func rom:0xEDF844 func_80240FB8_EDF978 = 0x80240FB8; // type:func rom:0xEDF978 func_8024101C_EDF9DC = 0x8024101C; // type:func rom:0xEDF9DC func_802413AC_EDFD6C = 0x802413AC; // type:func rom:0xEDFD6C @@ -15448,8 +16511,8 @@ D_80247B00_EE64C0 = 0x80247B00; // type:data rom:0xEE64C0 D_80247B50_EE6510 = 0x80247B50; // type:data rom:0xEE6510 D_80247BB0_EE6570 = 0x80247BB0; // type:data rom:0xEE6570 D_80247BE0_EE65A0 = 0x80247BE0; // type:data rom:0xEE65A0 -code_EE65B0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEE65B0 -code_EE65B0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEE66D4 +EE65B0_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEE65B0 +EE65B0_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEE66D4 func_8024030C_EE68BC = 0x8024030C; // type:func rom:0xEE68BC func_80240340_EE68F0 = 0x80240340; // type:func rom:0xEE68F0 func_802403D4_EE6984 = 0x802403D4; // type:func rom:0xEE6984 @@ -15463,7 +16526,7 @@ func_802412E8_EE7898 = 0x802412E8; // type:func rom:0xEE7898 func_802413A8_EE7958 = 0x802413A8; // type:func rom:0xEE7958 func_802416EC_EE7C9C = 0x802416EC; // type:func rom:0xEE7C9C func_80241764_EE7D14 = 0x80241764; // type:func rom:0xEE7D14 -code_EE70C0_DeadUnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xEE7D80 +EE70C0_DeadUnkNpcAIFunc14 = 0x802417D0; // type:func rom:0xEE7D80 func_80241904_EE7EB4 = 0x80241904; // type:func rom:0xEE7EB4 func_80241968_EE7F18 = 0x80241968; // type:func rom:0xEE7F18 func_80241CF8_EE82A8 = 0x80241CF8; // type:func rom:0xEE82A8 @@ -15490,7 +16553,7 @@ D_80245380_EEB930 = 0x80245380; // type:data rom:0xEEB930 D_80245388_EEB938 = 0x80245388; // type:data rom:0xEEB938 D_80245390_EEB940 = 0x80245390; // type:data rom:0xEEB940 D_802453E0_EEB990 = 0x802453E0; // type:data rom:0xEEB990 -code_EED100_DeadUnk1 = 0x80240000; // type:func rom:0xEED100 +EED100_DeadUnk1 = 0x80240000; // type:func rom:0xEED100 func_80240040_EED140 = 0x80240040; // type:func rom:0xEED140 func_802400E0_EED1E0 = 0x802400E0; // type:func rom:0xEED1E0 func_802400FC_EED1FC = 0x802400FC; // type:func rom:0xEED1FC @@ -15507,8 +16570,8 @@ func_80240624_EED724 = 0x80240624; // type:func rom:0xEED724 func_80240688_EED788 = 0x80240688; // type:func rom:0xEED788 func_802406E0_EED7E0 = 0x802406E0; // type:func rom:0xEED7E0 func_80240C18_EEDD18 = 0x80240C18; // type:func rom:0xEEDD18 -code_EED1E0_DeadUnkPartnerPosFunc = 0x80240D58; // type:func rom:0xEEDE58 -code_EED1E0_DeadUnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xEEDEA0 +EED1E0_DeadUnkPartnerPosFunc = 0x80240D58; // type:func rom:0xEEDE58 +EED1E0_DeadUnkPartnerPosFunc2 = 0x80240DA0; // type:func rom:0xEEDEA0 func_80240DE8_EEDEE8 = 0x80240DE8; // type:func rom:0xEEDEE8 func_80240E18_EEDF18 = 0x80240E18; // type:func rom:0xEEDF18 func_80240E50_EEDF50 = 0x80240E50; // type:func rom:0xEEDF50 @@ -15517,7 +16580,7 @@ func_80241628_EEE728 = 0x80241628; // type:func rom:0xEEE728 func_802416E8_EEE7E8 = 0x802416E8; // type:func rom:0xEEE7E8 func_80241A2C_EEEB2C = 0x80241A2C; // type:func rom:0xEEEB2C func_80241AA4_EEEBA4 = 0x80241AA4; // type:func rom:0xEEEBA4 -code_EEDF50_DeadUnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xEEEC10 +EEDF50_DeadUnkNpcAIFunc14 = 0x80241B10; // type:func rom:0xEEEC10 func_80241C44_EEED44 = 0x80241C44; // type:func rom:0xEEED44 func_80241CA8_EEEDA8 = 0x80241CA8; // type:func rom:0xEEEDA8 func_80242038_EEF138 = 0x80242038; // type:func rom:0xEEF138 @@ -15536,7 +16599,7 @@ D_80245450_EF2550 = 0x80245450; // type:data rom:0xEF2550 D_80245458_EF2558 = 0x80245458; // type:data rom:0xEF2558 D_80245460_EF2560 = 0x80245460; // type:data rom:0xEF2560 D_802454A8_EF25A8 = 0x802454A8; // type:data rom:0xEF25A8 -code_EF2610_DeadUnk1 = 0x80240000; // type:func rom:0xEF2610 +EF2610_DeadUnk1 = 0x80240000; // type:func rom:0xEF2610 func_80240040_EF2650 = 0x80240040; // type:func rom:0xEF2650 func_80240070_EF2680 = 0x80240070; // type:func rom:0xEF2680 func_80240220_EF2830 = 0x80240220; // type:func rom:0xEF2830 @@ -15544,7 +16607,7 @@ func_80240848_EF2E58 = 0x80240848; // type:func rom:0xEF2E58 func_80240908_EF2F18 = 0x80240908; // type:func rom:0xEF2F18 func_80240C4C_EF325C = 0x80240C4C; // type:func rom:0xEF325C func_80240CC4_EF32D4 = 0x80240CC4; // type:func rom:0xEF32D4 -code_EF2680_DeadUnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xEF3340 +EF2680_DeadUnkNpcAIFunc14 = 0x80240D30; // type:func rom:0xEF3340 func_80240E64_EF3474 = 0x80240E64; // type:func rom:0xEF3474 func_80240EC8_EF34D8 = 0x80240EC8; // type:func rom:0xEF34D8 func_80241258_EF3868 = 0x80241258; // type:func rom:0xEF3868 @@ -15565,27 +16628,1260 @@ D_802453B8_EF79C8 = 0x802453B8; // type:data rom:0xEF79C8 D_802453C0_EF79D0 = 0x802453C0; // type:data rom:0xEF79D0 D_80245408_EF7A18 = 0x80245408; // type:data rom:0xEF7A18 D_80245468_EF7A78 = 0x80245468; // type:data rom:0xEF7A78 -code_EF7A80_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEF7A80 -code_EF7A80_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEF7BA4 -code_EF7A80_DeadUnk1 = 0x8024030C; // type:func rom:0xEF7D8C +EF7A80_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEF7A80 +EF7A80_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEF7BA4 +EF7A80_DeadUnk1 = 0x8024030C; // type:func rom:0xEF7D8C func_80240340_EF7DC0 = 0x80240340; // type:func rom:0xEF7DC0 -code_EF7A80_DeadUnkFloatFunc = 0x80240394; // type:func rom:0xEF7E14 +EF7A80_DeadUnkFloatFunc = 0x80240394; // type:func rom:0xEF7E14 func_80240530_EF7FB0 = 0x80240530; // type:func rom:0xEF7FB0 func_80240590_EF8010 = 0x80240590; // type:func rom:0xEF8010 func_80240600_EF8080 = 0x80240600; // type:func rom:0xEF8080 -code_EFEB00_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEFEB00 -code_EFEB00_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEFEC24 -code_EFEB00_DeadUnk1 = 0x8024030C; // type:func rom:0xEFEE0C +EFEB00_DeadUnkTexturePanFunc = 0x80240000; // type:func rom:0xEFEB00 +EFEB00_DeadUnkTexturePanFunc2 = 0x80240124; // type:func rom:0xEFEC24 +EFEB00_DeadUnk1 = 0x8024030C; // type:func rom:0xEFEE0C func_80240340_EFEE40 = 0x80240340; // type:func rom:0xEFEE40 func_802404D0_EFEFD0 = 0x802404D0; // type:func rom:0xEFEFD0 func_80240540_EFF040 = 0x80240540; // type:func rom:0xEFF040 func_80240660_EFF160 = 0x80240660; // type:func rom:0xEFF160 func_80240784_EFF284 = 0x80240784; // type:func rom:0xEFF284 func_802407B0_EFF2B0 = 0x802407B0; // type:func rom:0xEFF2B0 +header_ROM_END = 0x40; // type:data D_00000094 = 0x94; // type:data D_00000094_2 = 0x94; // type:data +D_000001E4 = 0x1E4; // type:data +boot_ROM_END = 0x1000; // type:data D_00074210 = 0x74210; // type:data D_00074230 = 0x74230; // type:data +A5DD0_ROM_END = 0xE79B0; // type:data +E79B0_ROM_END = 0xFEE30; // type:data +FEE30_ROM_END = 0x102610; // type:data +peach_letter_ROM_END = 0x11A440; // type:data +pause_ROM_END = 0x163400; // type:data +icon_present_ROM_END = 0x1CC530; // type:data +icon_cake_finished_cake_ROM_END = 0x1CC750; // type:data +icon_cake_cake_base_ROM_END = 0x1CC970; // type:data +icon_cake_cake_tin_ROM_END = 0x1CCB90; // type:data +icon_cake_baked_cake_ROM_END = 0x1CCDB0; // type:data +icon_cake_mixing_bowl_ROM_END = 0x1CCFD0; // type:data +icon_cake_cake_batter_ROM_END = 0x1CD1F0; // type:data +icon_cake_iced_cake_ROM_END = 0x1CD410; // type:data +icon_cake_uniced_cake_ROM_END = 0x1CD630; // type:data +icon_upgrade_boots_ROM_END = 0x1CD850; // type:data +icon_upgrade_super_boots_ROM_END = 0x1CDA70; // type:data +icon_upgrade_ultra_boots_ROM_END = 0x1CDC90; // type:data +icon_upgrade_hammer_ROM_END = 0x1CDEB0; // type:data +icon_upgrade_super_hammer_ROM_END = 0x1CE0D0; // type:data +icon_upgrade_ultra_hammer_ROM_END = 0x1CE2F0; // type:data +icon_upgrade_lucky_star_ROM_END = 0x1CE510; // type:data +icon_upgrade_unk_item_1CE510_ROM_END = 0x1CE730; // type:data +icon_recipe_spicy_soup_ROM_END = 0x1CE950; // type:data +icon_recipe_spicy_soup_disabled_ROM_END = 0x1CE970; // type:data +icon_recipe_apple_pie_ROM_END = 0x1CEB90; // type:data +icon_recipe_apple_pie_disabled_ROM_END = 0x1CEBB0; // type:data +icon_recipe_honey_ultra_ROM_END = 0x1CEDD0; // type:data +icon_recipe_honey_ultra_disabled_ROM_END = 0x1CEDF0; // type:data +icon_recipe_maple_ultra_ROM_END = 0x1CF010; // type:data +icon_recipe_maple_ultra_disabled_ROM_END = 0x1CF030; // type:data +icon_recipe_jelly_ultra_ROM_END = 0x1CF250; // type:data +icon_recipe_jelly_ultra_disabled_ROM_END = 0x1CF270; // type:data +icon_recipe_koopasta_ROM_END = 0x1CF490; // type:data +icon_recipe_koopasta_disabled_ROM_END = 0x1CF4B0; // type:data +icon_recipe_fried_shroom_ROM_END = 0x1CF6D0; // type:data +icon_recipe_fried_shroom_disabled_ROM_END = 0x1CF6F0; // type:data +icon_recipe_shroom_cake_ROM_END = 0x1CF910; // type:data +icon_recipe_shroom_cake_disabled_ROM_END = 0x1CF930; // type:data +icon_recipe_shroom_steak_ROM_END = 0x1CFB50; // type:data +icon_recipe_shroom_steak_disabled_ROM_END = 0x1CFB70; // type:data +icon_recipe_hot_shroom_ROM_END = 0x1CFD90; // type:data +icon_recipe_hot_shroom_disabled_ROM_END = 0x1CFDB0; // type:data +icon_recipe_sweet_shroom_ROM_END = 0x1CFFD0; // type:data +icon_recipe_sweet_shroom_disabled_ROM_END = 0x1CFFF0; // type:data +icon_recipe_healthy_juice_ROM_END = 0x1D0210; // type:data +icon_recipe_healthy_juice_disabled_ROM_END = 0x1D0230; // type:data +icon_recipe_bland_meal_ROM_END = 0x1D0450; // type:data +icon_recipe_bland_meal_disabled_ROM_END = 0x1D0470; // type:data +icon_recipe_yummy_meal_ROM_END = 0x1D0690; // type:data +icon_recipe_yummy_meal_disabled_ROM_END = 0x1D06B0; // type:data +icon_recipe_deluxe_meal_ROM_END = 0x1D08D0; // type:data +icon_recipe_deluxe_meal_disabled_ROM_END = 0x1D08F0; // type:data +icon_recipe_special_shake_ROM_END = 0x1D0B10; // type:data +icon_recipe_special_shake_disabled_ROM_END = 0x1D0B30; // type:data +icon_recipe_big_cookie_ROM_END = 0x1D0D50; // type:data +icon_recipe_big_cookie_disabled_ROM_END = 0x1D0D70; // type:data +icon_recipe_cake_ROM_END = 0x1D0F90; // type:data +icon_recipe_cake_disabled_ROM_END = 0x1D0FB0; // type:data +icon_recipe_mistake_ROM_END = 0x1D11D0; // type:data +icon_recipe_mistake_disabled_ROM_END = 0x1D11F0; // type:data +icon_recipe_koopa_tea_ROM_END = 0x1D1410; // type:data +icon_recipe_koopa_tea_disabled_ROM_END = 0x1D1430; // type:data +icon_recipe_honey_super_ROM_END = 0x1D1650; // type:data +icon_recipe_honey_super_disabled_ROM_END = 0x1D1670; // type:data +icon_recipe_maple_super_ROM_END = 0x1D1890; // type:data +icon_recipe_maple_super_disabled_ROM_END = 0x1D18B0; // type:data +icon_recipe_jelly_super_ROM_END = 0x1D1AD0; // type:data +icon_recipe_jelly_super_disabled_ROM_END = 0x1D1AF0; // type:data +icon_recipe_spaghetti_ROM_END = 0x1D1D10; // type:data +icon_recipe_spaghetti_disabled_ROM_END = 0x1D1D30; // type:data +icon_recipe_egg_missile_ROM_END = 0x1D1F50; // type:data +icon_recipe_egg_missile_disabled_ROM_END = 0x1D1F70; // type:data +icon_recipe_fried_egg_ROM_END = 0x1D2190; // type:data +icon_recipe_fried_egg_disabled_ROM_END = 0x1D21B0; // type:data +icon_recipe_honey_shroom_ROM_END = 0x1D23D0; // type:data +icon_recipe_honey_shroom_disabled_ROM_END = 0x1D23F0; // type:data +icon_recipe_honey_candy_ROM_END = 0x1D2610; // type:data +icon_recipe_honey_candy_disabled_ROM_END = 0x1D2630; // type:data +icon_recipe_electro_pop_ROM_END = 0x1D2850; // type:data +icon_recipe_electro_pop_disabled_ROM_END = 0x1D2870; // type:data +icon_recipe_fire_pop_ROM_END = 0x1D2A90; // type:data +icon_recipe_fire_pop_disabled_ROM_END = 0x1D2AB0; // type:data +icon_recipe_lime_candy_ROM_END = 0x1D2CD0; // type:data +icon_recipe_lime_candy_disabled_ROM_END = 0x1D2CF0; // type:data +icon_recipe_coco_pop_ROM_END = 0x1D2F10; // type:data +icon_recipe_coco_pop_disabled_ROM_END = 0x1D2F30; // type:data +icon_recipe_lemon_candy_ROM_END = 0x1D3150; // type:data +icon_recipe_lemon_candy_disabled_ROM_END = 0x1D3170; // type:data +icon_recipe_jelly_pop_ROM_END = 0x1D3390; // type:data +icon_recipe_jelly_pop_disabled_ROM_END = 0x1D33B0; // type:data +icon_recipe_strange_cake_ROM_END = 0x1D35D0; // type:data +icon_recipe_strange_cake_disabled_ROM_END = 0x1D35F0; // type:data +icon_recipe_kooky_cookie_ROM_END = 0x1D3810; // type:data +icon_recipe_kooky_cookie_disabled_ROM_END = 0x1D3830; // type:data +icon_recipe_frozen_fries_ROM_END = 0x1D3A50; // type:data +icon_recipe_frozen_fries_disabled_ROM_END = 0x1D3A70; // type:data +icon_recipe_potato_salad_ROM_END = 0x1D3C90; // type:data +icon_recipe_potato_salad_disabled_ROM_END = 0x1D3CB0; // type:data +icon_recipe_nutty_cake_ROM_END = 0x1D3ED0; // type:data +icon_recipe_nutty_cake_disabled_ROM_END = 0x1D3EF0; // type:data +icon_recipe_maple_shroom_ROM_END = 0x1D4110; // type:data +icon_recipe_maple_shroom_disabled_ROM_END = 0x1D4130; // type:data +icon_recipe_boiled_egg_ROM_END = 0x1D4350; // type:data +icon_recipe_boiled_egg_disabled_ROM_END = 0x1D4370; // type:data +icon_recipe_yoshi_cookie_ROM_END = 0x1D4590; // type:data +icon_recipe_yoshi_cookie_disabled_ROM_END = 0x1D45B0; // type:data +icon_recipe_jelly_shroom_ROM_END = 0x1D47D0; // type:data +icon_recipe_jelly_shroom_disabled_ROM_END = 0x1D47F0; // type:data +icon_recipe_unk_item_1D47F0_ROM_END = 0x1D4A10; // type:data +icon_recipe_unk_item_1D47F0_disabled_ROM_END = 0x1D4A30; // type:data +icon_recipe_unk_item_1D4A30_ROM_END = 0x1D4C50; // type:data +icon_recipe_unk_item_1D4A30_disabled_ROM_END = 0x1D4C70; // type:data +icon_recipe_unk_item_1D4C70_ROM_END = 0x1D4E90; // type:data +icon_recipe_unk_item_1D4C70_disabled_ROM_END = 0x1D4EB0; // type:data +icon_recipe_unk_item_1D4EB0_ROM_END = 0x1D50D0; // type:data +icon_recipe_unk_item_1D4EB0_disabled_ROM_END = 0x1D50F0; // type:data +icon_recipe_unk_item_1D50F0_ROM_END = 0x1D5310; // type:data +icon_recipe_unk_item_1D50F0_disabled_ROM_END = 0x1D5330; // type:data +icon_key_item_key_ROM_END = 0x1D5550; // type:data +icon_key_item_ruins_key_ROM_END = 0x1D5770; // type:data +icon_key_item_tubbas_castle_key_ROM_END = 0x1D5990; // type:data +icon_key_item_palace_key_ROM_END = 0x1D5BB0; // type:data +icon_key_item_bowsers_castle_key_ROM_END = 0x1D5DD0; // type:data +icon_key_item_dolly_ROM_END = 0x1D5FF0; // type:data +icon_key_item_koopers_shell_ROM_END = 0x1D6210; // type:data +icon_key_item_pulse_stone_ROM_END = 0x1D6430; // type:data +icon_key_item_artifact_ROM_END = 0x1D6650; // type:data +icon_key_item_volcano_vase_ROM_END = 0x1D6870; // type:data +icon_key_item_pyramid_stone_ROM_END = 0x1D6A90; // type:data +icon_key_item_diamond_stone_ROM_END = 0x1D6CB0; // type:data +icon_key_item_lunar_stone_ROM_END = 0x1D6ED0; // type:data +icon_key_item_forest_pass_ROM_END = 0x1D70F0; // type:data +icon_key_item_broken_record_ROM_END = 0x1D7310; // type:data +icon_key_item_record_ROM_END = 0x1D7530; // type:data +icon_key_item_weight_ROM_END = 0x1D7750; // type:data +icon_key_item_boos_portrait_ROM_END = 0x1D7970; // type:data +icon_key_item_mystical_key_ROM_END = 0x1D7B90; // type:data +icon_key_item_storeroom_key_ROM_END = 0x1D7DB0; // type:data +icon_key_item_toy_train_ROM_END = 0x1D7FD0; // type:data +icon_key_item_frying_pan_ROM_END = 0x1D81F0; // type:data +icon_key_item_dictionary_ROM_END = 0x1D8410; // type:data +icon_key_item_mysterious_note_ROM_END = 0x1D8630; // type:data +icon_key_item_suspicious_note_ROM_END = 0x1D8850; // type:data +icon_key_item_magical_seed_pink_ROM_END = 0x1D8A70; // type:data +icon_key_item_magical_seed_purple_ROM_END = 0x1D8C90; // type:data +icon_key_item_magical_seed_blue_ROM_END = 0x1D8EB0; // type:data +icon_key_item_magical_seed_yellow_ROM_END = 0x1D90D0; // type:data +icon_key_item_crystal_berry_ROM_END = 0x1D92F0; // type:data +icon_key_item_water_stone_ROM_END = 0x1D9510; // type:data +icon_key_item_magical_bean_ROM_END = 0x1D9730; // type:data +icon_key_item_fertile_soil_ROM_END = 0x1D9950; // type:data +icon_key_item_miracle_water_ROM_END = 0x1D9B70; // type:data +icon_key_item_ultra_stone_ROM_END = 0x1D9D90; // type:data +icon_key_item_ultra_stone_copy_ROM_END = 0x1D9DB0; // type:data +icon_key_item_toad_doll_ROM_END = 0x1D9FD0; // type:data +icon_key_item_calculator_ROM_END = 0x1DA1F0; // type:data +icon_key_item_screwdriver_ROM_END = 0x1DA410; // type:data +icon_key_item_cookbook_ROM_END = 0x1DA630; // type:data +icon_key_item_jade_raven_ROM_END = 0x1DA850; // type:data +icon_key_item_bucket_ROM_END = 0x1DAA70; // type:data +icon_key_item_scarf_ROM_END = 0x1DAC90; // type:data +icon_key_item_red_key_ROM_END = 0x1DAEB0; // type:data +icon_key_item_red_key_copy_ROM_END = 0x1DAED0; // type:data +icon_key_item_blue_key_ROM_END = 0x1DB0F0; // type:data +icon_key_item_package_ROM_END = 0x1DB310; // type:data +icon_key_item_red_jar_ROM_END = 0x1DB530; // type:data +icon_key_item_melody_ROM_END = 0x1DB750; // type:data +icon_key_item_lyrics_ROM_END = 0x1DB970; // type:data +icon_key_item_mailbag_ROM_END = 0x1DBB90; // type:data +icon_key_item_star_stone_ROM_END = 0x1DBDB0; // type:data +icon_key_item_sneaky_parasol_ROM_END = 0x1DBFD0; // type:data +icon_key_item_sneaky_parasol_copy_ROM_END = 0x1DBFF0; // type:data +icon_key_item_peach_castle_key_ROM_END = 0x1DC210; // type:data +icon_key_item_unk_item_1DC210_ROM_END = 0x1DC430; // type:data +icon_key_item_unk_item_1DC430_ROM_END = 0x1DC650; // type:data +icon_key_item_unk_item_1DC650_ROM_END = 0x1DC870; // type:data +icon_key_item_unk_item_1DC870_ROM_END = 0x1DCA90; // type:data +icon_key_item_first_degree_card_ROM_END = 0x1DCCB0; // type:data +icon_key_item_second_degree_card_ROM_END = 0x1DCED0; // type:data +icon_key_item_third_degree_card_ROM_END = 0x1DD0F0; // type:data +icon_key_item_third_degree_card_copy_ROM_END = 0x1DD110; // type:data +icon_key_item_fourth_degree_card_ROM_END = 0x1DD330; // type:data +icon_key_item_diploma_ROM_END = 0x1DD550; // type:data +icon_key_item_crystal_ball_ROM_END = 0x1DD770; // type:data +icon_key_item_gold_credit_ROM_END = 0x1DD990; // type:data +icon_key_item_silver_credit_ROM_END = 0x1DDBB0; // type:data +icon_key_item_koopa_legends_ROM_END = 0x1DDDD0; // type:data +icon_key_item_tape_ROM_END = 0x1DDFF0; // type:data +icon_key_item_luigi_autograph_ROM_END = 0x1DE210; // type:data +icon_key_item_luigi_autograph_copy_ROM_END = 0x1DE230; // type:data +icon_key_item_empty_wallet_ROM_END = 0x1DE450; // type:data +icon_key_item_merluvlee_autograph_ROM_END = 0x1DE670; // type:data +icon_key_item_koopa_koots_shell_ROM_END = 0x1DE890; // type:data +icon_key_item_old_photo_ROM_END = 0x1DEAB0; // type:data +icon_key_item_glasses_ROM_END = 0x1DECD0; // type:data +icon_key_item_letter_ROM_END = 0x1DEEF0; // type:data +icon_key_item_letter_disabled_ROM_END = 0x1DEF10; // type:data +icon_key_item_japanese_letter_ROM_END = 0x1DF130; // type:data +icon_key_item_japanese_letter_disabled_ROM_END = 0x1DF150; // type:data +icon_key_item_green_letter_ROM_END = 0x1DF370; // type:data +icon_key_item_green_letter_disabled_ROM_END = 0x1DF390; // type:data +icon_key_item_post_card_ROM_END = 0x1DF5B0; // type:data +icon_key_item_post_card_disabled_ROM_END = 0x1DF5D0; // type:data +icon_key_item_green_book_ROM_END = 0x1DF7F0; // type:data +icon_key_item_green_book_disabled_ROM_END = 0x1DF810; // type:data +icon_key_item_letter_silhouette_ROM_END = 0x1DFA30; // type:data +icon_key_item_letter_silhouette_disabled_ROM_END = 0x1DFA50; // type:data +icon_key_item_letter_border_ROM_END = 0x1DFC70; // type:data +icon_key_item_letter_border_disabled_ROM_END = 0x1DFC90; // type:data +icon_key_item_unk_item_1DFC90_ROM_END = 0x1DFEB0; // type:data +icon_key_item_unk_item_1DFC90_disabled_ROM_END = 0x1DFED0; // type:data +icon_usable_item_please_come_back_ROM_END = 0x1E00F0; // type:data +icon_usable_item_please_come_back_disabled_ROM_END = 0x1E0110; // type:data +icon_usable_item_lotion_ROM_END = 0x1E0330; // type:data +icon_usable_item_lotion_disabled_ROM_END = 0x1E0350; // type:data +icon_usable_item_fright_jar_ROM_END = 0x1E0570; // type:data +icon_usable_item_fright_jar_disabled_ROM_END = 0x1E0590; // type:data +icon_usable_item_mystery_ROM_END = 0x1E07B0; // type:data +icon_usable_item_mystery_disabled_ROM_END = 0x1E07D0; // type:data +icon_usable_item_repel_gel_ROM_END = 0x1E09F0; // type:data +icon_usable_item_repel_gel_disabled_ROM_END = 0x1E0A10; // type:data +icon_usable_item_insecticide_grass_ROM_END = 0x1E0C30; // type:data +icon_usable_item_insecticide_grass_disabled_ROM_END = 0x1E0C50; // type:data +icon_usable_item_candy_cane_ROM_END = 0x1E0E70; // type:data +icon_usable_item_candy_cane_disabled_ROM_END = 0x1E0E90; // type:data +icon_usable_item_unk_item_1E0E90_ROM_END = 0x1E10B0; // type:data +icon_usable_item_unk_item_1E0E90_disabled_ROM_END = 0x1E10D0; // type:data +icon_badge_spin_smash_ROM_END = 0x1E12F0; // type:data +icon_badge_spin_smash_disabled_ROM_END = 0x1E1310; // type:data +icon_badge_multibounce_ROM_END = 0x1E1530; // type:data +icon_badge_multibounce_disabled_ROM_END = 0x1E1550; // type:data +icon_badge_power_plus_ROM_END = 0x1E1770; // type:data +icon_badge_power_plus_disabled_ROM_END = 0x1E1790; // type:data +icon_badge_dodge_master_ROM_END = 0x1E19B0; // type:data +icon_badge_dodge_master_disabled_ROM_END = 0x1E19D0; // type:data +icon_badge_power_bounce_ROM_END = 0x1E1BF0; // type:data +icon_badge_power_bounce_disabled_ROM_END = 0x1E1C10; // type:data +icon_badge_spike_shield_ROM_END = 0x1E1E30; // type:data +icon_badge_spike_shield_disabled_ROM_END = 0x1E1E50; // type:data +icon_badge_first_attack_ROM_END = 0x1E2070; // type:data +icon_badge_first_attack_disabled_ROM_END = 0x1E2090; // type:data +icon_badge_hp_plus_ROM_END = 0x1E22B0; // type:data +icon_badge_hp_plus_disabled_ROM_END = 0x1E22D0; // type:data +icon_badge_quake_hammer_ROM_END = 0x1E24F0; // type:data +icon_badge_quake_hammer_disabled_ROM_END = 0x1E2510; // type:data +icon_badge_double_dip_ROM_END = 0x1E2730; // type:data +icon_badge_double_dip_disabled_ROM_END = 0x1E2750; // type:data +icon_badge_power_quake_ROM_END = 0x1E2970; // type:data +icon_badge_power_quake_disabled_ROM_END = 0x1E2990; // type:data +icon_badge_mega_quake_ROM_END = 0x1E2BB0; // type:data +icon_badge_mega_quake_disabled_ROM_END = 0x1E2BD0; // type:data +icon_badge_sleep_stomp_ROM_END = 0x1E2DF0; // type:data +icon_badge_sleep_stomp_disabled_ROM_END = 0x1E2E10; // type:data +icon_badge_smash_charge_ROM_END = 0x1E3030; // type:data +icon_badge_smash_charge_disabled_ROM_END = 0x1E3050; // type:data +icon_badge_s_smash_chg_ROM_END = 0x1E3270; // type:data +icon_badge_s_smash_chg_disabled_ROM_END = 0x1E3290; // type:data +icon_badge_one_shot_smash_ROM_END = 0x1E34B0; // type:data +icon_badge_one_shot_smash_disabled_ROM_END = 0x1E34D0; // type:data +icon_badge_fire_shield_ROM_END = 0x1E36F0; // type:data +icon_badge_fire_shield_disabled_ROM_END = 0x1E3710; // type:data +icon_badge_jump_charge_ROM_END = 0x1E3930; // type:data +icon_badge_jump_charge_disabled_ROM_END = 0x1E3950; // type:data +icon_badge_s_jump_chg_ROM_END = 0x1E3B70; // type:data +icon_badge_s_jump_chg_disabled_ROM_END = 0x1E3B90; // type:data +icon_badge_one_shot_jump_ROM_END = 0x1E3DB0; // type:data +icon_badge_one_shot_jump_disabled_ROM_END = 0x1E3DD0; // type:data +icon_badge_d_down_pound_ROM_END = 0x1E3FF0; // type:data +icon_badge_d_down_pound_disabled_ROM_END = 0x1E4010; // type:data +icon_badge_auto_multibounce_ROM_END = 0x1E4230; // type:data +icon_badge_auto_multibounce_disabled_ROM_END = 0x1E4250; // type:data +icon_badge_dizzy_stomp_ROM_END = 0x1E4470; // type:data +icon_badge_dizzy_stomp_disabled_ROM_END = 0x1E4490; // type:data +icon_badge_hammer_throw_ROM_END = 0x1E46B0; // type:data +icon_badge_hammer_throw_disabled_ROM_END = 0x1E46D0; // type:data +icon_badge_smash_charge_0_ROM_END = 0x1E48F0; // type:data +icon_badge_smash_charge_0_disabled_ROM_END = 0x1E4910; // type:data +icon_badge_pretty_lucky_ROM_END = 0x1E4B30; // type:data +icon_badge_pretty_lucky_disabled_ROM_END = 0x1E4B50; // type:data +icon_badge_feeling_fine_ROM_END = 0x1E4D70; // type:data +icon_badge_feeling_fine_disabled_ROM_END = 0x1E4D90; // type:data +icon_badge_attack_fx_a_ROM_END = 0x1E4FB0; // type:data +icon_badge_attack_fx_a_disabled_ROM_END = 0x1E4FD0; // type:data +icon_badge_all_or_nothing_ROM_END = 0x1E51F0; // type:data +icon_badge_all_or_nothing_disabled_ROM_END = 0x1E5210; // type:data +icon_badge_hp_drain_ROM_END = 0x1E5430; // type:data +icon_badge_hp_drain_disabled_ROM_END = 0x1E5450; // type:data +icon_badge_jump_charge_0_ROM_END = 0x1E5670; // type:data +icon_badge_jump_charge_0_disabled_ROM_END = 0x1E5690; // type:data +icon_badge_slow_go_ROM_END = 0x1E58B0; // type:data +icon_badge_slow_go_disabled_ROM_END = 0x1E58D0; // type:data +icon_badge_fp_plus_ROM_END = 0x1E5AF0; // type:data +icon_badge_fp_plus_disabled_ROM_END = 0x1E5B10; // type:data +icon_badge_mega_rush_ROM_END = 0x1E5D30; // type:data +icon_badge_mega_rush_disabled_ROM_END = 0x1E5D50; // type:data +icon_badge_ice_power_ROM_END = 0x1E5F70; // type:data +icon_badge_ice_power_disabled_ROM_END = 0x1E5F90; // type:data +icon_badge_defend_plus_ROM_END = 0x1E61B0; // type:data +icon_badge_defend_plus_disabled_ROM_END = 0x1E61D0; // type:data +icon_badge_pay_off_ROM_END = 0x1E63F0; // type:data +icon_badge_pay_off_disabled_ROM_END = 0x1E6410; // type:data +icon_badge_money_money_ROM_END = 0x1E6630; // type:data +icon_badge_money_money_disabled_ROM_END = 0x1E6650; // type:data +icon_badge_chill_out_ROM_END = 0x1E6870; // type:data +icon_badge_chill_out_disabled_ROM_END = 0x1E6890; // type:data +icon_badge_happy_heart_ROM_END = 0x1E6AB0; // type:data +icon_badge_happy_heart_disabled_ROM_END = 0x1E6AD0; // type:data +icon_badge_zap_tap_ROM_END = 0x1E6CF0; // type:data +icon_badge_zap_tap_disabled_ROM_END = 0x1E6D10; // type:data +icon_badge_power_of_rage_ROM_END = 0x1E6F30; // type:data +icon_badge_power_of_rage_disabled_ROM_END = 0x1E6F50; // type:data +icon_badge_right_on_ROM_END = 0x1E7170; // type:data +icon_badge_right_on_disabled_ROM_END = 0x1E7190; // type:data +icon_badge_runaway_pay_ROM_END = 0x1E73B0; // type:data +icon_badge_runaway_pay_disabled_ROM_END = 0x1E73D0; // type:data +icon_badge_refund_ROM_END = 0x1E75F0; // type:data +icon_badge_refund_disabled_ROM_END = 0x1E7610; // type:data +icon_badge_flower_saver_ROM_END = 0x1E7830; // type:data +icon_badge_flower_saver_disabled_ROM_END = 0x1E7850; // type:data +icon_badge_triple_dip_ROM_END = 0x1E7A70; // type:data +icon_badge_triple_dip_disabled_ROM_END = 0x1E7A90; // type:data +icon_badge_total_saver_ROM_END = 0x1E7CB0; // type:data +icon_badge_total_saver_disabled_ROM_END = 0x1E7CD0; // type:data +icon_badge_power_jump_ROM_END = 0x1E7EF0; // type:data +icon_badge_power_jump_disabled_ROM_END = 0x1E7F10; // type:data +icon_badge_bagon_jump_ROM_END = 0x1E8130; // type:data +icon_badge_bagon_jump_disabled_ROM_END = 0x1E8150; // type:data +icon_badge_mega_jump_ROM_END = 0x1E8370; // type:data +icon_badge_mega_jump_disabled_ROM_END = 0x1E8390; // type:data +icon_badge_power_smash_ROM_END = 0x1E85B0; // type:data +icon_badge_power_smash_disabled_ROM_END = 0x1E85D0; // type:data +icon_badge_bagon_smash_ROM_END = 0x1E87F0; // type:data +icon_badge_bagon_smash_disabled_ROM_END = 0x1E8810; // type:data +icon_badge_mega_smash_ROM_END = 0x1E8A30; // type:data +icon_badge_mega_smash_disabled_ROM_END = 0x1E8A50; // type:data +icon_badge_lucky_day_ROM_END = 0x1E8C70; // type:data +icon_badge_lucky_day_disabled_ROM_END = 0x1E8C90; // type:data +icon_badge_super_get_ROM_END = 0x1E8EB0; // type:data +icon_badge_super_get_disabled_ROM_END = 0x1E8ED0; // type:data +icon_badge_bump_attack_ROM_END = 0x1E90F0; // type:data +icon_badge_bump_attack_disabled_ROM_END = 0x1E9110; // type:data +icon_badge_p_up_d_down_ROM_END = 0x1E9330; // type:data +icon_badge_p_up_d_down_disabled_ROM_END = 0x1E9350; // type:data +icon_badge_p_down_d_up_ROM_END = 0x1E9570; // type:data +icon_badge_p_down_d_up_disabled_ROM_END = 0x1E9590; // type:data +icon_badge_heart_finder_ROM_END = 0x1E97B0; // type:data +icon_badge_heart_finder_disabled_ROM_END = 0x1E97D0; // type:data +icon_badge_flower_finder_ROM_END = 0x1E99F0; // type:data +icon_badge_flower_finder_disabled_ROM_END = 0x1E9A10; // type:data +icon_badge_dizzy_attack_ROM_END = 0x1E9C30; // type:data +icon_badge_dizzy_attack_disabled_ROM_END = 0x1E9C50; // type:data +icon_badge_speedy_spin_ROM_END = 0x1E9E70; // type:data +icon_badge_speedy_spin_disabled_ROM_END = 0x1E9E90; // type:data +icon_badge_spin_attack_ROM_END = 0x1EA0B0; // type:data +icon_badge_spin_attack_disabled_ROM_END = 0x1EA0D0; // type:data +icon_badge_i_spy_ROM_END = 0x1EA2F0; // type:data +icon_badge_i_spy_disabled_ROM_END = 0x1EA310; // type:data +icon_badge_power_rush_ROM_END = 0x1EA530; // type:data +icon_badge_power_rush_disabled_ROM_END = 0x1EA550; // type:data +icon_badge_last_stand_ROM_END = 0x1EA770; // type:data +icon_badge_last_stand_disabled_ROM_END = 0x1EA790; // type:data +icon_badge_close_call_ROM_END = 0x1EA9B0; // type:data +icon_badge_close_call_disabled_ROM_END = 0x1EA9D0; // type:data +icon_badge_happy_happy_heart_ROM_END = 0x1EABF0; // type:data +icon_badge_happy_happy_heart_disabled_ROM_END = 0x1EAC10; // type:data +icon_badge_gray_boot_ROM_END = 0x1EAE30; // type:data +icon_badge_gray_boot_disabled_ROM_END = 0x1EAE50; // type:data +icon_badge_black_speedy_spin_ROM_END = 0x1EB070; // type:data +icon_badge_black_speedy_spin_disabled_ROM_END = 0x1EB090; // type:data +icon_badge_black_spin_attack_ROM_END = 0x1EB2B0; // type:data +icon_badge_black_spin_attack_disabled_ROM_END = 0x1EB2D0; // type:data +icon_badge_shrink_smash_ROM_END = 0x1EB4F0; // type:data +icon_badge_shrink_smash_disabled_ROM_END = 0x1EB510; // type:data +icon_badge_shrink_stomp_ROM_END = 0x1EB730; // type:data +icon_badge_shrink_stomp_disabled_ROM_END = 0x1EB750; // type:data +icon_badge_d_down_jump_ROM_END = 0x1EB970; // type:data +icon_badge_d_down_jump_disabled_ROM_END = 0x1EB990; // type:data +icon_badge_damage_dodge_ROM_END = 0x1EBBB0; // type:data +icon_badge_damage_dodge_disabled_ROM_END = 0x1EBBD0; // type:data +icon_badge_quake_jump_ROM_END = 0x1EBDF0; // type:data +icon_badge_quake_jump_disabled_ROM_END = 0x1EBE10; // type:data +icon_badge_happy_flower_ROM_END = 0x1EC030; // type:data +icon_badge_happy_flower_disabled_ROM_END = 0x1EC050; // type:data +icon_badge_happy_day_ROM_END = 0x1EC270; // type:data +icon_badge_happy_day_disabled_ROM_END = 0x1EC290; // type:data +icon_badge_unk_item_1EC290_ROM_END = 0x1EC4B0; // type:data +icon_badge_unk_item_1EC290_disabled_ROM_END = 0x1EC4D0; // type:data +icon_badge_deep_focus_ROM_END = 0x1EC6F0; // type:data +icon_badge_deep_focus_disabled_ROM_END = 0x1EC710; // type:data +icon_badge_super_focus_ROM_END = 0x1EC930; // type:data +icon_badge_super_focus_disabled_ROM_END = 0x1EC950; // type:data +icon_badge_initiation_ROM_END = 0x1ECB70; // type:data +icon_badge_initiation_disabled_ROM_END = 0x1ECB90; // type:data +icon_badge_quick_change_ROM_END = 0x1ECDB0; // type:data +icon_badge_quick_change_disabled_ROM_END = 0x1ECDD0; // type:data +icon_badge_unk_item_1ECDD0_ROM_END = 0x1ECFF0; // type:data +icon_badge_unk_item_1ECDD0_disabled_ROM_END = 0x1ED010; // type:data +icon_badge_unk_item_1ED010_ROM_END = 0x1ED230; // type:data +icon_badge_unk_item_1ED010_disabled_ROM_END = 0x1ED250; // type:data +icon_badge_unk_item_1ED250_ROM_END = 0x1ED470; // type:data +icon_badge_unk_item_1ED250_disabled_ROM_END = 0x1ED490; // type:data +icon_badge_unk_item_1ED490_ROM_END = 0x1ED6B0; // type:data +icon_badge_unk_item_1ED490_disabled_ROM_END = 0x1ED6D0; // type:data +icon_badge_peekaboo_ROM_END = 0x1ED8F0; // type:data +icon_badge_peekaboo_disabled_ROM_END = 0x1ED910; // type:data +icon_badge_group_focus_ROM_END = 0x1EDB30; // type:data +icon_badge_group_focus_disabled_ROM_END = 0x1EDB50; // type:data +icon_badge_attack_fx_d_ROM_END = 0x1EDD70; // type:data +icon_badge_attack_fx_d_disabled_ROM_END = 0x1EDD90; // type:data +icon_badge_attack_fx_b_ROM_END = 0x1EDFB0; // type:data +icon_badge_attack_fx_b_disabled_ROM_END = 0x1EDFD0; // type:data +icon_badge_attack_fx_e_ROM_END = 0x1EE1F0; // type:data +icon_badge_attack_fx_e_disabled_ROM_END = 0x1EE210; // type:data +icon_badge_attack_fx_c_ROM_END = 0x1EE430; // type:data +icon_badge_attack_fx_c_disabled_ROM_END = 0x1EE450; // type:data +icon_badge_attack_fx_f_ROM_END = 0x1EE670; // type:data +icon_badge_attack_fx_f_disabled_ROM_END = 0x1EE690; // type:data +icon_badge_unk_item_1EE690_ROM_END = 0x1EE8B0; // type:data +icon_badge_unk_item_1EE690_disabled_ROM_END = 0x1EE8D0; // type:data +icon_badge_healthy_healthy_ROM_END = 0x1EEAF0; // type:data +icon_badge_healthy_healthy_disabled_ROM_END = 0x1EEB10; // type:data +icon_badge_unk_item_1EEB10_ROM_END = 0x1EED30; // type:data +icon_badge_unk_item_1EEB10_disabled_ROM_END = 0x1EED50; // type:data +icon_badge_unk_item_1EED50_ROM_END = 0x1EEF70; // type:data +icon_badge_unk_item_1EED50_disabled_ROM_END = 0x1EEF90; // type:data +icon_badge_unk_item_1EEF90_ROM_END = 0x1EF1B0; // type:data +icon_badge_unk_item_1EEF90_disabled_ROM_END = 0x1EF1D0; // type:data +icon_badge_unk_item_1EF1D0_ROM_END = 0x1EF3F0; // type:data +icon_badge_unk_item_1EF1D0_disabled_ROM_END = 0x1EF410; // type:data +icon_badge_unk_item_1EF410_ROM_END = 0x1EF630; // type:data +icon_badge_unk_item_1EF410_disabled_ROM_END = 0x1EF650; // type:data +icon_badge_unk_item_1EF650_ROM_END = 0x1EF870; // type:data +icon_badge_unk_item_1EF650_disabled_ROM_END = 0x1EF890; // type:data +icon_badge_unk_item_1EF890_ROM_END = 0x1EFAB0; // type:data +icon_badge_unk_item_1EF890_disabled_ROM_END = 0x1EFAD0; // type:data +icon_usable_item_mushroom_ROM_END = 0x1EFCF0; // type:data +icon_usable_item_mushroom_disabled_ROM_END = 0x1EFD10; // type:data +icon_usable_item_super_shroom_ROM_END = 0x1EFF30; // type:data +icon_usable_item_super_shroom_disabled_ROM_END = 0x1EFF50; // type:data +icon_usable_item_ultra_shroom_ROM_END = 0x1F0170; // type:data +icon_usable_item_ultra_shroom_disabled_ROM_END = 0x1F0190; // type:data +icon_usable_item_life_shroom_ROM_END = 0x1F03B0; // type:data +icon_usable_item_life_shroom_disabled_ROM_END = 0x1F03D0; // type:data +icon_usable_item_dried_shroom_ROM_END = 0x1F05F0; // type:data +icon_usable_item_dried_shroom_disabled_ROM_END = 0x1F0610; // type:data +icon_usable_item_tasty_tonic_ROM_END = 0x1F0830; // type:data +icon_usable_item_tasty_tonic_disabled_ROM_END = 0x1F0850; // type:data +icon_usable_item_super_soda_ROM_END = 0x1F0A70; // type:data +icon_usable_item_super_soda_disabled_ROM_END = 0x1F0A90; // type:data +icon_usable_item_blue_berry_ROM_END = 0x1F0CB0; // type:data +icon_usable_item_blue_berry_disabled_ROM_END = 0x1F0CD0; // type:data +icon_usable_item_red_berry_ROM_END = 0x1F0EF0; // type:data +icon_usable_item_red_berry_disabled_ROM_END = 0x1F0F10; // type:data +icon_usable_item_yellow_berry_ROM_END = 0x1F1130; // type:data +icon_usable_item_yellow_berry_disabled_ROM_END = 0x1F1150; // type:data +icon_usable_item_bubble_berry_ROM_END = 0x1F1370; // type:data +icon_usable_item_bubble_berry_disabled_ROM_END = 0x1F1390; // type:data +icon_usable_item_goomnut_ROM_END = 0x1F15B0; // type:data +icon_usable_item_goomnut_disabled_ROM_END = 0x1F15D0; // type:data +icon_usable_item_koopa_leaf_ROM_END = 0x1F17F0; // type:data +icon_usable_item_koopa_leaf_disabled_ROM_END = 0x1F1810; // type:data +icon_usable_item_dried_pasta_ROM_END = 0x1F1A30; // type:data +icon_usable_item_dried_pasta_disabled_ROM_END = 0x1F1A50; // type:data +icon_usable_item_lime_ROM_END = 0x1F1C70; // type:data +icon_usable_item_lime_disabled_ROM_END = 0x1F1C90; // type:data +icon_usable_item_lemon_ROM_END = 0x1F1EB0; // type:data +icon_usable_item_lemon_disabled_ROM_END = 0x1F1ED0; // type:data +icon_usable_item_dried_fruit_ROM_END = 0x1F20F0; // type:data +icon_usable_item_dried_fruit_disabled_ROM_END = 0x1F2110; // type:data +icon_usable_item_strange_leaf_ROM_END = 0x1F2330; // type:data +icon_usable_item_strange_leaf_disabled_ROM_END = 0x1F2350; // type:data +icon_usable_item_cake_mix_ROM_END = 0x1F2570; // type:data +icon_usable_item_cake_mix_disabled_ROM_END = 0x1F2590; // type:data +icon_usable_item_egg_ROM_END = 0x1F27B0; // type:data +icon_usable_item_egg_disabled_ROM_END = 0x1F27D0; // type:data +icon_usable_item_coconut_ROM_END = 0x1F29F0; // type:data +icon_usable_item_coconut_disabled_ROM_END = 0x1F2A10; // type:data +icon_usable_item_melon_ROM_END = 0x1F2C30; // type:data +icon_usable_item_melon_disabled_ROM_END = 0x1F2C50; // type:data +icon_usable_item_stinky_herb_ROM_END = 0x1F2E70; // type:data +icon_usable_item_stinky_herb_disabled_ROM_END = 0x1F2E90; // type:data +icon_usable_item_iced_potato_ROM_END = 0x1F30B0; // type:data +icon_usable_item_iced_potato_disabled_ROM_END = 0x1F30D0; // type:data +icon_usable_item_honey_syrup_ROM_END = 0x1F32F0; // type:data +icon_usable_item_honey_syrup_disabled_ROM_END = 0x1F3310; // type:data +icon_usable_item_maple_syrup_ROM_END = 0x1F3530; // type:data +icon_usable_item_maple_syrup_disabled_ROM_END = 0x1F3550; // type:data +icon_usable_item_jammin_jelly_ROM_END = 0x1F3770; // type:data +icon_usable_item_jammin_jelly_disabled_ROM_END = 0x1F3790; // type:data +icon_usable_item_whackas_bump_ROM_END = 0x1F39B0; // type:data +icon_usable_item_whackas_bump_disabled_ROM_END = 0x1F39D0; // type:data +icon_usable_item_apple_ROM_END = 0x1F3BF0; // type:data +icon_usable_item_apple_disabled_ROM_END = 0x1F3C10; // type:data +icon_peach_salt_ROM_END = 0x1F3E30; // type:data +icon_peach_salt_disabled_ROM_END = 0x1F3E50; // type:data +icon_peach_sugar_ROM_END = 0x1F4070; // type:data +icon_peach_sugar_disabled_ROM_END = 0x1F4090; // type:data +icon_peach_egg_ROM_END = 0x1F42B0; // type:data +icon_peach_egg_disabled_ROM_END = 0x1F42D0; // type:data +icon_peach_cream_ROM_END = 0x1F44F0; // type:data +icon_peach_cream_disabled_ROM_END = 0x1F4510; // type:data +icon_peach_strawberry_ROM_END = 0x1F4730; // type:data +icon_peach_strawberry_disabled_ROM_END = 0x1F4750; // type:data +icon_peach_butter_ROM_END = 0x1F4970; // type:data +icon_peach_butter_disabled_ROM_END = 0x1F4990; // type:data +icon_peach_cleanser_ROM_END = 0x1F4BB0; // type:data +icon_peach_cleanser_disabled_ROM_END = 0x1F4BD0; // type:data +icon_peach_water_ROM_END = 0x1F4DF0; // type:data +icon_peach_water_disabled_ROM_END = 0x1F4E10; // type:data +icon_peach_flour_ROM_END = 0x1F5030; // type:data +icon_peach_flour_disabled_ROM_END = 0x1F5050; // type:data +icon_peach_milk_ROM_END = 0x1F5270; // type:data +icon_peach_milk_disabled_ROM_END = 0x1F5290; // type:data +icon_peach_unk_item_1F5290_ROM_END = 0x1F54B0; // type:data +icon_peach_unk_item_1F5290_disabled_ROM_END = 0x1F54D0; // type:data +icon_usable_item_sleepy_sheep_ROM_END = 0x1F56F0; // type:data +icon_usable_item_sleepy_sheep_disabled_ROM_END = 0x1F5710; // type:data +icon_usable_item_x_ROM_END = 0x1F5930; // type:data +icon_usable_item_x_disabled_ROM_END = 0x1F5950; // type:data +icon_usable_item_pow_block_ROM_END = 0x1F5B70; // type:data +icon_usable_item_pow_block_disabled_ROM_END = 0x1F5B90; // type:data +icon_usable_item_hustle_drink_ROM_END = 0x1F5DB0; // type:data +icon_usable_item_hustle_drink_disabled_ROM_END = 0x1F5DD0; // type:data +icon_usable_item_stop_watch_ROM_END = 0x1F5FF0; // type:data +icon_usable_item_stop_watch_disabled_ROM_END = 0x1F6010; // type:data +icon_usable_item_dizzy_dial_ROM_END = 0x1F6230; // type:data +icon_usable_item_dizzy_dial_disabled_ROM_END = 0x1F6250; // type:data +icon_usable_item_unk_item_1F6250_ROM_END = 0x1F6470; // type:data +icon_usable_item_unk_item_1F6250_disabled_ROM_END = 0x1F6490; // type:data +icon_usable_item_unk_item_1F6490_ROM_END = 0x1F66B0; // type:data +icon_usable_item_unk_item_1F6490_disabled_ROM_END = 0x1F66D0; // type:data +icon_usable_item_fire_flower_ROM_END = 0x1F68F0; // type:data +icon_usable_item_fire_flower_disabled_ROM_END = 0x1F6910; // type:data +icon_usable_item_snowman_doll_ROM_END = 0x1F6B30; // type:data +icon_usable_item_snowman_doll_disabled_ROM_END = 0x1F6B50; // type:data +icon_usable_item_thunder_rage_ROM_END = 0x1F6D70; // type:data +icon_usable_item_thunder_rage_disabled_ROM_END = 0x1F6D90; // type:data +icon_usable_item_thunder_bolt_ROM_END = 0x1F6FB0; // type:data +icon_usable_item_thunder_bolt_disabled_ROM_END = 0x1F6FD0; // type:data +icon_usable_item_shooting_star_ROM_END = 0x1F71F0; // type:data +icon_usable_item_shooting_star_disabled_ROM_END = 0x1F7210; // type:data +icon_usable_item_dusty_hammer_ROM_END = 0x1F7430; // type:data +icon_usable_item_dusty_hammer_disabled_ROM_END = 0x1F7450; // type:data +icon_usable_item_pebble_ROM_END = 0x1F7670; // type:data +icon_usable_item_pebble_disabled_ROM_END = 0x1F7690; // type:data +icon_usable_item_unk_item_1F7690_ROM_END = 0x1F78B0; // type:data +icon_usable_item_unk_item_1F7690_disabled_ROM_END = 0x1F78D0; // type:data +icon_usable_item_stone_cap_ROM_END = 0x1F7AF0; // type:data +icon_usable_item_stone_cap_disabled_ROM_END = 0x1F7B10; // type:data +icon_usable_item_volt_shroom_ROM_END = 0x1F7D30; // type:data +icon_usable_item_volt_shroom_disabled_ROM_END = 0x1F7D50; // type:data +icon_usable_item_star_ROM_END = 0x1F7F70; // type:data +icon_usable_item_star_disabled_ROM_END = 0x1F7F90; // type:data +icon_usable_item_umbrella_ROM_END = 0x1F81B0; // type:data +icon_usable_item_umbrella_disabled_ROM_END = 0x1F81D0; // type:data +icon_usable_item_mirror_ROM_END = 0x1F83F0; // type:data +icon_usable_item_mirror_disabled_ROM_END = 0x1F8410; // type:data +icon_usable_item_unk_item_1F8410_ROM_END = 0x1F8630; // type:data +icon_usable_item_unk_item_1F8410_disabled_ROM_END = 0x1F8650; // type:data +icon_usable_item_unk_item_1F8650_ROM_END = 0x1F8870; // type:data +icon_usable_item_unk_item_1F8650_disabled_ROM_END = 0x1F8890; // type:data +icon_usable_item_unk_item_1F8890_ROM_END = 0x1F8AB0; // type:data +icon_usable_item_unk_item_1F8890_disabled_ROM_END = 0x1F8AD0; // type:data +icon_hand_hand_1_ROM_END = 0x1F8C10; // type:data +icon_hand_hand_2_ROM_END = 0x1F8D50; // type:data +icon_hand_hand_3_ROM_END = 0x1F8E90; // type:data +icon_hand_hand_4_ROM_END = 0x1F8FD0; // type:data +icon_hand_hand_5_ROM_END = 0x1F9110; // type:data +icon_hand_hand_6_ROM_END = 0x1F9250; // type:data +icon_hand_hand_7_ROM_END = 0x1F9390; // type:data +icon_hand_hand_8_ROM_END = 0x1F94D0; // type:data +icon_hand_hand_9_ROM_END = 0x1F9610; // type:data +icon_hand_hand_10_ROM_END = 0x1F9750; // type:data +icon_hud_heart_ROM_END = 0x1F9890; // type:data +icon_hud_coin_ROM_END = 0x1F99D0; // type:data +icon_hud_heart_container_ROM_END = 0x1F9B10; // type:data +icon_hud_star_point_ROM_END = 0x1F9C50; // type:data +icon_battle_hammer_ROM_END = 0x1F9E70; // type:data +icon_battle_hammer_disabled_ROM_END = 0x1F9E90; // type:data +icon_battle_super_hammer_ROM_END = 0x1FA0B0; // type:data +icon_battle_super_hammer_disabled_ROM_END = 0x1FA0D0; // type:data +icon_battle_ultra_hammer_ROM_END = 0x1FA2F0; // type:data +icon_battle_ultra_hammer_disabled_ROM_END = 0x1FA310; // type:data +icon_battle_boot_ROM_END = 0x1FA530; // type:data +icon_battle_boot_disabled_ROM_END = 0x1FA550; // type:data +icon_battle_super_boot_ROM_END = 0x1FA770; // type:data +icon_battle_super_boot_disabled_ROM_END = 0x1FA790; // type:data +icon_battle_ultra_boot_ROM_END = 0x1FA9B0; // type:data +icon_battle_ultra_boot_disabled_ROM_END = 0x1FA9D0; // type:data +icon_battle_items_ROM_END = 0x1FABF0; // type:data +icon_battle_items_disabled_ROM_END = 0x1FAC10; // type:data +icon_heart_heart_1_ROM_END = 0x1FAE30; // type:data +icon_heart_heart_2_ROM_END = 0x1FB050; // type:data +icon_heart_heart_3_ROM_END = 0x1FB270; // type:data +icon_flower_flower_1_ROM_END = 0x1FB490; // type:data +icon_flower_flower_2_ROM_END = 0x1FB6B0; // type:data +icon_flower_flower_3_ROM_END = 0x1FB8D0; // type:data +icon_coin_coin_1_ROM_END = 0x1FBA10; // type:data +icon_coin_coin_2_ROM_END = 0x1FBB50; // type:data +icon_coin_coin_3_ROM_END = 0x1FBC90; // type:data +icon_coin_coin_4_ROM_END = 0x1FBDD0; // type:data +icon_coin_coin_5_ROM_END = 0x1FBF10; // type:data +icon_coin_coin_6_ROM_END = 0x1FC050; // type:data +icon_coin_coin_7_ROM_END = 0x1FC190; // type:data +icon_coin_coin_8_ROM_END = 0x1FC2D0; // type:data +icon_coin_coin_9_ROM_END = 0x1FC410; // type:data +icon_coin_coin_10_ROM_END = 0x1FC550; // type:data +icon_coin_unk_item_1FC550_ROM_END = 0x1FC710; // type:data +icon_star_piece_star_piece_1_ROM_END = 0x1FC930; // type:data +icon_star_piece_star_piece_2_ROM_END = 0x1FCB50; // type:data +icon_star_piece_star_piece_3_ROM_END = 0x1FCD70; // type:data +icon_small_heart_small_heart_1_ROM_END = 0x1FCEB0; // type:data +icon_small_heart_small_heart_2_ROM_END = 0x1FCFF0; // type:data +icon_heart_container_heart_container_ROM_END = 0x1FD130; // type:data +icon_star_point_star_point_1_ROM_END = 0x1FD270; // type:data +icon_star_point_star_point_2_ROM_END = 0x1FD3B0; // type:data +icon_star_point_star_point_3_ROM_END = 0x1FD4F0; // type:data +icon_star_point_star_point_4_ROM_END = 0x1FD630; // type:data +icon_star_point_star_point_5_ROM_END = 0x1FD770; // type:data +icon_star_point_star_point_6_ROM_END = 0x1FD8B0; // type:data +icon_star_point_star_point_7_ROM_END = 0x1FD9F0; // type:data +icon_star_point_star_point_8_ROM_END = 0x1FDB30; // type:data +icon_star_point_unk_item_1FC550_ROM_END = 0x1FDFB0; // type:data +icon_small_star_point_small_star_point_1_ROM_END = 0x1FDFF0; // type:data +icon_small_star_point_small_star_point_2_ROM_END = 0x1FE030; // type:data +icon_small_star_point_small_star_point_3_ROM_END = 0x1FE070; // type:data +icon_small_star_point_small_star_point_4_ROM_END = 0x1FE0B0; // type:data +icon_small_star_point_small_star_point_5_ROM_END = 0x1FE0F0; // type:data +icon_small_star_point_small_star_point_6_ROM_END = 0x1FE130; // type:data +icon_small_star_point_small_star_point_7_ROM_END = 0x1FE170; // type:data +icon_small_star_point_small_star_point_8_ROM_END = 0x1FE1B0; // type:data +logos_ROM_END = 0x2191B0; // type:data +title_bg_1_ROM_END = 0x223AC0; // type:data +title_bg_2_ROM_END = 0x22E3D0; // type:data +title_bg_3_ROM_END = 0x238CE0; // type:data +title_bg_4_ROM_END = 0x2435F0; // type:data +title_tape_ROM_END = 0x2475F0; // type:data +title_bowser_silhouette_ROM_END = 0x24B7F0; // type:data +world_partner_goombario_ROM_END = 0x317E50; // type:data +world_partner_bombette_ROM_END = 0x319670; // type:data +world_partner_parakarry_ROM_END = 0x31B120; // type:data +world_partner_kooper_ROM_END = 0x31CC70; // type:data +world_partner_watt_ROM_END = 0x31DE70; // type:data +world_partner_sushie_ROM_END = 0x320C50; // type:data +world_partner_lakilester_ROM_END = 0x323A50; // type:data +world_partner_bow_ROM_END = 0x324A10; // type:data +world_partner_goompa_ROM_END = 0x324F10; // type:data +world_partner_goombaria_ROM_END = 0x325070; // type:data +world_partner_twink_ROM_END = 0x3251D0; // type:data +battle_text_action_command_ratings_ROM_END = 0x3917B0; // type:data +world_text_chapter_ROM_END = 0x3EE7E0; // type:data +battle_area_kmr_part_1_ROM_END = 0x439A90; // type:data +battle_area_kmr_part_2_ROM_END = 0x447440; // type:data +battle_area_kmr_part_3_ROM_END = 0x464490; // type:data +battle_area_mac_ROM_END = 0x47F0B0; // type:data +battle_area_hos_ROM_END = 0x48D1A0; // type:data +battle_area_nok_ROM_END = 0x4A10A0; // type:data +battle_area_trd_part_1_ROM_END = 0x4B11F0; // type:data +battle_area_trd_part_2_ROM_END = 0x4CF1B0; // type:data +battle_area_trd_part_3_ROM_END = 0x4D01F0; // type:data +battle_area_iwa_ROM_END = 0x4DA5E0; // type:data +battle_area_sbk_ROM_END = 0x4E2740; // type:data +battle_area_isk_part_1_ROM_END = 0x4EF4A0; // type:data +battle_area_isk_part_2_ROM_END = 0x4F7BE0; // type:data +battle_area_mim_ROM_END = 0x4FEA50; // type:data +battle_area_arn_ROM_END = 0x50F020; // type:data +battle_area_dgb_ROM_END = 0x5125D0; // type:data +battle_area_omo_ROM_END = 0x52B6A0; // type:data +battle_area_omo2_ROM_END = 0x543570; // type:data +battle_area_omo2_1_ROM_END = 0x5483E0; // type:data +battle_area_omo2_2_ROM_END = 0x54CC70; // type:data +battle_area_omo2_3_ROM_END = 0x552440; // type:data +battle_area_omo2_4_ROM_END = 0x552BB0; // type:data +battle_area_omo2_5_ROM_END = 0x556C90; // type:data +battle_area_omo2_6_ROM_END = 0x5573E0; // type:data +battle_area_omo3_ROM_END = 0x56E2A0; // type:data +battle_area_kgr_ROM_END = 0x573920; // type:data +battle_area_jan_ROM_END = 0x584940; // type:data +battle_area_jan2_ROM_END = 0x58C2F0; // type:data +battle_area_kzn_ROM_END = 0x59E6E0; // type:data +battle_area_kzn2_ROM_END = 0x5B14B0; // type:data +battle_area_flo_ROM_END = 0x5CE690; // type:data +battle_area_flo2_ROM_END = 0x5EC490; // type:data +battle_area_tik_ROM_END = 0x608AB0; // type:data +battle_area_tik2_ROM_END = 0x6186F0; // type:data +battle_area_tik3_ROM_END = 0x623BA0; // type:data +battle_area_sam_ROM_END = 0x63D1E0; // type:data +battle_area_sam2_ROM_END = 0x648E10; // type:data +battle_area_pra_ROM_END = 0x660750; // type:data +battle_area_pra2_ROM_END = 0x669D80; // type:data +battle_area_pra3_ROM_END = 0x684A30; // type:data +battle_area_kpa_ROM_END = 0x69F200; // type:data +battle_area_kpa2_ROM_END = 0x6BBB90; // type:data +battle_area_kpa3_ROM_END = 0x6CC070; // type:data +battle_area_kpa4_ROM_END = 0x6DBDA0; // type:data +battle_area_kkj_ROM_END = 0x6DDDC0; // type:data +battle_area_dig_ROM_END = 0x6F0B30; // type:data +battle_partner_goompa_ROM_END = 0x6F10E0; // type:data +battle_partner_goombario_ROM_END = 0x6F5E80; // type:data +battle_partner_kooper_ROM_END = 0x6FAD10; // type:data +battle_partner_bombette_ROM_END = 0x6FFD80; // type:data +battle_partner_parakarry_ROM_END = 0x703AF0; // type:data +battle_partner_watt_ROM_END = 0x707CA0; // type:data +battle_partner_sushie_ROM_END = 0x70BD10; // type:data +battle_partner_lakilester_ROM_END = 0x710EF0; // type:data +battle_partner_bow_ROM_END = 0x714CF0; // type:data +battle_partner_twink_ROM_END = 0x715850; // type:data +battle_item_mushroom_ROM_END = 0x716C60; // type:data +battle_item_fire_flower_ROM_END = 0x7179D0; // type:data +battle_item_dusty_hammer_ROM_END = 0x718850; // type:data +battle_item_pow_block_ROM_END = 0x719970; // type:data +battle_item_pebble_ROM_END = 0x71A7F0; // type:data +battle_item_volt_shroom_ROM_END = 0x71B1A0; // type:data +battle_item_thunder_rage_ROM_END = 0x71BE30; // type:data +battle_item_snowman_doll_ROM_END = 0x71CCE0; // type:data +battle_item_dried_shroom_ROM_END = 0x71D770; // type:data +battle_item_shooting_star_ROM_END = 0x71E650; // type:data +battle_item_sleepy_sheep_ROM_END = 0x7215A0; // type:data +battle_item_stone_cap_ROM_END = 0x722000; // type:data +battle_item_tasty_tonic_ROM_END = 0x722B40; // type:data +battle_item_thunder_bolt_ROM_END = 0x723780; // type:data +battle_item_ultra_shroom_ROM_END = 0x724240; // type:data +battle_item_unknown_item_ROM_END = 0x724CE0; // type:data +battle_item_super_soda_ROM_END = 0x725F60; // type:data +battle_item_hustle_drink_ROM_END = 0x726DD0; // type:data +battle_item_stop_watch_ROM_END = 0x727910; // type:data +battle_item_dizzy_dial_ROM_END = 0x7285E0; // type:data +battle_item_please_come_back_ROM_END = 0x728EC0; // type:data +battle_item_egg_missile_ROM_END = 0x72A750; // type:data +battle_item_insecticide_herb_ROM_END = 0x72B910; // type:data +battle_item_fright_jar_ROM_END = 0x72C5B0; // type:data +battle_item_mystery_ROM_END = 0x72DB70; // type:data +battle_item_repel_gel_ROM_END = 0x72E530; // type:data +battle_item_life_shroom_ROM_END = 0x72F720; // type:data +battle_item_coconut_ROM_END = 0x7305A0; // type:data +battle_item_electro_pop_ROM_END = 0x731300; // type:data +battle_item_strange_cake_ROM_END = 0x7330D0; // type:data +battle_item_food_ROM_END = 0x7345A0; // type:data +battle_move_hammer_ROM_END = 0x737890; // type:data +battle_move_spin_smash_ROM_END = 0x73AED0; // type:data +battle_move_quake_hammer_ROM_END = 0x73D860; // type:data +battle_move_jump_ROM_END = 0x740CC0; // type:data +battle_move_multibounce_ROM_END = 0x743DF0; // type:data +battle_move_power_bounce_ROM_END = 0x746E10; // type:data +battle_move_sleep_stomp_ROM_END = 0x748DD0; // type:data +battle_move_dizzy_stomp_ROM_END = 0x74AD90; // type:data +battle_move_d_down_pound_ROM_END = 0x74D570; // type:data +battle_move_jump_charge_0_ROM_END = 0x74F130; // type:data +battle_move_hammer_charge_0_ROM_END = 0x752450; // type:data +battle_move_hammer_throw_ROM_END = 0x756780; // type:data +battle_move_mega_quake_ROM_END = 0x7595B0; // type:data +battle_move_hammer_charge_1_ROM_END = 0x75C980; // type:data +battle_move_jump_charge_1_ROM_END = 0x75E5D0; // type:data +battle_move_hammer_charge_2_ROM_END = 0x761920; // type:data +battle_move_jump_charge_2_ROM_END = 0x763540; // type:data +battle_move_auto_smash_ROM_END = 0x765C20; // type:data +battle_move_auto_jump_ROM_END = 0x767C90; // type:data +battle_move_power_quake_ROM_END = 0x76A830; // type:data +battle_move_auto_multibounce_ROM_END = 0x76D760; // type:data +battle_move_power_jump_ROM_END = 0x76F330; // type:data +battle_move_super_jump_ROM_END = 0x770F30; // type:data +battle_move_mega_jump_ROM_END = 0x772BA0; // type:data +battle_move_power_smash_ROM_END = 0x775100; // type:data +battle_move_super_smash_ROM_END = 0x777690; // type:data +battle_move_mega_smash_ROM_END = 0x779C90; // type:data +battle_move_unknown_move_ROM_END = 0x77CB80; // type:data +battle_move_shrink_smash_ROM_END = 0x77F240; // type:data +battle_move_shell_crack_ROM_END = 0x781920; // type:data +battle_move_d_down_jump_ROM_END = 0x783BA0; // type:data +battle_move_shrink_stomp_ROM_END = 0x785B20; // type:data +battle_move_earthquake_jump_ROM_END = 0x789E60; // type:data +battle_star_focus_ROM_END = 0x78B600; // type:data +battle_star_refresh_ROM_END = 0x78D150; // type:data +battle_star_lullaby_ROM_END = 0x78E7D0; // type:data +battle_star_star_storm_ROM_END = 0x7900D0; // type:data +battle_star_chill_out_ROM_END = 0x791D90; // type:data +battle_star_smooch_ROM_END = 0x793D20; // type:data +battle_star_time_out_ROM_END = 0x7952E0; // type:data +battle_star_up_and_away_ROM_END = 0x796FC0; // type:data +battle_star_star_beam_ROM_END = 0x7997B0; // type:data +battle_star_peach_beam_ROM_END = 0x79BFA0; // type:data +battle_star_peach_focus_ROM_END = 0x79D8A0; // type:data +battle_star_peach_dash_ROM_END = 0x79EF40; // type:data +world_script_api_ROM_END = 0x7E73A0; // type:data +machi_ROM_END = 0x7EAD10; // type:data +mac_00_ROM_END = 0x800880; // type:data +mac_01_ROM_END = 0x8232C0; // type:data +mac_02_ROM_END = 0x831800; // type:data +mac_03_ROM_END = 0x842BD0; // type:data +mac_04_ROM_END = 0x852170; // type:data +mac_05_ROM_END = 0x864B40; // type:data +mac_06_ROM_END = 0x8694B0; // type:data +tik_01_ROM_END = 0x86C740; // type:data +tik_02_ROM_END = 0x86EB00; // type:data +tik_03_ROM_END = 0x871A30; // type:data +tik_04_ROM_END = 0x874DC0; // type:data +tik_05_ROM_END = 0x876EE0; // type:data +tik_06_ROM_END = 0x879BE0; // type:data +tik_07_ROM_END = 0x87EDF0; // type:data +tik_08_ROM_END = 0x8821C0; // type:data +tik_09_ROM_END = 0x8863C0; // type:data +tik_10_ROM_END = 0x888BD0; // type:data +tik_12_ROM_END = 0x88D600; // type:data +tik_14_ROM_END = 0x88FBA0; // type:data +tik_15_ROM_END = 0x892A20; // type:data +tik_17_ROM_END = 0x8956E0; // type:data +tik_18_ROM_END = 0x8975E0; // type:data +tik_19_ROM_END = 0x89A350; // type:data +tik_20_ROM_END = 0x89D7A0; // type:data +tik_21_ROM_END = 0x89FEC0; // type:data +tik_22_ROM_END = 0x8A23D0; // type:data +tik_23_ROM_END = 0x8A5A80; // type:data +tik_24_ROM_END = 0x8A7F80; // type:data +tik_25_ROM_END = 0x8A9A10; // type:data +kgr_01_ROM_END = 0x8AA450; // type:data +kgr_02_ROM_END = 0x8ABF90; // type:data +kmr_00_ROM_END = 0x8B0070; // type:data +kmr_02_ROM_END = 0x8C7F90; // type:data +kmr_03_ROM_END = 0x8CA900; // type:data +kmr_04_ROM_END = 0x8CE070; // type:data +kmr_05_ROM_END = 0x8D1510; // type:data +kmr_06_ROM_END = 0x8D3DC0; // type:data +kmr_07_ROM_END = 0x8D5E00; // type:data +kmr_09_ROM_END = 0x8D84D0; // type:data +kmr_10_ROM_END = 0x8DA100; // type:data +kmr_11_ROM_END = 0x8EB360; // type:data +kmr_12_ROM_END = 0x8EBE20; // type:data +kmr_20_ROM_END = 0x8FEE80; // type:data +kmr_21_ROM_END = 0x8FF670; // type:data +kmr_22_ROM_END = 0x907A30; // type:data +kmr_23_ROM_END = 0x90B240; // type:data +kmr_24_ROM_END = 0x90B6D0; // type:data +kmr_30_ROM_END = 0x90CC40; // type:data +iwa_00_ROM_END = 0x90F6B0; // type:data +iwa_01_ROM_END = 0x915D70; // type:data +iwa_02_ROM_END = 0x918BB0; // type:data +iwa_03_ROM_END = 0x91B8E0; // type:data +iwa_04_ROM_END = 0x91E570; // type:data +iwa_10_ROM_END = 0x9269F0; // type:data +iwa_11_ROM_END = 0x929270; // type:data +sbk_00_ROM_END = 0x929A90; // type:data +sbk_01_ROM_END = 0x92A2B0; // type:data +sbk_02_ROM_END = 0x92F8B0; // type:data +sbk_03_ROM_END = 0x9304D0; // type:data +sbk_04_ROM_END = 0x930CF0; // type:data +sbk_05_ROM_END = 0x9325C0; // type:data +sbk_06_ROM_END = 0x933C80; // type:data +sbk_10_ROM_END = 0x934040; // type:data +sbk_11_ROM_END = 0x934D40; // type:data +sbk_12_ROM_END = 0x9357E0; // type:data +sbk_13_ROM_END = 0x9366E0; // type:data +sbk_14_ROM_END = 0x936CD0; // type:data +sbk_15_ROM_END = 0x937570; // type:data +sbk_16_ROM_END = 0x938590; // type:data +sbk_20_ROM_END = 0x939560; // type:data +sbk_21_ROM_END = 0x939930; // type:data +sbk_22_ROM_END = 0x93A760; // type:data +sbk_23_ROM_END = 0x93AC30; // type:data +sbk_24_ROM_END = 0x93C280; // type:data +sbk_25_ROM_END = 0x93DCD0; // type:data +sbk_26_ROM_END = 0x93F5B0; // type:data +sbk_30_ROM_END = 0x944000; // type:data +sbk_31_ROM_END = 0x944A60; // type:data +sbk_32_ROM_END = 0x9459D0; // type:data +sbk_33_ROM_END = 0x945ED0; // type:data +sbk_34_ROM_END = 0x9486B0; // type:data +sbk_35_ROM_END = 0x949E60; // type:data +sbk_36_ROM_END = 0x94B3A0; // type:data +sbk_40_ROM_END = 0x94C040; // type:data +sbk_41_ROM_END = 0x94C510; // type:data +sbk_42_ROM_END = 0x94D170; // type:data +sbk_43_ROM_END = 0x94D5A0; // type:data +sbk_44_ROM_END = 0x94E4A0; // type:data +sbk_45_ROM_END = 0x94E9A0; // type:data +sbk_46_ROM_END = 0x950610; // type:data +sbk_50_ROM_END = 0x950970; // type:data +sbk_51_ROM_END = 0x951670; // type:data +sbk_52_ROM_END = 0x951AE0; // type:data +sbk_53_ROM_END = 0x952580; // type:data +sbk_54_ROM_END = 0x952A50; // type:data +sbk_55_ROM_END = 0x953FC0; // type:data +sbk_56_ROM_END = 0x9569F0; // type:data +sbk_60_ROM_END = 0x956F90; // type:data +sbk_61_ROM_END = 0x957350; // type:data +sbk_62_ROM_END = 0x957D70; // type:data +sbk_63_ROM_END = 0x958590; // type:data +sbk_64_ROM_END = 0x958950; // type:data +sbk_65_ROM_END = 0x958CB0; // type:data +sbk_66_ROM_END = 0x95AEB0; // type:data +sbk_99_ROM_END = 0x95B200; // type:data +dro_01_ROM_END = 0x9691C0; // type:data +dro_02_ROM_END = 0x978140; // type:data +isk_01_ROM_END = 0x978710; // type:data +isk_02_ROM_END = 0x979E50; // type:data +isk_03_ROM_END = 0x97B630; // type:data +isk_04_ROM_END = 0x97DAD0; // type:data +isk_05_ROM_END = 0x980A20; // type:data +isk_06_ROM_END = 0x982440; // type:data +isk_07_ROM_END = 0x984E30; // type:data +isk_08_ROM_END = 0x9864E0; // type:data +isk_09_ROM_END = 0x988B60; // type:data +isk_10_ROM_END = 0x98AA10; // type:data +isk_11_ROM_END = 0x98D640; // type:data +isk_12_ROM_END = 0x98F7E0; // type:data +isk_13_ROM_END = 0x992730; // type:data +isk_14_ROM_END = 0x9951F0; // type:data +isk_16_ROM_END = 0x997F70; // type:data +isk_18_ROM_END = 0x999740; // type:data +isk_19_ROM_END = 0x999C70; // type:data +trd_00_ROM_END = 0x99C990; // type:data +trd_01_ROM_END = 0x9A0FE0; // type:data +trd_02_ROM_END = 0x9A4650; // type:data +trd_03_ROM_END = 0x9A83F0; // type:data +trd_04_ROM_END = 0x9AE700; // type:data +trd_05_ROM_END = 0x9B1790; // type:data +trd_06_ROM_END = 0x9B6980; // type:data +trd_07_ROM_END = 0x9BB2A0; // type:data +trd_08_ROM_END = 0x9BD660; // type:data +trd_09_ROM_END = 0x9C2910; // type:data +trd_10_ROM_END = 0x9C53E0; // type:data +nok_01_ROM_END = 0x9D7020; // type:data +nok_02_ROM_END = 0x9EB7F0; // type:data +nok_03_ROM_END = 0x9EDBF0; // type:data +nok_04_ROM_END = 0x9F4A40; // type:data +nok_11_ROM_END = 0x9FA7F0; // type:data +nok_12_ROM_END = 0xA00600; // type:data +nok_13_ROM_END = 0xA02840; // type:data +nok_14_ROM_END = 0xA06F00; // type:data +nok_15_ROM_END = 0xA0BCF0; // type:data +hos_00_ROM_END = 0xA10880; // type:data +hos_01_ROM_END = 0xA16220; // type:data +hos_02_ROM_END = 0xA1B100; // type:data +hos_03_ROM_END = 0xA26ED0; // type:data +hos_04_ROM_END = 0xA2A240; // type:data +hos_05_ROM_END = 0xA394E0; // type:data +hos_06_ROM_END = 0xA3F740; // type:data +hos_10_ROM_END = 0xA45930; // type:data +hos_20_ROM_END = 0xA46F60; // type:data +kpa_01_ROM_END = 0xA485C0; // type:data +kpa_03_ROM_END = 0xA4BF60; // type:data +kpa_04_ROM_END = 0xA4CA20; // type:data +kpa_08_ROM_END = 0xA4F000; // type:data +kpa_09_ROM_END = 0xA51980; // type:data +kpa_10_ROM_END = 0xA528C0; // type:data +kpa_11_ROM_END = 0xA54950; // type:data +kpa_12_ROM_END = 0xA55F20; // type:data +kpa_13_ROM_END = 0xA574B0; // type:data +kpa_14_ROM_END = 0xA59390; // type:data +kpa_15_ROM_END = 0xA5A030; // type:data +kpa_16_ROM_END = 0xA5CA20; // type:data +kpa_17_ROM_END = 0xA5E0C0; // type:data +kpa_32_ROM_END = 0xA5F080; // type:data +kpa_33_ROM_END = 0xA60040; // type:data +kpa_40_ROM_END = 0xA60470; // type:data +kpa_41_ROM_END = 0xA609D0; // type:data +kpa_50_ROM_END = 0xA64090; // type:data +kpa_51_ROM_END = 0xA67100; // type:data +kpa_52_ROM_END = 0xA6ACA0; // type:data +kpa_53_ROM_END = 0xA6CB00; // type:data +kpa_60_ROM_END = 0xA6E3E0; // type:data +kpa_61_ROM_END = 0xA72220; // type:data +kpa_62_ROM_END = 0xA735B0; // type:data +kpa_63_ROM_END = 0xA74870; // type:data +kpa_70_ROM_END = 0xA784C0; // type:data +kpa_81_ROM_END = 0xA7A500; // type:data +kpa_82_ROM_END = 0xA83490; // type:data +kpa_83_ROM_END = 0xA867B0; // type:data +kpa_90_ROM_END = 0xA86A50; // type:data +kpa_91_ROM_END = 0xA8C7C0; // type:data +kpa_94_ROM_END = 0xA8CA80; // type:data +kpa_95_ROM_END = 0xA927C0; // type:data +kpa_96_ROM_END = 0xA93160; // type:data +kpa_100_ROM_END = 0xA93440; // type:data +kpa_101_ROM_END = 0xA93740; // type:data +kpa_102_ROM_END = 0xA99590; // type:data +kpa_111_ROM_END = 0xA9C990; // type:data +kpa_112_ROM_END = 0xA9CC30; // type:data +kpa_113_ROM_END = 0xA9E980; // type:data +kpa_114_ROM_END = 0xA9ED40; // type:data +kpa_115_ROM_END = 0xAA1EE0; // type:data +kpa_116_ROM_END = 0xAA2180; // type:data +kpa_117_ROM_END = 0xAA23C0; // type:data +kpa_118_ROM_END = 0xAA2660; // type:data +kpa_119_ROM_END = 0xAA28F0; // type:data +kpa_121_ROM_END = 0xAA2D20; // type:data +kpa_130_ROM_END = 0xAA7480; // type:data +kpa_133_ROM_END = 0xAA8FA0; // type:data +kpa_134_ROM_END = 0xAAC830; // type:data +osr_00_ROM_END = 0xAAFFF0; // type:data +osr_01_ROM_END = 0xAB2170; // type:data +osr_02_ROM_END = 0xAB6290; // type:data +osr_03_ROM_END = 0xAB92B0; // type:data +osr_04_ROM_END = 0xABB290; // type:data +kkj_00_ROM_END = 0xAC5170; // type:data +kkj_01_ROM_END = 0xAC8D20; // type:data +kkj_02_ROM_END = 0xAC9710; // type:data +kkj_03_ROM_END = 0xACAB20; // type:data +kkj_10_ROM_END = 0xACE140; // type:data +kkj_11_ROM_END = 0xAD4090; // type:data +kkj_12_ROM_END = 0xAD5ED0; // type:data +kkj_13_ROM_END = 0xADAEA0; // type:data +kkj_14_ROM_END = 0xAE5590; // type:data +kkj_15_ROM_END = 0xAED410; // type:data +kkj_16_ROM_END = 0xAF1C60; // type:data +kkj_17_ROM_END = 0xAF2CA0; // type:data +kkj_18_ROM_END = 0xAF7950; // type:data +kkj_19_ROM_END = 0xAFDB40; // type:data +kkj_20_ROM_END = 0xB022A0; // type:data +kkj_21_ROM_END = 0xB024F0; // type:data +kkj_22_ROM_END = 0xB02880; // type:data +kkj_23_ROM_END = 0xB06570; // type:data +kkj_24_ROM_END = 0xB06A00; // type:data +kkj_25_ROM_END = 0xB13120; // type:data +kkj_26_ROM_END = 0xB13D70; // type:data +kkj_27_ROM_END = 0xB14EA0; // type:data +kkj_28_ROM_END = 0xB150B0; // type:data +kkj_29_ROM_END = 0xB1A900; // type:data +tst_01_ROM_END = 0xB1AC30; // type:data +tst_02_ROM_END = 0xB1AF80; // type:data +tst_03_ROM_END = 0xB1B570; // type:data +tst_04_ROM_END = 0xB1C540; // type:data +tst_10_ROM_END = 0xB1CA50; // type:data +tst_11_ROM_END = 0xB1D2F0; // type:data +tst_12_ROM_END = 0xB1D760; // type:data +tst_13_ROM_END = 0xB20470; // type:data +tst_20_ROM_END = 0xB20540; // type:data +jan_00_ROM_END = 0xB28030; // type:data +jan_01_ROM_END = 0xB2C470; // type:data +jan_02_ROM_END = 0xB34BD0; // type:data +jan_03_ROM_END = 0xB44770; // type:data +jan_04_ROM_END = 0xB4AA70; // type:data +jan_05_ROM_END = 0xB52830; // type:data +jan_06_ROM_END = 0xB59870; // type:data +jan_07_ROM_END = 0xB5E2B0; // type:data +jan_08_ROM_END = 0xB65AB0; // type:data +jan_09_ROM_END = 0xB6C390; // type:data +jan_10_ROM_END = 0xB70860; // type:data +jan_11_ROM_END = 0xB730B0; // type:data +jan_12_ROM_END = 0xB767B0; // type:data +jan_13_ROM_END = 0xB7A050; // type:data +jan_14_ROM_END = 0xB7D920; // type:data +jan_15_ROM_END = 0xB80000; // type:data +jan_16_ROM_END = 0xB837C0; // type:data +jan_17_ROM_END = 0xB83B90; // type:data +jan_18_ROM_END = 0xB83E60; // type:data +jan_19_ROM_END = 0xB84180; // type:data +jan_22_ROM_END = 0xB8FCD0; // type:data +jan_23_ROM_END = 0xB93440; // type:data +mim_01_ROM_END = 0xB97C00; // type:data +mim_02_ROM_END = 0xB9B480; // type:data +mim_03_ROM_END = 0xB9D960; // type:data +mim_04_ROM_END = 0xBA0730; // type:data +mim_05_ROM_END = 0xBA4780; // type:data +mim_06_ROM_END = 0xBAA140; // type:data +mim_07_ROM_END = 0xBAD940; // type:data +mim_08_ROM_END = 0xBB2E00; // type:data +mim_09_ROM_END = 0xBB59E0; // type:data +mim_10_ROM_END = 0xBB7070; // type:data +mim_11_ROM_END = 0xBBB380; // type:data +mim_12_ROM_END = 0xBBD1A0; // type:data +obk_01_ROM_END = 0xBC2A90; // type:data +obk_02_ROM_END = 0xBC4280; // type:data +obk_03_ROM_END = 0xBC7E60; // type:data +obk_04_ROM_END = 0xBCD060; // type:data +obk_05_ROM_END = 0xBCE690; // type:data +obk_06_ROM_END = 0xBCEBF0; // type:data +obk_07_ROM_END = 0xBD3870; // type:data +obk_08_ROM_END = 0xBDA7B0; // type:data +obk_09_ROM_END = 0xBDD1B0; // type:data +arn_02_ROM_END = 0xBDED90; // type:data +arn_03_ROM_END = 0xBE37B0; // type:data +arn_04_ROM_END = 0xBE7BE0; // type:data +arn_05_ROM_END = 0xBECDF0; // type:data +arn_07_ROM_END = 0xBF47A0; // type:data +arn_08_ROM_END = 0xBF6060; // type:data +arn_09_ROM_END = 0xBF6A00; // type:data +arn_10_ROM_END = 0xBF7680; // type:data +arn_11_ROM_END = 0xBF8790; // type:data +arn_12_ROM_END = 0xBF9410; // type:data +arn_13_ROM_END = 0xBFA0A0; // type:data +dgb_00_ROM_END = 0xBFD880; // type:data +dgb_01_ROM_END = 0xC20F40; // type:data +C20F40_ROM_END = 0xC2EBA0; // type:data +dgb_02_ROM_END = 0xC314E0; // type:data +dgb_03_ROM_END = 0xC36530; // type:data +dgb_04_ROM_END = 0xC3AA10; // type:data +dgb_05_ROM_END = 0xC3D080; // type:data +dgb_06_ROM_END = 0xC3DBF0; // type:data +dgb_07_ROM_END = 0xC3FDB0; // type:data +dgb_08_ROM_END = 0xC46BE0; // type:data +dgb_09_ROM_END = 0xC4C390; // type:data +dgb_10_ROM_END = 0xC4D3E0; // type:data +dgb_11_ROM_END = 0xC4DEF0; // type:data +dgb_12_ROM_END = 0xC4E960; // type:data +dgb_13_ROM_END = 0xC4F030; // type:data +dgb_14_ROM_END = 0xC4F510; // type:data +dgb_15_ROM_END = 0xC52540; // type:data +dgb_16_ROM_END = 0xC55A60; // type:data +dgb_17_ROM_END = 0xC55F40; // type:data +dgb_18_ROM_END = 0xC599D0; // type:data +kzn_01_ROM_END = 0xC5A740; // type:data +kzn_02_ROM_END = 0xC60D10; // type:data +kzn_03_ROM_END = 0xC68130; // type:data +kzn_04_ROM_END = 0xC6C0D0; // type:data +kzn_05_ROM_END = 0xC6C920; // type:data +kzn_06_ROM_END = 0xC6E330; // type:data +kzn_07_ROM_END = 0xC71480; // type:data +kzn_08_ROM_END = 0xC76CE0; // type:data +kzn_09_ROM_END = 0xC7E180; // type:data +kzn_10_ROM_END = 0xC801A0; // type:data +kzn_11_ROM_END = 0xC85AB0; // type:data +kzn_17_ROM_END = 0xC8C0A0; // type:data +kzn_18_ROM_END = 0xC8DBB0; // type:data +kzn_19_ROM_END = 0xC95F30; // type:data +kzn_20_ROM_END = 0xC9A200; // type:data +kzn_22_ROM_END = 0xC9C300; // type:data +kzn_23_ROM_END = 0xC9DF20; // type:data +flo_00_ROM_END = 0xCA72A0; // type:data +flo_03_ROM_END = 0xCAC1F0; // type:data +flo_07_ROM_END = 0xCAED40; // type:data +flo_08_ROM_END = 0xCB5000; // type:data +flo_09_ROM_END = 0xCB9200; // type:data +flo_10_ROM_END = 0xCBDCD0; // type:data +flo_11_ROM_END = 0xCC0E30; // type:data +flo_12_ROM_END = 0xCC3810; // type:data +flo_13_ROM_END = 0xCCB310; // type:data +flo_14_ROM_END = 0xCD06C0; // type:data +flo_15_ROM_END = 0xCD1E30; // type:data +flo_16_ROM_END = 0xCD72E0; // type:data +flo_17_ROM_END = 0xCDC6A0; // type:data +flo_18_ROM_END = 0xCE36F0; // type:data +flo_19_ROM_END = 0xCE6700; // type:data +flo_21_ROM_END = 0xCEC240; // type:data +flo_22_ROM_END = 0xCEE260; // type:data +flo_23_ROM_END = 0xCF0940; // type:data +flo_24_ROM_END = 0xCF2BD0; // type:data +flo_25_ROM_END = 0xCF7B70; // type:data +sam_01_ROM_END = 0xD05730; // type:data +sam_02_ROM_END = 0xD110C0; // type:data +sam_03_ROM_END = 0xD135D0; // type:data +sam_04_ROM_END = 0xD187E0; // type:data +sam_05_ROM_END = 0xD1FE90; // type:data +sam_06_ROM_END = 0xD2BD30; // type:data +sam_07_ROM_END = 0xD2FC80; // type:data +sam_08_ROM_END = 0xD362F0; // type:data +sam_09_ROM_END = 0xD37800; // type:data +sam_10_ROM_END = 0xD3A5D0; // type:data +sam_11_ROM_END = 0xD4BA20; // type:data +sam_12_ROM_END = 0xD4D040; // type:data +pra_01_ROM_END = 0xD4FFF0; // type:data +pra_02_ROM_END = 0xD53CB0; // type:data +pra_03_ROM_END = 0xD54690; // type:data +pra_04_ROM_END = 0xD55BB0; // type:data +pra_05_ROM_END = 0xD57430; // type:data +pra_06_ROM_END = 0xD58890; // type:data +pra_09_ROM_END = 0xD5F2B0; // type:data +pra_10_ROM_END = 0xD61500; // type:data +pra_11_ROM_END = 0xD62D10; // type:data +pra_12_ROM_END = 0xD645E0; // type:data +pra_13_ROM_END = 0xD67D00; // type:data +pra_14_ROM_END = 0xD69810; // type:data +pra_15_ROM_END = 0xD69B20; // type:data +pra_16_ROM_END = 0xD6B620; // type:data +pra_18_ROM_END = 0xD6E9B0; // type:data +pra_19_ROM_END = 0xD763A0; // type:data +pra_20_ROM_END = 0xD77F20; // type:data +pra_21_ROM_END = 0xD78880; // type:data +pra_22_ROM_END = 0xD799F0; // type:data +pra_27_ROM_END = 0xD7B2A0; // type:data +pra_28_ROM_END = 0xD7CB50; // type:data +pra_29_ROM_END = 0xD7ED60; // type:data +pra_31_ROM_END = 0xD86A00; // type:data +pra_32_ROM_END = 0xD896E0; // type:data +pra_33_ROM_END = 0xD8B3B0; // type:data +pra_34_ROM_END = 0xD8D250; // type:data +pra_35_ROM_END = 0xD91700; // type:data +pra_36_ROM_END = 0xD92F40; // type:data +pra_37_ROM_END = 0xD955F0; // type:data +pra_38_ROM_END = 0xD97890; // type:data +pra_39_ROM_END = 0xD999B0; // type:data +pra_40_ROM_END = 0xD9AEF0; // type:data +omo_01_ROM_END = 0xD9D4D0; // type:data +omo_02_ROM_END = 0xDA5240; // type:data +omo_03_ROM_END = 0xDAD400; // type:data +omo_04_ROM_END = 0xDB22C0; // type:data +omo_05_ROM_END = 0xDB7910; // type:data +omo_06_ROM_END = 0xDBD2B0; // type:data +omo_07_ROM_END = 0xDC43D0; // type:data +omo_08_ROM_END = 0xDCCCD0; // type:data +omo_09_ROM_END = 0xDD79B0; // type:data +omo_10_ROM_END = 0xDDC830; // type:data +omo_11_ROM_END = 0xDDF310; // type:data +omo_12_ROM_END = 0xDE2490; // type:data +omo_13_ROM_END = 0xDE56B0; // type:data +omo_14_ROM_END = 0xDE8770; // type:data +omo_15_ROM_END = 0xDEBED0; // type:data +omo_16_ROM_END = 0xDEEEA0; // type:data +omo_17_ROM_END = 0xDF6A00; // type:data +end_00_ROM_END = 0xE05360; // type:data +end_01_ROM_END = 0xE0E7A0; // type:data +mgm_00_ROM_END = 0xE12760; // type:data +mgm_01_ROM_END = 0xE15D80; // type:data +mgm_02_ROM_END = 0xE1E380; // type:data +mgm_03_ROM_END = 0xE1E460; // type:data +gv_01_ROM_END = 0xE20110; // type:data +E20110_ROM_END = 0xE20EB0; // type:data +E20EB0_ROM_END = 0xE21870; // type:data +E21870_ROM_END = 0xE225B0; // type:data +E225B0_ROM_END = 0xE23260; // type:data +E23260_ROM_END = 0xE236E0; // type:data +E236E0_ROM_END = 0xE24040; // type:data +E24040_ROM_END = 0xE245D0; // type:data +E245D0_ROM_END = 0xE24920; // type:data +E24920_ROM_END = 0xE24ED0; // type:data +E24ED0_ROM_END = 0xE25D60; // type:data +E25D60_ROM_END = 0xE26710; // type:data +E26710_ROM_END = 0xE26DE0; // type:data +E26DE0_ROM_END = 0xE27510; // type:data +E27510_ROM_END = 0xE27C90; // type:data +E27C90_ROM_END = 0xE27F40; // type:data +E27F40_ROM_END = 0xE287F0; // type:data +E287F0_ROM_END = 0xE28A30; // type:data +E28A30_ROM_END = 0xE291A0; // type:data +E291A0_ROM_END = 0xE29470; // type:data +E29470_ROM_END = 0xE2A340; // type:data +E2A340_ROM_END = 0xE2A6B0; // type:data +E2A6B0_ROM_END = 0xE2B530; // type:data +entity_default_ROM_END = 0xE2D730; // type:data +entity_jan_iwa_ROM_END = 0xE2F750; // type:data +entity_sbk_omo_ROM_END = 0xE31530; // type:data D_00E32420 = 0xE32420; // type:data D_00E35670 = 0xE35670; // type:data D_00E38890 = 0xE38890; // type:data @@ -15598,6 +17894,174 @@ D_00E62370 = 0xE62370; // type:data D_00E62AC0 = 0xE62AC0; // type:data D_00E639C0 = 0xE639C0; // type:data D_00E648D0 = 0xE648D0; // type:data +E31530_ROM_END = 0xEA0900; // type:data +EA0900_ROM_END = 0xEA6FD0; // type:data +EA6FD0_ROM_END = 0xEA8AE0; // type:data +EA8AE0_ROM_END = 0xEB0E60; // type:data +EB0E60_ROM_END = 0xEB5130; // type:data +EB5130_ROM_END = 0xEB7230; // type:data +EB7230_ROM_END = 0xEB8E50; // type:data +EB8E50_ROM_END = 0xEC2200; // type:data +EC2200_ROM_END = 0xEC71B0; // type:data +EC71B0_ROM_END = 0xEC9D00; // type:data +EC9D00_ROM_END = 0xECFFF0; // type:data +ECFFF0_ROM_END = 0xED4220; // type:data +ED4220_ROM_END = 0xED8E20; // type:data +ED8E20_ROM_END = 0xEDBFE0; // type:data +EDBFE0_ROM_END = 0xEDE9C0; // type:data +EDE9C0_ROM_END = 0xEE65B0; // type:data +EE65B0_ROM_END = 0xEED100; // type:data +EED100_ROM_END = 0xEF2610; // type:data +EF2610_ROM_END = 0xEF7A80; // type:data +EF7A80_ROM_END = 0xEFEB00; // type:data +EFEB00_ROM_END = 0xF007C0; // type:data +Battle_Fanfare_02_ROM_END = 0xF02160; // type:data +Hey_You_03_ROM_END = 0xF03740; // type:data +The_Goomba_King_s_Decree_07_ROM_END = 0xF043F0; // type:data +Attack_of_the_Koopa_Bros_08_ROM_END = 0xF073C0; // type:data +Trojan_Bowser_09_ROM_END = 0xF08D40; // type:data +Chomp_Attack_0A_ROM_END = 0xF09600; // type:data +Ghost_Gulping_0B_ROM_END = 0xF0A550; // type:data +Keeping_Pace_0C_ROM_END = 0xF0BAE0; // type:data +Go_Mario_Go_0D_ROM_END = 0xF0DEC0; // type:data +Huffin_and_Puffin_0E_ROM_END = 0xF0FD20; // type:data +Freeze_0F_ROM_END = 0xF110D0; // type:data +Winning_a_Battle_8B_ROM_END = 0xF116C0; // type:data +Winning_a_Battle_and_Level_Up_8E_ROM_END = 0xF12320; // type:data +Jr_Troopa_Battle_04_ROM_END = 0xF13C20; // type:data +Final_Bowser_Battle_interlude_05_ROM_END = 0xF15F40; // type:data +Master_Battle_2C_ROM_END = 0xF16F80; // type:data +Game_Over_87_ROM_END = 0xF171D0; // type:data +Resting_at_the_Toad_House_88_ROM_END = 0xF17370; // type:data +Running_around_the_Heart_Pillar_in_Ch1_84_ROM_END = 0xF17570; // type:data +Tutankoopa_s_Warning_45_ROM_END = 0xF18940; // type:data +Kammy_Koopa_s_Theme_46_ROM_END = 0xF193D0; // type:data +Jr_Troopa_s_Theme_47_ROM_END = 0xF19BC0; // type:data +Goomba_King_s_Theme_50_ROM_END = 0xF1A6F0; // type:data +Koopa_Bros_Defeated_51_ROM_END = 0xF1ABD0; // type:data +Koopa_Bros_Theme_52_ROM_END = 0xF1C810; // type:data +Tutankoopa_s_Warning_2_53_ROM_END = 0xF1DBF0; // type:data +Tutankoopa_s_Theme_54_ROM_END = 0xF1F2E0; // type:data +Tubba_Blubba_s_Theme_55_ROM_END = 0xF20FF0; // type:data +General_Guy_s_Theme_56_ROM_END = 0xF21780; // type:data +Lava_Piranha_s_Theme_57_ROM_END = 0xF22A00; // type:data +Huff_N_Puff_s_Theme_58_ROM_END = 0xF23A00; // type:data +Crystal_King_s_Theme_59_ROM_END = 0xF24810; // type:data +Blooper_s_Theme_5A_ROM_END = 0xF25240; // type:data +Midboss_Theme_5B_ROM_END = 0xF26260; // type:data +Monstar_s_Theme_5C_ROM_END = 0xF27840; // type:data +Moustafa_s_Theme_86_ROM_END = 0xF27E20; // type:data +Fuzzy_Searching_Minigame_85_ROM_END = 0xF28E20; // type:data +Phonograph_in_Mansion_44_ROM_END = 0xF29AC0; // type:data +Toad_Town_00_ROM_END = 0xF2E130; // type:data +Bill_Blaster_Theme_48_ROM_END = 0xF2EF90; // type:data +Monty_Mole_Theme_in_Flower_Fields_49_ROM_END = 0xF30590; // type:data +Shy_Guys_in_Toad_Town_4A_ROM_END = 0xF318B0; // type:data +Whale_s_Problem_4C_ROM_END = 0xF32220; // type:data +Toad_Town_Sewers_4B_ROM_END = 0xF33060; // type:data +Unused_Theme_4D_ROM_END = 0xF33AA0; // type:data +Mario_s_House_Prologue_3E_ROM_END = 0xF33F10; // type:data +Peach_s_Party_3F_ROM_END = 0xF354E0; // type:data +Goomba_Village_01_ROM_END = 0xF35ED0; // type:data +Pleasant_Path_11_ROM_END = 0xF36690; // type:data +Fuzzy_s_Took_My_Shell_12_ROM_END = 0xF379E0; // type:data +Koopa_Village_13_ROM_END = 0xF38570; // type:data +Koopa_Bros_Fortress_14_ROM_END = 0xF39160; // type:data +Dry_Dry_Ruins_18_ROM_END = 0xF3A0D0; // type:data +Dry_Dry_Ruins_Mystery_19_ROM_END = 0xF3A450; // type:data +Mt_Rugged_16_ROM_END = 0xF3AF20; // type:data +Dry_Dry_Desert_Oasis_17_ROM_END = 0xF3C130; // type:data +Dry_Dry_Outpost_15_ROM_END = 0xF3CCC0; // type:data +Forever_Forest_1A_ROM_END = 0xF3E130; // type:data +Boo_s_Mansion_1B_ROM_END = 0xF3F3E0; // type:data +Bow_s_Theme_1C_ROM_END = 0xF40F00; // type:data +Gusty_Gulch_Adventure_1D_ROM_END = 0xF42F30; // type:data +Tubba_Blubba_s_Castle_1E_ROM_END = 0xF45500; // type:data +The_Castle_Crumbles_1F_ROM_END = 0xF465E0; // type:data +Shy_Guy_s_Toy_Box_20_ROM_END = 0xF474A0; // type:data +Toy_Train_Travel_21_ROM_END = 0xF47E10; // type:data +Big_Lantern_Ghost_s_Theme_22_ROM_END = 0xF48410; // type:data +Jade_Jungle_24_ROM_END = 0xF4A880; // type:data +Deep_Jungle_25_ROM_END = 0xF4BC00; // type:data +Lavalava_Island_26_ROM_END = 0xF4E690; // type:data +Search_for_the_Fearsome_5_27_ROM_END = 0xF50A00; // type:data +Raphael_the_Raven_28_ROM_END = 0xF52520; // type:data +Hot_Times_in_Mt_Lavalava_29_ROM_END = 0xF55C80; // type:data +Escape_from_Mt_Lavalava_2A_ROM_END = 0xF58ED0; // type:data +Cloudy_Climb_32_ROM_END = 0xF592B0; // type:data +Puff_Puff_Machine_33_ROM_END = 0xF5AFF0; // type:data +Flower_Fields_30_ROM_END = 0xF5C8D0; // type:data +Flower_Fields_Sunny_31_ROM_END = 0xF5DF40; // type:data +Sun_s_Tower_34_ROM_END = 0xF5F500; // type:data +Sun_s_Celebration_35_ROM_END = 0xF61700; // type:data +Shiver_City_38_ROM_END = 0xF62E50; // type:data +Detective_Mario_39_ROM_END = 0xF64220; // type:data +Snow_Road_3A_ROM_END = 0xF64CB0; // type:data +Over_Shiver_Mountain_3B_ROM_END = 0xF65B30; // type:data +Starborn_Valley_3C_ROM_END = 0xF66690; // type:data +Sanctuary_3D_ROM_END = 0xF66B70; // type:data +Crystal_Palace_37_ROM_END = 0xF67F80; // type:data +Star_Haven_60_ROM_END = 0xF69640; // type:data +Shooting_Star_Summit_61_ROM_END = 0xF6A050; // type:data +Legendary_Star_Ship_62_ROM_END = 0xF6C270; // type:data +Star_Sanctuary_63_ROM_END = 0xF6CED0; // type:data +Bowser_s_Castle___Caves_65_ROM_END = 0xF6EE40; // type:data +Bowser_s_Castle_64_ROM_END = 0xF73390; // type:data +Star_Elevator_2B_ROM_END = 0xF751F0; // type:data +Goomba_Bros_Defeated_7E_ROM_END = 0xF759C0; // type:data +Farewell_Twink_70_ROM_END = 0xF77200; // type:data +Peach_Cooking_71_ROM_END = 0xF77680; // type:data +Gourmet_Guy_72_ROM_END = 0xF78600; // type:data +Hope_on_the_Balcony_Peach_1_73_ROM_END = 0xF79070; // type:data +Peach_s_Theme_2_74_ROM_END = 0xF7A0C0; // type:data +Peach_Sneaking_75_ROM_END = 0xF7AA40; // type:data +Peach_Captured_76_ROM_END = 0xF7AD90; // type:data +Quiz_Show_Intro_77_ROM_END = 0xF7BEA0; // type:data +Unconscious_Mario_78_ROM_END = 0xF7C780; // type:data +Petunia_s_Theme_89_ROM_END = 0xF7DC00; // type:data +Flower_Fields_Door_appears_8A_ROM_END = 0xF7E190; // type:data +Beanstalk_7B_ROM_END = 0xF7EE20; // type:data +Lakilester_s_Theme_7D_ROM_END = 0xF80230; // type:data +The_Sun_s_Back_7F_ROM_END = 0xF81260; // type:data +Shiver_City_in_Crisis_79_ROM_END = 0xF82460; // type:data +Solved_Shiver_City_Mystery_7A_ROM_END = 0xF82D00; // type:data +Merlon_s_Spell_7C_ROM_END = 0xF83DC0; // type:data +Bowser_s_Theme_66_ROM_END = 0xF85590; // type:data +Train_Travel_80_ROM_END = 0xF860E0; // type:data +Whale_Trip_81_ROM_END = 0xF87000; // type:data +Chanterelle_s_Song_8C_ROM_END = 0xF87610; // type:data +Boo_s_Game_8D_ROM_END = 0xF88B30; // type:data +Dry_Dry_Ruins_rises_up_83_ROM_END = 0xF89570; // type:data +End_of_Chapter_40_ROM_END = 0xF8AAF0; // type:data +Beginning_of_Chapter_41_ROM_END = 0xF8B820; // type:data +Hammer_and_Jump_Upgrade_42_ROM_END = 0xF8BD90; // type:data +Found_Baby_Yoshi_s_4E_ROM_END = 0xF8C360; // type:data +New_Partner_JAP_96_ROM_END = 0xF8D110; // type:data +Unused_YI_Fanfare_4F_ROM_END = 0xF8D3E0; // type:data +Unused_YI_Fanfare_2_5D_ROM_END = 0xF90880; // type:data +Peach_s_Castle_inside_Bubble_5E_ROM_END = 0xF92A50; // type:data +Angry_Bowser_67_ROM_END = 0xF95510; // type:data +Bowser_s_Castle_explodes_5F_ROM_END = 0xF96280; // type:data +Peach_s_Wish_68_ROM_END = 0xF98520; // type:data +File_Select_69_ROM_END = 0xF98F90; // type:data +Title_Screen_6A_ROM_END = 0xF9B830; // type:data +Peach_s_Castle_in_Crisis_6B_ROM_END = 0xF9D3B0; // type:data +Mario_falls_from_Bowser_s_Castle_6C_ROM_END = 0xF9D690; // type:data +Peach_s_Arrival_6D_ROM_END = 0xF9EF30; // type:data +Star_Rod_Recovered_6F_ROM_END = 0xF9FA30; // type:data +Mario_s_House_94_ROM_END = 0xFA08A0; // type:data +Bowser_s_Attacks_95_ROM_END = 0xFA3C60; // type:data +End_Parade_1_90_ROM_END = 0xFA85F0; // type:data +End_Parade_2_91_ROM_END = 0xFABE90; // type:data +The_End_6E_ROM_END = 0xFACC80; // type:data +Koopa_Radio_Station_2D_ROM_END = 0xFAD210; // type:data +The_End_Low_Frequency__2E_ROM_END = 0xFAD8F0; // type:data +SMW_Remix_2F_ROM_END = 0xFADE70; // type:data +New_Partner_82_ROM_END = 0xFAE860; // type:data +FAE860_ROM_END = 0x1943000; // type:data +npc_ROM_END = 0x1B82208; // type:data +msg_ROM_END = 0x1C84D30; // type:data +mapfs_ROM_END = 0x27FEE22; // type:data kmr_10_config = 0x2800000; // type:data kmr_04_config = 0x2800040; // type:data kmr_09_config = 0x2800080; // type:data @@ -15642,7 +18106,6 @@ D_8000030C = 0x8000030C; // type:data D_80000318 = 0x80000318; // type:data D_8000031C = 0x8000031C; // type:data D_80026AC7 = 0x80026AC7; // type:data -dead_atan2 = 0x8002AF70; // type:func D_8004AA85 = 0x8004AA85; // type:data ai = 0x8006AD64; // si = 0x8006AD90; // @@ -15740,7 +18203,6 @@ D_80093DB0 = 0x80093DB0; // type:data D_80094664 = 0x80094664; // type:data D_80094900 = 0x80094900; // type:data gBattleAreas = 0x80095A30; // type:data size:0x600 -D_80097D30 = 0x80097D30; // type:data D_80097D60 = 0x80097D60; // type:data D_80097D68 = 0x80097D68; // type:data D_80097D70 = 0x80097D70; // type:data @@ -16735,6 +19197,7 @@ D_802440FB = 0x802440FB; // type:data D_802440FF = 0x802440FF; // type:data D_80244100 = 0x80244100; // type:data D_80244104 = 0x80244104; // type:data +D_802442D0 = 0x802442D0; // type:data code_eb1170_bss = 0x802442D0; // type:data kzn_20_bss = 0x802442D0; // type:data D_80244494 = 0x80244494; // type:data @@ -18734,6 +21197,7 @@ D_F5000007 = 0xF5000007; // type:data D_F79DDD0F = 0xF79DDD0F; // type:data D_FA000028 = 0xFA000028; // type:data D_FD100008 = 0xFD100008; // type:data +dead_atan2 = 0x8002AF70; // type:func dead:yes dead_cos_rad = 0x8002B4C0; // type:func dead:yes dead_func_8006FEF0 = 0x80075170; // type:func dead:yes dead_get_variable = 0x802D4E8C; // type:func dead:yes diff --git a/ver/us/undefined_syms.txt b/ver/us/undefined_syms.txt index 6c9576bb49..657bbc3110 100644 --- a/ver/us/undefined_syms.txt +++ b/ver/us/undefined_syms.txt @@ -54,3 +54,4 @@ kzn_20_bss = 0x802442D0; code_eb1170_bss = 0x802442D0; D_000001E4 = 0x1E4; gPauseMenuStrings = 0x8026F778; +D_802442D0 = 0x802442D0; diff --git a/ver/us/undefined_syms_auto.txt b/ver/us/undefined_syms_auto.txt index 95c7286b56..036e20f259 100644 --- a/ver/us/undefined_syms_auto.txt +++ b/ver/us/undefined_syms_auto.txt @@ -3104,7 +3104,3 @@ jtbl_8022EB80_56DF60 = 0x8022EB80; jtbl_80231320_63CEC0 = 0x80231320; jtbl_80232A20_6847A0 = 0x80232A20; jtbl_80228450_6CBFE0 = 0x80228450; -D_802A285A_732B5A = 0x802A285A; -kzn_20_bss = 0x802442D0; -code_eb1170_bss = 0x802442D0; -D_000001E4 = 0x1E4;