diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2022-10-13 10:06:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 04:06:49 -0400 |
| commit | 22b78f169f140249a8be9ebcb41d3d5ac6b94a36 (patch) | |
| tree | 02b958160528abf2f49b8143ff0bb8f954c1077c /src/code/kanread.s | |
| parent | c3dc2994485277e3ff17f63f89335ab5c1cca7c6 (diff) | |
Fix misc 17 (#1392)
* Some cleanup on bgcheck waterbox y funcs
* Fix some typo/spelling
* EnFz_ApplyDamage match fixup
* Turn another sus construction into a switch
* Fixup comment on restoring MS as adult
* "doesnt, isnt" -> "doesn't, isn't"
* Hunt down whitespace at end of lines
* Format (clang-format does not like figs bug comment on bongo cutscene unskip sadge)
* Viewport z scale/translation: `0x1FF` -> `G_MAXZ/2` (see proman "9.7 Mixing CPU and SP Addresses", "12.7.6 Depth Source")
* static symbols: g -> s prefix
* Link young/old -> child/adult
* Fixups
* Get rid of signed vs unsigned comparison warning by changing room temps to s32
* waterbox search funcs consistency
* Revert "waterbox search funcs consistency"
This reverts commit 8f386e038f5e735f0f5f1240fc4da7bec4e8c7e2.
* `curWaterBox` -> `waterBox`
Diffstat (limited to 'src/code/kanread.s')
| -rw-r--r-- | src/code/kanread.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/kanread.s b/src/code/kanread.s index 70a884870..8f35b713b 100644 --- a/src/code/kanread.s +++ b/src/code/kanread.s @@ -16,7 +16,7 @@ * 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. * @@ -26,15 +26,15 @@ * @remark Original name: "LeoGetKadr" */ LEAF(Kanji_OffsetFromShiftJIS) - // Characters with codepoints >= 0x8800 are kanji. Arrangement is regular, + // Characters with codepoints >= 0x8800 are kanji. Arrangement is regular, // so convert index directly. li $at, 0x8800 slt $at, $a0, $at bnez $at, .nonkanji // 0xBC is number of glyphs in one block in the `kanji` file: // 0x100 possible codepoints with the same byte1 - // - 0x40 unused at beginning - // - 1 unused at 0x7F + // - 0x40 unused at beginning + // - 1 unused at 0x7F // - 3 unused at 0xFD, 0xFE, 0xFF li $a2, 0xBC // Get byte1 and adjust so starts at 0 @@ -99,7 +99,7 @@ END(Kanji_OffsetFromShiftJIS) * if (byte2 >= 0x40) { * byte2--; * } - * + * * if (sjis >= 0x8800) { * byte1 -= 0x88; * return (0x30A + byte2 + byte1 * 0xBC) * FONT_CHAR_TEX_SIZE; @@ -134,7 +134,7 @@ DATA(sNonKanjiIndices) /* 0x824_ */ .half 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0092 /* 0x825_ */ .half 0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009A, 0x009B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x826_ */ .half 0x009C, 0x009D, 0x009E, 0x009F, 0x00A0, 0x00A1, 0x00A2, 0x00A3, 0x00A4, 0x00A5, 0x00A6, 0x00A7, 0x00A8, 0x00A9, 0x00AA, 0x00AB -/* 0x827_ */ .half 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 +/* 0x827_ */ .half 0x00AC, 0x00AD, 0x00AE, 0x00AF, 0x00B0, 0x00B1, 0x00B2, 0x00B3, 0x00B4, 0x00B5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 /* 0x828_ */ .half 0x0000, 0x00B6, 0x00B7, 0x00B8, 0x00B9, 0x00BA, 0x00BB, 0x00BC, 0x00BD, 0x00BE, 0x00BF, 0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4 /* 0x829_ */ .half 0x00C5, 0x00C6, 0x00C7, 0x00C8, 0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CE, 0x00CF, 0x0000, 0x0000, 0x0000, 0x0000, 0x00D0 /* 0x82A_ */ .half 0x00D1, 0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0 |