diff options
| author | yenatch <yenatch@gmail.com> | 2014-08-13 19:42:58 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-08-13 19:42:58 -0700 |
| commit | 88a15c50387d02a7cdb95b508c43fa9f10a46982 (patch) | |
| tree | b0d1150c8ec6f4d1bca958d8f643df9bf27259c0 /constants | |
| parent | b922fe72a19bb82d4f0c0ebaadf415e8dfcb7166 (diff) | |
More constants and bug comments in item effects.
Apparently a bunch of constants from red were never removed for some reason.
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/item_constants.asm | 9 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index e790d1650..206bff1c0 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -252,6 +252,13 @@ HM_08 EQU $FA NUM_TMS EQU HM_01 - TM_01 - 2 + +; leftovers from red +SAFARI_BALL EQU 8 ; MOON_STONE +MOON_STONE_RED EQU 10 ; BURN_HEAL +FULL_HEAL_RED EQU 52 ; X_SPEED + + ; pockets ITEM EQU 1 KEY_ITEM EQU 2 @@ -311,6 +318,8 @@ HELD_DRAGON_BOOST EQU $40 HELD_DARK_BOOST EQU $41 HELD_STEEL_BOOST EQU $42 +HELD_CATCH_CHANCE EQU $46 + HELD_ESCAPE EQU $48 HELD_CRITICAL_UP EQU $49 HELD_QUICK_CLAW EQU $4a diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 6d82ca926..86d33f235 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -72,7 +72,9 @@ EVOLVE_HAPPINESS EQU 4 EVOLVE_STAT EQU 5 -BASE_HAPPINESS EQU 70 +BASE_HAPPINESS EQU 70 +FRIEND_BALL_HAPPINESS EQU 200 + ; happiness evolution triggers HAPPINESS_TO_EVOLVE EQU 220 TR_ANYTIME EQU 1 |