diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-11 09:51:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-11 09:51:18 -0500 |
| commit | a6317b7f57510047c8ae8d99c164ff6853c3e969 (patch) | |
| tree | 7c7009c3750e011658da9c786e527a9718d3a1a0 | |
| parent | e6aebc16da96d5aa6397bc269bd1646bf6ffbbb6 (diff) | |
| parent | 295ec313f5c2d591ee68e9328f582b852eae6fd6 (diff) | |
Merge pull request #1299 from opakedragon/payday-string-id
rename payday string id
| -rw-r--r-- | data/battle_scripts_1.s | 2 | ||||
| -rw-r--r-- | include/constants/battle_string_ids.h | 2 | ||||
| -rw-r--r-- | src/battle_message.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 873425c63..bf8ab19c1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3834,7 +3834,7 @@ BattleScript_MoveUsedIsConfusedNoMore:: return BattleScript_PrintPayDayMoneyString:: - printstring STRINGID_PKMNPICKEDUPITEM + printstring STRINGID_PLAYERPICKEDUPMONEY waitmessage 0x40 return diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 9e0d8e0be..1886043f1 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -124,7 +124,7 @@ #define STRINGID_PKMNSTORINGENERGY 120 #define STRINGID_PKMNUNLEASHEDENERGY 121 #define STRINGID_PKMNFATIGUECONFUSION 122 -#define STRINGID_PKMNPICKEDUPITEM 123 +#define STRINGID_PLAYERPICKEDUPMONEY 123 #define STRINGID_PKMNUNAFFECTED 124 #define STRINGID_PKMNTRANSFORMEDINTO 125 #define STRINGID_PKMNMADESUBSTITUTE 126 diff --git a/src/battle_message.c b/src/battle_message.c index e6c1666fc..985f51ff3 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -180,7 +180,7 @@ static const u8 sText_PkmnStayedAwakeUsing[] = _("{B_DEF_NAME_WITH_PREFIX} staye static const u8 sText_PkmnStoringEnergy[] = _("{B_ATK_NAME_WITH_PREFIX} is storing\nenergy!"); static const u8 sText_PkmnUnleashedEnergy[] = _("{B_ATK_NAME_WITH_PREFIX} unleashed\nenergy!"); static const u8 sText_PkmnFatigueConfusion[] = _("{B_ATK_NAME_WITH_PREFIX} became\nconfused due to fatigue!"); -static const u8 sText_PkmnPickedUpItem[] = _("{B_PLAYER_NAME} picked up\n¥{B_BUFF1}!\p"); +static const u8 sText_PlayerPickedUpMoney[] = _("{B_PLAYER_NAME} picked up\n¥{B_BUFF1}!\p"); static const u8 sText_PkmnUnaffected[] = _("{B_DEF_NAME_WITH_PREFIX} is\nunaffected!"); static const u8 sText_PkmnTransformedInto[] = _("{B_ATK_NAME_WITH_PREFIX} transformed\ninto {B_BUFF1}!"); static const u8 sText_PkmnMadeSubstitute[] = _("{B_ATK_NAME_WITH_PREFIX} made\na SUBSTITUTE!"); @@ -632,7 +632,7 @@ const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_PKMNSTORINGENERGY - 12] = sText_PkmnStoringEnergy, [STRINGID_PKMNUNLEASHEDENERGY - 12] = sText_PkmnUnleashedEnergy, [STRINGID_PKMNFATIGUECONFUSION - 12] = sText_PkmnFatigueConfusion, - [STRINGID_PKMNPICKEDUPITEM - 12] = sText_PkmnPickedUpItem, + [STRINGID_PLAYERPICKEDUPMONEY - 12] = sText_PlayerPickedUpMoney, [STRINGID_PKMNUNAFFECTED - 12] = sText_PkmnUnaffected, [STRINGID_PKMNTRANSFORMEDINTO - 12] = sText_PkmnTransformedInto, [STRINGID_PKMNMADESUBSTITUTE - 12] = sText_PkmnMadeSubstitute, |