diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 6 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1c2f89ca3..8562af526 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -622,7 +622,7 @@ BattleScript_EffectBide: @ 81D7297 ppreduce attackanimation waitanimation - orword gHitMarker, HITMARKER_x8000000 + orword gHitMarker, HITMARKER_CHARGING setbide goto BattleScript_MoveEnd @@ -851,7 +851,7 @@ BattleScriptFirstChargingTurn: @ 81D756C ppreduce attackanimation waitanimation - orword gHitMarker, HITMARKER_x8000000 + orword gHitMarker, HITMARKER_CHARGING setbyte cEFFECT_CHOOSER, 76 seteffectprimary copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID @@ -2000,7 +2000,7 @@ BattleScript_SolarbeamDecideTurn: @ 81D81E1 goto BattleScript_MoveEnd BattleScript_SolarbeamOnFirstTurn: @ 81D8209 - orword gHitMarker, HITMARKER_x8000000 + orword gHitMarker, HITMARKER_CHARGING setbyte cEFFECT_CHOOSER, 76 seteffectprimary ppreduce diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 478b0b7f0..cc7a58d1c 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -77,12 +77,12 @@ BattleScript_TryNicknameCaughtMon: @ 81D9EE3 BattleScript_GiveCaughtMonEnd: @ 81D9EF8 givecaughtmon - setbyte gBattleOutcome, BATTLE_CAUGHT + setbyte gBattleOutcome, B_OUTCOME_CAUGHT finishturn BattleScript_WallyBallThrow:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 - setbyte gBattleOutcome, BATTLE_CAUGHT + setbyte gBattleOutcome, B_OUTCOME_CAUGHT finishturn BattleScript_ShakeBallThrow:: @ 81D9F0A @@ -92,7 +92,7 @@ BattleScript_ShakeBallThrow:: @ 81D9F0A jumpifbyte NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd printstring BATTLE_TEXT_SafariOver waitmessage 64 - setbyte gBattleOutcome, BATTLE_OUT_OF_BALLS + setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS BattleScript_ShakeBallThrowEnd: @ 81D9F34 finishaction @@ -165,7 +165,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB BattleScript_RunByUsingItem: @ 81D9FDA playse SE_NIGERU - setbyte gBattleOutcome, BATTLE_RAN + setbyte gBattleOutcome, B_OUTCOME_RAN finishturn BattleScript_ActionWatchesCarefully: @ 81D9FE4 |