diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-24 10:17:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-24 10:17:34 -0400 |
commit | 42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch) | |
tree | db4ae87659baced2022e440109306266c1c80e3b /asm/macros/battle_frontier/apprentice.inc | |
parent | f8f7617946e150514313267ba52a35ebd9052936 (diff) | |
parent | 09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff) |
Merge branch 'master' into tag-none
Diffstat (limited to 'asm/macros/battle_frontier/apprentice.inc')
-rw-r--r-- | asm/macros/battle_frontier/apprentice.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/battle_frontier/apprentice.inc b/asm/macros/battle_frontier/apprentice.inc index 5d9ab8e3b..83871880b 100644 --- a/asm/macros/battle_frontier/apprentice.inc +++ b/asm/macros/battle_frontier/apprentice.inc @@ -53,7 +53,7 @@ special CallApprenticeFunction .endm - @ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason + @ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason .macro apprentice_shouldcheckgone setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE special CallApprenticeFunction @@ -109,7 +109,7 @@ special CallApprenticeFunction .endm - @ Set which mon the Apprentice should lead with + @ Set which mon the Apprentice should lead with .macro apprentice_setleadmon monId:req copyvar VAR_0x8005, \monId setvar VAR_0x8004, APPRENTICE_FUNC_SET_LEAD_MON @@ -141,7 +141,7 @@ special CallApprenticeFunction .endm - @ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason + @ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason .macro apprentice_shouldleave setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE special CallApprenticeFunction |