dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #452 from Meowsy/pokemon-adding-easer

Browse Source 
Add macros to simplify defining front animations and still pics.
This commit is contained in:
Diegoisawesome
2018-12-18 14:27:01 -06:00
committed by GitHub
parent c74468fd11 d6b31346c3
commit 2c7948bae8
9 changed files with 904 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_main.c
View File

@@ -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;