diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:22:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 20:22:44 -0400 |
| commit | 1a27af88553394c3190cf74b47128f2a82750f4c (patch) | |
| tree | 9f036690606e5693181559add76db1c214e8dbdc /asm/macros/battle_script.inc | |
| parent | 1cf2470aac038fce48a5777e36b00554af90d910 (diff) | |
| parent | fb402725c6c668ee2ac50d6c345f3f8207a32cea (diff) | |
Merge pull request #1100 from GriffinRichards/clean-battlescrdata
Misc battle and battle palace documentation
Diffstat (limited to 'asm/macros/battle_script.inc')
| -rw-r--r-- | asm/macros/battle_script.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index eda410c5b..37548f410 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1263,8 +1263,8 @@ various \battler, VARIOUS_GET_MOVE_TARGET .endm - .macro various4 battler:req - various \battler, 4 + .macro getbattlerfainted battler:req + various \battler, VARIOUS_GET_BATTLER_FAINTED .endm .macro resetintimidatetracebits battler:req @@ -1279,8 +1279,8 @@ various \battler, 7 .endm - .macro various8 battler:req - various \battler, 8 + .macro palaceflavortext battler:req + various \battler, VARIOUS_PALACE_FLAVOR_TEXT .endm .macro arenajudgmentwindow @@ -1365,11 +1365,11 @@ .endm .macro chosenstatus1animation battler:req, status:req - chosenstatusanimation \battler 0x0 \status + chosenstatusanimation \battler, 0x0, \status .endm .macro chosenstatus2animation battler:req, status:req - chosenstatusanimation \battler 0x1 \status + chosenstatusanimation \battler, 0x1, \status .endm .macro sethword dst:req, value:req |