diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 02:34:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 02:34:54 -0500 |
| commit | c51e0f3bae824a4c099bdcb0f938e298ef49fdcb (patch) | |
| tree | 8825791d67d44b905e63ea59311c3d85711ac140 /data/maps/FallarborTown_BattleTentLobby/scripts.inc | |
| parent | cb90f22c5e632cf8161ae2c3246d8d1f205ce39f (diff) | |
| parent | 7beddd16dd81d79ee886183053037e68910e01d5 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/FallarborTown_BattleTentLobby/scripts.inc')
| -rw-r--r-- | data/maps/FallarborTown_BattleTentLobby/scripts.inc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index 507820e09..8021b2622 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -39,19 +39,15 @@ FallarborTown_BattleTentLobby_EventScript_1FFEED:: @ 81FFEED msgbox FallarborTown_BattleTentLobby_Text_2C4EC3, MSGBOX_DEFAULT message FallarborTown_BattleTentLobby_Text_2C4EFF waitmessage - setvar VAR_0x8004, 4 - special CallFallarborTentFunction + fallarbortent_setrandomprize frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special CallFallarborTentFunction + fallarbortent_save 0 playse SE_SAVE waitse FallarborTown_BattleTentLobby_EventScript_1FFF27:: @ 81FFF27 msgbox FallarborTown_BattleTentLobby_Text_2C4F22, MSGBOX_DEFAULT - setvar VAR_0x8004, 5 - special CallFallarborTentFunction + fallarbortent_giveprize switch VAR_RESULT case 0, FallarborTown_BattleTentLobby_EventScript_1FFF73 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 @@ -84,9 +80,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFF93:: @ 81FFF93 message FallarborTown_BattleTentLobby_Text_2C4FD7 waitmessage frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 0 - special CallFallarborTentFunction + fallarbortent_save 0 playse SE_SAVE waitse msgbox FallarborTown_BattleTentLobby_Text_2C501F, MSGBOX_DEFAULT @@ -99,9 +93,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD lockall message FallarborTown_BattleTentLobby_Text_2C504C waitmessage - setvar VAR_0x8004, 3 - setvar VAR_0x8005, 1 - special CallFallarborTentFunction + fallarbortent_save CHALLENGE_STATUS_SAVING playse SE_SAVE waitse frontier_set FRONTIER_DATA_PAUSED, FALSE @@ -111,8 +103,7 @@ FallarborTown_BattleTentLobby_EventScript_1FFFCD:: @ 81FFFCD FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001 lock faceplayer - setvar VAR_0x8004, 1 - special CallFallarborTentFunction + fallarbortent_getprize compare VAR_RESULT, 0 goto_if_ne FallarborTown_BattleTentLobby_EventScript_1FFF84 special SavePlayerParty @@ -153,8 +144,7 @@ FallarborTown_BattleTentLobby_EventScript_20005D:: @ 820005D FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2 setvar VAR_TEMP_0, 0 frontier_set FRONTIER_DATA_SELECTED_MON_ORDER - setvar VAR_0x8004, 0 - special CallFallarborTentFunction + fallarbortent_init frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING frontier_set FRONTIER_DATA_PAUSED, FALSE special LoadPlayerParty |