diff --git a/README.md b/README.md
index e8292927..459fa51e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# banjo (94.5451%)
+# banjo (94.5848%)
diff --git a/progress/progress_core1.svg b/progress/progress_core1.svg
index 9be74cd4..35b38a90 100644
--- a/progress/progress_core1.svg
+++ b/progress/progress_core1.svg
@@ -9,7 +9,7 @@
-
+
@@ -17,7 +17,7 @@
core1
- 89.9026%
- 89.9026%
+ 90.1759%
+ 90.1759%
\ No newline at end of file
diff --git a/progress/progress_total.svg b/progress/progress_total.svg
index c89750c6..d9fd2ab0 100644
--- a/progress/progress_total.svg
+++ b/progress/progress_total.svg
@@ -17,7 +17,7 @@
Banjo-Kazooie (us.v10)
- 94.5451%
- 94.5451%
+ 94.5848%
+ 94.5848%
\ No newline at end of file
diff --git a/src/core1/code_EAF0.c b/src/core1/code_EAF0.c
index 0d8cb54c..f8a068b1 100644
--- a/src/core1/code_EAF0.c
+++ b/src/core1/code_EAF0.c
@@ -4,7 +4,6 @@
extern void guPerspective(Mtx *, u16*, f32, f32, f32, f32, f32);
extern f32 ml_vec3f_dot_product(f32[3], f32[3]);
-extern s32 D_A00001D8;
/* .data */
extern f32 D_80275D20; //fovy
@@ -133,21 +132,17 @@ void func_8024C904(Gfx **gfx, Mtx **mtx){
func_8024C964(gfx, mtx, D_80275D28, D_80275D2C);
}
-#ifndef NONMATCHING
-#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_EAF0/func_8024C964.s")
-#else
void func_8024C964(Gfx **gfx, Mtx **mtx, f32 near, f32 far){
u16 sp5e;
near = MAX(D_80275D28, near);
far = MIN(D_80275D2C, far);
- if(D_A00001D8 + 0x53D4FFF0){
+ if(*(u32*)OS_PHYSICAL_TO_K1(0x1D8) + 0x53D4FFF0){
near = 750.0f;
far = 1250.0f;
}
-
guPerspective(*mtx, &sp5e, D_80275D20, D_80275D24, near, far, 0.5f);
gSPPerspNormalize((*gfx)++, sp5e);
gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
@@ -164,7 +159,6 @@ void func_8024C964(Gfx **gfx, Mtx **mtx, f32 near, f32 far){
guTranslate(*mtx, 0.0f, 0.0f, 0.0f);
gSPMatrix((*gfx)++, OS_PHYSICAL_TO_K0((*mtx)++), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
}
-#endif
void func_8024CBD4(Gfx **gfx, Mtx **mtx){
func_8024C964(gfx, mtx, D_80275D28, D_80275D2C);