diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2021-12-27 21:32:31 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-27 21:32:31 -0800 |
| commit | 9456e38606b3ebfe388bd810a4187a5c06c97947 (patch) | |
| tree | 58b6bd533d86b0f74a25a22055415b17e01ae714 /data/scripts/hyruleTown/script_Object69SimonsSimulation.inc | |
| parent | d8dfff5de93387a6a8a77ea9e7bdbd53b6ff9500 (diff) | |
| parent | c4f2efe13278c5aeb094be914513d19f5ddbce2b (diff) | |
Merge pull request #225 from notyourav/asm_funcs
finish player, label script functions
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 |