diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index e05c49885..5764025e0 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -74,7 +74,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 waitfanfare special HealPlayerParty setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26 playse 263 @@ -95,14 +95,14 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259BA5:: @ 8259BA5 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13:: @ 8259C13 setvar VAR_0x8004, 9 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A0B9 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C26:: @ 8259C26 setvar VAR_0x8004, 1 setvar VAR_0x8005, 2 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 1 call_if 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E1D compare VAR_RESULT, 2 @@ -232,7 +232,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47 waitse fadescreen 1 setvar VAR_0x8004, 4 - special sub_81A1780 + special CallFrontierUtilFunc end BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 @@ -243,7 +243,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69 setvar VAR_0x8004, 2 setvar VAR_0x8005, 6 setvar VAR_0x8006, 1 - special sub_81A1780 + special CallFrontierUtilFunc special CalculatePlayerPartyCount goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259C13 |