diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-22 18:43:15 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-22 18:43:15 +0200 |
commit | df4e32a307c17163e9a64e5ea615ab9eb18afc4b (patch) | |
tree | 0aa62be639c330084f67032185eff58768a5cc9e /src/battle_2.c | |
parent | 813b1bfd4a8f0fc316e78b39abaaafd09a42f0c4 (diff) |
player battle controller is done
Diffstat (limited to 'src/battle_2.c')
-rw-r--r-- | src/battle_2.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index f2a5508e0..fd1b88b48 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -238,7 +238,6 @@ static void sub_8038F34(void); static void sub_80392A8(void); static void sub_803937C(void); static void sub_803939C(void); -void oac_poke_opponent(struct Sprite *sprite); static void sub_803980C(struct Sprite *sprite); static void sub_8039838(struct Sprite *sprite); static void sub_8039894(struct Sprite *sprite); @@ -4025,7 +4024,7 @@ static void HandleTurnActionSelectionState(void) } else { - EmitOpenBag(0, gBattleStruct->field_60[gActiveBank]); + EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]); MarkBufferBankForExecution(gActiveBank); } break; @@ -4070,7 +4069,7 @@ static void HandleTurnActionSelectionState(void) } break; case ACTION_POKEBLOCK_CASE: - EmitOpenBag(0, gBattleStruct->field_60[gActiveBank]); + EmitChooseItem(0, gBattleStruct->field_60[gActiveBank]); MarkBufferBankForExecution(gActiveBank); break; case ACTION_CANCEL_PARTNER: |