From 85b9d866c8392b9ca56c1c17f82dc99a37e1011c Mon Sep 17 00:00:00 2001 From: SnorlaxMonster <7100450+SnorlaxMonster@users.noreply.github.com> Date: Sun, 18 Jan 2026 08:11:37 +1030 Subject: Align move grammar with pokecrystal (#565) Add comments explaining the redundant move grammar categories inherited from the Japanese version. --- data/moves/grammar.asm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'data/moves') diff --git a/data/moves/grammar.asm b/data/moves/grammar.asm index bc3d1dc6..e3e87387 100644 --- a/data/moves/grammar.asm +++ b/data/moves/grammar.asm @@ -1,17 +1,21 @@ -ExclamationPointMoveSets: -; set 0 +; Used by GetMoveGrammar (see engine/battle/core.asm) +; Each move is given an identifier for what usedmovetext to use (0-4). +; Made redundant in English localization, where all are just "[mon]used [move]!" + +MoveGrammar: +; 0: originally "[mon]は[move]を つかった!" ("[mon]used [move]!") db SWORDS_DANCE db GROWTH db 0 ; end set -; set 1 +; 1: originally "[mon]は[move]を した!" ("[mon]did [move]!") db RECOVER db BIDE db SELFDESTRUCT db AMNESIA db 0 ; end set -; set 2 +; 2: originally "[mon]は[move]した!" ("[mon]did [move]!") db MEDITATE db AGILITY db TELEPORT @@ -20,7 +24,7 @@ ExclamationPointMoveSets: db BARRAGE db 0 ; end set -; set 3 +; 3: originally "[mon]の[move] こうげき!" ("[mon]'s[move] attack!") db POUND db SCRATCH db VICEGRIP @@ -69,4 +73,6 @@ ExclamationPointMoveSets: db SUBSTITUTE db 0 ; end set +; 4: originally "[mon]の[move]!" ("[mon]'s[move]!") +; Any move not listed above uses this grammar. db -1 ; end -- cgit v1.3.1-sl0p