kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

93%

Browse Source
This commit is contained in:
Banjo Kazooie
2022-11-06 17:09:22 -06:00
parent cf25186021
commit 7071f98cc9
8 changed files with 22 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -1,4 +1,4 @@
# banjo (92.8727%)
# banjo (93.0880%)
<img src="./progress/progress_total.svg">

6
progress/progress_core1.svg
View File

@@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h44v20H0z"/>
<path fill="#3ce000" d="M44 0h67v20H44z"/>
<path fill="#3be000" d="M44 0h67v20H44z"/>
<path fill="url(#b)" d="M0 0h111v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -17,7 +17,7 @@
<text x="22.0" y="14">core1</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">86.5006%</text>
<text x="77.5" y="14">86.5006%</text>
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">86.8247%</text>
<text x="77.5" y="14">86.8247%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

6
progress/progress_core2.svg
View File

@@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h44v20H0z"/>
<path fill="#27e000" d="M44 0h67v20H44z"/>
<path fill="#26e000" d="M44 0h67v20H44z"/>
<path fill="url(#b)" d="M0 0h111v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -17,7 +17,7 @@
<text x="22.0" y="14">core2</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">91.2064%</text>
<text x="77.5" y="14">91.2064%</text>
<text x="78.5" y="15" fill="#010101" fill-opacity=".3">91.4998%</text>
<text x="77.5" y="14">91.4998%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

6
progress/progress_total.svg
View File

@@ -9,7 +9,7 @@
</mask>
<g mask="url(#anybadge_1)">
<path fill="#555" d="M0 0h150v20H0z"/>
<path fill="#20e000" d="M150 0h67v20H150z"/>
<path fill="#1fe000" d="M150 0h67v20H150z"/>
<path fill="url(#b)" d="M0 0h217v20H0z"/>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
@@ -17,7 +17,7 @@
<text x="75.0" y="14">Banjo-Kazooie (us.v10)</text>
</g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="184.5" y="15" fill="#010101" fill-opacity=".3">92.8727%</text>
<text x="183.5" y="14">92.8727%</text>
<text x="184.5" y="15" fill="#010101" fill-opacity=".3">93.0880%</text>
<text x="183.5" y="14">93.0880%</text>
</g>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

23
src/core1/code_9D30.c
View File

@@ -317,26 +317,19 @@ s32 func_8024824C(s32 arg0) {
}
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_9D30/func_80248330.s")
#else
void func_80248330(u8 *arg0){
s32 i;
s32 val;
s32 var_v0;
D_80275BC4 = D_80275BBC;
D_80275BD4 = 2;
i = 0;
val = arg0[i];
while(arg0[i] != 0){
val = arg0[i];
func_8024824C(val);
func_80247CEC(D_80275BCC, val, 2);
i++;
for(i = 0; arg0[i] != 0; i++){
var_v0 = arg0[i];
func_80247CEC(D_80275BCC, func_8024824C(var_v0), 2);
}
func_80248520();
}
#endif
void func_802483B8(void){
D_80275BD0 = 1;
@@ -518,9 +511,6 @@ void draw_sprite_rgba16(s32 x, s32 y, BKSprite *sprite, s32 frame, bool alpha_en
}
}
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_9D30/draw_sprite_i4.s")
#else
void draw_sprite_i4(s32 x, s32 y, BKSprite *sprite, s32 frame, bool aplha_enabled) {
BKSpriteFrame *frame_ptr;
BKSpriteTextureBlock *chunk_ptr;
@@ -552,9 +542,9 @@ void draw_sprite_i4(s32 x, s32 y, BKSprite *sprite, s32 frame, bool aplha_enable
if ((fb_x >= 0) && (fb_x < D_80276588)) {
fb_y = chunk_ptr->y + y + txtr_y;
if ((fb_y >= 0) && (fb_y < D_8027658C)) {
fb_pxl_ptr = framebuffer_ptr + fb_x + (fb_y * D_80276588);
p1 = (*tmem >> 4);
p2 = (*tmem & 0xF);
fb_pxl_ptr = framebuffer_ptr + fb_x + (fb_y * D_80276588);
if (p1) {
*fb_pxl_ptr = (p1 << 0xC) | (p1 << 0x7) | (p1 << 0x2) | 1;
} else if (!aplha_enabled) {
@@ -573,7 +563,6 @@ void draw_sprite_i4(s32 x, s32 y, BKSprite *sprite, s32 frame, bool aplha_enable
chunk_ptr = (BKSpriteTextureBlock *) tmem;
}
}
#endif
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_9D30/draw_sprite_ia4.s")

10
src/core2/code_637D0.c
View File

@@ -158,10 +158,6 @@ s32 func_802EAD5C(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32
return 0;
}
#ifndef NONMATCHING
s32 func_802EAED4(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32 scale, s32 arg4, s32 arg5, f32 arg6[3], f32 arg7);
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_637D0/func_802EAED4.s")
#else
s32 func_802EAED4(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32 scale, s32 arg4, struct58s *arg5, f32 arg6[3], f32 arg7) {
f32 spF4[3];
f32 spE8[3];
@@ -211,7 +207,8 @@ s32 func_802EAED4(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32
spA4[0] = arg6[0] - spB0[0];
spA4[1] = arg6[1] - spB0[1];
spA4[2] = arg6[2] - spB0[2];
if ((arg7 <= ((spA4[0]*spBC[0]) + (spA4[1]*spBC[1]) + (spA4[2]*spBC[2])))) {
if (!(arg7 <= ((spA4[0]*spBC[0]) + (spA4[1]*spBC[1]) + (spA4[2]*spBC[2])))) {
if (1) {}
sp8C[0] = arg6[0] - sp98[0];
sp8C[1] = arg6[1] - sp98[1];
sp8C[2] = arg6[2] - sp98[2];
@@ -222,6 +219,7 @@ s32 func_802EAED4(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32
spBC[2] = spB0[2] - sp80[2];
ml_vec3f_normalize(spBC);
if (!(arg7 <= ((spA4[0]*spBC[0]) + (spA4[1]*spBC[1]) + (spA4[2]*spBC[2])))) {
if (1) {}
sp74[0] = arg6[0] - sp80[0];
sp74[1] = arg6[1] - sp80[1];
sp74[2] = arg6[2] - sp80[2];
@@ -232,6 +230,7 @@ s32 func_802EAED4(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32
spBC[2] = spB0[2] - sp68[2];
ml_vec3f_normalize(spBC);
if (!(arg7 <= ((spA4[0]*spBC[0]) + (spA4[1]*spBC[1]) + (spA4[2]*spBC[2])))) {
if (1) {}
sp5C[0] = arg6[0] - sp68[0];
sp5C[1] = arg6[1] - sp68[1];
sp5C[2] = arg6[2] - sp68[2];
@@ -247,7 +246,6 @@ s32 func_802EAED4(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32
}
return 0;
}
#endif
#ifndef NONMATCHING
s32 func_802EB458(BKModelUnk14List *arg0, f32 position[3], f32 rotation[3], f32 scale, s32 arg4, s32 arg5, f32 arg6[3], f32 arg7);

6
src/core2/code_8DC20.c
View File

@@ -13,9 +13,6 @@ s32 D_803830A0;
/* .code */
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_8DC20/func_80314BB0.s")
#else
void func_80314BB0(Gfx **gfx, Mtx **mtx, Vtx **vtx, void * frame_buffer_1, void *frame_buffer_2) {
s32 x;
s32 y;
@@ -28,7 +25,7 @@ void func_80314BB0(Gfx **gfx, Mtx **mtx, Vtx **vtx, void * frame_buffer_1, void
0x20*x, 0x20*y, 0x20*(x + 1) - 1, 0x20*(y + 1) - 1,
NULL, G_TX_CLAMP, G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, 0, 0
);
gSPScisTextureRectangle((*gfx)++, 0x80*x, 0x80*y, 0x80*(x + 1), 0x80*(y + 1),
gSPScisTextureRectangle((*gfx)++, (0x20*x)*4, (0x20*y)*4, 0x20*(x + 1)*4, (0x20*(y + 1)*4),
G_TX_RENDERTILE, (0x20*x)<<5, (0x20*y)<<5, 0x400, 0x400
);
}
@@ -36,7 +33,6 @@ void func_80314BB0(Gfx **gfx, Mtx **mtx, Vtx **vtx, void * frame_buffer_1, void
gSPDisplayList((*gfx)++, D_8036C690);
gDPSetColorImage((*gfx)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, D_80276588, OS_PHYSICAL_TO_K0(D_803A5D00[func_8024BDA0()]));
}
#endif
void func_80315084(Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_80335128(0);

2
subyaml/core2.us.v10.yaml
View File

@@ -296,7 +296,7 @@ segments:
- [0x85800, c, code_85800] #DONE
- [0x87E30, c, code_87E30]
- [0x8A7B0, c, gc/pauseMenu] #DONE
- [0x8DC20, c, code_8DC20]
- [0x8DC20, c, code_8DC20] #DONE
- [0x8E270, c, gc/zoombox] #DONE
- [0x91E10, c, code_91E10]
- [0x935F0, c, code_935F0] #DONE #chminigmae