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

func_80328508() match

Browse Source
This commit is contained in:
Banjo Kazooie
2022-12-09 17:47:29 -06:00
parent 82ff6d4886
commit 915a2c9ec9
5 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

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

4
progress/progress_core2.svg
View File

@@ -17,7 +17,7 @@
<text x="22.0" y="14">core2</text> <text x="22.0" y="14">core2</text>
</g> </g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <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">93.7629%</text> <text x="78.5" y="15" fill="#010101" fill-opacity=".3">93.7877%</text>
<text x="77.5" y="14">93.7629%</text> <text x="77.5" y="14">93.7877%</text>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

4
progress/progress_total.svg
View File

@@ -17,7 +17,7 @@
<text x="75.0" y="14">Banjo-Kazooie (us.v10)</text> <text x="75.0" y="14">Banjo-Kazooie (us.v10)</text>
</g> </g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <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">95.3508%</text> <text x="184.5" y="15" fill="#010101" fill-opacity=".3">95.3650%</text>
<text x="183.5" y="14">95.3508%</text> <text x="183.5" y="14">95.3650%</text>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

1
src/core2/code_94620.c
View File

@@ -26,7 +26,6 @@ void func_8031B5C4(s32 arg0) {
D_80383150 = 1; D_80383150 = 1;
} }
// regalloc
bool func_8031B604(char *arg0) { bool func_8031B604(char *arg0) {
return (arg0[0] == 0xFD) && (arg0[1] == 0x6A); return (arg0[0] == 0xFD) && (arg0[1] == 0x6A);
} }

28
src/core2/code_9E370.c
View File

@@ -1151,20 +1151,20 @@ void func_80328478(f32 arg0[3], f32 arg1, f32 arg2){
arg0[2] += sp1C[2]; arg0[2] += sp1C[2];
} }
#ifndef NONMATCHING bool func_80328508(Actor *arg0, s32 arg1)
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_9E370/func_80328508.s") {
#else
bool func_80328508(Actor * arg0, s32 arg1){
ActorAnimationInfo *animInfo; ActorAnimationInfo *animInfo;
s32 index;
arg0->state = arg1; arg0->state = arg1;
if(arg0->unk18 != NULL) if (arg0->unk18 == 0)
return 0; return FALSE;
animInfo = &arg0->unk18[arg1]; animInfo = arg0->unk18 + arg1;
index = animInfo->index;
if (1);
if(animInfo->index != NULL){ if (index != 0){
if(arg0->animctrl == NULL){ if (arg0->animctrl == NULL){
arg0->animctrl = animctrl_new(0); arg0->animctrl = animctrl_new(0);
animctrl_reset(arg0->animctrl); animctrl_reset(arg0->animctrl);
} }
@@ -1172,16 +1172,12 @@ bool func_80328508(Actor * arg0, s32 arg1){
animctrl_setDuration(arg0->animctrl, animInfo->duration); animctrl_setDuration(arg0->animctrl, animInfo->duration);
animctrl_setDirection(arg0->animctrl, mvmt_dir_forwards); animctrl_setDirection(arg0->animctrl, mvmt_dir_forwards);
} }
else { else if (arg0->animctrl) {
if(arg0->animctrl){
animctrl_setPlaybackType(arg0->animctrl, ANIMCTRL_STOPPED); animctrl_setPlaybackType(arg0->animctrl, ANIMCTRL_STOPPED);
animctrl_setDirection(arg0->animctrl, mvmt_dir_forwards); animctrl_setDirection(arg0->animctrl, mvmt_dir_forwards);
} }
} return TRUE;
return 1;
} }
#endif
void func_803285E8(Actor *this, f32 arg1, int direction){ void func_803285E8(Actor *this, f32 arg1, int direction){
func_8028774C(this->animctrl, arg1); func_8028774C(this->animctrl, arg1);