diff options
| author | Andrew Martinek <andrewrmartinek@gmail.com> | 2019-09-23 12:27:12 -0400 |
|---|---|---|
| committer | Andrew Martinek <andrewrmartinek@gmail.com> | 2019-09-23 12:27:12 -0400 |
| commit | f3f374e6b7e26bc93c8428c8cb7b8c210223b2f4 (patch) | |
| tree | 2e2f67f4237bc77b33196d396f50baa105a745db /src/constants | |
| parent | 751b28d4fee472af4d0de83ef22a1f11ec6fade6 (diff) | |
Fleshed out flags a lot
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/duel_constants.asm | 7 | ||||
| -rw-r--r-- | src/constants/event_constants.asm | 6 | ||||
| -rw-r--r-- | src/constants/misc_constants.asm | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index f3e2912..044b888 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -224,3 +224,10 @@ EFFECT_FAILED_UNSUCCESSFUL EQU $02 ; wAnimationQueue length ANIMATION_QUEUE_LENGTH EQU 7 + +PRIZES_1 EQU $01 +PRIZES_2 EQU $02 +PRIZES_3 EQU $03 +PRIZES_4 EQU $04 +PRIZES_5 EQU $05 +PRIZES_6 EQU $06 diff --git a/src/constants/event_constants.asm b/src/constants/event_constants.asm index 496f5a3..f6ac803 100644 --- a/src/constants/event_constants.asm +++ b/src/constants/event_constants.asm @@ -1,3 +1,3 @@ -; Event Flags -EVENT_BEAT_SARA EQU $15 -EVENT_BEAT_AMANDA EQU $16 +; EVENT_JOSHUA_STATE ; $33 +JOSHUA_TALKED EQU 1 +JOSHUA_BEATEN EQU 2 diff --git a/src/constants/misc_constants.asm b/src/constants/misc_constants.asm index b31631a..c513111 100644 --- a/src/constants/misc_constants.asm +++ b/src/constants/misc_constants.asm @@ -44,3 +44,6 @@ FLUSH_ALL_PALS_F EQU 6 const GAME_EVENT_CONTINUE_DUEL ; $5 const GAME_EVENT_CHALLENGE_MACHINE ; $6 NUM_GAME_EVENTS EQU const_value + +; Script constant +NO_JUMP EQU $0000 |