core1/code_ABB0.c done

This commit is contained in:
Banjo Kazooie
2022-12-15 14:01:35 -06:00
parent dac5ace123
commit 4b6eec06cb
10 changed files with 58 additions and 26 deletions

View File

@@ -162,7 +162,7 @@ void func_802E70FC(BKCollisionList *collision_list, s32 arg1[3], s32 arg2[3], BK
}
}
void func_802E73C8(f32 (*arg0)[3]) {
void func_802E73C8(f32 arg0[3][3]) {
s32 i;
for(i = 0; i < 3; i++){
arg0[i][0] = D_8037EAA8[i][0];

View File

@@ -68,7 +68,7 @@ s32 D_803860A4;
s32 D_803860A8;
s32 D_803860AC;
s32 spriteRenderHasPalette;
s32 D_803860B4;
s32 spriteRender1PrimMode;
/* .code */
void func_80347DF0(Struct81s *arg0){
@@ -148,15 +148,14 @@ void func_80348044(Gfx **gfx, BKSprite* sprite, s32 frame, s32 tmem, s32 rtile,
gDPSetTextureLUT((*gfx)++, G_TT_RGBA16);
gDPLoadTLUT_pal16((*gfx)++, 0, palette_addr);
spriteRenderHasPalette = TRUE;
D_803860B4 = 0;
spriteRender1PrimMode = FALSE;
D_80386074 = 0;
var_v1 = palette_addr + 0x20;
D_80386098 = D_8038607C = 0;
} else if (sprite->type & SPRITE_TYPE_CI8) {
gDPPipelineMode((*gfx)++, G_PM_1PRIMITIVE);
for(palette_addr = (s32)(sprite_frame + 1); palette_addr % 8; palette_addr++);
D_803860B4 = spriteRenderHasPalette = TRUE;
// D_803860B4 = 1;
spriteRender1PrimMode = spriteRenderHasPalette = TRUE;
D_80386074 = NULL;
D_8038607C = 0;
var_v1 = palette_addr + 0x200;
@@ -300,9 +299,9 @@ void func_80349B1C(Gfx **gfx) {
gDPPipeSync((*gfx)++);
gDPSetTextureLUT((*gfx)++, G_TT_NONE);
spriteRenderHasPalette = FALSE;
if (D_803860B4) {
if (spriteRender1PrimMode) {
gDPPipelineMode((*gfx)++, G_PM_NPRIMITIVE);
D_803860B4 = FALSE;
spriteRender1PrimMode = FALSE;
}
}
}

View File

@@ -26,10 +26,8 @@ typedef struct {
f32 unk28[3];
f32 unk34[3];
s32 unk40;
f32 unk44[3];
u8 pad50[0x18];
f32 unk68[3];
u8 pad74[0x18];
f32 unk44[3][3];
f32 unk68[3][3];
s32 unk8C;
}Struct_core2_C4B0_0;
@@ -509,7 +507,7 @@ BKCollisionTri *func_802946F0(void){
return D_8037C204;
}
int func_802946FC(s32 arg0, s32 arg1){
bool func_802946FC(f32 arg0[3][3], s32 arg1){
if(arg1 == 0){
return 0;
}