diff --git a/asm/code_2.s b/asm/code_2.s index 4470cdd9e..2b628c036 100644 --- a/asm/code_2.s +++ b/asm/code_2.s @@ -135,7 +135,7 @@ QuickSave: movs r0, 0 bl xxx_update_some_bg_tiles bl sub_8014144 - bl sub_80097B0 + bl InitFontPalette movs r0, 0x2 bl sub_800CDA8 movs r0, 0 @@ -316,7 +316,7 @@ sub_80008C0: movs r0, 0 bl xxx_update_some_bg_tiles bl sub_8014144 - bl sub_80097B0 + bl InitFontPalette movs r0, 0x2 bl sub_800CDA8 movs r0, 0 diff --git a/asm/text.s b/asm/text.s index d0d5503b1..d085e184c 100644 --- a/asm/text.s +++ b/asm/text.s @@ -3555,7 +3555,7 @@ _08009714: bl CpuCopy adds r0, r6, 0 bl CloseFile - bl sub_80097B0 + bl InitFontPalette ldr r0, _080097AC adds r1, r4, 0 bl OpenFileAndGetFileDataPtr diff --git a/include/code_8009804.h b/include/code_8009804.h index c149b64fb..11de16a16 100644 --- a/include/code_8009804.h +++ b/include/code_8009804.h @@ -17,7 +17,7 @@ struct unkStruct_202D038 void vram_related_8009804(void); -void sub_80097B0(void); +void InitFontPalette(void); void sub_80098A0(void); void sub_80098BC(u32 *, u32 *, u32); void sub_80098F8(u32); @@ -25,4 +25,4 @@ void sub_8009908(void); void sub_80099C0(void); void sub_80099F0(u32); -#endif // GUARD_CODE_8009804_H \ No newline at end of file +#endif // GUARD_CODE_8009804_H diff --git a/include/math.h b/include/math.h index 81cabfc81..2c28b1222 100644 --- a/include/math.h +++ b/include/math.h @@ -99,4 +99,15 @@ s32 s24_8_div(s32 r0, s32 r1); */ u24_8 u24_8_mul(u24_8 x, u24_8 y); +/** + * This function divides two unsigned 24.8 fixed-point numbers. + * + * @param[in] x The first factor. + * @param[in] y The second factor. + * + * @return The quotient `x/y` as an unsigned 24.8 fixed-point number. + */ +u24_8 u24_8_div(u24_8 x, u24_8 y); + + #endif // GUARD_MATH_H diff --git a/src/code_2.c b/src/code_2.c index 4ac3996c4..403413e0e 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -99,7 +99,7 @@ void GameLoop(void) sub_800A8F8(2); ResetSprites(TRUE); xxx_update_some_bg_tiles(0); - sub_80097B0(); + InitFontPalette(); sub_800CDA8(2); sub_800641C(NULL, TRUE, TRUE); gUnknown_2026E4E = 0x1000; diff --git a/src/code_8009804.c b/src/code_8009804.c index a65e08a36..b41d19e61 100644 --- a/src/code_8009804.c +++ b/src/code_8009804.c @@ -16,7 +16,7 @@ extern struct unkStruct_202D240 gUnknown_202D240[8]; // code_8009804.s extern void sub_8009A1C(u32); -void sub_80097B0(void) +void InitFontPalette(void) { OpenedFile *fontpalFile; s32 i; @@ -137,4 +137,4 @@ void sub_80099F0(u32 a0) UNUSED static void sub_8009A10(u32 *a0) { sub_8009A1C(a0[1]); -} \ No newline at end of file +} diff --git a/src/math.c b/src/math.c index e7b4816b7..7efcb42ab 100644 --- a/src/math.c +++ b/src/math.c @@ -4,8 +4,6 @@ #include "data/math.h" -u24_8 u24_8_div(u24_8 x, u24_8 y); - u32 fast_mod_3(s32 x) { if (x < 0x100) { return gFastMod3Lookup[x];