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

Merge branch 'master' of https://gitlab.com/banjo.decomp/banjo-kazooie into core1_docu

Browse Source
This commit is contained in:
mariob92
2024-10-15 10:40:52 +02:00
parent a5b65b87fa d1b41e109d
commit 9495386470
57 changed files with 3157 additions and 2134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -377,7 +377,7 @@ void gcdialog_update(void) {
pfsManager_getFirstControllerFaceButtonState(0, controller_face_buttons);
func_8024E640(0, controller_side_buttons);
} else {
pfsManager_getControllerFaceButtonState(0, controller_face_buttons);
controller_copyFaceButtons(0, controller_face_buttons);
func_8024E60C(0, controller_side_buttons);
}
@@ -726,7 +726,7 @@ void func_80310A5C(s32 next_state, s32 arg1, s32 arg2, s32 arg3, s32 arg4){
f32 tmpf;
for(i = 0, tmpf = 0.4f; i< 2; i++){
if(g_Dialog.zoombox[i]){
func_803184C8(g_Dialog.zoombox[i], arg2, next_state, arg1, tmpf, arg3, arg4);
gczoombox_func_803184C8(g_Dialog.zoombox[i], arg2, next_state, arg1, tmpf, arg3, arg4);
}
}
}

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

@@ -240,7 +240,7 @@ void gcpausemenu_zoomboxes_initMainMenu(void) {
s32 i;
for (i = 0; i < 4; i++) {
D_80383010.zoombox[i] = gczoombox_new(D_8036C4E0[i].y, D_8036C4E0[i].portrait, 2, 0, gcpausemenu_zoombox_callback);
func_803184C8(D_80383010.zoombox[i], 60.0f, 5, 2, 0.3f, 0, 0);
gczoombox_func_803184C8(D_80383010.zoombox[i], 60.0f, 5, 2, 0.3f, 0, 0);
func_80318640(D_80383010.zoombox[i], 0x1C, 0.75f, 0.9f, 0);
func_80318760(D_80383010.zoombox[i], 8000);
}
@@ -251,7 +251,7 @@ void gcpausemenu_zoomboxes_initTotalsMenu(void) {
for (i = 0; i < 4; i++) {
D_80383010.zoombox[i] = gczoombox_new(D_8036C520[i].y, D_8036C520[i].portrait, (i == 3) ? 1 : 2, 0, gcpausemenu_zoombox_callback);
func_803184C8(D_80383010.zoombox[i], 40.0f, 5, 2, 0.3f, 0, 0);
gczoombox_func_803184C8(D_80383010.zoombox[i], 40.0f, 5, 2, 0.3f, 0, 0);
func_80318640(D_80383010.zoombox[i], 0x46, 0.9f, 0.7f, 1);
func_80318760(D_80383010.zoombox[i], 8000);
}
@@ -933,7 +933,7 @@ s32 gcPauseMenu_update(void) {
return 0;
}
pfsManager_getControllerFaceButtonState(0, face_button);
controller_copyFaceButtons(0, face_button);
controller_getJoystick(0, joystick);
func_8024E60C(0, sp60);
func_8024E6E0(0, sp50);
@@ -1003,7 +1003,7 @@ s32 gcPauseMenu_update(void) {
}//L80313664
else {
if (D_80383010.selection == PAUSE_SELECTION_2_VIEW_TOTALS && !D_80383010.unk3_6) {
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 1;
}
@@ -1015,7 +1015,7 @@ s32 gcPauseMenu_update(void) {
D_80383010.selection--;
}
gczoombox_highlight(D_80383010.zoombox[D_80383010.selection], TRUE);
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 0;
D_80383010.unk7 = 6;
}
@@ -1028,7 +1028,7 @@ s32 gcPauseMenu_update(void) {
D_80383010.selection++;
}
gczoombox_highlight(D_80383010.zoombox[D_80383010.selection], 1);
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 0;
D_80383010.unk7 = 6;
}
@@ -1036,7 +1036,7 @@ s32 gcPauseMenu_update(void) {
}
if (D_80383010.selection == 2 && !D_80383010.unk3_6 && D_80383010.unk7 == 3) {
func_803160A8(D_80383010.zoombox[D_80383010.selection]);
gczoombox_func_803160A8(D_80383010.zoombox[D_80383010.selection]);
D_80383010.unk3_6 = 1;
}
break;

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

@@ -764,7 +764,7 @@ void func_80315C90(GcZoombox *this, s32 arg1) {
}
}
void func_803160A8(GcZoombox *this) {
void gczoombox_func_803160A8(GcZoombox *this) {
f32 temp_f14;
f32 phi_f14;
s32 phi_a0;
@@ -879,7 +879,7 @@ void func_80316764(GcZoombox *this, s32 arg1) {
f32 pad0;
if (!this->unk1A4_10 ) {
pfsManager_getControllerFaceButtonState(0, sp38);
controller_copyFaceButtons(0, sp38);
func_8024E60C(0, sp2C);
phi_f0 = time_getDelta();
} else {
@@ -1065,7 +1065,7 @@ void gczoombox_update(GcZoombox *this){
return;
if( !this->unk1A4_10 ){
pfsManager_getControllerFaceButtonState(0, sp58);
controller_copyFaceButtons(0, sp58);
func_8024E60C(0, sp4C);
tmp_f0 = time_getDelta();
}
@@ -1449,7 +1449,7 @@ GcZoombox *gczoombox_new(s32 y, GcZoomboxSprite portrait_id, s32 arg2, s32 arg3,
animctrl_setIndex(this->anim_ctrl, ASSET_138_ANIM_ZOOMBOX);
animctrl_start(this->anim_ctrl, "gczoombox.c", 0x6fd);
func_803184C8(this, 15.0f, 5, 2, 0.4f, 0, 0); //func_803184C8(this, 15.0f, 5, 2, D_80378940, 0, 0);
gczoombox_func_803184C8(this, 15.0f, 5, 2, 0.4f, 0, 0); //gczoombox_func_803184C8(this, 15.0f, 5, 2, D_80378940, 0, 0);
this->unk176 = D_8036C6C0[portrait_id].unk2;
this->unk177 = D_8036C6C0[portrait_id].unk3;
this->unk100 = 0;
@@ -1556,14 +1556,14 @@ void func_803184B8(GcZoombox *this){
this->unk13A &= (u8)~(0x20);
}
void func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool arg5, bool arg6) {
void gczoombox_func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 animation_duration, bool arg5, bool arg6) {
if (this != NULL) {
this->unk182 = arg2;
this->unk184 = arg3;
this->unk190 = 1.0 / arg1;
if (this->anim_ctrl != NULL) {
animctrl_setDuration(this->anim_ctrl, arg4);
animctrl_setDuration(this->anim_ctrl, animation_duration);
}
this->unk1A4_12 = BOOL(arg5);
this->unk1A4_10 = BOOL(arg6);
@@ -1581,8 +1581,8 @@ bool func_8031857C(GcZoombox *this, u8 *str){
return FALSE;
}
void gczoombox_highlight(GcZoombox *this, bool arg1){
if(arg1)
void gczoombox_highlight(GcZoombox *this, bool should_highlight){
if(should_highlight)
this->highlighted = 1;
else
this->highlighted = 0;
@@ -1630,7 +1630,7 @@ void func_80318760(GcZoombox *this, s32 arg1){
this->unk12E = arg1;
}
void func_80318774(GcZoombox *this){
void gczoombox_setUnk13ATo0(GcZoombox *this){
this->unk13A = 0;
}
@@ -1763,10 +1763,10 @@ void gczoombox_defrag(GcZoombox *this) {
}
}
void func_80318C48(GcZoombox *this, s32 arg1) {
void gczoombox_func_80318C48(GcZoombox *this, bool arg1) {
if (this != NULL) {
if (this->unk1A4_30) {
if (arg1 != 0) {
if (arg1 != FALSE) {
if (this->unk0[0] == 0xFD) {
this->unk0[1] = 0x68;
} else {
@@ -1781,7 +1781,7 @@ void func_80318C48(GcZoombox *this, s32 arg1) {
}
}
if (this->unk1A4_29) {
if (arg1 != 0) {
if (arg1 != FALSE) {
if (this->unk30[0] == 0xFD) {
this->unk30[1] = 0x68;
return;

8
src/core2/gc/zoombox.h
View File

@@ -207,7 +207,7 @@ typedef struct {
void gczoombox_free(GcZoombox *this);
void func_803160A8(GcZoombox *this);
void gczoombox_func_803160A8(GcZoombox *this);
void func_803163A8(GcZoombox *this, Gfx **gfx, Mtx **mtx);
void func_803164B0(GcZoombox *this, Gfx **gfx, Mtx **mtx, s32 arg3, s32 arg4, BKSpriteDisplayData *arg5, f32 arg6);
void func_80316764(GcZoombox *this, s32 arg1);
@@ -231,7 +231,7 @@ void func_80318488(GcZoombox *this);
void func_80318498(GcZoombox *this);
void gczoombox_resolve_minimize(GcZoombox *this);
void func_803184B8(GcZoombox *this);
void func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool arg5, bool arg6);
void gczoombox_func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool arg5, bool arg6);
bool func_8031857C(GcZoombox *this, u8 *str);
void gczoombox_highlight(GcZoombox *this, bool arg1);
bool gczoombox_is_highlighted(GcZoombox *this);
@@ -239,7 +239,7 @@ void func_80318614(GcZoombox *this, int arg1);
void func_80318640(GcZoombox *this, s32 arg1, f32 arg2, f32 arg3, s32 arg4);
void func_80318734(GcZoombox *this, f32 arg1);
void func_80318760(GcZoombox *this, s32 arg1);
void func_80318774(GcZoombox *this);
void gczoombox_setUnk13ATo0(GcZoombox *this);
bool func_8031877C(GcZoombox *this);
bool func_803188B4(GcZoombox *this);
bool func_80318964(GcZoombox *this);
@@ -247,6 +247,6 @@ bool gczoombox_loadSprite(GcZoombox *this, GcZoomboxSprite arg1);
void func_80318B7C(GcZoombox *this, s32 arg1);
bool func_80318BEC(GcZoombox *this);
void gczoombox_defrag(GcZoombox *this);
void func_80318C48(GcZoombox *this, s32 arg1);
void gczoombox_func_80318C48(GcZoombox *this, bool arg1);
#endif // __BANJO_KAZOOIE_CORE2_GC_ZOOMBOX_H__