diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/cgb_constants.asm | 6 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/constants/cgb_constants.asm b/constants/cgb_constants.asm index 726099509..b5f61ff2b 100755 --- a/constants/cgb_constants.asm +++ b/constants/cgb_constants.asm @@ -25,9 +25,9 @@ const SCGB_17 const SCGB_18 const SCGB_GAMEFREAK_LOGO - const SCGB_1A - const SCGB_1B - const SCGB_FRONTPICPALS + const SCGB_PLAYER_OR_MON_FRONTPIC_PALS + const SCGB_TRADE_TUBE + const SCGB_TRAINER_OR_MON_FRONTPIC_PALS const SCGB_1D const SCGB_1E diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index e7524cd58..f4069c7c8 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -390,8 +390,8 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_FRAMESET_14 const SPRITE_ANIM_FRAMESET_15 const SPRITE_ANIM_FRAMESET_16 - const SPRITE_ANIM_FRAMESET_17 - const SPRITE_ANIM_FRAMESET_18 + const SPRITE_ANIM_FRAMESET_TRADEMON_ICON + const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE const SPRITE_ANIM_FRAMESET_19 const SPRITE_ANIM_FRAMESET_1A const SPRITE_ANIM_FRAMESET_1B @@ -453,7 +453,7 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_SEQ_0F const SPRITE_ANIM_SEQ_10 const SPRITE_ANIM_SEQ_11 - const SPRITE_ANIM_SEQ_12 + const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE const SPRITE_ANIM_SEQ_13 const SPRITE_ANIM_SEQ_14 const SPRITE_ANIM_SEQ_15 @@ -489,8 +489,8 @@ MAX_OUTDOOR_SPRITES EQU 23 const SPRITE_ANIM_INDEX_0E const SPRITE_ANIM_INDEX_0F const SPRITE_ANIM_INDEX_10 - const SPRITE_ANIM_INDEX_11 - const SPRITE_ANIM_INDEX_12 + const SPRITE_ANIM_INDEX_TRADEMON_ICON + const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE const SPRITE_ANIM_INDEX_13 const SPRITE_ANIM_INDEX_14 const SPRITE_ANIM_INDEX_15 |