diff --git a/README.md b/README.md index 6d8af43c..26f69bdc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# banjo (97.8170%) +# banjo (97.8257%) diff --git a/progress/progress_core2.svg b/progress/progress_core2.svg index 54e751cd..9efe9116 100644 --- a/progress/progress_core2.svg +++ b/progress/progress_core2.svg @@ -17,7 +17,7 @@ core2 - 96.9477% - 96.9477% + 96.9627% + 96.9627% \ No newline at end of file diff --git a/progress/progress_total.svg b/progress/progress_total.svg index 7980b11f..604fffdc 100644 --- a/progress/progress_total.svg +++ b/progress/progress_total.svg @@ -17,7 +17,7 @@ Banjo-Kazooie (us.v10) - 97.8170% - 97.8170% + 97.8257% + 97.8257% \ No newline at end of file diff --git a/src/core2/code_83340.c b/src/core2/code_83340.c index 48cae2d8..c74095ee 100644 --- a/src/core2/code_83340.c +++ b/src/core2/code_83340.c @@ -72,18 +72,15 @@ BKModelBin *func_8030A4B4(s32 arg0){ return D_80382390[arg0].unk0; } -#ifndef NONMATCHING -#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_83340/func_8030A4D4.s") -#else -BKSpriteDisplayData *func_8030A4D4(s32 arg0){ - struct_7AF80_1 *ptr; - if((ptr = D_80382394[arg0].unk0) == NULL){ - D_80382394[arg0].unk0 = func_8033B6C4(arg0 + 0x572, &ptr->unk4); +BKSpriteDisplayData *func_8030A4D4(s32 arg0) +{ + + if (((struct_7AF80_1 *)((s32)D_80382394 + arg0*sizeof(struct_7AF80_1)))->unk0 == 0){ + ((struct_7AF80_1 *)((s32)D_80382394 + arg0*sizeof(struct_7AF80_1)))->unk0 = func_8033B6C4(arg0 + 0x572, &((struct_7AF80_1 *)((s32)D_80382394 + arg0*sizeof(struct_7AF80_1)))->unk4); } D_80382394[arg0].unk8 = func_8023DB5C(); return D_80382394[arg0].unk4; } -#endif BKSprite *func_8030A55C(s32 arg0){ func_8030A4D4(arg0);