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

core1/code_31C0.c done, core1/code_3250.c done

Browse Source
This commit is contained in:
Banjo Kazooie
2022-10-16 13:39:56 -05:00
parent 90067074fb
commit 7e2298a89c
10 changed files with 257 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core1/code_0.c
View File

@@ -24,7 +24,7 @@ u64 D_8027BEF0;
extern u8 D_80286F90;
extern u8 D_803A5D00[2][0x1ECC0];
extern u16 D_803A5D00[2][0x1ECC0/2];
void func_8023DA20(s32 arg0){
bzero(&D_8027A130, &D_80286F90 - (u8*)&D_8027A130);
@@ -131,6 +131,7 @@ void func_8023DD0C(void){
s32 r;
s32 g;
s32 b;
u16 rgba;
if((func_8023DB5C() & 0x7f) == 0x11)
sns_write_payload_over_heap();
@@ -170,19 +171,20 @@ void func_8023DD0C(void){
|| !levelSpecificFlags_validateCRC1()
|| !func_80320240()
){
s32 offset;
//render weird CRC failure image
for(x= 0x1e; x< D_8027658C - 0x1e; x++){//L8023DEB4
g = x >> 3;
for(y = 0x14; y < 0xeb; y++){
b = ((func_8023DB5C() << 3) + y*y + x*x) >> 3;
g = x >> 3;
r = y >> 3;
*(u16*)&D_803A5D00[1][((D_80276588 - 0xff)/2 + y + x*D_80276588)*2] =
*(u16*)&D_803A5D00[0][((D_80276588 - 0xff)/2 + y + x*D_80276588)*2] =
_SHIFTL(b, 1, 5)
| _SHIFTL(g, 6, 5)
| _SHIFTL(r, 11, 5)
| _SHIFTL(1, 0, 1 )
;
rgba = _SHIFTL(b, 1, 5);
rgba |= _SHIFTL(r, 11, 5 );
rgba |= _SHIFTL(g, 6, 5);
rgba |= _SHIFTL(1, 0, 1 );
offset = ((D_80276588 - 0xff)/2 + y + x*D_80276588);
D_803A5D00[0][offset] = rgba;
D_803A5D00[1][offset] = rgba;
}
}
}//L8023DF70

96
src/core1/code_31C0.c
View File

@@ -3,8 +3,6 @@
#include "variables.h"
extern f64 D_80277640;
u8 D_8027EB10[0x200]; // Size based on the previous symbol's address
OSThread D_8027ED10;
@@ -27,97 +25,3 @@ void func_80240C30(void *arg)
osStartThread(func_8023E060());
while (1);
}
static void _guMtxF2L(float mf[4][4], Mtx *m)
{
int i, j;
int e1,e2;
int *ai,*af;
ai=(int *) &m->m[0][0];
af=(int *) &m->m[2][0];
for (i=0; i<4; i++)
for (j=0; j<2; j++) {
e1=FTOFIX32(mf[i][j*2]);
e2=FTOFIX32(mf[i][j*2+1]);
*(ai++) = ( e1 & 0xffff0000 ) | ((e2 >> 16)&0xffff);
*(af++) = ((e1 << 16) & 0xffff0000) | (e2 & 0xffff);
}
}
static void _guMtxIdentF(float mf[4][4])
{
int i, j;
for (i=0; i<4; i++)
for (j=0; j<4; j++)
if (i == j) mf[i][j] = 1.0;
else mf[i][j] = 0.0;
}
void guScaleF(float mf[4][4], float x, float y, float z)
{
_guMtxIdentF(mf);
mf[0][0] = x;
mf[1][1] = y;
mf[2][2] = z;
mf[3][3] = 1;
}
void func_80240E4C(f32 mf[4][4], LookAt *l, float xEye, float yEye, float zEye,
float xAt, float yAt, float zAt,
float xUp, float yUp, float zUp);
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_31C0/func_80240E4C.s")
void func_8024128C (Mtx *m, LookAt *l, float xEye, float yEye, float zEye,
float xAt, float yAt, float zAt,
float xUp, float yUp, float zUp)
{
float mf[4][4];
func_80240E4C(mf, l, xEye, yEye, zEye, xAt, yAt, zAt,
xUp, yUp, zUp);
guMtxF2L(mf, m);
}
void guScale(Mtx *m, float x, float y, float z)
{
float mf[4][4];
guScaleF(mf, x, y, z);
_guMtxF2L(mf, m);
}
void guRotateRPYF(f32 mf[4][4], f32 r, f32 p, f32 h) {
static f32 dtor = 3.1415926 / 180.0;
s32 pad;
f32 sinp, sinh, sinr;
f32 cosp, cosh, cosr;
r *= dtor;
p *= dtor;
h *= dtor;
sinr = sinf(r);
cosr = cosf(r);
sinp = sinf(p);
cosp = cosf(p);
sinh = sinf(h);
cosh = cosf(h);
guMtxIdentF(mf);
mf[0][0] = cosp * cosh;
mf[0][1] = cosp * sinh;
mf[0][2] = -sinp;
mf[1][0] = (sinr*sinp*cosh - cosr*sinh);
mf[1][1] = (sinr*sinp*sinh + cosr*cosh);
mf[1][2] = (sinr*cosp);
mf[2][0] = (cosr*sinp*cosh + sinr*sinh);
mf[2][1] = (cosr*sinp*sinh - sinr*cosh);
mf[2][2] = (cosr*cosp);
}

176
src/core1/code_3250.c Normal file
View File

@@ -0,0 +1,176 @@
#include <ultra64.h>
extern f32 gu_sqrtf(f32);
static void _guMtxF2L(float mf[4][4], Mtx *m)
{
int i, j;
int e1,e2;
int *ai,*af;
ai=(int *) &m->m[0][0];
af=(int *) &m->m[2][0];
for (i=0; i<4; i++)
for (j=0; j<2; j++) {
e1=FTOFIX32(mf[i][j*2]);
e2=FTOFIX32(mf[i][j*2+1]);
*(ai++) = ( e1 & 0xffff0000 ) | ((e2 >> 16)&0xffff);
*(af++) = ((e1 << 16) & 0xffff0000) | (e2 & 0xffff);
}
}
static void _guMtxIdentF(float mf[4][4])
{
int i, j;
for (i=0; i<4; i++)
for (j=0; j<4; j++)
if (i == j) mf[i][j] = 1.0;
else mf[i][j] = 0.0;
}
void guScaleF(float mf[4][4], float x, float y, float z)
{
_guMtxIdentF(mf);
mf[0][0] = x;
mf[1][1] = y;
mf[2][2] = z;
mf[3][3] = 1;
}
void guLookAtReflectF(float mf[4][4], LookAt *l,
float xEye, float yEye, float zEye,
float xAt, float yAt, float zAt,
float xUp, float yUp, float zUp)
{
float len, xLook, yLook, zLook, xRight, yRight, zRight;
guMtxIdentF(mf);
xLook = xAt - xEye;
yLook = yAt - yEye;
zLook = zAt - zEye;
/* Negate because positive Z is behind us: */
len = -1.0 / gu_sqrtf (xLook*xLook + yLook*yLook + zLook*zLook);
xLook *= len;
yLook *= len;
zLook *= len;
/* Right = Up x Look */
xRight = yUp * zLook - zUp * yLook;
yRight = zUp * xLook - xUp * zLook;
zRight = xUp * yLook - yUp * xLook;
len = 1.0 / gu_sqrtf (xRight*xRight + yRight*yRight + zRight*zRight);
xRight *= len;
yRight *= len;
zRight *= len;
/* Up = Look x Right */
xUp = yLook * zRight - zLook * yRight;
yUp = zLook * xRight - xLook * zRight;
zUp = xLook * yRight - yLook * xRight;
len = 1.0 / gu_sqrtf (xUp*xUp + yUp*yUp + zUp*zUp);
xUp *= len;
yUp *= len;
zUp *= len;
/* reflectance vectors = Up and Right */
l->l[0].l.dir[0] = FTOFRAC8(xRight);
l->l[0].l.dir[1] = FTOFRAC8(yRight);
l->l[0].l.dir[2] = FTOFRAC8(zRight);
l->l[1].l.dir[0] = FTOFRAC8(xUp);
l->l[1].l.dir[1] = FTOFRAC8(yUp);
l->l[1].l.dir[2] = FTOFRAC8(zUp);
l->l[0].l.col[0] = 0x00;
l->l[0].l.col[1] = 0x00;
l->l[0].l.col[2] = 0x00;
l->l[0].l.pad1 = 0x00;
l->l[0].l.colc[0] = 0x00;
l->l[0].l.colc[1] = 0x00;
l->l[0].l.colc[2] = 0x00;
l->l[0].l.pad2 = 0x00;
l->l[1].l.col[0] = 0x00;
l->l[1].l.col[1] = 0x80;
l->l[1].l.col[2] = 0x00;
l->l[1].l.pad1 = 0x00;
l->l[1].l.colc[0] = 0x00;
l->l[1].l.colc[1] = 0x80;
l->l[1].l.colc[2] = 0x00;
l->l[1].l.pad2 = 0x00;
mf[0][0] = xRight;
mf[1][0] = yRight;
mf[2][0] = zRight;
mf[3][0] = -(xEye * xRight + yEye * yRight + zEye * zRight);
mf[0][1] = xUp;
mf[1][1] = yUp;
mf[2][1] = zUp;
mf[3][1] = -(xEye * xUp + yEye * yUp + zEye * zUp);
mf[0][2] = xLook;
mf[1][2] = yLook;
mf[2][2] = zLook;
mf[3][2] = -(xEye * xLook + yEye * yLook + zEye * zLook);
mf[0][3] = 0;
mf[1][3] = 0;
mf[2][3] = 0;
mf[3][3] = 1;
}
void guLookAtReflect (Mtx *m, LookAt *l, float xEye, float yEye, float zEye,
float xAt, float yAt, float zAt,
float xUp, float yUp, float zUp)
{
float mf[4][4];
guLookAtReflectF(mf, l, xEye, yEye, zEye, xAt, yAt, zAt,
xUp, yUp, zUp);
guMtxF2L(mf, m);
}
void guScale(Mtx *m, float x, float y, float z)
{
float mf[4][4];
guScaleF(mf, x, y, z);
_guMtxF2L(mf, m);
}
void guRotateRPYF(f32 mf[4][4], f32 r, f32 p, f32 h) {
static f32 dtor = 3.1415926 / 180.0;
s32 pad;
f32 sinp, sinh, sinr;
f32 cosp, cosh, cosr;
r *= dtor;
p *= dtor;
h *= dtor;
sinr = sinf(r);
cosr = cosf(r);
sinp = sinf(p);
cosp = cosf(p);
sinh = sinf(h);
cosh = cosf(h);
guMtxIdentF(mf);
mf[0][0] = cosp * cosh;
mf[0][1] = cosp * sinh;
mf[0][2] = -sinp;
mf[1][0] = (sinr*sinp*cosh - cosr*sinh);
mf[1][1] = (sinr*sinp*sinh + cosr*cosh);
mf[1][2] = (sinr*cosp);
mf[2][0] = (cosr*sinp*cosh + sinr*sinh);
mf[2][1] = (cosr*sinp*sinh - sinr*cosh);
mf[2][2] = (cosr*cosp);
}

61
src/core1/code_9D30.c
View File

@@ -303,7 +303,62 @@ 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;
s16 *temp_v0;
u8 *tmem;
s32 fb_x;
s32 fb_y;
s32 p1;
s32 p2;
u16 *framebuffer_ptr;
s32 txtr_y;
s32 i_chunk;
s32 txtr_x;
u16 *fb_pxl_ptr;
framebuffer_ptr = &D_803A5D00[D_802806EC][0];
frame_ptr = spriteGetFramePtr(sprite, frame);
if (!aplha_enabled) {
set_prim_color(0, 0, 0x80);
draw_prim_rect(x, y, frame_ptr->w, frame_ptr->h);
}
chunk_ptr = (BKSpriteTextureBlock *)(frame_ptr + 1);
for(i_chunk = 0; i_chunk < frame_ptr->chunkCnt; i_chunk++) {
for(tmem = (u8*)(chunk_ptr + 1); (s32)tmem % 8; tmem++);
for(txtr_y = 0; txtr_y < chunk_ptr->h; txtr_y++) {
for(txtr_x = 0; txtr_x < chunk_ptr->w; txtr_x += 2) {
fb_x = chunk_ptr->x + x + txtr_x;
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);
if (p1) {
*fb_pxl_ptr = (p1 << 0xC) | (p1 << 0x7) | (p1 << 0x2) | 1;
} else if (!aplha_enabled) {
*fb_pxl_ptr = 1;
}
if (p2) {
*(fb_pxl_ptr + 1) = (p2 << 0xC) | (p2 << 7) | (p2 << 2) | 1;
} else if (!aplha_enabled) {
*(fb_pxl_ptr + 1) = 1;
}
}
}
tmem++;
}
}
chunk_ptr = (BKSpriteTextureBlock *) tmem;
}
}
#endif
#ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_9D30/draw_sprite_ia4.s")
@@ -345,13 +400,13 @@ void draw_sprite_ia4(s32 x, s32 y, BKSprite *sprite, s32 frame, bool aplha_enabl
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;
p2 = (*tmem & 0xF);
p1_i = p1 & 0xE;
p1_a = p1 & 1;
p2_i = p2 & 0xE;
p2_a = p2 & 1;
if (p1_a) {
*fb_pxl_ptr = (p1_i << 0xC) | (p1_i << 7) | (p1_i << 2) | p1_a;
if (p1 & 1) {
*fb_pxl_ptr = (p1_i << 0xC) | (p1_i << 0x7) | (p1_i << 0x2) | (p1 & 1);
} else if (!aplha_enabled) {
*fb_pxl_ptr = 1;
}