atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix missed merge conflict

Browse source
This commit is contained in:
ExpoSeed 2021-03-02 14:17:48 -06:00
parent 7802264732
commit 7e8659c4ee
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/pokemon.h
View file

@ -244,14 +244,12 @@ struct Evolution
u16 targetSpecies; u16 targetSpecies;
}; };
<<<<<<< HEAD
struct FormChange { struct FormChange {
u16 method; u16 method;
u16 targetSpecies; u16 targetSpecies;
u16 param1; u16 param1;
u16 param2; u16 param2;
}; };
=======
#define NUM_UNOWN_FORMS 28 #define NUM_UNOWN_FORMS 28
#define GET_UNOWN_LETTER(personality) (( \ #define GET_UNOWN_LETTER(personality) (( \
@ -260,7 +258,6 @@ struct FormChange {
| (((personality) & 0x00000300) >> 6) \ | (((personality) & 0x00000300) >> 6) \
| (((personality) & 0x00000003) >> 0) \ | (((personality) & 0x00000003) >> 0) \
) % NUM_UNOWN_FORMS) ) % NUM_UNOWN_FORMS)
>>>>>>> b2a541a33b2a5116f6780f1830f2606a5dbc065e
extern u8 gPlayerPartyCount; extern u8 gPlayerPartyCount;
extern struct Pokemon gPlayerParty[PARTY_SIZE]; extern struct Pokemon gPlayerParty[PARTY_SIZE];