diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 15:01:18 -0400 |
| commit | 00c7dee919c8f93b8519a7eede2c41ba2ddcaf08 (patch) | |
| tree | 5707f8764920abcd4cffca84c675e5c53c32559d /src/pokemon_1.c | |
| parent | 3d9eb18add0d8a9eb5bfa77fc64cd7b1f37fea5d (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into pokemon_data
Diffstat (limited to 'src/pokemon_1.c')
| -rw-r--r-- | src/pokemon_1.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/pokemon_1.c b/src/pokemon_1.c index dacbb81c3..c55105ef3 100644 --- a/src/pokemon_1.c +++ b/src/pokemon_1.c @@ -1,5 +1,4 @@ #include "global.h" -#include "asm.h" #include "data2.h" #include "items.h" #include "main.h" @@ -17,17 +16,10 @@ //Extracts the lower 16 bits of a 32-bit number #define LOHALF(n) ((n) & 0xFFFF) -extern struct Pokemon gPlayerParty[6]; // 0x3004360 -extern struct Pokemon gEnemyParty[6]; // 0x30045C0 - extern u8 unk_2000000[]; extern u16 word_2024E82; extern u8 byte_2024E88; -extern u32 gExperienceTables[8][101]; -extern struct BaseStats gBaseStats[]; -extern const u16 *gLevelUpLearnsets[]; - void ZeroBoxMonData(struct BoxPokemon *boxMon) { u8 *raw = (u8 *)boxMon; |