diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-04-05 16:31:04 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-04-05 16:31:04 +0100 |
| commit | 99808f1ac473167d952edb986f6a1d102c564b61 (patch) | |
| tree | c78ec1bc8ee69324eefa89f64ff4e903d55dce9f | |
| parent | 5313b86645fa0b049de2d19c0807997497cfe577 (diff) | |
Fix medal constants order
| -rw-r--r-- | src/constants/script_constants.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/constants/script_constants.asm b/src/constants/script_constants.asm index 600d0c7..d7ae7d6 100644 --- a/src/constants/script_constants.asm +++ b/src/constants/script_constants.asm @@ -281,18 +281,18 @@ VARIABLE_CARD EQU 0 ; use the card located in wCardReceived instead of using the ; medal flags set in EVENT_MEDAL_FLAGS const_def - const PSYCHIC_MEDAL_F ; 0 + const FIGHTING_MEDAL_F ; 0 const ROCK_MEDAL_F ; 1 - const FIGHTING_MEDAL_F ; 2 + const PSYCHIC_MEDAL_F ; 2 const LIGHTNING_MEDAL_F ; 3 const WATER_MEDAL_F ; 4 const FIRE_MEDAL_F ; 5 const SCIENCE_MEDAL_F ; 6 const GRASS_MEDAL_F ; 7 -PSYCHIC_MEDAL EQU 1 << PSYCHIC_MEDAL_F -ROCK_MEDAL EQU 1 << ROCK_MEDAL_F FIGHTING_MEDAL EQU 1 << FIGHTING_MEDAL_F +ROCK_MEDAL EQU 1 << ROCK_MEDAL_F +PSYCHIC_MEDAL EQU 1 << PSYCHIC_MEDAL_F LIGHTNING_MEDAL EQU 1 << LIGHTNING_MEDAL_F WATER_MEDAL EQU 1 << WATER_MEDAL_F FIRE_MEDAL EQU 1 << FIRE_MEDAL_F |