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

src/core1: more documentation and renaming

Browse Source 
neue Datei:     include/core1/framebufferdraw.h
        neue Datei:     include/core1/sprite.h
        umbenannt:      src/core1/code_ABB0.c -> src/core1/framebufferdraw.c
        umbenannt:      src/core1/code_13680.c -> src/core1/sprite.c
        umbenannt:      src/core1/code_3A70.c -> src/core1/stub_3A70.c
This commit is contained in:
mariob92
2024-10-15 22:14:17 +02:00
parent fe54c1d7ce
commit 05fe65d6e8
22 changed files with 306 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core2/code_5C240.c
View File

@@ -29,8 +29,8 @@ void func_802E31D0(s32 arg0) {
temp_v0 = D_8037E8C0.unk14;
if ((temp_v0 == 0) || (temp_v0 == 3)) {
func_8024A85C(arg0);
func_80249DE0(0, 0, D_8037E8C0.unkC, 0, 0);
framebufferdraw_setBufferIndex(arg0);
framebufferdraw_func_80249DE0(0, 0, D_8037E8C0.unkC, 0, 0);
osWritebackDCache(gFramebuffers[arg0], (s32) ((f32) gFramebufferWidth * (f32) gFramebufferHeight * sizeof(s16)));
}
}

2
src/core2/code_5C870.c
View File

@@ -166,7 +166,7 @@ void func_802E39D0(Gfx **gdl, Mtx **mptr, Vtx **vptr, s32 framebuffer_idx, s32 a
}
void func_802E3BD0(s32 frame_buffer_indx){
func_8024A85C(frame_buffer_indx);
framebufferdraw_setBufferIndex(frame_buffer_indx);
}
void func_802E3BF0(void){

4
src/core2/code_5DBC0.c
View File

@@ -121,7 +121,7 @@ BKSpriteTextureBlock **func_802E4D8C(BKSprite *sprite) {
s32 i;
s32 chunk_size;
frame = spriteGetFramePtr(sprite, 0);
frame = sprite_getFramePtr(sprite, 0);
chunkPtrArray = (BKSpriteTextureBlock **)malloc((frame->chunkCnt + 1)*4);
chunk = (BKSpriteTextureBlock *)(frame + 1);
for (i = 0; i < frame->chunkCnt; i++) {
@@ -530,7 +530,7 @@ void func_802E6820(s32 arg0) {
prev_sprite_ptr = D_8037E900->unk4[var_s5].font_bin;
if (D_8037E900->unk4[var_s5].font_bin != NULL) {
chunk_count = spriteGetFramePtr(prev_sprite_ptr, 0U)->chunkCnt;
chunk_count = sprite_getFramePtr(prev_sprite_ptr, 0U)->chunkCnt;
D_8037E900->unk4[var_s5].font_bin = (BKSprite *)defrag_asset(D_8037E900->unk4[var_s5].font_bin);
for(i_chunk = 0; i_chunk < chunk_count; i_chunk++){
D_8037E900->unk4[var_s5].letter_texture[i_chunk] = ((u32)(((s32)D_8037E900->unk4[var_s5].letter_texture[i_chunk] - (s32)prev_sprite_ptr)) + (u32)D_8037E900->unk4[var_s5].font_bin);

4
src/core2/code_6DA30.c
View File

@@ -283,7 +283,7 @@ void func_802F4B58(BKSpriteTextureBlock *alphaMask, BKSpriteTextureBlock *textur
//This functions seperates the fonts into letters
FontLetter *func_802F4C3C(BKSprite *alphaMask, BKSprite *textureSprite){
BKSpriteFrame * font = spriteGetFramePtr(alphaMask, 0);
BKSpriteFrame * font = sprite_getFramePtr(alphaMask, 0);
BKSpriteTextureBlock *chunkPtr;
FontLetter * sp2C = malloc((font->chunkCnt + 1)*sizeof(FontLetter));
u8* palDataPtr;
@@ -320,7 +320,7 @@ FontLetter *func_802F4C3C(BKSprite *alphaMask, BKSprite *textureSprite){
{
chunkPtr = (BKSpriteTextureBlock *)(font + 1);
for( i = 0; i < font->chunkCnt; i++){
func_802F4B58(chunkPtr, (BKSpriteTextureBlock *)(spriteGetFramePtr(textureSprite, 0) + 1));
func_802F4B58(chunkPtr, (BKSpriteTextureBlock *)(sprite_getFramePtr(textureSprite, 0) + 1));
sp2C[i].unk0 = chunkPtr;
chunkSize = chunkPtr->w*chunkPtr->h;
chunkDataPtr = (u8*)(chunkPtr + 1);

2
src/core2/code_A5BC0.c
View File

@@ -1975,7 +1975,7 @@ f32 func_80331D20(BKSprite *sprite) {
if (sprite == 0) {
return 1.0f;
}
frame = spriteGetFramePtr(sprite, 0);
frame = sprite_getFramePtr(sprite, 0);
temp_lo = (s32) (((frame->unk10 - frame->unkC) + 1) * sprite->unk8) / (s32) frame->w;
temp_lo_2 = (s32) (((frame->unk12 - frame->unkE) + 1) * sprite->unkA) / (s32) frame->h;
phi_v0 = (temp_lo_2 < temp_lo) ? temp_lo : temp_lo_2;

2
src/core2/code_AEDA0.c
View File

@@ -260,7 +260,7 @@ void spriteRender_drawWithSegment(Gfx **gfx, Vtx **vtx, BKSprite *sprite, u32 fr
gDPPipelineMode((*gfx)++, G_PM_1PRIMITIVE);
}
frame_ptr = spriteGetFramePtr(sprite, frame);
frame_ptr = sprite_getFramePtr(sprite, frame);
//load palette in indexed pixels
var_t2 = (BKSpriteTextureBlock *)(frame_ptr + 1);

2
src/core2/code_B3A80.c
View File

@@ -338,7 +338,7 @@ BKSprite *func_8033B6C4(enum asset_e sprite_id, BKSpriteDisplayData **arg1){
s0 = assetcache_get(sprite_id);
if(D_80383CD4[assetCacheCurrentIndex] == NULL){
func_803382E4(-1);
func_80338308(func_802510A0(s0), func_802510A8(s0));
func_80338308(sprite_getUnk8(s0), sprite_getUnkA(s0));
D_80383CD4[assetCacheCurrentIndex] = func_80344A1C(s0);
}
*arg1 = D_80383CD4[assetCacheCurrentIndex];

2
src/core2/code_C0E60.c
View File

@@ -135,7 +135,7 @@ void func_80348044(Gfx **gfx, BKSprite* sprite, s32 frame, s32 tmem, s32 rtile,
s32 var_v0;
s32 maskt;
sprite_frame = spriteGetFramePtr(sprite, frame);
sprite_frame = sprite_getFramePtr(sprite, frame);
*frame_width = (s32) sprite_frame->w;
*frame_height = (s32) sprite_frame->h;
if (*textureCount == -1) {

8
src/core2/gc/pauseMenu.c
View File

@@ -761,12 +761,12 @@ void gcpausemenu_init(void) {
func_80311604();
gcpausemenu_zoomboxes_initMainMenu();
D_80383010.joystick_sprite = assetcache_get(0x7EB);
D_80383010.joystick_frame_count = spriteGetFrameCount(D_80383010.joystick_sprite);
D_80383010.joystick_frame_count = sprite_getFrameCount(D_80383010.joystick_sprite);
D_80383010.left_joystick_alpha = temp_v1 = D_80383010.right_joystick_alpha = 0;
D_80383010.joystick_frame = D_80383010.unk3_4 = temp_v1;
D_80383010.b_button_sprite = assetcache_get(0x7ED);
D_80383010.b_button_frame_count = spriteGetFrameCount(D_80383010.b_button_sprite);
D_80383010.b_button_frame_count = sprite_getFrameCount(D_80383010.b_button_sprite);
D_80383010.b_button_frame = D_80383010.unk3_0 = D_80383010.b_button_alpha = 0;
D_80383010.page_cnt = gcpausemenu_initLargestPageIndex();
D_80383010.sns_alpha = D_80383010.sns_visible = D_80383010.unk70_31 = D_80383010.unk70_30 = 0;
@@ -1303,7 +1303,7 @@ void __gcpausemenu_drawSprite(Gfx **gdl, Mtx **mptr, Vtx **vptr, BKSprite *sprit
f32 sp2C;
f32 sp28;
_frame = spriteGetFramePtr(sprite, frame);
_frame = sprite_getFramePtr(sprite, frame);
sp2C = _frame->w;
sp28 = _frame->h;
func_803382E4(5);
@@ -1334,7 +1334,7 @@ void gcpausemenu_drawSprite(Gfx **gdl, Mtx **mptr, Vtx **vptr, BKSprite *sprite,
BKSpriteFrame *_frame;
s32 w;
s32 h;
_frame = spriteGetFramePtr(sprite, frame);
_frame = sprite_getFramePtr(sprite, frame);
w = ((mirror) ? -1 : 1) * _frame->w;
h = _frame->h;
__gcpausemenu_drawSprite(gdl, mptr, vptr, sprite, frame, (x - w * 0.5), (y - h * 0.5), w, h, a);

2
src/core2/gc/zoombox.c
View File

@@ -1343,7 +1343,7 @@ void __gczoombox_load_sprite(GcZoombox *this, GcZoomboxSprite portrait_id){
this->frame_count = this->unkF8->frameCnt;
func_803382E4(-1);
func_80338308(func_802510A0(this->unkF8), func_802510A8(this->unkF8));
func_80338308(sprite_getUnk8(this->unkF8), sprite_getUnkA(this->unkF8));
}
void __gczoombox_load_sfx(GcZoombox *this, GcZoomboxSprite portrait_id){

6
src/core2/particle.c
View File

@@ -4,7 +4,7 @@
#include "variables.h"
#include "core2/particle.h"
extern s32 spriteGetFrameCount(BKSprite *);
extern s32 sprite_getFrameCount(BKSprite *);
extern void func_80344720(s32 SpriteGfx, s32 frame, s32, f32[3], f32[3], f32[3], Gfx **, Mtx **);
extern void func_80344424(s32 SpriteGfx, s32 frame, s32, f32[3], f32[3], f32, Gfx **, Mtx **);
@@ -626,9 +626,9 @@ void particleEmitter_update(ParticleEmitter *this){
if(this->sprite_1C){
particle->frame += particle->framerate*tick;
if(!((s32)particle->frame < spriteGetFrameCount(this->sprite_1C))){
if(!((s32)particle->frame < sprite_getFrameCount(this->sprite_1C))){
if(this->draw_mode & PART_EMIT_NO_LOOP){
particle->frame = spriteGetFrameCount(this->sprite_1C) - 1;
particle->frame = sprite_getFrameCount(this->sprite_1C) - 1;
}else{
particle->frame = 0.0f;
}