summaryrefslogtreecommitdiff
path: root/asm/macros
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros')
-rw-r--r--asm/macros/battle_frontier.inc11
1 files changed, 4 insertions, 7 deletions
diff --git a/asm/macros/battle_frontier.inc b/asm/macros/battle_frontier.inc
index 337238cd3..2a6ee7d74 100644
--- a/asm/macros/battle_frontier.inc
+++ b/asm/macros/battle_frontier.inc
@@ -118,14 +118,11 @@ special CallApprenticeFunction
.macro apprentice_buff whichstringvar:req, tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
setvar VAR_0x8005, \whichstringvar
-setvar VAR_0x8006, \tobuff
-special CallApprenticeFunction
-.endm
-
-.macro apprentice_buffv whichstringvar:req tobuff:req
-setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
-setvar VAR_0x8005, \whichstringvar
+.if \tobuff >= VARS_START
copyvar VAR_0x8006, \tobuff
+.else
+setvar VAR_0x8006, \tobuff
+.endif
special CallApprenticeFunction
.endm