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

core1/code_C4B0.c func_80293F0C() done

Browse Source
This commit is contained in:
Banjo Kazooie
2022-11-11 13:11:27 -06:00
parent ebdd7836a5
commit cc8a6ffc78
6 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core2/code_ABC00.c
View File

@@ -272,19 +272,16 @@ void func_80333270(enum jiggy_e jiggy_id, f32 position[3], void (*method)(Actor
ptr->unk10.unk18 = other_marker;
}
#ifndef NONMATCHING
void func_803332D0(Actor *);
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_ABC00/func_803332D0.s")
#else
void func_803332D0(Actor * arg0){
// s32 indx = func_802C8088(arg0) - 1;
// s32 size = 0x2C;
Struct_core2_ABC00_0 *ptr = D_8036E834 + (func_802C8088(arg0) - 1);
Struct81s *sp18 = &ptr->unk10;
ptr->unkC(sp18);
sp18->marker = NULL;
void func_803332D0(Actor *arg0)
{
s32 indx = func_802C8088(arg0) - 1;
Struct81s *sp18 = &D_8036E834[indx].unk10;
if (D_8036E834[indx].unkC)
{
}
D_8036E834[indx].unkC(sp18);
sp18->marker = 0;
}
#endif
void func_80333334(enum jiggy_e jiggy_id) {
Struct_core2_ABC00_0 *temp_v0;

7
src/core2/code_C4B0.c
View File

@@ -303,9 +303,6 @@ f32 func_80293EAC(f32 arg0, f32 arg1, f32 arg2){
return arg1;
}
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_C4B0/func_80293F0C.s")
#else
void func_80293F0C(void){
f32 sp44[3];
f32 sp38[3];
@@ -333,7 +330,7 @@ void func_80293F0C(void){
_player_getPosition(D_8037C218);
func_80298504(D_8037C228);
ml_vec3f_diff_copy(D_8037C238, D_8037C218, D_8037C228);
if ((D_8037C274 == 3) && func_8031C594(D_8037C200) && ((func_8031C5E4(D_8037C200) - 70.0f) < D_8037C218[1])) {
if ((D_8037C274 == 3) && func_8031C594(D_8037C200) && (D_8037C218[1] > (func_8031C5E4(D_8037C200) - 70.0f))) {
D_8037C218[1] = func_8031C5E4(D_8037C200) - 70.0f;
D_8037C27E = 1;
player_setYVelocity(1.0f);
@@ -391,13 +388,11 @@ void func_80293F0C(void){
func_80298504(sp2C);
_player_getPosition(sp38);
ml_vec3f_diff_copy(D_8037C268, sp38, sp2C);
// temp_a1 = D_8037C204;
if (D_8037C204) {
func_8024587C(&D_8037C208, D_8037C204);
D_8037C204 = &D_8037C208;
}
}
#endif
void func_8029436C(s32 arg0){
D_8037C27F = arg0;