diff options
| author | Melody <melody@pallet.town> | 2018-12-24 21:22:56 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-28 08:22:21 -0600 |
| commit | 6d556f8cf77a21b20cdad75de69eaf61a59cf54e (patch) | |
| tree | a55ada3c41c9ffe7c590d13555bf4318ae05f674 /constants | |
| parent | d59f5a8e5649ad09a41b65edcc68f701320ca52e (diff) | |
improve checkplayergender calls
clean up constant definitions
make tweaks from review
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/constants.inc | 2 | ||||
| -rw-r--r-- | constants/global.inc (renamed from constants/misc_constants.inc) | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/constants/constants.inc b/constants/constants.inc index 38887dd28..7c74c8e87 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "constants/misc_constants.inc" + .include "constants/global.inc" .include "constants/contest_constants.inc" .include "constants/pokemon_data_constants.inc" .include "constants/berry_constants.inc" diff --git a/constants/misc_constants.inc b/constants/global.inc index 5fa58cfe8..621ba2af8 100644 --- a/constants/misc_constants.inc +++ b/constants/global.inc @@ -3,9 +3,6 @@ .set NULL, 0 - .set POKEMON_NAME_LENGTH, 11 - .set MOVE_NAME_LENGTH, 13 - .set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_16x16, (OAM_SIZE_1 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14) |