ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #324 from Diegoisawesome/master

Browse Source 
Document main_menu
This commit is contained in:
Diegoisawesome 2018-09-14 12:17:11 -05:00 committed by GitHub
commit b8c9d9a980
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 568 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/battle_frontier_2.s
View File

@ -2156,7 +2156,7 @@ sub_81A0A34: @ 81A0A34
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_8197224 bl RunTextPrintersAndIsPrinter0Active
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
bne _081A0A68 bne _081A0A68

4
asm/rom_8011DC0.s
View File

@ -2831,7 +2831,7 @@ sub_8017020: @ 8017020
thumb_func_start sub_801704C thumb_func_start sub_801704C
sub_801704C: @ 801704C sub_801704C: @ 801704C
push {lr} push {lr}
bl sub_8197224 bl RunTextPrintersAndIsPrinter0Active
lsls r0, 16 lsls r0, 16
cmp r0, 0 cmp r0, 0
beq _0801705C beq _0801705C
@ -2871,7 +2871,7 @@ _08017076:
b _080170AE b _080170AE
.pool .pool
_0801709C: _0801709C:
bl sub_8197224 bl RunTextPrintersAndIsPrinter0Active
lsls r0, 16 lsls r0, 16
lsrs r0, 16 lsrs r0, 16
cmp r0, 0 cmp r0, 0

2
asm/trade.s
View File

@ -1881,7 +1881,7 @@ sub_807825C: @ 807825C
lsrs r1, 24 lsrs r1, 24
movs r0, 0x1C movs r0, 0x1C
bl SetGpuReg bl SetGpuReg
bl sub_8197224 bl RunTextPrintersAndIsPrinter0Active
bl RunTasks bl RunTasks
bl AnimateSprites bl AnimateSprites
bl BuildOamBuffer bl BuildOamBuffer

2
include/main_menu.h
View File

@ -2,6 +2,6 @@
#define GUARD_MAIN_MENU_H #define GUARD_MAIN_MENU_H
void CB2_InitMainMenu(void); 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 #endif // GUARD_MAIN_MENU_H

2
include/menu.h
View File

@ -22,7 +22,7 @@ extern const u16 gUnknown_0860F074[];
void sub_81971D0(void); void sub_81971D0(void);
void sub_8197200(void); void sub_8197200(void);
u16 sub_8197224(void); u16 RunTextPrintersAndIsPrinter0Active(void);
void sub_81973A4(void); void sub_81973A4(void);
void NewMenuHelpers_DrawDialogueFrame(u8, u8); void NewMenuHelpers_DrawDialogueFrame(u8, u8);
void sub_819746C(u8 windowId, bool8 copyToVram); void sub_819746C(u8 windowId, bool8 copyToVram);

4
src/data/pokemon/trainer_class_lookups.h
View File

@ -63,10 +63,10 @@ const u8 gFacilityClassToPicIndex[] =
TRAINER_PIC_TWINS, // FACILITY_CLASS_TWINS TRAINER_PIC_TWINS, // FACILITY_CLASS_TWINS
TRAINER_PIC_SAILOR, // FACILITY_CLASS_SAILOR TRAINER_PIC_SAILOR, // FACILITY_CLASS_SAILOR
TRAINER_PIC_WALLY, // FACILITY_CLASS_PKMN_TRAINER_1 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_3
TRAINER_PIC_BRENDAN, // FACILITY_CLASS_PKMN_TRAINER_4 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_6
TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_7 TRAINER_PIC_MAY, // FACILITY_CLASS_PKMN_TRAINER_7
TRAINER_PIC_POKEMON_BREEDER_M, // FACILITY_CLASS_PKMN_BREEDER_2 TRAINER_PIC_POKEMON_BREEDER_M, // FACILITY_CLASS_PKMN_BREEDER_2

2
src/field_message_box.c
View File

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

1054
src/main_menu.c
View File

File diff suppressed because it is too large Load Diff

2
src/mauville_old_man.c
View File

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

2
src/menu.c
View File

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

2
src/slot_machine.c
View File

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

2
src/start_menu.c
View File

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