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_BattlePikeRandomRoom3 | |
| parent | 43a8534fced2c4327acdd8dc9690f5bc6751e2db (diff) | |
| parent | ccc5d27fcb8647225656b06a60a7d79ad0fa299f (diff) | |
Merge remote-tracking branch 'pret/master' into render_text
Diffstat (limited to 'data/maps/BattleFrontier_BattlePikeRandomRoom3')
| -rw-r--r-- | data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc index 9256764e8..d1d968054 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc @@ -19,7 +19,7 @@ BattleFrontier_BattlePikeRandomRoom3_EventScript_25E44A:: @ 825E44A setvar VAR_0x8004, 2 setvar VAR_0x8005, 0 setvar VAR_0x8006, 4 - special sub_81A1780 + special CallFrontierUtilFunc warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 waitstate end @@ -37,7 +37,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript1_25E47A: @ 825E47A call BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4271 setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 - special sub_81A1780 + special CallFrontierUtilFunc compare VAR_RESULT, 2 goto_eq BattleFrontier_BattlePikeRandomRoom3_EventScript_25E4A3 compare VAR_RESULT, 3 |