diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2020-06-13 13:40:57 -0400 |
| commit | e2eb17dcbd8f9021b7e9fc805c8c03fac6b3b255 (patch) | |
| tree | 5705aaca2ef0713f55ca22a4a814161e26aa4582 /include/strings.h | |
| parent | 1ce33843b645e3139bd414c2d048c628967f4e07 (diff) | |
| parent | f75c048434d5dc7538e628206c29a0730404db81 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered
Diffstat (limited to 'include/strings.h')
| -rw-r--r-- | include/strings.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/strings.h b/include/strings.h index 50c132829..fd224aea4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -188,7 +188,7 @@ extern const u8 gText_Ghost[]; // pokemon extern const u8 gBattleText_Rose[]; -extern const u8 gBattleText_UnknownString3[]; +extern const u8 gText_PkmnsStatChanged2[]; extern const u8 gBattleText_GetPumped[]; extern const u8 gBattleText_MistShroud[]; extern const u8 gText_BadEgg[]; @@ -215,9 +215,9 @@ extern const u8 gString_QuitPlaying[]; extern const u8 gString_SlotMachineControls[]; // battle_controller_safari -extern const u8 gUnknown_83FDA4C[]; +extern const u8 gText_EmptyString3[]; extern const u8 gUnknown_83FE747[]; -extern const u8 gUnknown_83FE6E6[]; +extern const u8 gText_WhatWillPlayerThrow[]; // battle_controller_player extern const u8 gText_BattleSwitchWhich[]; @@ -225,23 +225,23 @@ extern const u8 gUnknown_83FE770[]; extern const u8 gText_MoveInterfacePP[]; extern const u8 gText_MoveInterfaceType[]; extern const u8 gText_LinkStandby[]; -extern const u8 gUnknown_83FE725[]; +extern const u8 gText_BattleMenu[]; extern const u8 gText_WhatWillPkmnDo[]; // battle_script_commands extern const u8 gText_BattleYesNoChoice[]; // battle_controller_oak_old_man -extern const u8 gUnknown_83FDAE2[]; -extern const u8 gUnknown_83FDB92[]; -extern const u8 gUnknown_83FDBEF[]; -extern const u8 gUnknown_83FDC58[]; -extern const u8 gUnknown_83FDC95[]; -extern const u8 gUnknown_83FDD23[]; -extern const u8 gUnknown_83FDD64[]; -extern const u8 gUnknown_83FDDEB[]; -extern const u8 gUnknown_83FDCD2[]; -extern const u8 gUnknown_83FE6FA[]; +extern const u8 gText_ForPetesSake[]; +extern const u8 gText_TheTrainerThat[]; +extern const u8 gText_TryBattling[]; +extern const u8 gText_InflictingDamageIsKey[]; +extern const u8 gText_LoweringStats[]; +extern const u8 gText_KeepAnEyeOnHP[]; +extern const u8 gText_OakNoRunningFromATrainer[]; +extern const u8 gText_WinEarnsPrizeMoney[]; +extern const u8 gText_HowDissapointing[]; +extern const u8 gText_WhatWillOldManDo[]; // battle_controller_pokedude extern const u8 Pokedude_Text_SpeedierBattlerGoesFirst[]; |