diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-02-15 13:25:02 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-15 13:25:02 -0600 |
| commit | 456a6d2378b967d59e4c07edf17313f334341892 (patch) | |
| tree | ba0877ba507c5116b10e2628e4eb3ab2a3fbccac /src/constants/script_constants.asm | |
| parent | c708b288d4f978b7e269c934233a7db747d91a53 (diff) | |
| parent | 9a74ae3bc62fe1aa1c6ef33cdac4df324fd44e57 (diff) | |
Merge pull request #97 from dannye/master
Script command clean up and Overworld map menu logic
Diffstat (limited to 'src/constants/script_constants.asm')
| -rw-r--r-- | src/constants/script_constants.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/constants/script_constants.asm b/src/constants/script_constants.asm index 29f8eae..a6a05be 100644 --- a/src/constants/script_constants.asm +++ b/src/constants/script_constants.asm @@ -120,7 +120,7 @@ const EVENT_AARON_DECK_MENU_CHOICE ; $76 EVENT_FLAG_AMOUNT EQU const_value -EVENT_FLAG_BYTES EQU $40 +EVENT_VAR_BYTES EQU $40 ; EVENT_PUPIL_MICHAEL_STATE ; EVENT_PUPIL_CHRIS_STATE @@ -277,4 +277,4 @@ SOUTH EQU $02 WEST EQU $03 NO_MOVE EQU %10000000 ; For rotations without movement -VARIABLE_CARD EQU 0 ; use the card located in wd697 instead of using the script's argument +VARIABLE_CARD EQU 0 ; use the card located in wCardReceived instead of using the script's argument |