Reformating pause
This commit is contained in:
@@ -52,18 +52,18 @@ extern void func_802FACA4(enum item_e);
|
||||
extern void func_8033BD20(void *);
|
||||
|
||||
enum gcpausemenu_state_e {
|
||||
PAUSE_STATE_0_CLOSED,
|
||||
PAUSE_STATE_1_OPENING,
|
||||
PAUSE_STATE_0_MENU_INIT,
|
||||
PAUSE_STATE_1_MENU_OPENING,
|
||||
PAUSE_STATE_2_MENU,
|
||||
PAUSE_STATE_3_RETURNING_TO_GAME,
|
||||
PAUSE_STATE_4_PROCESS_SELECTION,
|
||||
PAUSE_STATE_5_CONFIRM_SELECTION,
|
||||
PAUSE_STATE_4_SELECTION_PROCESSING,
|
||||
PAUSE_STATE_5_SELECTION_CONFIRMATION,
|
||||
PAUSE_STATE_6_UNKNOWN,
|
||||
PAUSE_STATE_7_LEVEL_TOTALS_INIT,
|
||||
PAUSE_STATE_8_LEVEL_TOTALS_OPENING,
|
||||
PAUSE_STATE_9_LEVEL_TOTALS,
|
||||
PAUSE_STATE_A_UNKNOWN,
|
||||
PAUSE_STATE_B_UNKNOWN,
|
||||
PAUSE_STATE_A_LEVEL_TOTALS_CLOSING,
|
||||
PAUSE_STATE_B_LEVEL_TOTALS_DISPOSE,
|
||||
PAUSE_STATE_C_UNKNOWN,
|
||||
PAUSE_STATE_D_UNKNOWN,
|
||||
PAUSE_STATE_E_UNKNOWN,
|
||||
@@ -76,7 +76,6 @@ enum gcpausemenu_state_e {
|
||||
};
|
||||
|
||||
|
||||
|
||||
/* .data */
|
||||
struct1As D_8036C4E0[4] = {
|
||||
{0.0f, 0.0f, "RETURN TO GAME", 55, ZOOMBOX_SPRITE_4_BANJO_1, 0},
|
||||
@@ -259,14 +258,16 @@ void gcpausemenu_80311A84(void){
|
||||
if (func_802FC3C4()) {
|
||||
D_80383010.unk70_31 = 1;
|
||||
func_802FAD64(ITEM_12_JINJOS);
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
func_802FACA4(ITEM_12_JINJOS);
|
||||
}
|
||||
|
||||
if (func_802FD2D4()) {
|
||||
D_80383010.unk70_30 = 1;
|
||||
func_802FAD64(ITEM_16_LIFE);
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
func_802FACA4(ITEM_16_LIFE);
|
||||
}
|
||||
}
|
||||
@@ -393,8 +394,7 @@ void gcpausemenu_printTotals(void){
|
||||
}
|
||||
|
||||
s32 gcpausemenu_levelToMenuPage(enum level_e arg0) {
|
||||
switch (arg0)
|
||||
{
|
||||
switch (arg0) {
|
||||
case LEVEL_1_MUMBOS_MOUNTAIN:
|
||||
case LEVEL_2_TREASURE_TROVE_COVE:
|
||||
case LEVEL_3_CLANKERS_CAVERN:
|
||||
@@ -405,16 +405,22 @@ s32 gcpausemenu_levelToMenuPage(enum level_e arg0){
|
||||
case LEVEL_6_LAIR:
|
||||
case LEVEL_C_BOSS:
|
||||
return 2;
|
||||
|
||||
case LEVEL_7_GOBIS_VALLEY:
|
||||
return 8;
|
||||
|
||||
case LEVEL_8_CLICK_CLOCK_WOOD:
|
||||
return 11;
|
||||
|
||||
case LEVEL_9_RUSTY_BUCKET_BAY:
|
||||
return 10;
|
||||
|
||||
case LEVEL_A_MAD_MONSTER_MANSION:
|
||||
return 9;
|
||||
|
||||
case LEVEL_B_SPIRAL_MOUNTAIN:
|
||||
return 1;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
@@ -432,19 +438,20 @@ void gcpausemenu_8031209C(struct1As *arg0, s32 arg1){
|
||||
void gcPauseMenu_setState(enum gcpausemenu_state_e next_state) {
|
||||
s32 i;
|
||||
switch (next_state) {
|
||||
case PAUSE_STATE_0_CLOSED:
|
||||
case PAUSE_STATE_0_MENU_INIT:
|
||||
gcpausemenu_80311A84();
|
||||
D_80383010.unk1 = 0;
|
||||
D_80383010.left_joystick_visible = D_80383010.right_joystick_visible = D_80383010.exit_pause = D_80383010.selection = D_80383010.zoombox_processed_count = 0;
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_1_OPENING:
|
||||
case PAUSE_STATE_1_MENU_OPENING:
|
||||
D_80383010.unkC = D_80383010.unk3_6 = D_80383010.unk7 = 0;
|
||||
gcpausemenu_8031209C(D_8036C4E0, 4);
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
gczoombox_highlight(D_80383010.zoombox[i], 1);
|
||||
}
|
||||
|
||||
if (D_80383010.return_to_lair_disabled) {
|
||||
gczoombox_highlight(D_80383010.zoombox[1], 0);
|
||||
}
|
||||
@@ -461,10 +468,11 @@ void gcPauseMenu_setState(enum gcpausemenu_state_e next_state){
|
||||
gcpausemenu_8031209C(D_8036C4E0, 4);
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_5_CONFIRM_SELECTION:/* 8B334 803122C4 3C128038 */
|
||||
case PAUSE_STATE_5_SELECTION_CONFIRMATION:/* 8B334 803122C4 3C128038 */
|
||||
D_80383010.unkC = 3;
|
||||
D_80383010.unk5 = D_80383010.unk3_6 = 0;
|
||||
gcpausemenu_8031209C(D_8036C4E0, 4);
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
D_80383010.unk5 += func_803188B4(D_80383010.zoombox[i]);
|
||||
}
|
||||
@@ -486,12 +494,15 @@ void gcPauseMenu_setState(enum gcpausemenu_state_e next_state){
|
||||
D_80383010.unk20 = D_80383010.unk28 = 0.0f;
|
||||
gcpausemenu_zoomboxes_free();
|
||||
gcpausemenu_zoomboxes_initTotalsMenu();
|
||||
|
||||
if (D_80383010.selection == gcpausemenu_levelToMenuPage(level_get())) {
|
||||
func_802F5060(0x6e7);
|
||||
}
|
||||
|
||||
if (D_80383010.selection) {
|
||||
gcpausemenu_printLevelTotals(D_8036C58C[D_80383010.selection].level_id);
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
gcpausemenu_printTotals();
|
||||
}
|
||||
|
||||
@@ -517,20 +528,23 @@ void gcPauseMenu_setState(enum gcpausemenu_state_e next_state){
|
||||
D_80383010.unk3_5 = 1;
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_A_UNKNOWN:
|
||||
case PAUSE_STATE_A_LEVEL_TOTALS_CLOSING:
|
||||
D_80383010.unk3_5 = 1;
|
||||
D_80383010.unkC = 0.0f;
|
||||
D_80383010.unk5 = 4;
|
||||
|
||||
if (D_80383010.unk9 != 0xC) {
|
||||
D_80383010.b_button_visible = FALSE;
|
||||
}
|
||||
|
||||
gcpausemenu_8031209C(D_8036C520, 4);
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_B_UNKNOWN:
|
||||
case PAUSE_STATE_B_LEVEL_TOTALS_DISPOSE:
|
||||
if (D_80383010.selection && D_80383010.selection == gcpausemenu_levelToMenuPage(level_get())) {
|
||||
func_802F5188();
|
||||
}
|
||||
|
||||
gcpausemenu_zoomboxes_free();
|
||||
gcpausemenu_zoomboxes_initMainMenu();
|
||||
break;
|
||||
@@ -555,8 +569,9 @@ void gcPauseMenu_setState(enum gcpausemenu_state_e next_state){
|
||||
if (D_80383010.selection && D_80383010.selection == gcpausemenu_levelToMenuPage(level_get())) {
|
||||
func_802F5060(0x6e7);
|
||||
}
|
||||
if(D_80383010.selection)
|
||||
if (D_80383010.selection) {
|
||||
gcpausemenu_printLevelTotals(D_8036C58C[D_80383010.selection].level_id);
|
||||
}
|
||||
else {
|
||||
gcpausemenu_printTotals();
|
||||
}
|
||||
@@ -571,6 +586,7 @@ void gcPauseMenu_setState(enum gcpausemenu_state_e next_state){
|
||||
else {
|
||||
gczoombox_highlight(D_80383010.zoombox[i], 1);
|
||||
}
|
||||
|
||||
if (gczoombox_is_highlighted(D_80383010.zoombox[i])) {
|
||||
gczoombox_maximize(D_80383010.zoombox[i]);
|
||||
func_803183A4(D_80383010.zoombox[i], D_8036C520[i].str);
|
||||
@@ -603,8 +619,9 @@ void gcPauseMenu_setState(enum gcpausemenu_state_e next_state){
|
||||
case PAUSE_STATE_11_UNKNOWN: /* 8B944 803128D4 3C128038 */
|
||||
D_80383010.unk3_5 = 1;
|
||||
D_80383010.sns_visible = 0;
|
||||
if(D_80383010.unk9 == -1)
|
||||
if (D_80383010.unk9 == -1) {
|
||||
D_80383010.b_button_visible = FALSE;
|
||||
}
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_12_UNKNOWN: /* 8B978 80312908 3C128038 */
|
||||
@@ -637,21 +654,22 @@ void gcpausemenu_zoombox_callback(s32 portrait_id, s32 zoombox_state) {
|
||||
|
||||
switch (D_80383010.state) {
|
||||
case PAUSE_STATE_3_RETURNING_TO_GAME:
|
||||
case PAUSE_STATE_A_UNKNOWN:
|
||||
case PAUSE_STATE_A_LEVEL_TOTALS_CLOSING:
|
||||
if (zoombox_state == 6) {
|
||||
D_80383010.zoombox_processed_count++;
|
||||
} else if (zoombox_state == 4) {
|
||||
}
|
||||
else if (zoombox_state == 4) {
|
||||
D_80383010.unk5 = (s8)(D_80383010.unk5 - 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_5_CONFIRM_SELECTION:
|
||||
case PAUSE_STATE_5_SELECTION_CONFIRMATION:
|
||||
if (zoombox_state == 4) {
|
||||
D_80383010.unk5 = (s8)(D_80383010.unk5 - 1);
|
||||
}
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_1_OPENING:
|
||||
case PAUSE_STATE_1_MENU_OPENING:
|
||||
case PAUSE_STATE_8_LEVEL_TOTALS_OPENING:
|
||||
if (zoombox_state == 1) {
|
||||
D_80383010.zoombox_processed_count++;
|
||||
@@ -695,7 +713,9 @@ s32 gcpausemenu_initLargestPageIndex(void) {
|
||||
return var_s3;
|
||||
}
|
||||
|
||||
bool gcpausemenu_isReturnToLairDisabled(void){ return TRUE; }
|
||||
bool gcpausemenu_isReturnToLairDisabled(void) {
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void gcpausemenu_init(void) {
|
||||
s32 i;
|
||||
@@ -717,13 +737,7 @@ void gcpausemenu_init(void) {
|
||||
sp30 = sns_get_item_state(3, 0);
|
||||
sp34 = sns_get_item_state(2, 0);
|
||||
sp38 = sns_get_item_state(1, 0);
|
||||
D_80383010.unk39 = sp38
|
||||
+ sp34
|
||||
+ sp30
|
||||
+ sp2C
|
||||
+ sp28
|
||||
+ sp24
|
||||
+ sns_get_item_state(7, 0);
|
||||
D_80383010.unk39 = sp38 + sp34 + sp30 + sp2C + sp28 + sp24 + sns_get_item_state(7, 0);
|
||||
D_80383010.return_to_lair_disabled = gcpausemenu_isReturnToLairDisabled();
|
||||
func_80311604();
|
||||
gcpausemenu_zoomboxes_initMainMenu();
|
||||
@@ -738,7 +752,7 @@ void gcpausemenu_init(void) {
|
||||
D_80383010.page_cnt = gcpausemenu_initLargestPageIndex();
|
||||
D_80383010.sns_alpha = D_80383010.sns_visible = D_80383010.unk70_31 = D_80383010.unk70_30 = 0;
|
||||
rumbleManager_80250FC0();
|
||||
gcPauseMenu_setState(PAUSE_STATE_0_CLOSED);
|
||||
gcPauseMenu_setState(PAUSE_STATE_0_MENU_INIT);
|
||||
}
|
||||
|
||||
s32 gcpausemenu_80312D78(struct1As *arg0, s32 arg1) {
|
||||
@@ -802,7 +816,8 @@ void gcpausemenu_80312FD0(s32 arg0) {
|
||||
if (D_80383010.unk6 == 0xC) {
|
||||
D_80383010.unk3_5 = FALSE;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
D_80383010.unk6--;
|
||||
temp_v1 = D_8036C5F4[D_80383010.unk6];
|
||||
D_80383010.unk8 -= temp_v1;
|
||||
@@ -821,11 +836,12 @@ void gcpausemenu_getNextPage(s32 arg0) {
|
||||
D_80383010.unk9 = D_80383010.selection;
|
||||
do {
|
||||
D_80383010.unk9 += arg0;
|
||||
if((D_80383010.unk39 != 0) && (D_80383010.unk9 == 0xC))
|
||||
if ((D_80383010.unk39 != 0) && (D_80383010.unk9 == 0xC)) {
|
||||
break;
|
||||
}
|
||||
while( (D_80383010.unk9 != 0) && itemscore_timeScores_get(D_8036C58C[D_80383010.unk9].level_id) == 0);
|
||||
gcPauseMenu_setState((D_80383010.unk9 == 0xC) ? PAUSE_STATE_A_UNKNOWN : PAUSE_STATE_C_UNKNOWN);
|
||||
} while ((D_80383010.unk9 != 0) && itemscore_timeScores_get(D_8036C58C[D_80383010.unk9].level_id) == 0);
|
||||
|
||||
gcPauseMenu_setState((D_80383010.unk9 == 0xC) ? PAUSE_STATE_A_LEVEL_TOTALS_CLOSING : PAUSE_STATE_C_UNKNOWN);
|
||||
D_80383010.unk7 = 6;
|
||||
}
|
||||
|
||||
@@ -849,7 +865,8 @@ void gcpausemenu_updateBButtonAndJoystickSprites(void) {
|
||||
D_80383010.unk3_4 = FALSE;
|
||||
var_f0 = 0.066666666666666666;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
D_80383010.joystick_frame++;
|
||||
if (D_80383010.joystick_frame >= D_80383010.joystick_frame_count) {
|
||||
D_80383010.unk3_4 = TRUE;
|
||||
@@ -871,7 +888,8 @@ void gcpausemenu_updateBButtonAndJoystickSprites(void) {
|
||||
D_80383010.unk3_0 = FALSE;
|
||||
var_f12 = 0.04;
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
D_80383010.b_button_frame++;
|
||||
if (D_80383010.b_button_frame >= D_80383010.b_button_frame_count) {
|
||||
D_80383010.unk3_0 = TRUE;
|
||||
@@ -892,33 +910,35 @@ s32 gcPauseMenu_update(void){
|
||||
f32 joystick[2];
|
||||
s32 level = level_get(); //sp44
|
||||
|
||||
|
||||
if(getGameMode() != GAME_MODE_4_PAUSED)
|
||||
if (getGameMode() != GAME_MODE_4_PAUSED) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
func_8024E55C(0, face_button);
|
||||
func_8024E71C(0, joystick);
|
||||
func_8024E60C(0, sp60);
|
||||
func_8024E6E0(0, sp50);
|
||||
func_80310D2C();
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
gczoombox_update(D_80383010.zoombox[i]);
|
||||
}
|
||||
|
||||
|
||||
D_80383010.unkC += time_getDelta();
|
||||
|
||||
switch (D_80383010.state) {
|
||||
case PAUSE_STATE_0_CLOSED: //closed
|
||||
gcPauseMenu_setState(PAUSE_STATE_1_OPENING);
|
||||
case PAUSE_STATE_0_MENU_INIT: //closed
|
||||
gcPauseMenu_setState(PAUSE_STATE_1_MENU_OPENING);
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_1_OPENING: //opening
|
||||
case PAUSE_STATE_1_MENU_OPENING: //opening
|
||||
if (gcpausemenu_80312D78(D_8036C4E0, 4) == 4) {
|
||||
if (((D_80383010.return_to_lair_disabled) ? 3 : 4) == D_80383010.zoombox_processed_count) {
|
||||
D_80383010.zoombox_processed_count = 0;
|
||||
gcPauseMenu_setState(PAUSE_STATE_2_MENU);
|
||||
}
|
||||
}
|
||||
|
||||
if (func_8024E67C(0) == 1) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN);
|
||||
}
|
||||
@@ -929,21 +949,24 @@ s32 gcPauseMenu_update(void){
|
||||
func_802FACA4(ITEM_12_JINJOS);
|
||||
D_80383010.unk70_31 = 0;
|
||||
}//L8031350C
|
||||
|
||||
if (D_80383010.unk70_30 && !func_802FD2D4()) {
|
||||
func_802FACA4(ITEM_16_LIFE);
|
||||
D_80383010.unk70_30 = 0;
|
||||
}
|
||||
|
||||
if (func_8024E67C(0) == 1) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN);
|
||||
}else if(face_button[FACE_BUTTON(BUTTON_A)] == 1){
|
||||
}
|
||||
else if (face_button[FACE_BUTTON(BUTTON_A)] == 1) {
|
||||
switch (D_80383010.selection) {
|
||||
case 1://L80313594
|
||||
if (level > 0 && level < LEVEL_C_BOSS && D_8036C560[level - 1].map != -1) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_5_CONFIRM_SELECTION);
|
||||
gcPauseMenu_setState(PAUSE_STATE_5_SELECTION_CONFIRMATION);
|
||||
}
|
||||
break;
|
||||
case 3://L803135D0
|
||||
gcPauseMenu_setState(PAUSE_STATE_5_CONFIRM_SELECTION);
|
||||
gcPauseMenu_setState(PAUSE_STATE_5_SELECTION_CONFIRMATION);
|
||||
break;
|
||||
default://L803135E4
|
||||
gcPauseMenu_setState(PAUSE_STATE_3_RETURNING_TO_GAME);
|
||||
@@ -975,7 +998,8 @@ s32 gcPauseMenu_update(void){
|
||||
D_80383010.unk3_6 = 0;
|
||||
D_80383010.unk7 = 6;
|
||||
}
|
||||
}else if(joystick[JOYSTICK_Y] < -0.75){
|
||||
}
|
||||
else if (joystick[JOYSTICK_Y] < -0.75) {
|
||||
if ((s32) D_80383010.selection < 3) {
|
||||
gczoombox_highlight(D_80383010.zoombox[D_80383010.selection], 0);
|
||||
D_80383010.selection++;
|
||||
@@ -988,6 +1012,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]);
|
||||
D_80383010.unk3_6 = 1;
|
||||
@@ -1004,10 +1029,11 @@ s32 gcPauseMenu_update(void){
|
||||
}
|
||||
if (D_80383010.zoombox_processed_count == 4) {
|
||||
D_80383010.zoombox_processed_count = 0;
|
||||
gcPauseMenu_setState(PAUSE_STATE_4_PROCESS_SELECTION);
|
||||
gcPauseMenu_setState(PAUSE_STATE_4_SELECTION_PROCESSING);
|
||||
}
|
||||
break;
|
||||
case PAUSE_STATE_4_PROCESS_SELECTION:
|
||||
|
||||
case PAUSE_STATE_4_SELECTION_PROCESSING:
|
||||
switch (D_80383010.selection) {
|
||||
case 0://L803138FC
|
||||
D_80383010.exit_pause = TRUE;
|
||||
@@ -1017,7 +1043,8 @@ s32 gcPauseMenu_update(void){
|
||||
if (map_get() == MAP_8E_GL_FURNACE_FUN) {
|
||||
volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 0);
|
||||
func_802E4078(MAP_80_GL_FF_ENTRANCE, 2, 1);
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
func_802E4078(D_8036C560[level - 1].map, D_8036C560[level - 1].exit, 1);
|
||||
}
|
||||
gcPauseMenu_setState(PAUSE_STATE_13_UNKNOWN);
|
||||
@@ -1029,9 +1056,11 @@ s32 gcPauseMenu_update(void){
|
||||
case 3://L8031399C
|
||||
func_802C5994();
|
||||
volatileFlag_set(VOLATILE_FLAG_0_IN_FURNACE_FUN_QUIZ, 0);
|
||||
if(!fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE) || fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){
|
||||
if (!fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE) ||
|
||||
fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_14_UNKNOWN);
|
||||
}else{
|
||||
}
|
||||
else {
|
||||
func_802E412C(1, 0);
|
||||
func_802E4078(MAP_83_CS_GAME_OVER_MACHINE_ROOM, 0, 1);
|
||||
gcPauseMenu_setState(PAUSE_STATE_13_UNKNOWN);
|
||||
@@ -1039,23 +1068,28 @@ s32 gcPauseMenu_update(void){
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case PAUSE_STATE_5_CONFIRM_SELECTION:
|
||||
|
||||
case PAUSE_STATE_5_SELECTION_CONFIRMATION:
|
||||
if (3.0 < D_80383010.unkC) {
|
||||
if (D_8036C4E0[D_80383010.selection].unkF) {
|
||||
gczoombox_minimize(D_80383010.zoombox[D_80383010.selection]);
|
||||
}
|
||||
D_80383010.unk3_6 ^= 1;
|
||||
gczoombox_maximize(D_80383010.zoombox[D_80383010.selection]);
|
||||
if(D_8036C4E0[D_80383010.selection].unkF = func_803183A4(D_80383010.zoombox[D_80383010.selection], (D_80383010.unk3_6)? "ARE YOU SURE?" : "A - YES, B - NO"))
|
||||
if (D_8036C4E0[D_80383010.selection].unkF = func_803183A4(D_80383010.zoombox[D_80383010.selection], (D_80383010.unk3_6) ? "ARE YOU SURE?" : "A - YES, B - NO")) {
|
||||
D_80383010.unkC = 0.0;
|
||||
}
|
||||
}//L80313AF4
|
||||
|
||||
if (func_8024E67C(0) == 1) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_6_UNKNOWN);
|
||||
}else if(face_button[FACE_BUTTON(BUTTON_B)] == 1){
|
||||
}
|
||||
else if (face_button[FACE_BUTTON(BUTTON_B)] == 1) {
|
||||
D_80383010.zoombox_processed_count = (D_80383010.return_to_lair_disabled) ? 3 : 4;
|
||||
func_803188B4(D_80383010.zoombox[D_80383010.selection]);
|
||||
gcPauseMenu_setState(PAUSE_STATE_1_OPENING);
|
||||
}else if(face_button[FACE_BUTTON(BUTTON_A)] == 1){//L80313B68
|
||||
gcPauseMenu_setState(PAUSE_STATE_1_MENU_OPENING);
|
||||
}
|
||||
else if (face_button[FACE_BUTTON(BUTTON_A)] == 1) {//L80313B68
|
||||
gcPauseMenu_setState(PAUSE_STATE_3_RETURNING_TO_GAME);
|
||||
}
|
||||
break;
|
||||
@@ -1064,7 +1098,7 @@ s32 gcPauseMenu_update(void){
|
||||
if (D_80383010.zoombox_processed_count == 4) {
|
||||
if (0.2 < D_80383010.unkC) {
|
||||
D_80383010.zoombox_processed_count = 0;
|
||||
gcPauseMenu_setState(PAUSE_STATE_4_PROCESS_SELECTION);
|
||||
gcPauseMenu_setState(PAUSE_STATE_4_SELECTION_PROCESSING);
|
||||
}
|
||||
}
|
||||
break;
|
||||
@@ -1078,6 +1112,7 @@ s32 gcPauseMenu_update(void){
|
||||
gcpausemenu_80312FD0(1);
|
||||
gcpausemenu_80312D78(D_8036C520, 4);
|
||||
gcpausemenu_updateBButtonAndJoystickSprites();
|
||||
|
||||
if (D_80383010.zoombox_processed_count == 4) {
|
||||
D_80383010.zoombox_processed_count = 0;
|
||||
gcPauseMenu_setState(PAUSE_STATE_9_LEVEL_TOTALS);
|
||||
@@ -1091,47 +1126,53 @@ s32 gcPauseMenu_update(void){
|
||||
|
||||
if (func_8024E67C(0) == 1) {
|
||||
D_80383010.unk1 = 3;
|
||||
gcPauseMenu_setState(PAUSE_STATE_A_UNKNOWN);
|
||||
} else if (face_button[FACE_BUTTON(BUTTON_B)] == 1) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_A_UNKNOWN);
|
||||
} else if (0.75 < joystick[JOYSTICK_X]) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_A_LEVEL_TOTALS_CLOSING);
|
||||
}
|
||||
else if (face_button[FACE_BUTTON(BUTTON_B)] == 1) {
|
||||
gcPauseMenu_setState(PAUSE_STATE_A_LEVEL_TOTALS_CLOSING);
|
||||
}
|
||||
else if (0.75 < joystick[JOYSTICK_X]) {
|
||||
if ((s32) D_80383010.selection < gcpausemenu_getMaxPage()) {
|
||||
gcpausemenu_getNextPage(1);
|
||||
}
|
||||
} else if (joystick[JOYSTICK_X] < -0.75) {//L80313CCC
|
||||
}
|
||||
else if (joystick[JOYSTICK_X] < -0.75) {//L80313CCC
|
||||
if ((s32) D_80383010.selection > 0) {
|
||||
gcpausemenu_getNextPage(-1);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_A_UNKNOWN://80313D00
|
||||
case PAUSE_STATE_A_LEVEL_TOTALS_CLOSING://80313D00
|
||||
gcpausemenu_printTotalsHeader(D_80383010.selection);
|
||||
gcpausemenu_80312FD0(-1);
|
||||
gcpausemenu_80312E80(D_8036C520, 4);
|
||||
gcpausemenu_updateBButtonAndJoystickSprites();
|
||||
|
||||
if (D_80383010.unk9 != 0xC) {
|
||||
D_80383010.left_joystick_visible = FALSE;
|
||||
D_80383010.right_joystick_visible = FALSE;
|
||||
}//L80313D50
|
||||
|
||||
if (!D_80383010.unk5) {
|
||||
for (i = 0; i < 4; i++) {
|
||||
gczoombox_close(D_80383010.zoombox[i]);
|
||||
}
|
||||
D_80383010.unk5 = 1;
|
||||
}//L80313D8C
|
||||
|
||||
if (D_80383010.zoombox_processed_count == 4) {
|
||||
D_80383010.zoombox_processed_count = 0;
|
||||
gcPauseMenu_setState(PAUSE_STATE_B_UNKNOWN);
|
||||
gcPauseMenu_setState(PAUSE_STATE_B_LEVEL_TOTALS_DISPOSE);
|
||||
}
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_B_UNKNOWN:
|
||||
case PAUSE_STATE_B_LEVEL_TOTALS_DISPOSE:
|
||||
if (D_80383010.unk1 == 3) {
|
||||
D_80383010.exit_pause = TRUE;
|
||||
}
|
||||
else {
|
||||
gcPauseMenu_setState((D_80383010.unk9 == 0xC) ? PAUSE_STATE_E_UNKNOWN : PAUSE_STATE_0_CLOSED);
|
||||
gcPauseMenu_setState((D_80383010.unk9 == 0xC) ? PAUSE_STATE_E_UNKNOWN : PAUSE_STATE_0_MENU_INIT);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1148,10 +1189,13 @@ s32 gcPauseMenu_update(void){
|
||||
gcpausemenu_printTotalsHeader(D_80383010.selection);
|
||||
gcpausemenu_80312FD0(1);
|
||||
gcpausemenu_updateBButtonAndJoystickSprites();
|
||||
if(D_80383010.unk7 > 0)
|
||||
if (D_80383010.unk7 > 0) {
|
||||
D_80383010.unk7--;
|
||||
else
|
||||
}
|
||||
else {
|
||||
gcPauseMenu_setState(PAUSE_STATE_9_LEVEL_TOTALS);
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case PAUSE_STATE_E_UNKNOWN:
|
||||
@@ -1199,8 +1243,9 @@ s32 gcPauseMenu_update(void){
|
||||
case PAUSE_STATE_12_UNKNOWN:
|
||||
if (D_80383010.unk1 == 3) {
|
||||
D_80383010.exit_pause = TRUE;
|
||||
}else{
|
||||
gcPauseMenu_setState((D_80383010.unk9 != -1) ? PAUSE_STATE_7_LEVEL_TOTALS_INIT : PAUSE_STATE_0_CLOSED);
|
||||
}
|
||||
else {
|
||||
gcPauseMenu_setState((D_80383010.unk9 != -1) ? PAUSE_STATE_7_LEVEL_TOTALS_INIT : PAUSE_STATE_0_MENU_INIT);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1215,8 +1260,8 @@ s32 gcPauseMenu_update(void){
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
|
||||
return D_80383010.exit_pause;
|
||||
}
|
||||
|
||||
@@ -1290,7 +1335,8 @@ void gcpausemenu_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
|
||||
func_8033B61C();
|
||||
func_80315084(gfx, mtx, vtx);
|
||||
D_8036C620 = FALSE;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
func_80315110(gfx, mtx, vtx);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user