diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-27 12:51:10 -0500 |
| commit | cb90f22c5e632cf8161ae2c3246d8d1f205ce39f (patch) | |
| tree | 5b507a61b43ecfe02bf4b474b0857ac92e0992a8 /data/maps/BattleFrontier_BattleTowerLobby | |
| parent | f559fa3fe26910056e84315370cb13ec8501af18 (diff) | |
| parent | 70d1f54ab96235b0e0d07d40526f16449e7cb1e7 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'data/maps/BattleFrontier_BattleTowerLobby')
| -rw-r--r-- | data/maps/BattleFrontier_BattleTowerLobby/scripts.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 32229f724..53997b0b5 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -239,8 +239,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23E984:: @ 823E984 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 3 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -310,8 +310,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EAED:: @ 823EAED fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 4 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -382,8 +382,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC59:: @ 823EC59 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 @@ -453,8 +453,8 @@ BattleFrontier_BattleTowerLobby_EventScript_23EDC2:: @ 823EDC2 fadescreen 1 call BattleFrontier_EventScript_GetLvlMode copyvar VAR_0x8004, VAR_RESULT - setvar VAR_0x8005, 2 - special sub_80F9490 + setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE + special ChoosePartyForBattleFrontier waitstate compare VAR_RESULT, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0E3 |