diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-12-10 16:06:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-10 16:06:34 -0600 |
| commit | d8f98d97bcd41f710d51925470dc799a6051f022 (patch) | |
| tree | f0c7a02687e4be35960386de99d6422753196d57 /src/macros/scripts.asm | |
| parent | ec1e57b155d040beeb309a1524d496c6582da384 (diff) | |
| parent | e6d288a61c8a4ad06efda838084ed59d7864d2d1 (diff) | |
Merge pull request #77 from shealyrd/master
[Ken/Mitch interaction scripts] & [All Club After Duel Tables] & function friendly names
Diffstat (limited to 'src/macros/scripts.asm')
| -rw-r--r-- | src/macros/scripts.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 1a64c38..ed7b30d 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -27,14 +27,14 @@ ENDM const ScriptCommand_MoveActiveNPCByDirection_index ; $0a const ScriptCommand_CloseTextBox_index ; $0b const ScriptCommand_GiveBoosterPacks_index ; $0c - const Func_cf0c_index ; $0d - const Func_cf12_index ; $0e + const ScriptCommand_CheckIfCardInCollectionOrDecks_index ; $0d + const ScriptCommand_CheckIfCardInCollection_index ; $0e const ScriptCommand_GiveCard_index ; $0f const ScriptCommand_TakeCard_index ; $10 const Func_cf53_index ; $11 const Func_cf7b_index ; $12 - const Func_cf2d_index ; $13 - const Func_cf96_index ; $14 + const ScriptCommand_CheckRawAmountOfCardsOwned_index ; $13 + const ScriptCommand_JumpBasedOnFightingClubPupilStatus_index ; $14 const Func_cfc6_index ; $15 const Func_cfd4_index ; $16 const Func_d00b_index ; $17 |