diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-07 01:56:36 -0400 |
| commit | d84d94e29a1424dd1d12ff821957bb6b1bc847d6 (patch) | |
| tree | c5ba0778afca66a91f71815cd53fe9abef1bdac6 /src/battle_controller_link_opponent.c | |
| parent | ad2a97935e1c1f4362f0dffa58ef437d191bab4e (diff) | |
| parent | c3cfd6065825ec8ddd5e1782998071518efaa322 (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'src/battle_controller_link_opponent.c')
| -rw-r--r-- | src/battle_controller_link_opponent.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 23d469c27..3fb5da9dc 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -9,7 +9,7 @@ #include "battle_tower.h" #include "battle_tv.h" #include "bg.h" -#include "data2.h" +#include "data.h" #include "link.h" #include "main.h" #include "m4a.h" @@ -31,8 +31,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; - // this file's functions static void LinkOpponentHandleGetMonData(void); static void LinkOpponentHandleGetRawMonData(void); |