diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:40:17 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:40:17 -0600 |
| commit | 9afe7a896e7bf9257d3c73c8fb592f0b9243d520 (patch) | |
| tree | 490f5c185053db27730eefe1f6764b406d4adfb2 /data/maps/BattleFrontier_BattleFactoryPreBattleRoom | |
| parent | 43a8534fced2c4327acdd8dc9690f5bc6751e2db (diff) | |
| parent | ccc5d27fcb8647225656b06a60a7d79ad0fa299f (diff) | |
Merge remote-tracking branch 'pret/master' into render_text
Diffstat (limited to 'data/maps/BattleFrontier_BattleFactoryPreBattleRoom')
| -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 |