diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-23 08:09:25 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-23 08:09:25 -0500 |
| commit | 2bf1e0600ee341970c4731640a351ded047a55c5 (patch) | |
| tree | cbf503b9b428953be57d6399eff3f77c9187f93c /asm/macros | |
| parent | 81507fc8b7ed565f5df3a2df6c41959920516bf6 (diff) | |
Consolidate apprentice_buff macros
Diffstat (limited to 'asm/macros')
| -rw-r--r-- | asm/macros/battle_frontier.inc | 11 |
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 |