diff --git a/README.md b/README.md index 487920e9..7c1c9de4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# banjo (94.6127%) +# banjo (94.6191%) diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index 5ae87c7f..0c66ac5e 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -686,7 +686,7 @@ segments: - [0xFB1810, c, code_5BEB0] - [0xFB1BA0, c, code_5C240] #DONE - [0xFB21D0, c, code_5C870] #DONE - - [0xFB3520, c, code_5DBC0] + - [0xFB3520, c, code_5DBC0] #DONE - [0xFB5460, c, code_5FB00] #DONE - [0xFB56E0, c, code_5FD80] #DONE - [0xFB56F0, c, code_5FD90] diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg index 0dac2edc..917b7fae 100644 --- a/progress/progress_core2.svg +++ b/progress/progress_core2.svg @@ -17,7 +17,7 @@ core2 - 93.1420% - 93.1420% + 93.1531% + 93.1531% \ No newline at end of file diff --git a/progress/progress_total.svg b/progress/progress_total.svg index 3c46c8df..25189085 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Banjo-Kazooie (us.v10) - 94.6127% - 94.6127% + 94.6191% + 94.6191% \ No newline at end of file diff --git a/src/core2/code_5DBC0.c b/src/core2/code_5DBC0.c index e6692aa4..bfa3ee3a 100644 --- a/src/core2/code_5DBC0.c +++ b/src/core2/code_5DBC0.c @@ -97,22 +97,16 @@ void func_802E4C78(void){ D_8037E900 = NULL; } -#ifndef NONMATCHING -s32 func_802E4CF8(u8); -#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_5DBC0/func_802E4CF8.s") -#else s32 func_802E4CF8(u8 arg0) { u32 var_v1; - - for(var_v1 = D_8037E900->unk10; var_v1 > 0; var_v1--){ - if (arg0 == D_8037E900->unk4[var_v1 - 1].font_id) { - return var_v1 - 1; + var_v1 = D_8037E900->unk10; + while(var_v1--){ + if (arg0 == D_8037E900->unk4[var_v1].font_id) { + return var_v1; } } return -1; } -#endif - BKSpriteTextureBlock *func_802E4D5C(s32 arg0, char arg1){ return D_8037E900->unk4[arg0].letter_texture[arg1 - 0x21];