diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-28 21:06:32 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-28 21:06:32 +0200 |
| commit | 272b98da6c5174db3f7f2d05ed765fc4cdefc2c6 (patch) | |
| tree | 8ac87362ab09758152a68fb4eaeb02c8b5c9ac14 /data | |
| parent | ab36efdaf4a7f64df9bbfae153eb88cd9c5b29b0 (diff) | |
document party status summary
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 8 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 058833fa9..a9d305ec8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2899,7 +2899,7 @@ BattleScript_FaintedMonTryChooseAnother:: switchindataupdate BS_ATTACKER hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON - atk62 BS_ATTACKER + hidepartystatussummary BS_ATTACKER switchinanim BS_ATTACKER, 0x0 waitstate switchineffects BS_ATTACKER @@ -2910,7 +2910,7 @@ BattleScript_FaintedMonChooseAnother:: switchindataupdate BS_FAINTED hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON - atk62 BS_FAINTED + hidepartystatussummary BS_FAINTED switchinanim BS_FAINTED, FALSE waitstate various7 BS_ATTACKER @@ -2933,7 +2933,7 @@ BattleScript_82DA908:: switchindataupdate BS_FAINTED hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON - atk62 BS_FAINTED + hidepartystatussummary BS_FAINTED switchinanim BS_FAINTED, FALSE waitstate switchineffects 5 @@ -3136,7 +3136,7 @@ BattleScript_DoSwitchOut:: switchindataupdate BS_ATTACKER hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON - atk62 BS_ATTACKER + hidepartystatussummary BS_ATTACKER switchinanim BS_ATTACKER, FALSE waitstate switchineffects BS_ATTACKER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 8020d7c5c..1fbaa9536 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -44,7 +44,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58 .4byte BattleScript_ActionWatchesCarefully .4byte BattleScript_ActionGetNear .4byte BattleScript_ActionThrowPokeblock - .4byte BattleScript_82DBEE3 + .4byte BattleScript_ActionWallyThrow BattleScript_BallThrow:: jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally @@ -176,17 +176,17 @@ BattleScript_RunByUsingItem:: setbyte gBattleOutcome, B_OUTCOME_RAN finishturn -BattleScript_ActionWatchesCarefully:: +BattleScript_ActionWatchesCarefully: printstring STRINGID_PKMNWATCHINGCAREFULLY waitmessage 0x40 end2 -BattleScript_ActionGetNear:: +BattleScript_ActionGetNear: printfromtable gSafariGetNearStringIds waitmessage 0x40 end2 -BattleScript_ActionThrowPokeblock:: +BattleScript_ActionThrowPokeblock: printstring STRINGID_THREWPOKEBLOCKATPKMN waitmessage 0x40 playanimation BS_ATTACKER, B_ANIM_x4, NULL @@ -194,7 +194,7 @@ BattleScript_ActionThrowPokeblock:: waitmessage 0x40 end2 -BattleScript_82DBEE3:: +BattleScript_ActionWallyThrow: printstring STRINGID_RETURNMON waitmessage 0x40 returnatktoball |