summaryrefslogtreecommitdiff
path: root/asm/macros/battle_frontier/apprentice.inc
diff options
context:
space:
mode:
Diffstat (limited to 'asm/macros/battle_frontier/apprentice.inc')
-rw-r--r--asm/macros/battle_frontier/apprentice.inc14
1 files changed, 11 insertions, 3 deletions
diff --git a/asm/macros/battle_frontier/apprentice.inc b/asm/macros/battle_frontier/apprentice.inc
index 83871880b..9eb5f9ea8 100644
--- a/asm/macros/battle_frontier/apprentice.inc
+++ b/asm/macros/battle_frontier/apprentice.inc
@@ -94,11 +94,19 @@
@ Buffer some APPRENTICE_BUFF_* string to the given stringvar (0 for STR_VAR_1, 1 for STR_VAR_2, 2 for STR_VAR_3)
.macro apprentice_buff stringvar:req, tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
- setvar VAR_0x8005, \stringvar
+ .if \stringvar == STR_VAR_1
+ setvar VAR_0x8005, 0
+ .elseif \stringvar == STR_VAR_2
+ setvar VAR_0x8005, 1
+ .elseif \stringvar == STR_VAR_3
+ setvar VAR_0x8005, 2
+ .else
+ setvar VAR_0x8005, \stringvar
+ .endif
.if \tobuff >= VARS_START
- copyvar VAR_0x8006, \tobuff
+ copyvar VAR_0x8006, \tobuff
.else
- setvar VAR_0x8006, \tobuff
+ setvar VAR_0x8006, \tobuff
.endif
special CallApprenticeFunction
.endm