ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 12:44:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate apprentice_buff macros

Browse Source
This commit is contained in:
GriffinR 2019-11-23 08:09:25 -05:00
parent 81507fc8b7
commit 2bf1e0600e
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/macros/battle_frontier.inc
View File

@ -118,14 +118,11 @@ special CallApprenticeFunction
.macro apprentice_buff whichstringvar:req, tobuff:req .macro apprentice_buff whichstringvar:req, tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
setvar VAR_0x8005, \whichstringvar setvar VAR_0x8005, \whichstringvar
setvar VAR_0x8006, \tobuff .if \tobuff >= VARS_START
special CallApprenticeFunction
.endm
.macro apprentice_buffv whichstringvar:req tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
setvar VAR_0x8005, \whichstringvar
copyvar VAR_0x8006, \tobuff copyvar VAR_0x8006, \tobuff
.else
setvar VAR_0x8006, \tobuff
.endif
special CallApprenticeFunction special CallApprenticeFunction
.endm .endm

4
data/scripts/apprentice.inc
View File

@ -67,7 +67,7 @@ Apprentice_EventScript_UseWhichMon: @ 82B69D3
apprentice_getnumpartymons apprentice_getnumpartymons
compare VAR_RESULT, MULTI_PARTY_SIZE compare VAR_RESULT, MULTI_PARTY_SIZE
call_if_eq Apprentice_EventScript_LastMonSelected call_if_eq Apprentice_EventScript_LastMonSelected
apprentice_buffv 0, VAR_0x8007 apprentice_buff 0, VAR_0x8007
apprentice_freequestion apprentice_freequestion
apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MON
call Apprentice_EventScript_SetHideFlags call Apprentice_EventScript_SetHideFlags
@ -162,7 +162,7 @@ Apprentice_EventScript_UseWhichMove: @ 82B6C77
call_if_eq Apprentice_EventScript_ChoseMove2 call_if_eq Apprentice_EventScript_ChoseMove2
apprentice_setmove apprentice_setmove
apprentice_answeredquestion apprentice_answeredquestion
apprentice_buffv 0, VAR_0x8007 apprentice_buff 0, VAR_0x8007
apprentice_freequestion apprentice_freequestion
apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MOVE apprentice_msg TRUE, APPRENTICE_MSG_THANKS_MOVE
call Apprentice_EventScript_SetHideFlags call Apprentice_EventScript_SetHideFlags