diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/berry_constants.inc | 6 | ||||
| -rw-r--r-- | constants/constants.inc | 2 | ||||
| -rw-r--r-- | constants/gba_constants.inc | 23 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.inc | 35 |
4 files changed, 23 insertions, 43 deletions
diff --git a/constants/berry_constants.inc b/constants/berry_constants.inc deleted file mode 100644 index 2ecd7ac36..000000000 --- a/constants/berry_constants.inc +++ /dev/null @@ -1,6 +0,0 @@ - .set BERRY_FIRMNESS_UNKNOWN, 0 - .set BERRY_FIRMNESS_VERY_SOFT, 1 - .set BERRY_FIRMNESS_SOFT, 2 - .set BERRY_FIRMNESS_HARD, 3 - .set BERRY_FIRMNESS_VERY_HARD, 4 - .set BERRY_FIRMNESS_SUPER_HARD, 5 diff --git a/constants/constants.inc b/constants/constants.inc index 7c74c8e87..a58bf92a2 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -1,6 +1,4 @@ .include "constants/gba_constants.inc" .include "constants/global.inc" .include "constants/contest_constants.inc" - .include "constants/pokemon_data_constants.inc" - .include "constants/berry_constants.inc" .include "constants/contest_move_effects.inc" diff --git a/constants/gba_constants.inc b/constants/gba_constants.inc index 9d59c8fcd..3ff857ee8 100644 --- a/constants/gba_constants.inc +++ b/constants/gba_constants.inc @@ -488,3 +488,26 @@ .set OAM_SIZE_8x32, OAM_SIZE_1 | OAM_V_RECTANGLE .set OAM_SIZE_16x32, OAM_SIZE_2 | OAM_V_RECTANGLE .set OAM_SIZE_32x64, OAM_SIZE_3 | OAM_V_RECTANGLE + +@ BLDCNT + + .set BLDCNT_TGT1_BG0, 1 << 0 + .set BLDCNT_TGT1_BG1, 1 << 1 + .set BLDCNT_TGT1_BG2, 1 << 2 + .set BLDCNT_TGT1_BG3, 1 << 3 + .set BLDCNT_TGT1_OBJ, 1 << 4 + .set BLDCNT_TGT1_BD, 1 << 5 + .set BLDCNT_TGT1_ALL, BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD + + .set BLDCNT_EFFECT_NONE, 0 << 6 + .set BLDCNT_EFFECT_BLEND, 1 << 6 + .set BLDCNT_EFFECT_LIGHTEN, 2 << 6 + .set BLDCNT_EFFECT_DARKEN, 3 << 6 + + .set BLDCNT_TGT2_BG0, 1 << 8 + .set BLDCNT_TGT2_BG1, 1 << 9 + .set BLDCNT_TGT2_BG2, 1 << 10 + .set BLDCNT_TGT2_BG3, 1 << 11 + .set BLDCNT_TGT2_OBJ, 1 << 12 + .set BLDCNT_TGT2_BD, 1 << 13 + .set BLDCNT_TGT2_ALL, BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD diff --git a/constants/pokemon_data_constants.inc b/constants/pokemon_data_constants.inc deleted file mode 100644 index 646bd6d4c..000000000 --- a/constants/pokemon_data_constants.inc +++ /dev/null @@ -1,35 +0,0 @@ - .set GROWTH_MEDIUM_FAST, 0x00 - .set GROWTH_ERRATIC, 0x01 - .set GROWTH_FLUCTUATING, 0x02 - .set GROWTH_MEDIUM_SLOW, 0x03 - .set GROWTH_FAST, 0x04 - .set GROWTH_SLOW, 0x05 - - .set BODY_COLOR_RED, 0x00 - .set BODY_COLOR_BLUE, 0x01 - .set BODY_COLOR_YELLOW, 0x02 - .set BODY_COLOR_GREEN, 0x03 - .set BODY_COLOR_BLACK, 0x04 - .set BODY_COLOR_BROWN, 0x05 - .set BODY_COLOR_PURPLE, 0x06 - .set BODY_COLOR_GRAY, 0x07 - .set BODY_COLOR_WHITE, 0x08 - .set BODY_COLOR_PINK, 0x09 - - .set F_SUMMARY_SCREEN_FLIP_SPRITE, 0x80 - - .set EVO_FRIENDSHIP, 0x0001 @ Pokémon levels up with friendship ≥ 220 - .set EVO_FRIENDSHIP_DAY, 0x0002 @ Pokémon levels up during the day with friendship ≥ 220 - .set EVO_FRIENDSHIP_NIGHT, 0x0003 @ Pokémon levels up at night with friendship ≥ 220 - .set EVO_LEVEL, 0x0004 @ Pokémon reaches the specified level - .set EVO_TRADE, 0x0005 @ Pokémon is traded - .set EVO_TRADE_ITEM, 0x0006 @ Pokémon is traded while it's holding the specified item - .set EVO_ITEM, 0x0007 @ specified item is used on Pokémon - .set EVO_LEVEL_ATK_GT_DEF, 0x0008 @ Pokémon reaches the specified level with attack > defense - .set EVO_LEVEL_ATK_EQ_DEF, 0x0009 @ Pokémon reaches the specified level with attack = defense - .set EVO_LEVEL_ATK_LT_DEF, 0x000a @ Pokémon reaches the specified level with attack < defense - .set EVO_LEVEL_SILCOON, 0x000b @ Pokémon reaches the specified level with a Silcoon personality value - .set EVO_LEVEL_CASCOON, 0x000c @ Pokémon reaches the specified level with a Cascoon personality value - .set EVO_LEVEL_NINJASK, 0x000d @ Pokémon reaches the specified level (special value for Ninjask) - .set EVO_LEVEL_SHEDINJA, 0x000e @ Pokémon reaches the specified level (special value for Shedinja) - .set EVO_BEAUTY, 0x000f @ Pokémon levels up with beauty ≥ specified value |