diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-12 17:04:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 17:04:23 -0500 |
| commit | 92d99d4fd2e5579372b9f4cc39468000553ba3a8 (patch) | |
| tree | 4ff8e60d1ad6a25dad888a4e78011624b46ad9ec /src/script_menu.c | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
| parent | 0676e732869d0e62322b001cbab57b8500361005 (diff) | |
Merge pull request #207 from GriffinRichards/sync-script
Sync scripts with pokeemerald
Diffstat (limited to 'src/script_menu.c')
| -rw-r--r-- | src/script_menu.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/script_menu.c b/src/script_menu.c index 4ebd0f8f8..2a81a7bce 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -579,7 +579,7 @@ const u8 *const gStdStringPtrs[] = { gText_Items, gText_KeyItems, gText_PokeBalls, - gText_TmsgUnknown_8417B2CHms, + gText_TMsAndHMs, gText_Berries, gText_Boulderbadge, gText_Cascadebadge, @@ -598,22 +598,22 @@ const u8 *const gStdStringPtrs[] = { }; static const u8 *const sDescriptionPtrs_CableClub_TradeBattleCancel[] = { - Text_1BC388, - Text_1BC3C7, - Text_1BCB42 + CableClub_Text_TradeMonsUsingLinkCable, + CableClub_Text_BattleUsingLinkCable, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCAF2, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CanMakeBerryPowder, + CableClub_Text_CancelSelectedItem }; static const u8 *const sDescriptionPtrs_WirelessCenter_TradeBattleCancel[] = { - Text_1BCA95, - Text_1BCACB, - Text_1BCB42 + CableClub_Text_YouMayTradeHere, + CableClub_Text_YouMayBattleHere, + CableClub_Text_CancelSelectedItem }; static const union AnimCmd sMuseumFossilAnim0[] = { @@ -1007,7 +1007,7 @@ static void CreatePCMenuWindow(void) void ScriptMenu_DisplayPCStartupPrompt(void) { sub_80F7768(0, TRUE); - AddTextPrinterParameterized2(0, 2, gUnknown_81A508A, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, Text_AccessWhichPC, 0, NULL, 2, 1, 3); } static void Task_ScriptShowMonPic(u8 taskId) |