diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-15 12:04:54 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2021-11-16 10:53:00 -0500 |
| commit | 04cc923d6c17edae778f14cb431991867a05cf65 (patch) | |
| tree | b6e1b5bede12da3f64293dde84b1b09f08d40053 /data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc | |
| parent | c1130592faa26f4e555142c48bdc02c1378ff1ee (diff) | |
Handle optional arguments for warp commands, add WARP_ID_NONE
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc index 06038b43c..3beaa38c7 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc @@ -108,7 +108,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: call BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator closedoor 10, 1 waitdooranim - warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 + warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 1, 6 waitstate releaseall end @@ -189,7 +189,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner:: call_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth removeobject VAR_LAST_TALKED setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER - warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 3 + warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 10, 3 waitstate release end |