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

core2/code_79C80.c done

Browse Source
This commit is contained in:
Banjo Kazooie
2022-08-12 13:40:48 -05:00
parent a5acb3dd82
commit 7c72e31e63
5 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/core2/code_79C80.c
View File

@@ -2,6 +2,8 @@
#include "functions.h"
#include "variables.h"
extern f32 func_802FB0E4(struct8s*);
extern s32 D_80276588;
extern s32 D_8027658C;
@@ -64,9 +66,6 @@ struct7s *func_80300CD8(enum item_e item_id){
return &D_80381F30;
}
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core2/code_79C80/func_80300D0C.s")
#else
void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vtx **vtx){
int i;
int tmp_v1;
@@ -88,19 +87,14 @@ void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
for(i = D_80381F00-1; i >= 0; i--){//L80300E40
if(i != 0 && (i + 1 != D_80381F00 || D_80381F00 & 1)
){
if(i & 1){
s6 = i +1;
}
else{
s6 = i -1;
}
s6 = (i & 1) ? i + 1 : i - 1;
}
else{//L80300E84
s6 = i;
}
gDPPipeSync((*gfx)++);
if(i < D_80381F04){
if( 8.0f < i && i < D_80381F04 - 8.0f){
if(D_80381F04 > i){
if((0 < D_80381F04 - 8.0f) && ((D_80381F04 - 8.0f) > i)){
if(!spD4){
func_80347FC0(gfx, D_8036A914, 0, 0, 0, 0, 0, 2, 2, &spEC, &spE8);
spD4 = TRUE;
@@ -111,22 +105,14 @@ void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
else{//L80300F58
gDPSetPrimColor((*gfx)++, 0, 0, 0xFF, 0xFF, 0xFF, 0x78);
}
f20 = i*0xd + (96.0f - (f32)D_80276588/2);
f14 = (f32)D_8027658C/2 - func_802FB0E4(arg1);
f14 = (f14 - D_80381F08[s6]) - -48.0f;
f20 = 96.0f - (f32)D_80276588/2 + (i*13);
f14 = (f32)D_8027658C/2 - func_802FB0E4(arg1) - D_80381F08[s6] - -48.0f;
f14 = (i & 1) ? f14 + 5.75 : f14 - 5.75;
gSPVertex((*gfx)++, *vtx, 4, 0);
for(tmp_v1 = 0; tmp_v1 < 2; tmp_v1++){//L8030101C
for(tmp_v0 = 0; tmp_v0 < 2; tmp_v0++){//L80301030
f18 = spEC * D_80381EFC*tmp_v0 - spEC * D_80381EFC/2;
f18 += f20;
f18 *= 4.0f;
(*vtx)->v.ob[0] = f18;
f18 = spE8 * D_80381EFC/2 - spE8 * D_80381EFC*tmp_v1;
f18 += f14;
f18 *= 4.0f;
(*vtx)->v.ob[1] = f18;
(*vtx)->v.ob[0] = (((spEC * D_80381EFC)*tmp_v0 - (spEC * D_80381EFC)/2) + f20)*4.0f;
(*vtx)->v.ob[1] = (((spE8 * D_80381EFC)/2 - (spE8 * D_80381EFC)*tmp_v1) + f14) * 4.0f;
(*vtx)->v.ob[2] = -0x14;
(*vtx)->v.tc[0] = ((spEC - 1) *tmp_v0) << 6;
(*vtx)->v.tc[1] = ((spE8 - 1) *tmp_v1) << 6;
@@ -140,7 +126,6 @@ void func_80300D0C(enum item_e item_id, struct8s *arg1, Gfx **gfx, Mtx **mtx, Vt
gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
func_8024C904(gfx, mtx);
}
#endif
bool func_803012B8(f32 arg0, s32 arg1, s32 arg2){
if(arg1 == 0)
@@ -234,4 +219,4 @@ void func_80301348(enum item_e item_id, struct8s *arg1) {
}
}
}
}
}