diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-19 20:49:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 20:49:58 -0500 |
| commit | 6999b237ebbc36c3aa751335027bcba6b5b3556f (patch) | |
| tree | 993f5737fbe70a21f062e7d18908267a456f145d /src/battle_main.c | |
| parent | c2ddb92c9e0905a6625f83f7b5e0936b630c0597 (diff) | |
| parent | 752982552e212dcb33d57c66342f87eba3ce9089 (diff) | |
Merge pull request #1309 from GriffinRichards/misc-macro
Use constants for item data, misc other constants/fixes
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 7e8966597..940fab8ff 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2722,7 +2722,7 @@ void SpriteCB_FaintOpponentMon(struct Sprite *sprite) if (species == SPECIES_UNOWN) { u32 personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_PERSONALITY); - u16 unownForm = ((((personalityValue & 0x3000000) >> 18) | ((personalityValue & 0x30000) >> 12) | ((personalityValue & 0x300) >> 6) | (personalityValue & 3)) % 0x1C); + u16 unownForm = GET_UNOWN_LETTER(personalityValue); u16 unownSpecies; if (unownForm == 0) |