diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-12 14:05:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-12 14:05:40 -0600 |
| commit | f639c7c309bbd32fc60278eafa726db5c0c49914 (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /src/battle_controller_opponent.c | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
| parent | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (diff) | |
Merge pull request #380 from DizzyEggg/frontier_2
More battle frontier
Diffstat (limited to 'src/battle_controller_opponent.c')
| -rw-r--r-- | src/battle_controller_opponent.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index b8b5bd3b8..2629a56c0 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -29,6 +29,9 @@ #include "pokeball.h" #include "data2.h" #include "battle_setup.h" +#include "battle_arena.h" +#include "battle_tower.h" +#include "frontier_util.h" extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y; @@ -38,11 +41,7 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); -extern void sub_81A57E4(u8 battlerId, u16 stringId); -extern u8 GetFrontierBrainTrainerPicIndex(void); extern u8 GetTrainerHillTrainerFrontSpriteId(u16 trainerId); -extern u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); -extern u8 GetEreaderTrainerFrontSpriteId(void); // this file's functions static void OpponentHandleGetMonData(void); @@ -1513,7 +1512,7 @@ static void OpponentHandlePrintString(void) BufferStringBattle(*stringId); BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; - sub_81A57E4(gActiveBattler, *stringId); + BattleArena_DeductMindPoints(gActiveBattler, *stringId); } static void OpponentHandlePrintSelectionString(void) |