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

Merge branch 'documenting_pause' into 'master'

Browse Source 
Pause Refactor : Renaming and reformating

See merge request banjo.decomp/banjo-kazooie!77
This commit is contained in:
Banjo Kazooie
2024-09-26 23:46:39 +00:00
parent fbe20325c2 13135e606f
commit d6487c8478
7 changed files with 694 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core1/code_10A00.c
View File

@@ -128,7 +128,7 @@ f32 func_8024E668(s32 controller_index){
return D_80281308[controller_index]; return D_80281308[controller_index];
} }
s32 func_8024E67C(s32 controller_index){ s32 controller_getStartButton(s32 controller_index){
return D_80281138[controller_index].start_button; return D_80281138[controller_index].start_button;
} }

2
src/core2/code_5C240.c
View File

@@ -147,7 +147,7 @@ void func_802E35D8(void ) {
if (D_8037E8C0.unk18 > 15.0f) { if (D_8037E8C0.unk18 > 15.0f) {
sp38++; sp38++;
} }
if (func_8024E67C(0) == 1) { if (controller_getStartButton(0) == 1) {
sp38++; sp38++;
} }
if (sp38 != 0) { if (sp38 != 0) {

4
src/core2/code_5C870.c
View File

@@ -527,7 +527,7 @@ bool func_802E4424(void) {
case GAME_MODE_7_ATTRACT_DEMO: case GAME_MODE_7_ATTRACT_DEMO:
case GAME_MODE_9_BANJO_AND_KAZOOIE: case GAME_MODE_9_BANJO_AND_KAZOOIE:
func_8034BB90(); func_8034BB90();
if ((func_8024E67C(0) == 1) && (D_8037E8E0.unk0 != 0)) { if ((controller_getStartButton(0) == 1) && (D_8037E8E0.unk0 != 0)) {
func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U); func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U);
} }
break; break;
@@ -547,7 +547,7 @@ bool func_802E4424(void) {
&& dummy_func_80320248() && dummy_func_80320248()
) { ) {
func_802E3BF8(GAME_MODE_4_PAUSED, 0U); func_802E3BF8(GAME_MODE_4_PAUSED, 0U);
} else if ((func_8024E67C(0) == 1) && (D_8037E8E0.unk0 != 0)) { } else if ((controller_getStartButton(0) == 1) && (D_8037E8E0.unk0 != 0)) {
func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U); func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U);
} else if (sp1C == 0) { } else if (sp1C == 0) {
func_802E3BF8(GAME_MODE_3_NORMAL, 1U); func_802E3BF8(GAME_MODE_3_NORMAL, 1U);

2
src/core2/code_E410.c
View File

@@ -24,7 +24,7 @@ void func_802953A0(void){
void func_80295448(void){ void func_80295448(void){
s32 i; s32 i;
D_8037C310.unk0[0] = func_8024E67C(BUTTON_START); D_8037C310.unk0[0] = controller_getStartButton(0);
func_8024E60C(0, &D_8037C310.unk0[1]); func_8024E60C(0, &D_8037C310.unk0[1]);
func_8024E6E0(0, &D_8037C310.unk0[4]); func_8024E6E0(0, &D_8037C310.unk0[4]);
func_8024E55C(0, &D_8037C310.unk0[8]); func_8024E55C(0, &D_8037C310.unk0[8]);

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

File diff suppressed because it is too large Load Diff

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

@@ -1043,12 +1043,12 @@ void func_80316E60(GcZoombox *this){
func_80318488(this); func_80318488(this);
} }
void func_80316E84(GcZoombox *this, s32 arg1){ void func_80316E84(GcZoombox *this, s32 state){
if(this->unk134 != arg1){ if(this->unk134 != state){
if(this->unk130 != NULL){ if (this->callback != NULL) {
this->unk130(this->portrait_id, arg1); this->callback(this->portrait_id, state);
} }
this->unk134 = arg1; this->unk134 = state;
} }
} }
@@ -1378,13 +1378,13 @@ void __gczoombox_load_sfx(GcZoombox *this, GcZoomboxSprite portrait_id){
} }
} }
GcZoombox *gczoombox_new(s32 arg0, GcZoomboxSprite portrait_id, s32 arg2, s32 arg3, void (*arg4)(s32, s32)){ GcZoombox *gczoombox_new(s32 y, GcZoomboxSprite portrait_id, s32 arg2, s32 arg3, void (*callback)(s32 portrait_id, s32 state)){
GcZoombox *this; GcZoombox *this;
s32 i; s32 i;
s32 temp_v1; s32 temp_v1;
this = (GcZoombox *)malloc(sizeof(GcZoombox)); this = (GcZoombox *)malloc(sizeof(GcZoombox));
this->unk130 = arg4; this->callback = callback;
this->state = 0xB; this->state = 0xB;
this->portrait_id = portrait_id; this->portrait_id = portrait_id;
this->unk134 = this->str_cnt = this->current_str_index = 0; this->unk134 = this->str_cnt = this->current_str_index = 0;
@@ -1399,7 +1399,7 @@ GcZoombox *gczoombox_new(s32 arg0, GcZoomboxSprite portrait_id, s32 arg2, s32 ar
this->unk15C = 0; this->unk15C = 0;
this->unk160 = 0; this->unk160 = 0;
this->unk166 = this->unk1A4_19; this->unk166 = this->unk1A4_19;
this->unk164 = arg0; this->unk164 = y;
this->unk168 = 0xFF; this->unk168 = 0xFF;
this->unk1A4_24 = arg3; this->unk1A4_24 = arg3;
if(this->unk1A4_24){ if(this->unk1A4_24){

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

@@ -132,7 +132,7 @@ typedef struct {
f32 unk110[5]; //sfx_??? f32 unk110[5]; //sfx_???
s16 unk124[5]; //sfx_??? s16 unk124[5]; //sfx_???
s16 unk12E; s16 unk12E;
void (*unk130)(s32, s32); void (*callback)(s32 portrait_id, s32 state);
u8 unk134; u8 unk134;
u8 state; u8 state;
u8 portrait_id; //0x136 u8 portrait_id; //0x136