diff options
| author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
| commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
| tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /src/battle_script_commands.c | |
| parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
| parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) | |
fix conflicts
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c5c8e89a4..8a0e32ba8 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5045,7 +5045,7 @@ static void atk5A_yesnoboxlearnmove(void) case 3: if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2) { - u8 movePosition = sub_8138B2C(); + u8 movePosition = GetMoveSlotToReplace(); if (movePosition == 4) { @@ -9629,7 +9629,7 @@ static void atkF2_displaydexinfo(void) } break; case 3: - sub_800F34C(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); gBattle_BG3_X = 0x100; ++gBattleCommunication[0]; |