diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:14:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-01 18:19:52 -0500 |
| commit | 6b2d0ae841f5a7ff851d462b12f09eac998d2d8f (patch) | |
| tree | 280e64b26f9b525606de02701f0c9a768301c4d2 /constants | |
| parent | 010b450834bd595b961582aea5e5771632510ef9 (diff) | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
Fix merge conflicts
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/misc_constants.asm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 3b7ffb139..d333a5114 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -6,9 +6,6 @@ MAX_BALLS EQU 12 MAX_KEY_ITEMS EQU 25 MAX_PC_ITEMS EQU 50 -LO_NYBBLE EQU $0f -HI_NYBBLE EQU $f0 - ; strings PLAYER_NAME_LENGTH EQU 8 PKMN_NAME_LENGTH EQU 11 |