diff options
| author | Evan <eroelke@gmail.com> | 2019-11-20 10:17:41 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-20 10:17:41 -0700 |
| commit | 80e84c2f48c83448be224e07a97ba0288d744ed6 (patch) | |
| tree | e9cd5c4829833b2c87bcd27a831a4e3b1a372ea0 /include | |
| parent | 4a3d7ad972d964dcc008c5e736b3547196e65547 (diff) | |
| parent | 39a71e64d1b6823cd12bf74a80e2d5bf287165d9 (diff) | |
Merge branch 'options_menu'
Diffstat (limited to 'include')
| -rw-r--r-- | include/menu_helpers.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/menu_helpers.h b/include/menu_helpers.h index 6ea771500..8d042825c 100644 --- a/include/menu_helpers.h +++ b/include/menu_helpers.h @@ -12,7 +12,7 @@ struct YesNoFuncTable }; bool16 RunTextPrinters_CheckActive(u8 textPrinterId); -bool8 sub_80BF72C(void); +bool32 sub_80BF72C(void); bool8 sub_80BF748(void); bool8 MenuHelpers_LinkSomething(void); void SetVBlankHBlankCallbacksToNull(void); diff --git a/include/strings.h b/include/strings.h index 327d3cfcb..bef3ed7cb 100644 --- a/include/strings.h +++ b/include/strings.h @@ -780,7 +780,7 @@ extern const u8 gText_BattleStyleShift[]; extern const u8 gText_BattleStyleSet[]; extern const u8 gText_SoundMono[]; extern const u8 gText_SoundStereo[]; -extern const u8 gText_ButtonTypeNormal[]; +extern const u8 gText_ButtonTypeHelp[]; extern const u8 gText_ButtonTypeLR[]; extern const u8 gText_ButtonTypeLEqualsA[]; extern const u8 gText_MenuOption[]; |