diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/link.c | 6 | ||||
| -rw-r--r-- | src/main_menu.c | 8 | ||||
| -rw-r--r-- | src/menu.c | 28 |
3 files changed, 21 insertions, 21 deletions
diff --git a/src/link.c b/src/link.c index 0fa1f4673..13fcf8c05 100644 --- a/src/link.c +++ b/src/link.c @@ -27,7 +27,7 @@ struct LinkTestBGInfo u32 dummy_C; }; -extern void InitMenuWindowConfig(const struct WindowConfig *); +extern void InitMenuWindow(const struct WindowConfig *); extern void sub_80516C4(u8, u16); extern u8 unk_2000000[]; @@ -237,7 +237,7 @@ static void LinkTestScreen(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E6CE4); - InitMenuWindowConfig(&gWindowConfig_81E6CE4); + InitMenuWindow(&gWindowConfig_81E6CE4); ResetBlockSend(); gLinkType = 0x1111; OpenLink(); @@ -1224,7 +1224,7 @@ void CB2_LinkError(void) ResetTasks(); SetVBlankCallback(VBlankCB_LinkTest); SetUpWindowConfig(&gWindowConfig_81E7198); - InitMenuWindowConfig(&gWindowConfig_81E7198); + InitMenuWindow(&gWindowConfig_81E7198); MenuZeroFillScreen(); REG_BLDALPHA = 0; REG_BG0VOFS = 0; diff --git a/src/main_menu.c b/src/main_menu.c index 246cf72a3..721c7090e 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -35,7 +35,7 @@ void DisplayYesNoMenu(u8 r0, u8 r1, u32 r2); s8 ProcessMenuInputNoWrap_(void); void c2_load_new_map_2(void); void LZ77UnCompVram(const void *src, void *dest); -void InitMenuWindowConfig(const struct WindowConfig *); +void InitMenuWindow(const struct WindowConfig *); void CB2_MainMenu(void); void VBlankCB_MainMenu(void); void DecompressPicFromTable_2(const struct SpriteSheet *, u8, u8, void *, void *, u32); @@ -139,7 +139,7 @@ u32 InitMainMenu(u8 a1) ResetSpriteData(); FreeAllSpritePalettes(); SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindowConfig(&gWindowConfig_81E6CE4); + InitMenuWindow(&gWindowConfig_81E6CE4); if (a1) BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black @@ -721,7 +721,7 @@ void set_default_player_name(u8 a); void Task_Birch1(u8 taskId) { SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindowConfig(&gWindowConfig_81E6CE4); + InitMenuWindow(&gWindowConfig_81E6CE4); REG_WIN0H = 0; REG_WIN0V = 0; REG_WININ = 0; @@ -1363,7 +1363,7 @@ void new_game_prof_birch_speech_part2_start() AddBirchSpeechObjects(taskId); SetUpWindowConfig(&gWindowConfig_81E6C3C); - InitMenuWindowConfig(&gWindowConfig_81E6CE4); + InitMenuWindow(&gWindowConfig_81E6CE4); if (gSaveBlock2.playerGender != MALE) { diff --git a/src/menu.c b/src/menu.c index 6533b59cf..1ced7d517 100644 --- a/src/menu.c +++ b/src/menu.c @@ -17,15 +17,15 @@ struct Menu u8 columnXCoords[8]; }; -void InitMenuWindowConfig(struct WindowConfig *); -void MultistepInitMenuWindowConfigBegin(struct WindowConfig *); -void MultistepInitMenuWindowConfigInternal(struct WindowConfig *, u16); -bool32 MultistepInitMenuWindowConfigContinue(void); -void InitMenuWindowConfigInternal(struct WindowConfig *, u16); +void InitMenuWindow(struct WindowConfig *); +void MultistepInitMenuWindowBegin(struct WindowConfig *); +void MultistepInitMenuWindowInternal(struct WindowConfig *, u16); +bool32 MultistepInitMenuWindowContinue(void); +void InitMenuWindowInternal(struct WindowConfig *, u16); void unref_sub_8071DA4(struct WindowConfig *, u16); void MenuLoadTextWindowGraphics_OverrideFrameType(u8); void MenuLoadTextWindowGraphics(void); -void BasicInitMenuWindowConfig(struct WindowConfig *); +void BasicInitMenuWindow(struct WindowConfig *); void MenuPrint(u8 *, u8, u8); void MenuZeroFillWindowRect(u8, u8, u8, u8); void MenuFillWindowRectWithBlankTile(u8, u8, u8, u8); @@ -102,17 +102,17 @@ extern u16 gMenuMessageBoxContentTileOffset; extern const u8 *gUnknown_08376D74[][2]; -void InitMenuWindowConfig(struct WindowConfig *winConfig) +void InitMenuWindow(struct WindowConfig *winConfig) { - InitMenuWindowConfigInternal(winConfig, 1); + InitMenuWindowInternal(winConfig, 1); } -void MultistepInitMenuWindowConfigBegin(struct WindowConfig *winConfig) +void MultistepInitMenuWindowBegin(struct WindowConfig *winConfig) { - MultistepInitMenuWindowConfigInternal(winConfig, 1); + MultistepInitMenuWindowInternal(winConfig, 1); } -void MultistepInitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 tileOffset) +void MultistepInitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset) { gMenuMultistepInitState = 0; gMenuTextTileOffset = tileOffset; @@ -120,7 +120,7 @@ void MultistepInitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 t InitWindowFromConfig(&gMenuWindow, winConfig); } -bool32 MultistepInitMenuWindowConfigContinue(void) +bool32 MultistepInitMenuWindowContinue(void) { switch (gMenuMultistepInitState) { @@ -149,7 +149,7 @@ bool32 MultistepInitMenuWindowConfigContinue(void) } } -void InitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 tileOffset) +void InitMenuWindowInternal(struct WindowConfig *winConfig, u16 tileOffset) { gMenuWindowPtr = &gMenuWindow; InitWindowFromConfig(&gMenuWindow, winConfig); @@ -181,7 +181,7 @@ void MenuLoadTextWindowGraphics(void) LoadTextWindowGraphics(gMenuWindowPtr); } -void BasicInitMenuWindowConfig(struct WindowConfig *winConfig) +void BasicInitMenuWindow(struct WindowConfig *winConfig) { InitWindowFromConfig(gMenuWindowPtr, winConfig); gMenuWindowPtr->tileDataStartOffset = gMenuTextTileOffset; |