diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-25 16:46:37 -0500 |
|---|---|---|
| committer | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2024-12-25 16:53:04 -0500 |
| commit | 47b784a4fbc7513ea6106877fbb7a54158e1b13b (patch) | |
| tree | 301a856e76abb5dcb7bcc3986ddb4bbe4f70e88e /constants | |
| parent | Fix comments around battle evolution code (#120) (diff) | |
| parent | Use `SERIAL_RNS_LENGTH` in `BattleRandom` (diff) | |
| download | pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.tar.gz pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.tar.xz pokeyellow-47b784a4fbc7513ea6106877fbb7a54158e1b13b.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/move_effect_constants.asm | 4 | ||||
| -rw-r--r-- | constants/palette_constants.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index 0727f41e..6914fafd 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -9,7 +9,7 @@ const POISON_SIDE_EFFECT1 ; $02 const DRAIN_HP_EFFECT ; $03 const BURN_SIDE_EFFECT1 ; $04 - const FREEZE_SIDE_EFFECT ; $05 + const FREEZE_SIDE_EFFECT1 ; $05 const PARALYZE_SIDE_EFFECT1 ; $06 const EXPLODE_EFFECT ; $07 Explosion, Self Destruct const DREAM_EATER_EFFECT ; $08 @@ -39,7 +39,7 @@ const SLEEP_EFFECT ; $20 const POISON_SIDE_EFFECT2 ; $21 const BURN_SIDE_EFFECT2 ; $22 - const UNUSED_EFFECT_23 ; $23 + const FREEZE_SIDE_EFFECT2 ; $23 unused (Blizzard in JP Red/Green) const PARALYZE_SIDE_EFFECT2 ; $24 const FLINCH_SIDE_EFFECT2 ; $25 const OHKO_EFFECT ; $26 moves like Horn Drill diff --git a/constants/palette_constants.asm b/constants/palette_constants.asm index 8d54e84e..58b2201e 100644 --- a/constants/palette_constants.asm +++ b/constants/palette_constants.asm @@ -62,7 +62,7 @@ DEF SET_PAL_DEFAULT EQU $ff const PAL_GREENMON ; $16 const PAL_PINKMON ; $17 const PAL_YELLOWMON ; $18 - const PAL_GREYMON ; $19 + const PAL_GRAYMON ; $19 const PAL_SLOTS1 ; $1A const PAL_SLOTS2 ; $1B const PAL_SLOTS3 ; $1C |