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_player.c | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
| parent | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (diff) | |
Merge pull request #380 from DizzyEggg/frontier_2
More battle frontier
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 6bc6c6f49..20781ca44 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -32,6 +32,7 @@ #include "recorded_battle.h" #include "party_menu.h" #include "battle_dome.h" +#include "battle_arena.h" extern u8 gUnknown_0203CEE8; extern u8 gUnknown_0203CEE9; @@ -46,7 +47,6 @@ extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern void sub_8172EF0(u8 battlerId, struct Pokemon *mon); extern void sub_81AABB0(void); -extern void sub_81A57E4(u8 battlerId, u16 stringId); extern void sub_81851A8(u8 *); // this file's functions @@ -2537,7 +2537,7 @@ static void PlayerHandlePrintString(void) BattlePutTextOnWindow(gDisplayedStringBattle, 0); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2; BattleTv_SetDataBasedOnString(*stringId); - sub_81A57E4(gActiveBattler, *stringId); + BattleArena_DeductMindPoints(gActiveBattler, *stringId); } static void PlayerHandlePrintSelectionString(void) @@ -2600,9 +2600,11 @@ static void HandleChooseMoveAfterDma3(void) } } +// arenaMindPoints is used here as a placeholder for a timer. + static void PlayerChooseMoveInBattlePalace(void) { - if (--*(gBattleStruct->field_298 + gActiveBattler) == 0) + if (--*(gBattleStruct->arenaMindPoints + gActiveBattler) == 0) { gBattlePalaceMoveSelectionRngValue = gRngValue; BtlController_EmitTwoReturnValues(1, 10, ChooseMoveAndTargetInBattlePalace()); @@ -2614,7 +2616,7 @@ static void PlayerHandleChooseMove(void) { if (gBattleTypeFlags & BATTLE_TYPE_PALACE) { - *(gBattleStruct->field_298 + gActiveBattler) = 8; + *(gBattleStruct->arenaMindPoints + gActiveBattler) = 8; gBattlerControllerFuncs[gActiveBattler] = PlayerChooseMoveInBattlePalace; } else |