diff options
| author | Ibot02 <jtp.jtp@gmx.de> | 2022-01-09 20:46:03 +0100 |
|---|---|---|
| committer | Ibot02 <jtp.jtp@gmx.de> | 2022-01-09 20:46:03 +0100 |
| commit | 4fc5a7c3e4dd240db3bc190439d07fcecba7b0e1 (patch) | |
| tree | fc7aa8be7f80de6c1a2c5a760e4862e86b863f07 /data/scripts/hyruleTown/script_Object69SimonsSimulation.inc | |
| parent | 85fa74cc57166378e150086abb407ca0f3b756db (diff) | |
| parent | 7b87141d9b708b5baa0458303bf7d68c4d11a99a (diff) | |
Merge branch 'master' into gyorg
Diffstat (limited to 'data/scripts/hyruleTown/script_Object69SimonsSimulation.inc')
| -rw-r--r-- | data/scripts/hyruleTown/script_Object69SimonsSimulation.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc index 00761031..0a1a958a 100644 --- a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc +++ b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc @@ -1,30 +1,30 @@ @ Simons Simulation OBJECT_69 SCRIPT_START script_Object69SimonsSimulation BeginBlock - _0807E888 + DisablePlayerControl EndBlock CallWithArg sub_0806C2A0, 0x00000001 WaitForFadeFinish Wait 0x003c - _0807E878 + EnablePlayerControl SetRoomFlag 0x0000 PlayBgm BGM_FIGHT_THEME2 script_08011C04: CheckRoomFlag 0x0064 JumpIfNot script_08011C04 StopBgm - _0807E864 + SetPlayerIdle Wait 0x003c CameraTargetEntity Wait 0x003c Call Simon_CreateChest Wait 0x003c CameraTargetPlayer - _0807E878 + EnablePlayerControl script_08011C28: CheckLocalFlag 0x0001 JumpIfNot script_08011C28 - _0807E888 + DisablePlayerControl WaitPlayerGetItem Wait 0x001e CallWithArg sub_0806C2A0, 0x00000000 |