mirror of
https://github.com/pret/pokeemerald.git
synced 2026-08-28 13:41:15 -05:00
Update battle messages to Gen 5+ standards (#3240)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
This commit is contained in:
@@ -44,7 +44,7 @@ SINGLE_BATTLE_TEST("Stun Spore inflicts paralysis")
|
||||
TURN { MOVE(player, MOVE_STUN_SPORE); } // 3.
|
||||
} SCENE {
|
||||
ANIMATION(ANIM_TYPE_MOVE, MOVE_STUN_SPORE, player);
|
||||
MESSAGE("Foe Wobbuffet is paralyzed! It may be unable to move!"); // 4
|
||||
MESSAGE("The opposing Wobbuffet is paralyzed, so it may be unable to move!"); // 4
|
||||
STATUS_ICON(opponent, paralysis: TRUE); // 4.
|
||||
}
|
||||
}
|
||||
@@ -86,7 +86,7 @@ SINGLE_BATTLE_TEST("Stun Spore does not affect Grass-types")
|
||||
TURN { MOVE(player, MOVE_STUN_SPORE); } // 3.
|
||||
} SCENE {
|
||||
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_STUN_SPORE, player); // 4.
|
||||
MESSAGE("It doesn't affect Foe Oddish…"); // 5.
|
||||
MESSAGE("It doesn't affect the opposing Oddish…"); // 5.
|
||||
}
|
||||
}
|
||||
```
|
||||
@@ -226,7 +226,7 @@ SINGLE_BATTLE_TEST("Paralysis has a 25% chance of skipping the turn")
|
||||
} WHEN {
|
||||
TURN { MOVE(player, MOVE_CELEBRATE); }
|
||||
} SCENE {
|
||||
MESSAGE("Wobbuffet is paralyzed! It can't move!");
|
||||
MESSAGE("Wobbuffet couldn't move because it's paralyzed!");
|
||||
}
|
||||
}
|
||||
```
|
||||
@@ -428,7 +428,7 @@ Spaces in pattern match newlines (\n, \l, and \p) in the message.
|
||||
Often used to check that a battler took its turn but it failed, e.g.:
|
||||
```
|
||||
MESSAGE("Wobbuffet used Dream Eater!");
|
||||
MESSAGE("Foe Wobbuffet wasn't affected!");
|
||||
MESSAGE("The opposing Wobbuffet wasn't affected!");
|
||||
```
|
||||
|
||||
### `STATUS_ICON`
|
||||
@@ -452,7 +452,7 @@ Causes the test to fail if the `SCENE` command succeeds before the following com
|
||||
```
|
||||
// Our Wobbuffet does not Celebrate before the foe's.
|
||||
NOT MESSAGE("Wobbuffet used Celebrate!");
|
||||
MESSAGE("Foe Wobbuffet used Celebrate!");
|
||||
MESSAGE("The opposing Wobbuffet used Celebrate!");
|
||||
```
|
||||
**NOTE**: If this condition fails, the viewable ROM freezes at the NOT command.
|
||||
**WARNING: `NOT` is an alias of `NONE_OF`, so it behaves surprisingly when applied to multiple commands wrapped in braces.**
|
||||
@@ -467,7 +467,7 @@ Causes the test to fail unless one of the `SCENE` commands succeeds.
|
||||
```
|
||||
ONE_OF {
|
||||
MESSAGE("Wobbuffet used Celebrate!");
|
||||
MESSAGE("Wobbuffet is paralyzed! It can't move!");
|
||||
MESSAGE("Wobbuffet couldn't move because it's paralyzed!");
|
||||
}
|
||||
```
|
||||
|
||||
@@ -482,9 +482,9 @@ Causes the test to fail if one of the `SCENE` commands succeeds before the comma
|
||||
// Our Wobbuffet does not move before the foe's.
|
||||
NONE_OF {
|
||||
MESSAGE("Wobbuffet used Celebrate!");
|
||||
MESSAGE("Wobbuffet is paralyzed! It can't move!");
|
||||
MESSAGE("Wobbuffet couldn't move because it's paralyzed!");
|
||||
}
|
||||
MESSAGE("Foe Wobbuffet used Celebrate!");
|
||||
MESSAGE("The opposing Wobbuffet used Celebrate!");
|
||||
```
|
||||
|
||||
### `PLAYER_PARTY`
|
||||
|
||||
Reference in New Issue
Block a user