diff options
| author | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-12-03 16:58:28 -0500 |
| commit | 2c14d6ee6c40f4b7e5cd9366080ce911d67be718 (patch) | |
| tree | 4a70ca275a2f161d2d23f63d0608f92d8ea08acb /src/battle_controller_recorded_player.c | |
| parent | d6a88e0eaa7d74f187fb27f8a376203f40537340 (diff) | |
| parent | d9a5de5317d4589b139f9532a7e8bf3b851e673f (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle_controller_recorded_player.c')
| -rw-r--r-- | src/battle_controller_recorded_player.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 17b115caa..4d7fdc01e 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -25,16 +25,12 @@ #include "constants/battle_anim.h" #include "constants/songs.h" -extern u32 gTransformedPersonalities[MAX_BATTLERS_COUNT]; -extern u8 gUnknown_0203C7B4; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); // this file's functions static void RecordedPlayerHandleGetMonData(void); |