diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-04-13 11:36:28 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-04-13 11:36:28 -0500 |
| commit | 27ec064056f5ae08a7c547224ff8cb5fdcf969b2 (patch) | |
| tree | 8ca02add77343148c3e3f5acc5cf2b15f6c5e6f1 /constants | |
| parent | 0b0db144356f88c16134571cecb090004796c90c (diff) | |
| parent | 1fd39f7fb9544c74f143d0c54a84aae55ea8365f (diff) | |
Merge pull request #245 from yenatch/master
Picking off small incbins and static labels.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/misc_constants.asm | 3 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 23b331b36..eb5d97abe 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -3,6 +3,9 @@ PLAYER_NAME_LENGTH EQU 8 PKMN_NAME_LENGTH EQU 11 +; boxes +NUM_BOXES EQU 14 + ; predefs PREDEF_FLAG EQU $03 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index cfc0e26f0..d546adde4 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,3 +1,5 @@ +NUM_TRAINER_CLASSES EQU $44 + ; trainer groups FALKNER EQU $01 WHITNEY EQU $02 |