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/engine/bank04.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/engine/bank04.asm')
| -rw-r--r-- | src/engine/bank04.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 801d035..a1e504f 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -981,14 +981,14 @@ OverworldScriptTable: ; 1217b (4:617b) dw ScriptCommand_MoveActiveNPCByDirection dw ScriptCommand_CloseTextBox dw ScriptCommand_GiveBoosterPacks - dw Func_cf0c - dw Func_cf12 + dw ScriptCommand_CheckIfCardInCollectionOrDecks + dw ScriptCommand_CheckIfCardInCollection dw ScriptCommand_GiveCard dw ScriptCommand_TakeCard dw Func_cf53 dw Func_cf7b - dw Func_cf2d - dw Func_cf96 + dw ScriptCommand_CheckRawAmountOfCardsOwned + dw ScriptCommand_JumpBasedOnFightingClubPupilStatus dw Func_cfc6 dw Func_cfd4 dw Func_d00b |