diff options
| author | SnorlaxMonster <7100450+SnorlaxMonster@users.noreply.github.com> | 2026-01-18 08:11:37 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-17 16:41:37 -0500 |
| commit | 85b9d866c8392b9ca56c1c17f82dc99a37e1011c (patch) | |
| tree | eb0ce74afcb326f2e5f4c5a8235486269009aee9 /data | |
| parent | Document SFX event bug inside Rocket Hideout B1F (#566) (diff) | |
| download | pokeyellow-85b9d866c8392b9ca56c1c17f82dc99a37e1011c.tar.gz pokeyellow-85b9d866c8392b9ca56c1c17f82dc99a37e1011c.tar.xz pokeyellow-85b9d866c8392b9ca56c1c17f82dc99a37e1011c.zip | |
Align move grammar with pokecrystal (#565)
Add comments explaining the redundant move grammar categories inherited from the Japanese version.
Diffstat (limited to 'data')
| -rw-r--r-- | data/moves/grammar.asm | 16 | ||||
| -rw-r--r-- | data/text/text_2.asm | 18 |
2 files changed, 20 insertions, 14 deletions
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]<LINE>used [move]!" + +MoveGrammar: +; 0: originally "[mon]は<LINE>[move]を つかった！" ("[mon]<LINE>used [move]!") db SWORDS_DANCE db GROWTH db 0 ; end set -; set 1 +; 1: originally "[mon]は<LINE>[move]を した！" ("[mon]<LINE>did [move]!") db RECOVER db BIDE db SELFDESTRUCT db AMNESIA db 0 ; end set -; set 2 +; 2: originally "[mon]は<LINE>[move]した！" ("[mon]<LINE>did [move]!") db MEDITATE db AGILITY db TELEPORT @@ -20,7 +24,7 @@ ExclamationPointMoveSets: db BARRAGE db 0 ; end set -; set 3 +; 3: originally "[mon]の<LINE>[move] こうげき！" ("[mon]'s<LINE>[move] attack!") db POUND db SCRATCH db VICEGRIP @@ -69,4 +73,6 @@ ExclamationPointMoveSets: db SUBSTITUTE db 0 ; end set +; 4: originally "[mon]の<LINE>[move]!" ("[mon]'s<LINE>[move]!") +; Any move not listed above uses this grammar. db -1 ; end diff --git a/data/text/text_2.asm b/data/text/text_2.asm index df28740d..d62e0929 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -1075,21 +1075,21 @@ _MoveIsDisabledText:: cont "disabled!" prompt -_MonName1Text:: +_ActorNameText:: text "<USER>@" text_end -_Used1Text:: +_UsedMove1Text:: text_start line "used @" text_end -_Used2Text:: +_UsedMove2Text:: text_start line "used @" text_end -_InsteadText:: +_UsedInsteadText:: text "instead," cont "@" text_end @@ -1098,23 +1098,23 @@ _MoveNameText:: text_ram wStringBuffer text "@" -_ExclamationPoint1Text:: +_EndUsedMove1Text:: text "!" done -_ExclamationPoint2Text:: +_EndUsedMove2Text:: text "!" done -_ExclamationPoint3Text:: +_EndUsedMove3Text:: text "!" done -_ExclamationPoint4Text:: +_EndUsedMove4Text:: text "!" done -_ExclamationPoint5Text:: +_EndUsedMove5Text:: text "!" done |