diff --git a/include/kanread.h b/include/kanread.h index 0ca7ddf9d0..5fdc31f6a3 100644 --- a/include/kanread.h +++ b/include/kanread.h @@ -3,24 +3,6 @@ #include "PR/ultratypes.h" -/** - * s32 Kanji_OffsetFromShiftJIS(s32 sjis); - * - * Returns the offset of the glyph texture data in the file `kanji` corresponding - * to a given 2-byte Shift-JIS codepoint. No range validity check is carried out. - * - * A nice Shift-JIS codepoint table: https://uic.io/en/charset/show/shift_jis/ - * The file `kanji` contains the 'Level 1' kanji (0x889F-0x9872), and a reworked - * version of the non-kanji section that includes extra English and Hylian glyphs. - * - * @note This function assumes that its argument is a valid Shift-JIS codepoint; - * there is no range protection at all. - * - * @param sjis Shift-JIS Codepoint of glyph. - * @return s32 offset into `kanji` file. - * - * @remark Original name: "LeoGetKadr" - */ s32 Kanji_OffsetFromShiftJIS(s32 sjis); #endif diff --git a/src/audio/code_8019AEC0.s b/src/audio/code_8019AEC0.s index 50b38bf8de..8178798957 100644 --- a/src/audio/code_8019AEC0.s +++ b/src/audio/code_8019AEC0.s @@ -5,6 +5,7 @@ .align 5 /* Copy 0x20 bytes at a1 to a0, with word alignment */ +/* void func_8019AEC0(u32 dst[8], u32 src[8]) */ LEAF(func_8019AEC0) addi t7, a1, 0x20 1: diff --git a/tools/disasm/disasm.py b/tools/disasm/disasm.py index 79d41bd969..dcdde2f8df 100755 --- a/tools/disasm/disasm.py +++ b/tools/disasm/disasm.py @@ -122,7 +122,7 @@ def discard_decomped_files(files_spec, include_files): with open(root_path / last_line, "r") as f2: if "GLOBAL_ASM" in f2.read(): include = True - else: + elif last_line.rsplit(".", 1)[0] not in ("src/makerom/ipl3"): assert os.path.exists(root_path / last_line.replace(".c", ".s")) include |= force_include