Merge branch 'master' into decompile_battle_7

This commit is contained in:
DizzyEggg
2017-11-04 16:12:45 +01:00
57 changed files with 17152 additions and 11849 deletions
+1
View File
@@ -1000,5 +1000,6 @@ extern u8 gBattleOutcome;
extern u16 gLastUsedItem;
extern u32 gBattleTypeFlags;
extern struct MonSpritesGfx* gMonSpritesGfxPtr;
extern u16 gTrainerBattleOpponent_A;
#endif // GUARD_BATTLE_H