diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-19 11:12:41 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-19 11:12:41 -0500 |
| commit | ff3fb436227a1993add63fdd9f14b61c304b37c8 (patch) | |
| tree | 9ec424760d0dab9dddd2ac938fc698c249986912 /src/battle_controllers.c | |
| parent | d13375a4e03519feb3e9a6b0f7784f09b55b7709 (diff) | |
| parent | 89dc26755ad2818c10b37a34ed46f5c79dc571c8 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into dism_more_data
Diffstat (limited to 'src/battle_controllers.c')
| -rw-r--r-- | src/battle_controllers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index f3530fc4b..6fb090307 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -85,9 +85,9 @@ static void InitSinglePlayerBtlControllers(void) gBattleMainFunc = BeginBattleIntro; if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE) { - gBattlerControllerFuncs[0] = SetControllerToPokeDude; + gBattlerControllerFuncs[0] = SetControllerToPokedude; gBattlerPositions[0] = B_POSITION_PLAYER_LEFT; - gBattlerControllerFuncs[1] = SetControllerToPokeDude; + gBattlerControllerFuncs[1] = SetControllerToPokedude; gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT; gBattlersCount = 2; } @@ -110,13 +110,13 @@ static void InitSinglePlayerBtlControllers(void) gBattleMainFunc = BeginBattleIntro; if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE) { - gBattlerControllerFuncs[0] = SetControllerToPokeDude; + gBattlerControllerFuncs[0] = SetControllerToPokedude; gBattlerPositions[0] = B_POSITION_PLAYER_LEFT; - gBattlerControllerFuncs[1] = SetControllerToPokeDude; + gBattlerControllerFuncs[1] = SetControllerToPokedude; gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT; - gBattlerControllerFuncs[2] = SetControllerToPokeDude; + gBattlerControllerFuncs[2] = SetControllerToPokedude; gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT; - gBattlerControllerFuncs[3] = SetControllerToPokeDude; + gBattlerControllerFuncs[3] = SetControllerToPokedude; gBattlerPositions[3] = B_POSITION_OPPONENT_RIGHT; gBattlersCount = MAX_BATTLERS_COUNT; } |