mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-25 19:24:16 +01:00
Document main_menu
This commit is contained in:
parent
8026188e36
commit
b860d583e4
@ -2156,7 +2156,7 @@ sub_81A0A34: @ 81A0A34
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
bl sub_8197224
|
||||
bl RunTextPrintersAndIsPrinter0Active
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _081A0A68
|
||||
|
@ -2831,7 +2831,7 @@ sub_8017020: @ 8017020
|
||||
thumb_func_start sub_801704C
|
||||
sub_801704C: @ 801704C
|
||||
push {lr}
|
||||
bl sub_8197224
|
||||
bl RunTextPrintersAndIsPrinter0Active
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
beq _0801705C
|
||||
@ -2871,7 +2871,7 @@ _08017076:
|
||||
b _080170AE
|
||||
.pool
|
||||
_0801709C:
|
||||
bl sub_8197224
|
||||
bl RunTextPrintersAndIsPrinter0Active
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, 0
|
||||
|
@ -1881,7 +1881,7 @@ sub_807825C: @ 807825C
|
||||
lsrs r1, 24
|
||||
movs r0, 0x1C
|
||||
bl SetGpuReg
|
||||
bl sub_8197224
|
||||
bl RunTextPrintersAndIsPrinter0Active
|
||||
bl RunTasks
|
||||
bl AnimateSprites
|
||||
bl BuildOamBuffer
|
||||
|
@ -2,6 +2,6 @@
|
||||
#define GUARD_MAIN_MENU_H
|
||||
|
||||
void CB2_InitMainMenu(void);
|
||||
void sub_80323CC(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f);
|
||||
void CreateYesNoMenuParameterized(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f);
|
||||
|
||||
#endif // GUARD_MAIN_MENU_H
|
||||
|
@ -22,7 +22,7 @@ extern const u16 gUnknown_0860F074[];
|
||||
|
||||
void sub_81971D0(void);
|
||||
void sub_8197200(void);
|
||||
u16 sub_8197224(void);
|
||||
u16 RunTextPrintersAndIsPrinter0Active(void);
|
||||
void sub_81973A4(void);
|
||||
void NewMenuHelpers_DrawDialogueFrame(u8, u8);
|
||||
void sub_819746C(u8 windowId, bool8 copyToVram);
|
||||
|
@ -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
|
||||
|
@ -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);
|
||||
|
1054
src/main_menu.c
1054
src/main_menu.c
File diff suppressed because it is too large
Load Diff
@ -668,7 +668,7 @@ static void Task_BardSong(u8 taskId)
|
||||
task->tState = 3;
|
||||
break;
|
||||
}
|
||||
sub_8197224();
|
||||
RunTextPrintersAndIsPrinter0Active();
|
||||
}
|
||||
|
||||
void ScrSpecial_SetMauvilleOldManEventObjGfx(void)
|
||||
|
@ -157,7 +157,7 @@ void sub_8197200(void)
|
||||
sub_81973A4();
|
||||
}
|
||||
|
||||
u16 sub_8197224(void)
|
||||
u16 RunTextPrintersAndIsPrinter0Active(void)
|
||||
{
|
||||
RunTextPrinters();
|
||||
return IsTextPrinterActive(0);
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user