diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-19 08:08:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 08:08:03 -0500 |
| commit | d63e99c418de98005eac31ba3e6c1abdd6e3ecaf (patch) | |
| tree | f8352a8edfbc7209588cd783e485ba6b6d2e0b00 /data | |
| parent | 11170ce90c0baf77b196e378441d25e7f16e2cf3 (diff) | |
| parent | e97f37077c793a388e3a98c13f09846839e80b22 (diff) | |
Merge pull request #754 from camthesaxman/emerald_diff
resolve more emerald differences
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 10 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1c2f89ca3..ed286c3b2 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 @@ -3248,7 +3248,7 @@ BattleScript_DamagingWeatherContinues:: @ 81D8F7D setbyte gBattleCommunication, 0 BattleScript_DamagingWeatherLoop: @ 81D8F95 - copyarraywithindex gBattlerAttacker, gBanksByTurnOrder, gBattleCommunication, 1 + copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement printfromtable gSandStormHailDmgStringIds @@ -3693,7 +3693,7 @@ BattleScript_MoveSelectionImprisoned:: @ 81D9464 printselectionstring BATTLE_TEXT_SealedNoUse endselectionscript -BattleScript_SelectingImprisionedMoveInPalace:: @ 81D9468 +BattleScript_GrudgeTakesPp:: @ 81D9468 printstring BATTLE_TEXT_GrudgeLosePP waitmessage 64 return 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 |