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

Further documentations have been made:

Browse Source 
- src/fight: named more variables and functions, named some parameters
- src/core1, src/core2: named some dummy functions, documented a bit of the graphics stack
This commit is contained in:
mariob92
2024-09-06 19:37:28 +02:00
parent fbeb744fc6
commit 539d6f4804
25 changed files with 521 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ch/bottlesbonuscursor.c
View File

@@ -154,7 +154,7 @@ void chBottlesBonusCursor_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
func_80253208(gfx,
(s32)(D_8037E5C0.unk18[0] - sp3C/2), (s32)(D_8037E5C0.unk18[1] - sp3C/2),
(s32)sp3C, (s32)sp3C,
D_803A5D00[func_8024BDA0()]
D_803A5D00[getActiveFramebuffer()]
);
modelRender_draw(gfx, mtx, this->position, rotation, this->scale, NULL, func_80330B1C(chBottlesBonusCursorMarker));
func_8024E030(this->position, D_8037E5C0.unk10);

16
src/core2/code_5C240.c
View File

@@ -46,24 +46,24 @@ void func_802E329C(s32 arg0, Gfx **gfx_begin, Gfx **gfx_end) {
Vtx *vtx;
Vtx *vtx_start;
func_80254404(&gfx, &mtx, &vtx);
getGraphicsStacks(&gfx, &mtx, &vtx);
gfx_start = gfx;
mtx_start = mtx;
vtx_start = vtx;
func_802539AC(&gfx, arg0);
scissorBox_SetForGameMode(&gfx, arg0);
if (D_8037E8C0.unk14 == 2) {
func_80254084(&gfx, 0, 0, (s32) (f32) framebuffer_width, (s32) (f32) framebuffer_height, 0, 0, 0);
drawRectangle2D(&gfx, 0, 0, (s32) (f32) framebuffer_width, (s32) (f32) framebuffer_height, 0, 0, 0);
}
if ((D_8037E8C0.unk14 == 0) || (D_8037E8C0.unk14 == 3)) {
func_8024C904(&gfx, &mtx);
gcbound_draw(&gfx);
}
if (D_8037E8C0.unk14 == 1) {
func_80254084(&gfx, 0, 0, (s32) (f32) framebuffer_width, (s32) (f32) framebuffer_height, 0, 0, 0);
drawRectangle2D(&gfx, 0, 0, (s32) (f32) framebuffer_width, (s32) (f32) framebuffer_height, 0, 0, 0);
func_8024C904(&gfx, &mtx);
func_802F1858(D_8037E8C0.unk10, &gfx, &mtx, &vtx);
}
func_80253DE0(&gfx);
finishFrame(&gfx);
osWritebackDCache(mtx_start, (mtx - mtx_start) * sizeof(Mtx));
osWritebackDCache(vtx_start, (vtx - vtx_start) * sizeof(Vtx));
*gfx_begin = gfx_start;
@@ -83,7 +83,7 @@ void func_802E3460(s32 arg0) {
if (func_8025AD7C(COMUSIC_31_GAME_OVER)) {
comusic_8025AB44(COMUSIC_31_GAME_OVER, 0, 200);
}
func_802F1934(D_8037E8C0.unk10, func_8024BDA0());
func_802F1934(D_8037E8C0.unk10, getActiveFramebuffer());
}
else if (D_8037E8C0.unk14 == 3) {
D_8037E8C0.unk0 = 0.0f;
@@ -106,11 +106,11 @@ void func_802E3580(void) {
func_802F1884(D_8037E8C0.unk10);
func_802E5F68();
comusicPlayer_free();
func_80253420();
dummy_func_80253420();
func_8024BF94(2);
}
void func_802E35D0(void){}
void dummy_func_802E35D0(void){}
void func_802E35D8(void ) {
s32 sp40[6];

48
src/core2/code_5C870.c
View File

@@ -74,7 +74,7 @@ void func_802E3854(void){
int i;
func_8033B61C();
func_80254464();
dummy_func_80254464();
for(i = 0; i < 0xF; i++){
func_802E6820(5);
modelRender_defrag();
@@ -115,16 +115,16 @@ void func_802E398C(s32 arg0) {
}
}
void func_802E39D0(Gfx **gdl, Mtx **mptr, Vtx **vptr, s32 arg3, s32 arg4){
void func_802E39D0(Gfx **gdl, Mtx **mptr, Vtx **vptr, s32 framebuffer_idx, s32 arg4){
Mtx* m_start = *mptr;
Vtx* v_start = *vptr;
func_802539AC(gdl, arg3);
scissorBox_SetForGameMode(gdl, framebuffer_idx);
D_8037E8E0.unkC = FALSE;
func_80334540(gdl, mptr, vptr);
if(!arg4){
func_802E67AC();
func_802E3BD0(func_8024BDA0());
func_802E3BD0(getActiveFramebuffer());
func_802E67C4();
func_802E5F10(gdl);
}
@@ -147,7 +147,7 @@ void func_802E39D0(Gfx **gdl, Mtx **mptr, Vtx **vptr, s32 arg3, s32 arg4){
gcpausemenu_draw(gdl, mptr, vptr);
if(!game_is_frozen()){
func_8025AFC0(gdl, mptr, vptr);
dummy_func_8025AFC0(gdl, mptr, vptr);
}
gcdialog_draw(gdl, mptr, vptr);
@@ -163,7 +163,7 @@ void func_802E39D0(Gfx **gdl, Mtx **mptr, Vtx **vptr, s32 arg3, s32 arg4){
){
gctransition_draw(gdl, mptr, vptr);
}
func_80253DE0(gdl);
finishFrame(gdl);
osWritebackDCache(m_start, sizeof(Mtx)*( *mptr - m_start));
osWritebackDCache(v_start, sizeof(Vtx)*( *vptr - v_start));
}
@@ -282,29 +282,33 @@ s32 func_802E3F80(void){
return D_8037E8E0.unk0;
}
//game_draw
void func_802E3F8C(s32 arg0){
Gfx *sp34;
void game_draw(s32 arg0){
Gfx *gfx;
Gfx *gfx_start;
Gfx *sp2C;
Mtx *sp28;
Vtx *sp24;
if(arg0){
func_80254348();
Mtx *mtx;
Vtx *vtx;
if(arg0) {
scissorBox_setDefault();
}
func_80254404(&sp34, &sp28, &sp24);
getGraphicsStacks(&gfx, &mtx, &vtx);
if(D_8037E8E0.unkC == 1){
func_80254404(&sp34, &sp28, &sp24);
getGraphicsStacks(&gfx, &mtx, &vtx);
}
gfx_start = sp34;
func_802E39D0(&sp34, &sp28, &sp24, func_8024BDA0(), arg0);
gfx_start = gfx;
func_802E39D0(&gfx, &mtx, &vtx, getActiveFramebuffer(), arg0);
if(D_8037E8E0.unkC == 0){
sp2C = sp34;
sp2C = gfx;
func_8024C1DC();
func_80253EC4(gfx_start, sp2C);
if(arg0){
func_80254348();
if(arg0) {
scissorBox_setDefault();
}
}
}
@@ -364,7 +368,7 @@ void func_802E4170(void){
timedFuncQueue_free();
func_802F9C48();
modelRender_free();
func_80253420();
dummy_func_80253420();
func_802E398C(0);
func_8030AFD8(0);
func_80321854();
@@ -399,7 +403,7 @@ void func_802E4214(enum map_e map_id){
viewport_reset();
viewport_set_near_far(1.0f, 10000.0f);
rand_reset();
func_80254348();
scissorBox_setDefault();
func_80253FE8();
func_8033DC70();
func_8033DC04();

4
src/core2/code_77E50.c
View File

@@ -11,7 +11,7 @@ void func_802FEDE0(BKTextureList *texture_list, s32 indx, s32 x_offset, s32 y_of
s32 x;
sp24 = (u16*)func_802EA620(texture_list) + indx*32*32;
frame_buffer_ptr = D_803A5D00[func_8024BDA0()];
frame_buffer_ptr = D_803A5D00[getActiveFramebuffer()];
for(y = 0; y < 32; y++){//L802FEE60
for(x = 0; x < 32; x++){//L802FEE68
sp24[32*(31 - y) + x] = frame_buffer_ptr[(y_offset + y)*framebuffer_width + (x_offset + x)] | 1; //framebuffer to texture???
@@ -25,7 +25,7 @@ void func_802FEF48(BKModelBin *model_bin){
s32 x, y;
texture_list = model_getTextureList(model_bin);
osInvalDCache((void *)D_803A5D00[func_8024BDA0()], framebuffer_width * framebuffer_height*2);
osInvalDCache((void *)D_803A5D00[getActiveFramebuffer()], framebuffer_width * framebuffer_height*2);
for(y = 0; y < 8; y++){//L802FEFEC
for(x = 0; x < 10; x++){

8
src/core2/code_851D0.c
View File

@@ -90,8 +90,8 @@ void func_8030C27C(void){
}
void func_8030C2D4(Gfx **gdl, Mtx **mptr, Vtx **vptr){
func_80254348();
func_80253640(gdl, D_803A5D00[func_8024BDA0()]);
scissorBox_setDefault();
func_80253640(gdl, D_803A5D00[getActiveFramebuffer()]);
}
// Draws a 160x128 image pointed to by D_80382450 into the center of the screen
@@ -128,6 +128,6 @@ s32 func_8030C704(void){
return D_80382450;
}
void func_8030C710(void){
func_802542F4(0, 0xA0, 0, 0x80);
void scissorBox_setSmall(void){
scissorBox_set(0, 160, 0, 128);
}

6
src/core2/code_8DC20.c
View File

@@ -53,13 +53,13 @@ void func_80314BB0(Gfx **gfx, Mtx **mtx, Vtx **vtx, void * frame_buffer_1, void
}
}
gSPDisplayList((*gfx)++, D_8036C690);
gDPSetColorImage((*gfx)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, framebuffer_width, OS_PHYSICAL_TO_K0(D_803A5D00[func_8024BDA0()]));
gDPSetColorImage((*gfx)++, G_IM_FMT_RGBA, G_IM_SIZ_16b, framebuffer_width, OS_PHYSICAL_TO_K0(D_803A5D00[getActiveFramebuffer()]));
}
void func_80315084(Gfx **gfx, Mtx **mtx, Vtx **vtx){
func_80335128(0);
D_803830A0 = 2;
func_80314BB0(gfx, mtx, vtx, func_80253540(), D_803A5D00[func_8024BDA0()]);
func_80314BB0(gfx, mtx, vtx, zBuffer_get(), D_803A5D00[getActiveFramebuffer()]);
}
void func_80315110(Gfx **gfx, Mtx **mtx, Vtx **vtx){
@@ -72,7 +72,7 @@ void func_80315110(Gfx **gfx, Mtx **mtx, Vtx **vtx){
else{
D_803830A0--;
}
func_80314BB0(gfx, mtx, vtx, D_803A5D00[func_8024BDA0()], func_80253540());
func_80314BB0(gfx, mtx, vtx, D_803A5D00[getActiveFramebuffer()], zBuffer_get());
}
void func_803151D0(Gfx **gfx, Mtx **mtx, Vtx **vtx){

333
src/core2/code_9E370.c
View File

@@ -63,7 +63,7 @@ f32 D_8036E598[4] = {1000.f, 20.0f, 10.5f, 1.0f};
/* .bss */
Actor *D_80383390;
Actor *suLastBaddie;
s32 D_80383394;
Actor *suBaddieJiggyArray[14]; //array of jiggy actor ptrs
@@ -768,267 +768,270 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
suBaddieActorArray->cnt = 0;
suBaddieActorArray->max_cnt = 20;
}
//i = suBaddieActorArray->cnt + 1;
if(suBaddieActorArray->cnt + 1 > suBaddieActorArray->max_cnt){
suBaddieActorArray->max_cnt = suBaddieActorArray->cnt + 5;
suBaddieActorArray = (ActorArray *)realloc(suBaddieActorArray, sizeof(ActorArray) + suBaddieActorArray->max_cnt*sizeof(Actor));
}
++suBaddieActorArray->cnt;
D_80383390 = &suBaddieActorArray->data[suBaddieActorArray->cnt - 1];
D_80383390->actor_info = actorInfo;
D_80383390->unk10_25 = 0;
D_80383390->unk10_18 = 0;
D_80383390->state = actorInfo->startAnimation;
D_80383390->position_x = (f32)position[0];
D_80383390->position_y = (f32)position[1];
D_80383390->position_z = (f32)position[2];
D_80383390->unkF4_8 = 0;
D_80383390->yaw = (f32) yaw;
D_80383390->yaw_ideal = (f32) yaw;
D_80383390->pitch = 0.0f;
D_80383390->roll = 0.0f;
D_80383390->unk6C = 0.0f;
D_80383390->unk28 = 0.0f;
D_80383390->unk10_12 = 0;
D_80383390->unk38_0 = 0;
D_80383390->unk38_31 = 0;
D_80383390->unk58_0 = 1;
D_80383390->unk40 = 0;
D_80383390->unk44_31 = 0;
D_80383390->despawn_flag = 0;
D_80383390->unk44_14 = -1;
D_80383390->unk48 = 0.0f;
D_80383390->unk4C = 100.0f;
D_80383390->unk10_1 = 1;
D_80383390->unkF4_30 = 0;
D_80383390->unkF4_29 = 0;
D_80383390->scale = 1.0f;
D_80383390->unk124_7 = 0;
D_80383390->unk124_6 = 1;
D_80383390->modelCacheIndex = actorInfo->actorId;
D_80383390->unk44_2 = func_80326C18();
D_80383390->marker = func_8032F9DC(position, actorInfo->draw_func, (func_8033B64C(actorInfo->modelId) == 1) ? 0 : 1, actorInfo->markerId, (flags & 0x400) ? 1 : 0);
D_80383390->marker->unk3E_0 = 1;
D_80383390->unk138_28 = 1;
D_80383390->unk10_3 = -1;
D_80383390->unk10_4 = 0;
D_80383390->unk10_8 = 0;
D_80383390->unk10_7 = 0;
D_80383390->unk10_6 = 0;
D_80383390->unk54 = 0.0f;
D_80383390->unk58_31 = 0;
D_80383390->unk5C = 0.0f;
D_80383390->unkF4_31 = 0;
D_80383390->unk138_30 = 0;
D_80383390->unk138_3 = 0;
D_80383390->unk38_21 = 0;
D_80383390->unk38_13 = 0;
D_80383390->unk78_22 = 0;
D_80383390->unk78_31 = 0;
D_80383390->unk74 = 0.0f;
D_80383390->unk70 = 0.0f;
D_80383390->unkF4_24 = 0;
D_80383390->unk140 = 0.0f;
D_80383390->unk144 = 0.0f;
D_80383390->unk44_1 = 0;
D_80383390->unk44_0 = 0;
D_80383390->initialized = FALSE;
D_80383390->unk16C_4 = 0;
D_80383390->unk60 = 0.0f;
D_80383390->unk10_0 = 0;
D_80383390->unk104 = NULL;
D_80383390->unk100 = NULL;
D_80383390->unk158[0] = NULL;
D_80383390->unk158[1] = NULL;
D_80383390->unk78_13 = 0;
D_80383390->unk124_31 = 0;
D_80383390->unkF4_20 = 0;
D_80383390->sound_timer = 0.0f;
func_8032FFD4(D_80383390->marker, suBaddieActorArray->cnt - 1);
marker_setModelId(D_80383390->marker, actorInfo->modelId);
func_803300C8(D_80383390->marker, actorInfo->update_func);
func_803300D0(D_80383390->marker, actorInfo->unk10);
ml_vec3f_clear(D_80383390->unk1C);
ml_vec3f_clear(D_80383390->velocity);
ml_vec3f_clear(D_80383390->spawn_position);
D_80383390->stored_animctrl_index = 0;
D_80383390->unk58_2 = 1;
D_80383390->stored_animctrl_playbackType_ = 0;
D_80383390->stored_animctrl_forwards = 0;
D_80383390->stored_animctrl_smoothTransistion = 0;
D_80383390->stored_animctrl_duration = 0.0f;
D_80383390->unkEC = 0.0f;
D_80383390->unk138_19 = 0;
D_80383390->stored_animctrl_subrangeMin = 0.0f;
D_80383390->stored_animctrl_subrangeMax = 1.0f;
D_80383390->unkF4_22 = 0;
D_80383390->unk58_1 = 0;
D_80383390->unk138_29 = 0;
D_80383390->unk18 = actorInfo->animations;
D_80383390->animctrl = NULL;
D_80383390->unkEC = 0.0f;
D_80383390->unk130 = 0;
D_80383390->unk124_5 = 0;
D_80383390->unk124_3 = 0;
D_80383390->unk138_9 = 0;
D_80383390->unk138_8 = 0;
D_80383390->unk138_25 = 0;
D_80383390->unk16C_3 = 0;
D_80383390->unk16C_2 = 0;
D_80383390->unk16C_1 = 0;
D_80383390->unk16C_0 = 0;
D_80383390->unk17C_31 = 0;
D_80383390->unk14C[0] = NULL;
D_80383390->unk14C[1] = NULL;
D_80383390->unk138_27 = 0;
D_80383390->unk138_24 = 0;
D_80383390->unk138_23 = 0;
D_80383390->unk138_22 = 0;
D_80383390->unk138_21 = 0;
D_80383390->unk138_20 = 0;
D_80383390->unk174 = 0.0f;
D_80383390->unk178 = 0.0f;
suLastBaddie = &suBaddieActorArray->data[suBaddieActorArray->cnt - 1];
suLastBaddie->actor_info = actorInfo;
suLastBaddie->unk10_25 = 0;
suLastBaddie->unk10_18 = 0;
suLastBaddie->state = actorInfo->startAnimation;
suLastBaddie->position_x = (f32)position[0];
suLastBaddie->position_y = (f32)position[1];
suLastBaddie->position_z = (f32)position[2];
suLastBaddie->unkF4_8 = 0;
suLastBaddie->yaw = (f32) yaw;
suLastBaddie->yaw_ideal = (f32) yaw;
suLastBaddie->pitch = 0.0f;
suLastBaddie->roll = 0.0f;
suLastBaddie->unk6C = 0.0f;
suLastBaddie->unk28 = 0.0f;
suLastBaddie->unk10_12 = 0;
suLastBaddie->unk38_0 = 0;
suLastBaddie->unk38_31 = 0;
suLastBaddie->unk58_0 = 1;
suLastBaddie->unk40 = 0;
suLastBaddie->unk44_31 = 0;
suLastBaddie->despawn_flag = 0;
suLastBaddie->unk44_14 = -1;
suLastBaddie->unk48 = 0.0f;
suLastBaddie->unk4C = 100.0f;
suLastBaddie->unk10_1 = 1;
suLastBaddie->unkF4_30 = 0;
suLastBaddie->unkF4_29 = 0;
suLastBaddie->scale = 1.0f;
suLastBaddie->unk124_7 = 0;
suLastBaddie->unk124_6 = 1;
suLastBaddie->modelCacheIndex = actorInfo->actorId;
suLastBaddie->unk44_2 = func_80326C18();
suLastBaddie->marker = func_8032F9DC(position, actorInfo->draw_func, (func_8033B64C(actorInfo->modelId) == 1) ? 0 : 1, actorInfo->markerId, (flags & 0x400) ? 1 : 0);
suLastBaddie->marker->unk3E_0 = 1;
suLastBaddie->unk138_28 = 1;
suLastBaddie->unk10_3 = -1;
suLastBaddie->unk10_4 = 0;
suLastBaddie->unk10_8 = 0;
suLastBaddie->unk10_7 = 0;
suLastBaddie->unk10_6 = 0;
suLastBaddie->unk54 = 0.0f;
suLastBaddie->unk58_31 = 0;
suLastBaddie->unk5C = 0.0f;
suLastBaddie->unkF4_31 = 0;
suLastBaddie->unk138_30 = 0;
suLastBaddie->unk138_3 = 0;
suLastBaddie->unk38_21 = 0;
suLastBaddie->unk38_13 = 0;
suLastBaddie->unk78_22 = 0;
suLastBaddie->unk78_31 = 0;
suLastBaddie->unk74 = 0.0f;
suLastBaddie->unk70 = 0.0f;
suLastBaddie->unkF4_24 = 0;
suLastBaddie->unk140 = 0.0f;
suLastBaddie->unk144 = 0.0f;
suLastBaddie->unk44_1 = 0;
suLastBaddie->unk44_0 = 0;
suLastBaddie->initialized = FALSE;
suLastBaddie->unk16C_4 = 0;
suLastBaddie->unk60 = 0.0f;
suLastBaddie->unk10_0 = 0;
suLastBaddie->unk104 = NULL;
suLastBaddie->unk100 = NULL;
suLastBaddie->unk158[0] = NULL;
suLastBaddie->unk158[1] = NULL;
suLastBaddie->unk78_13 = 0;
suLastBaddie->unk124_31 = 0;
suLastBaddie->unkF4_20 = 0;
suLastBaddie->sound_timer = 0.0f;
func_8032FFD4(suLastBaddie->marker, suBaddieActorArray->cnt - 1);
marker_setModelId(suLastBaddie->marker, actorInfo->modelId);
func_803300C8(suLastBaddie->marker, actorInfo->update_func);
func_803300D0(suLastBaddie->marker, actorInfo->unk10);
ml_vec3f_clear(suLastBaddie->unk1C);
ml_vec3f_clear(suLastBaddie->velocity);
ml_vec3f_clear(suLastBaddie->spawn_position);
suLastBaddie->stored_animctrl_index = 0;
suLastBaddie->unk58_2 = 1;
suLastBaddie->stored_animctrl_playbackType_ = 0;
suLastBaddie->stored_animctrl_forwards = 0;
suLastBaddie->stored_animctrl_smoothTransistion = 0;
suLastBaddie->stored_animctrl_duration = 0.0f;
suLastBaddie->unkEC = 0.0f;
suLastBaddie->unk138_19 = 0;
suLastBaddie->stored_animctrl_subrangeMin = 0.0f;
suLastBaddie->stored_animctrl_subrangeMax = 1.0f;
suLastBaddie->unkF4_22 = 0;
suLastBaddie->unk58_1 = 0;
suLastBaddie->unk138_29 = 0;
suLastBaddie->unk18 = actorInfo->animations;
suLastBaddie->animctrl = NULL;
suLastBaddie->unkEC = 0.0f;
suLastBaddie->unk130 = 0;
suLastBaddie->unk124_5 = 0;
suLastBaddie->unk124_3 = 0;
suLastBaddie->unk138_9 = 0;
suLastBaddie->unk138_8 = 0;
suLastBaddie->unk138_25 = 0;
suLastBaddie->unk16C_3 = 0;
suLastBaddie->unk16C_2 = 0;
suLastBaddie->unk16C_1 = 0;
suLastBaddie->unk16C_0 = 0;
suLastBaddie->unk17C_31 = 0;
suLastBaddie->unk14C[0] = NULL;
suLastBaddie->unk14C[1] = NULL;
suLastBaddie->unk138_27 = 0;
suLastBaddie->unk138_24 = 0;
suLastBaddie->unk138_23 = 0;
suLastBaddie->unk138_22 = 0;
suLastBaddie->unk138_21 = 0;
suLastBaddie->unk138_20 = 0;
suLastBaddie->unk174 = 0.0f;
suLastBaddie->unk178 = 0.0f;
if( actorInfo->animations){
sp54 = &D_80383390->unk18[D_80383390->state];
sp54 = &suLastBaddie->unk18[suLastBaddie->state];
if(sp54->index != 0){
D_80383390->animctrl = animctrl_new(0);
animctrl_reset(D_80383390->animctrl);
animctrl_setIndex(D_80383390->animctrl, sp54->index);
animctrl_setDuration(D_80383390->animctrl, sp54->duration);
animctrl_start(D_80383390->animctrl, "subaddie.c", 0x4A5);
suLastBaddie->animctrl = animctrl_new(0);
animctrl_reset(suLastBaddie->animctrl);
animctrl_setIndex(suLastBaddie->animctrl, sp54->index);
animctrl_setDuration(suLastBaddie->animctrl, sp54->duration);
animctrl_start(suLastBaddie->animctrl, "subaddie.c", 0x4A5);
}
}//L80327BA8
D_80383390->unk124_11 = 0;
D_80383390->alpha_124_19 = 0xff;
D_80383390->depth_mode = MODEL_RENDER_DEPTH_FULL;
D_80383390->unk124_0 = D_80383390->unk138_31 = 1;
suLastBaddie->unk124_11 = 0;
suLastBaddie->alpha_124_19 = 0xff;
suLastBaddie->depth_mode = MODEL_RENDER_DEPTH_FULL;
suLastBaddie->unk124_0 = suLastBaddie->unk138_31 = 1;
for(i = 0; i < 0x10; i++){
((s32 *)D_80383390->unk7C)[i] = 0;
((s32 *)suLastBaddie->unk7C)[i] = 0;
}
for(i = 0; i < 0x0C; i++){
((s32 *)D_80383390->unkBC)[i] = 0;
((s32 *)suLastBaddie->unkBC)[i] = 0;
}
if(flags & ACTOR_FLAG_UNKNOWN_0){
D_80383390->unk10_25 = func_80306DDC(position) + 1;
if(D_80383390->unk10_25 == 0){
D_80383390->unk10_25 = 0;
suLastBaddie->unk10_25 = func_80306DDC(position) + 1;
if(suLastBaddie->unk10_25 == 0){
suLastBaddie->unk10_25 = 0;
}else{
sp44[0] = (f32)position[0];
sp44[1] = (f32)position[1];
sp44[2] = (f32)position[2];
D_80383390->unk10_18 = func_80307258(&sp44, D_80383390->unk10_25 - 1, 0) + 1;
suLastBaddie->unk10_18 = func_80307258(&sp44, suLastBaddie->unk10_25 - 1, 0) + 1;
}
}//L80327D30
if(flags & ACTOR_FLAG_UNKNOWN_2){
D_80383390->unk10_1 = 0;
suLastBaddie->unk10_1 = 0;
}
if(flags & ACTOR_FLAG_UNKNOWN_3){
D_80383390->unkF4_30 = 1;
suLastBaddie->unkF4_30 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_1){
D_80383390->marker->unk44 = 1;
suLastBaddie->marker->unk44 = 1;
}
else if(flags & ACTOR_FLAG_UNKNOWN_6){
D_80383390->marker->unk44 = func_8034A2C8();
suLastBaddie->marker->unk44 = func_8034A2C8();
}
if(flags & ACTOR_FLAG_UNKNOWN_12){
func_8033F738(D_80383390->marker);
func_8034BFF8(D_80383390->marker);
func_8033F738(suLastBaddie->marker);
func_8034BFF8(suLastBaddie->marker);
}
D_80383390->unk148 = 0;
suLastBaddie->unk148 = 0;
if(flags & ACTOR_FLAG_UNKNOWN_11){
D_80383390->unk148 = skeletalAnim_new();
suLastBaddie->unk148 = skeletalAnim_new();
}
if(flags & ACTOR_FLAG_UNKNOWN_14){
D_80383390->marker->unk50 = func_803406B0();
suLastBaddie->marker->unk50 = func_803406B0();
}
if(flags & ACTOR_FLAG_UNKNOWN_4){
D_80383390->unk124_31 = -1;
suLastBaddie->unk124_31 = -1;
}
if(flags & ACTOR_FLAG_UNKNOWN_7){
D_80383390->unkF4_22 = 1;
suLastBaddie->unkF4_22 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_19){
D_80383390->unk58_1 = 1;
suLastBaddie->unk58_1 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_8){
D_80383390->unk130 = func_803255FC;
suLastBaddie->unk130 = func_803255FC;
}
if(flags & ACTOR_FLAG_UNKNOWN_9){
D_80383390->marker->unk40_21 = 1;
suLastBaddie->marker->unk40_21 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_15){
D_80383390->marker->unk40_20 = 1;
suLastBaddie->marker->unk40_20 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_17){
D_80383390->marker->unk40_22 = 1;
suLastBaddie->marker->unk40_22 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_22){
D_80383390->marker->unk40_19 = 1;
suLastBaddie->marker->unk40_19 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_16){
D_80383390->unk138_9 = 1;
suLastBaddie->unk138_9 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_18){
D_80383390->unk138_8 = 1;
suLastBaddie->unk138_8 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_21){
D_80383390->unk138_25 = 1;
suLastBaddie->unk138_25 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_23){
D_80383390->unk16C_3 = 1;
suLastBaddie->unk16C_3 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_24){
D_80383390->unk16C_2 = 1;
suLastBaddie->unk16C_2 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_25){
D_80383390->unk16C_1 = 1;
suLastBaddie->unk16C_1 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_26){
D_80383390->unk17C_31 = 1;
suLastBaddie->unk17C_31 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_13){
D_80383390->unk138_29 = 1;
suLastBaddie->unk138_29 = 1;
}
if(flags & ACTOR_FLAG_UNKNOWN_20){
D_80383390->unk58_2 = 0;
suLastBaddie->unk58_2 = 0;
}
D_80383390->unk154 = 0x005e0000;
D_80383390->marker->unk54 = func_8032B5C0;
suLastBaddie->unk154 = 0x005e0000;
suLastBaddie->marker->unk54 = func_8032B5C0;
for(i = 0; i < 3; ++i){
D_80383390->unk164[i] = 0x63;
suLastBaddie->unk164[i] = 0x63;
}
D_80383390->unk170 = -10.0f;
D_80383390->unk138_7 = 0;
D_80383390->unk3C = flags;
return D_80383390;
suLastBaddie->unk170 = -10.0f;
suLastBaddie->unk138_7 = 0;
suLastBaddie->unk3C = flags;
return suLastBaddie;
}
static void __actor_free(ActorMarker *arg0, Actor *arg1){

2
src/core2/code_AD5B0.c
View File

@@ -29,7 +29,7 @@ void func_80334540(Gfx** gdl, Mtx **mptr, Vtx **vptr) {
f32 sp40;
if (D_803835E0 == 0) {
func_80254084(gdl, 0, 0, framebuffer_width, framebuffer_height, 0, 0, 0);
drawRectangle2D(gdl, 0, 0, framebuffer_width, framebuffer_height, 0, 0, 0);
func_802BBD2C(&sp44, &sp40);
viewport_set_near_far(sp44, sp40);
func_8024C904(gdl, mptr);

44
src/core2/code_B7F40.c
View File

@@ -2,53 +2,53 @@
#include "functions.h"
#include "variables.h"
void func_8033EF08(void);
void func_8033EF10(void);
void dummy_func_8033EF08(void);
void dummy_func_8033EF10(void);
/* .data */
void *D_80371E60 = NULL;
void *gUnusedBlock = NULL;
/* .code */
void func_8033EED0(void){
func_8033EF10();
func_8033EF08();
void dummy_func_8033EED0(void){
dummy_func_8033EF10();
dummy_func_8033EF08();
}
void func_8033EEF8(void){}
void dummy_func_8033EEF8(void){}
void func_8033EF00(void){}
void dummy_func_8033EF00(void){}
void func_8033EF08(void){}
void dummy_func_8033EF08(void){}
void func_8033EF10(void){}
void dummy_func_8033EF10(void){}
void func_8033EF18(s32 arg0, s32 arg1){
void dummy_func_8033EF18(s32 arg0, s32 arg1){
return;
}
void func_8033EF24(void){
if(D_80371E60){
free(D_80371E60);
void unallocUnusedBlock(void){
if(gUnusedBlock){
free(gUnusedBlock);
}
D_80371E60 = NULL;
gUnusedBlock = NULL;
}
void func_8033EF58(void){
D_80371E60 = malloc(0x50);
void allocUnusedBlock(void){
gUnusedBlock = malloc(80);
}
void func_8033EF7C(s32 arg0){
void dummy_func_8033EF7C(s32 arg0){
return;
}
void func_8033EF84(void){}
void dummy_func_8033EF84(void){}
void func_8033EF8C(void){}
void dummy_func_8033EF8C(void){}
void func_8033EF94(s32 arg0){
void dummy_func_8033EF94(s32 arg0){
return;
}
void func_8033EF9C(s32 arg0){
void dummy_func_8033EF9C(s32 arg0){
return;
}

2
src/core2/code_E910.c
View File

@@ -282,7 +282,7 @@ void func_80295C14(void){
stateTimer_update();
func_8029E100();
pfsManager_update();//controller_update
func_8023E06C();
disableInput_set();
func_80295448();
func_8029B174();
func_8029533C(); //dive_cooldown_update

2
src/core2/fx/common3score.c
View File

@@ -209,7 +209,7 @@ void fxcommon3score_draw(enum item_e item_id, void *arg1, Gfx **gfx, Mtx **mtx,
if(a1->unk6C == 0.0f){
a1->unk6C = 1.1*(vtxList_getGlobalNorm(model_getVtxList(a1->model)) * a1->unk3C);
}
func_80253208(gfx, a1->unk30 - a1->unk6C, sp40 - a1->unk6C, 2*a1->unk6C, 2*a1->unk6C, D_803A5D00[func_8024BDA0()]);
func_80253208(gfx, a1->unk30 - a1->unk6C, sp40 - a1->unk6C, 2*a1->unk6C, 2*a1->unk6C, D_803A5D00[getActiveFramebuffer()]);
if(a1->anim_ctrl != NULL){
animctrl_drawSetup(a1->anim_ctrl, sp5C, 1);
}

4
src/core2/gc/sky.c
View File

@@ -76,7 +76,7 @@ void sky_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){
viewport_set_near_far(5.0f, 15000.0f);
if(gcSky.model_bins[0]){
func_80254084(gfx, 0, 0, (s32)(f32) framebuffer_width, (s32)(f32)framebuffer_height,0, 0, 0); //fill screen with black
drawRectangle2D(gfx, 0, 0, (s32)(f32) framebuffer_width, (s32)(f32)framebuffer_height,0, 0, 0); //fill screen with black
func_8024C904(gfx, mtx);
viewport_get_position_vec3f(position);
for(i = 0; i < 3; i++){
@@ -90,7 +90,7 @@ void sky_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
}
else{//L8030B200
func_80254084(gfx, 0, 0, (s32)(f32) framebuffer_width, (s32)(f32)framebuffer_height, 0, 0, 0);
drawRectangle2D(gfx, 0, 0, (s32)(f32) framebuffer_width, (s32)(f32)framebuffer_height, 0, 0, 0);
}//L8030B254
}