diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-18 14:27:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 14:27:01 -0600 |
| commit | 2c7948bae8cbe58882c1d4ad0669f33d56dac76b (patch) | |
| tree | 71bae050175d7ea03df5be89d9bc62075c1d2fd6 /src/battle_main.c | |
| parent | c74468fd11b551e1babf18a4d320e114fe495bd8 (diff) | |
| parent | d6b31346c3441d4d99f1fbf7d4c4de8573450872 (diff) | |
Merge pull request #452 from Meowsy/pokemon-adding-easer
Add macros to simplify defining front animations and still pics.
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index fb2e5105a..16025a455 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2122,12 +2122,12 @@ static void sub_8038B94(u8 taskId) if (species != SPECIES_EGG && hp != 0 && status == 0) r7 |= 1 << i * 2; - if (species == 0) + if (species == SPECIES_NONE) continue; if (hp != 0 && (species == SPECIES_EGG || status != 0)) r7 |= 2 << i * 2; - if (species == 0) + if (species == SPECIES_NONE) continue; if (species != SPECIES_EGG && hp == 0) r7 |= 3 << i * 2; |