Merge branch 'master' into decompile_battle_link_817C95C

This commit is contained in:
DizzyEggg
2018-03-01 01:01:18 +01:00
55 changed files with 5205 additions and 6363 deletions
-1
View File
@@ -32,7 +32,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern struct UnusedControllerStruct gUnknown_02022D0C;
extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
extern const struct BattleMove gBattleMoves[];
extern void sub_8172EF0(u8 bank, struct Pokemon *mon);
extern void sub_806A068(u16, u8);