diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-13 19:58:45 +0200 |
commit | 72ed86171500c58644655bac7d33c07749cbf299 (patch) | |
tree | 66ef93a15092fa5978fe4c1409605fc3236390ef /src/battle_script_commands.c | |
parent | 20d158cf4a17e8d362cdafbf13906c59d9916e24 (diff) | |
parent | 3040c1e1aa07a8a6466dd3653462595c2dd0fc9c (diff) |
fix rom3 conflicts
Diffstat (limited to 'src/battle_script_commands.c')
-rw-r--r-- | src/battle_script_commands.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 50ae5bafe..fb6a8272b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -11087,7 +11087,7 @@ static void atkEF_pokeball_catch_calculation(void) { if (gLastUsedItem == ITEM_MASTER_BALL) { - gBattleResults.unk5_1 = 1; + gBattleResults.usedMasterBall = TRUE; } else { |