Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

_000:
// {0} can’t use {1} because of gravity!
PrintMessage pl_msg_00000368_01001, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
PrintMessage BattleStrings_Text_PokemonCantUseMoveBecauseOfGravity, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
Wait
WaitButtonABTime 30
End
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

_000:
// {0} can’t use {1} after the taunt!
PrintMessage pl_msg_00000368_00613, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
PrintMessage BattleStrings_Text_PokemonCantUseMoveAfterTheTaunt, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
Wait
WaitButtonABTime 30
UnlockMoveChoice BTLSCR_ATTACKER
Expand Down
2 changes: 1 addition & 1 deletion res/battle/scripts/subscripts/subscript_move_is_disabled.s
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _000:

_005:
// {0}’s {1} is disabled!
PrintMessage pl_msg_00000368_00609, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
PrintMessage BattleStrings_Text_PokemonsMoveIsDisabled, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
Wait
WaitButtonABTime 30
UnlockMoveChoice BTLSCR_ATTACKER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
_000:
UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK
// {0} can’t use {2} because of {1}!
PrintMessage pl_msg_00000368_01057, TAG_NICKNAME_MOVE_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP, BTLSCR_ATTACKER
PrintMessage BattleStrings_Text_PokemonCantUseMoveBecauseOfMove, TAG_NICKNAME_MOVE_MOVE, BTLSCR_ATTACKER, BTLSCR_MSG_TEMP, BTLSCR_ATTACKER
Wait
WaitButtonABTime 30
End
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

_000:
// {0} can’t use the sealed {1}!
PrintMessage pl_msg_00000368_00616, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
PrintMessage BattleStrings_Text_PokemonCantUseTheSealedMove, TAG_NICKNAME_MOVE, BTLSCR_ATTACKER, BTLSCR_ATTACKER
Wait
WaitButtonABTime 30
UnlockMoveChoice BTLSCR_ATTACKER
Expand Down
32 changes: 16 additions & 16 deletions res/text/battle_strings.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
"en_US": "... ... ... ...\r"
},
{
"id": "pl_msg_00000368_00039",
"id": "BattleStrings_Text_PokemonPreventsEscapeWithAbility",
"en_US": [
"{STRVAR_1 1, 0, 0} prevents\n",
"escape with {STRVAR_1 5, 1, 0}!\r"
Expand Down Expand Up @@ -4199,70 +4199,70 @@
]
},
{
"id": "pl_msg_00000368_00609",
"id": "BattleStrings_Text_PokemonsMoveIsDisabled",
"en_US": [
"{STRVAR_1 1, 0, 0}’s {STRVAR_1 6, 1, 0}\n",
"is disabled!\r"
]
},
{
"id": "pl_msg_00000368_00610",
"id": "BattleStrings_Text_TheWildPokemonsMoveIsDisabled",
"en_US": [
"The wild {STRVAR_1 1, 0, 0}’s\n",
"{STRVAR_1 6, 1, 0} is disabled!\r"
]
},
{
"id": "pl_msg_00000368_00611",
"id": "BattleStrings_Text_TheFoesPokemonsMoveIsDisabled",
"en_US": [
"The foe’s {STRVAR_1 1, 0, 0}’s\n",
"{STRVAR_1 6, 1, 0} is disabled!\r"
]
},
{
"id": "pl_msg_00000368_00612",
"id": "BattleStrings_Text_PokemonCantUseTheSameMoveTwiceInARowDueToTheTorment",
"en_US": [
"{STRVAR_1 1, 0, 0} can’t use the same move\n",
"twice in a row due to the torment!\r"
]
},
{
"id": "pl_msg_00000368_00613",
"id": "BattleStrings_Text_PokemonCantUseMoveAfterTheTaunt",
"en_US": [
"{STRVAR_1 1, 0, 0} can’t use\n",
"{STRVAR_1 6, 1, 0} after the taunt!\r"
]
},
{
"id": "pl_msg_00000368_00614",
"id": "BattleStrings_Text_TheWildPokemonCantUseMoveAfterTheTaunt",
"en_US": [
"The wild {STRVAR_1 1, 0, 0} can’t use\n",
"{STRVAR_1 6, 1, 0} after the taunt!\r"
]
},
{
"id": "pl_msg_00000368_00615",
"id": "BattleStrings_Text_TheFoesPokemonCantUseMoveAfterTheTaunt",
"en_US": [
"The foe’s {STRVAR_1 1, 0, 0} can’t use\n",
"{STRVAR_1 6, 1, 0} after the taunt!\r"
]
},
{
"id": "pl_msg_00000368_00616",
"id": "BattleStrings_Text_PokemonCantUseTheSealedMove",
"en_US": [
"{STRVAR_1 1, 0, 0} can’t use\n",
"the sealed {STRVAR_1 6, 1, 0}!\r"
]
},
{
"id": "pl_msg_00000368_00617",
"id": "BattleStrings_Text_TheWildPokemonCantUseTheSealedMove",
"en_US": [
"The wild {STRVAR_1 1, 0, 0} can’t use\n",
"the sealed {STRVAR_1 6, 1, 0}!\r"
]
},
{
"id": "pl_msg_00000368_00618",
"id": "BattleStrings_Text_TheFoesPokemonCantUseTheSealedMove",
"en_US": [
"The foe’s {STRVAR_1 1, 0, 0} can’t use\n",
"the sealed {STRVAR_1 6, 1, 0}!\r"
Expand Down Expand Up @@ -5515,7 +5515,7 @@
]
},
{
"id": "pl_msg_00000368_00794",
"id": "BattleStrings_Text_CantEscape",
"en_US": "Can’t escape!\r"
},
{
Expand Down Expand Up @@ -5649,7 +5649,7 @@
]
},
{
"id": "pl_msg_00000368_00823",
"id": "BattleStrings_Text_TheresNoPPLeftForThisMove",
"en_US": "There’s no PP left for this move!"
},
{
Expand Down Expand Up @@ -6220,7 +6220,7 @@
]
},
{
"id": "pl_msg_00000368_00911",
"id": "BattleStrings_Text_TheItemAllowsTheUseOfOnlyMove",
"en_US": [
"The {STRVAR_1 8, 0, 0} allows the\n",
"use of only {STRVAR_1 6, 1, 0}!\r"
Expand Down Expand Up @@ -6721,7 +6721,7 @@
]
},
{
"id": "pl_msg_00000368_01001",
"id": "BattleStrings_Text_PokemonCantUseMoveBecauseOfGravity",
"en_US": [
"{STRVAR_1 1, 0, 0} can’t use\n",
"{STRVAR_1 6, 1, 0} because of gravity!"
Expand Down Expand Up @@ -7107,7 +7107,7 @@
]
},
{
"id": "pl_msg_00000368_01057",
"id": "BattleStrings_Text_PokemonCantUseMoveBecauseOfMove",
"en_US": [
"{STRVAR_1 1, 0, 0} can’t use\n",
"{STRVAR_1 6, 2, 0} because of\f",
Expand Down
Loading