Document main_menu

This commit is contained in:
Diegoisawesome
2018-09-14 12:15:46 -05:00
parent 8026188e36
commit b860d583e4
12 changed files with 568 additions and 512 deletions

View File

@@ -63,10 +63,10 @@ const u8 gFacilityClassToPicIndex[] =
TRAINER_PIC_TWINS, // FACILITY_CLASS_TWINS
TRAINER_PIC_SAILOR, // FACILITY_CLASS_SAILOR
TRAINER_PIC_WALLY, // FACILITY_CLASS_PKMN_TRAINER_1
TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_MAY
TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN
TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_3
TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_4
TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_BRENDAN
TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_MAY
TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_6
TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_7
TRAINER_PIC_POKEMON_BREEDER_M, // FACILITY_CLASS_PKMN_BREEDER_2

View File

@@ -37,7 +37,7 @@ void sub_8098154(u8 taskId)
task->data[0]++;
break;
case 2:
if (sub_8197224() != 1)
if (RunTextPrintersAndIsPrinter0Active() != 1)
{
gUnknown_020375BC = 0;
DestroyTask(taskId);

File diff suppressed because it is too large Load Diff

View File

@@ -668,7 +668,7 @@ static void Task_BardSong(u8 taskId)
task->tState = 3;
break;
}
sub_8197224();
RunTextPrintersAndIsPrinter0Active();
}
void ScrSpecial_SetMauvilleOldManEventObjGfx(void)

View File

@@ -157,7 +157,7 @@ void sub_8197200(void)
sub_81973A4();
}
u16 sub_8197224(void)
u16 RunTextPrintersAndIsPrinter0Active(void)
{
RunTextPrinters();
return IsTextPrinterActive(0);

View File

@@ -968,7 +968,7 @@ bool8 sub_8102318(struct Task *task)
NewMenuHelpers_DrawDialogueFrame(0, 0);
AddTextPrinterParameterized(0, 1, gText_QuitTheGame, 0, 1, 0, 0);
CopyWindowToVram(0, 3);
sub_80323CC(0x15, 7, 0x214, 0x180, 0xE, 0xF);
CreateYesNoMenuParameterized(0x15, 7, 0x214, 0x180, 0xE, 0xF);
sSlotMachine->state = 22;
return FALSE;
}

View File

@@ -866,7 +866,7 @@ static void InitSave(void)
static u8 RunSaveCallback(void)
{
// True if text is still printing
if (sub_8197224() == TRUE)
if (RunTextPrintersAndIsPrinter0Active() == TRUE)
{
return SAVE_IN_PROGRESS;
}