summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/battle_script.inc12
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