From 0f65f8fd5008d06defcfae6c9d66270ff45a8e49 Mon Sep 17 00:00:00 2001 From: theo3 Date: Tue, 28 Dec 2021 12:08:30 -0800 Subject: Identify player functions and update asm.h --- data/scripts/cloudTops/script_PlayerAtSiroc.inc | 2 +- data/scripts/cutscene/ezlo/script_EzloCap.inc | 2 +- data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc | 2 +- data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc | 2 +- data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc | 2 +- data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc | 2 +- data/scripts/cutscene/intro/script_PlayerIntro.inc | 2 +- data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc | 2 +- data/scripts/cutscene/introAssembly/script_PlayerEnters.inc | 2 +- data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc | 2 +- .../cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc | 2 +- .../cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc | 2 +- .../cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc | 2 +- .../cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc | 2 +- .../cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc | 2 +- data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc | 2 +- data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc | 2 +- data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc | 2 +- data/scripts/cutscene/introCeremony/script_PlayerFainting.inc | 2 +- data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc | 2 +- data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc | 2 +- data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc | 2 +- data/scripts/cutscene/introTown/script_PlayerIntro1.inc | 2 +- data/scripts/cutscene/introTown/script_PlayerIntro2.inc | 2 +- data/scripts/cutscene/introTown/script_PlayerIntro3.inc | 2 +- data/scripts/cutscene/introTown/script_PlayerIntro4.inc | 2 +- data/scripts/cutscene/introTown/script_PlayerIntro5.inc | 2 +- data/scripts/cutscene/introTown/script_PlayerIntroTown.inc | 2 +- data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc | 2 +- .../cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc | 2 +- .../cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc | 2 +- .../cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc | 2 +- .../cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc | 2 +- data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc | 2 +- data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc | 2 +- data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc | 2 +- data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc | 2 +- data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc | 2 +- data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc | 2 +- data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc | 2 +- data/scripts/cutscene/outro/script_PlayerAtEzlo.inc | 2 +- data/scripts/cutscene/outro/script_PlayerAtOutro.inc | 2 +- data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc | 2 +- data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc | 2 +- data/scripts/cutscene/reveal/script_PlayerAtPicture.inc | 2 +- data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc | 2 +- data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc | 2 +- data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc | 2 +- data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc | 2 +- data/scripts/dhc/script_PlayerAfterDefeatingV2.inc | 2 +- data/scripts/dhc/script_PlayerAtDarkNut1.inc | 2 +- data/scripts/dhc/script_PlayerAtDarkNut2.inc | 2 +- data/scripts/dhc/script_PlayerAtDarkNut3.inc | 2 +- data/scripts/dhc/script_PlayerCastleCollapsing.inc | 2 +- data/scripts/dhc/script_PlayerCastleEscape.inc | 2 +- data/scripts/dhc/script_PlayerRescuedZelda.inc | 2 +- data/scripts/dhc/script_PlayerStonesFall.inc | 2 +- data/scripts/dhc/script_PlayerV2Defeated.inc | 2 +- data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc | 2 +- data/scripts/graveyard/script_PlayerAtKingGustav.inc | 2 +- data/scripts/graveyard/script_PlayerGetKeyStolen.inc | 2 +- data/scripts/hyruleTown/script_Anju.inc | 2 +- data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc | 2 +- data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc | 2 +- data/scripts/hyruleTown/script_PlayerAtInnDoor.inc | 2 +- data/scripts/hyruleTown/script_PlayerCannotEnter.inc | 2 +- data/scripts/hyruleTown/script_PlayerSleepingInn.inc | 2 +- data/scripts/hyruleTown/script_PlayerStepOnTrap.inc | 2 +- data/scripts/hyruleTown/script_TownMinish5.inc | 2 +- data/scripts/lakeHylia/script_PlayerAfterToD.inc | 2 +- data/scripts/minishWoods/script_PlayerAtBombMinish.inc | 2 +- data/scripts/minishWoods/script_PlayerAtFestari.inc | 2 +- data/scripts/minishWoods/script_PlayerAtGentari.inc | 2 +- data/scripts/minishWoods/script_PlayerAtMadderpillar.inc | 2 +- data/scripts/mtCrenel/script_PlayerAtMelari.inc | 2 +- data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc | 2 +- data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc | 2 +- data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc | 2 +- data/scripts/npc/script_PlayerAtBladeBrothers.inc | 2 +- data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc | 2 +- data/scripts/sanctuary/script_PlayerAtPedestal.inc | 2 +- data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc | 2 +- data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc | 2 +- data/scripts/sanctuary/script_PlayerPickUpSword.inc | 2 +- data/scripts/sanctuary/script_PlayerSanctuary.inc | 2 +- data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc | 2 +- data/scripts/sanctuary/script_PlayerTextBoardAppears.inc | 2 +- data/scripts/unused/script_0800FB2C.inc | 2 +- data/scripts/unused/script_08012B24.inc | 2 +- data/scripts/unused/script_08012B50.inc | 2 +- data/scripts/unused/script_08012B7C.inc | 2 +- data/scripts/unused/script_08013D04.inc | 2 +- data/scripts/unused/script_08013D44.inc | 2 +- data/scripts/unused/script_08013D84.inc | 2 +- data/scripts/unused/script_08013DC4.inc | 2 +- data/scripts/unused/script_08015A7C.inc | 2 +- data/scripts/unused/script_08015AA0.inc | 2 +- data/scripts/windRuins/script_PlayerAtTextboard.inc | 2 +- 98 files changed, 98 insertions(+), 98 deletions(-) (limited to 'data/scripts') diff --git a/data/scripts/cloudTops/script_PlayerAtSiroc.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc index ceeed89f..ebdfb81b 100644 --- a/data/scripts/cloudTops/script_PlayerAtSiroc.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerAtSiroc SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_EzloCap.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc index f13702bc..3f2c786c 100644 --- a/data/scripts/cutscene/ezlo/script_EzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -74,7 +74,7 @@ script_08012824: SetPlayerIdle _0807E9DC CallWithArg sub_0807F5B0, 0x0000003c - Call sub_080791D0 + Call ResetPlayerAnimationAndAction EndBlock SetSyncFlag 0x00000008 WaitForSyncFlagAndClear 0x00000004 diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc index f9350061..fa6ae96d 100644 --- a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -18,7 +18,7 @@ script_0801248A: _0807E80C 0x00000000 WaitForFadeFinish _0807E858 0x0000 - Call sub_080791BC + Call SetPlayerActionNormal LoadRoomEntityList gUnk_080F4D70 Call DeleteAllEnemies SetEntityPositionRelative 0x0388, 0x0168 diff --git a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index 017b7111..eaa33a4c 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerDefeatedOctoroks SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc index 1082a4b1..33310752 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerEzloBeingBullied DoPostScriptAction 0x0004 Wait 0x003c SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc b/data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc index 545b7a6c..90acd24f 100644 --- a/data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc @@ -1,5 +1,5 @@ @ Get Ezlo cap Player SCRIPT_START script_PlayerGetEzloCap DoPostScriptAction 0x0015 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_PlayerIntro.inc b/data/scripts/cutscene/intro/script_PlayerIntro.inc index 5f06f18e..33520235 100644 --- a/data/scripts/cutscene/intro/script_PlayerIntro.inc +++ b/data/scripts/cutscene/intro/script_PlayerIntro.inc @@ -20,5 +20,5 @@ SCRIPT_START script_PlayerIntro Call sub_08053250 EnablePlayerControl Call sub_0807DF50 - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index 31780509..021ce626 100644 --- a/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -34,7 +34,7 @@ SCRIPT_START script_ZeldaTalkToSmith BeginBlock SetGlobalFlag 0x0013 Call sub_0807DF50 - Call sub_080791D0 + Call ResetPlayerAnimationAndAction EnablePlayerControl EndBlock SCRIPT_END diff --git a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index b5bf75ce..daa91183 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -15,6 +15,6 @@ SCRIPT_START script_PlayerEnters DoPostScriptAction 0x0000 Wait 0x000f SetSyncFlag 0x00000020 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc index e2fd2766..009478ee 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerGetSword MessageFromTargetPos 0x0501, 0x000e WaitUntilTextboxCloses SetSyncFlag 0x00000020 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc index 862275c2..79078065 100644 --- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc @@ -29,5 +29,5 @@ script_08009EA4: Call sub_08053250 EnablePlayerControl Call sub_0807DF50 - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc index 605ee80e..8e4e4823 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerAtIntroBusinessScrub4 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index 36e3e08b..f5475ac2 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -5,5 +5,5 @@ SCRIPT_START script_PlayerIntroBusinessScrub1 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index d5c30e2a..3f6979a5 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -5,5 +5,5 @@ SCRIPT_START script_PlayerIntroBusinessScrub2 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index deea175d..b9ea15ff 100644 --- a/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -5,5 +5,5 @@ SCRIPT_START script_PlayerIntroBusinessScrub3 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000010 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index 4385bb7b..0e733e50 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -28,7 +28,7 @@ SCRIPT_START script_Npc4EMonsters CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C - Call sub_080791BC + Call SetPlayerActionNormal CallWithArg EquipItem, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 _0807F0B4 0x0001 diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index 54bd0c43..c969f3bb 100644 --- a/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EVaatiAttacking MessageFromTargetPos 0x1047, 0x0000 WaitUntilTextboxCloses Call sub_0806DC3C - Call sub_080791BC + Call SetPlayerActionNormal CallWithArg EquipItem, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 Wait 0x001e diff --git a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc index 33d0784c..b48339a3 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc @@ -6,5 +6,5 @@ SCRIPT_START script_PlayerAtIntroCeremony SetSyncFlag 0x00000400 ClearSyncFlag 0x00000002 EndBlock - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc index 880c2d9e..8e0ae500 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc @@ -13,5 +13,5 @@ SCRIPT_START script_PlayerFainting EndBlock Call WaitForFrameHiBit WaitForSyncFlag 0x80000000 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc index 78be94a1..124fe933 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerIntroCastle SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index dc4e414f..13efecf9 100644 --- a/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -9,5 +9,5 @@ SCRIPT_START script_PlayerProtectingZelda SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000400 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index 409387ac..1b23ef0d 100644 --- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -160,7 +160,7 @@ SCRIPT_START script_Npc4EIntroTown GivePlayerItem 0x000d WaitPlayerGetItem Call sub_0806DC3C - Call sub_080791BC + Call SetPlayerActionNormal CallWithArg EquipItem, 0x0000000d SetIntVariable 0x000000ff Call sub_0807F5B0 diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc index d5a09109..ea5c12ce 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro1.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerIntro1 SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 986893df..02058ebd 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro2.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerIntro2 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc index d2eda272..2ee42514 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro3.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerIntro3 SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc index 33307f8c..ad1b34dd 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerIntro4 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc index e90538d7..f1393d94 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntro5.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -14,5 +14,5 @@ script_0800FB10: SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc index 453e2bbe..7457da40 100644 --- a/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc @@ -5,6 +5,6 @@ SCRIPT_START script_PlayerIntroTown SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index 58479b51..937cf7a9 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -12,5 +12,5 @@ SCRIPT_START script_PlayerAtFirstKinstone SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc index 7d7223dc..253d7131 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc @@ -3,6 +3,6 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone1 SetEntitySpeed 0x0100 WalkEast 0x0008 SetSyncFlag 0x00000400 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc index 86076092..56b1e534 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc @@ -3,6 +3,6 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone2 SetEntitySpeed 0x0100 WalkWest 0x0008 SetSyncFlag 0x00000400 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc index c64ab60a..7abe1476 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc @@ -3,6 +3,6 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone3 SetEntitySpeed 0x0100 WalkSouth 0x0008 SetSyncFlag 0x00000400 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc index 5b436fa5..d93c0ec4 100644 --- a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc @@ -3,6 +3,6 @@ SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone4 SetEntitySpeed 0x0100 WalkNorth 0x0008 SetSyncFlag 0x00000400 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc index 81855968..2e9cc5ce 100644 --- a/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc +++ b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc @@ -9,6 +9,6 @@ SCRIPT_START script_PlayerAtVillageIntro _0807EDD4 0x0208, 0x0340 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 429a13fd..6269f54b 100644 --- a/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerAtVaatisAppearance SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 253e6517..88e9a2fd 100644 --- a/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerDefeatedMoblins SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc b/data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc index 77508e79..79a68621 100644 --- a/data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc +++ b/data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc @@ -1,5 +1,5 @@ @ Player Outside Castle after Ezlo explanation after ezlo cutscene SCRIPT_START script_PlayerReceivedExposition DoPostScriptAction 0x0015 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc index 1418123b..f2290db0 100644 --- a/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc +++ b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerSeenOriginStory SetAnimationState 0x0006 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc index 26d0e170..ce5801a1 100644 --- a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc +++ b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc @@ -10,6 +10,6 @@ SCRIPT_START script_PlayerStoneWallsAppear Wait 0x000a SetAnimationState 0x0004 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index f6eb5063..42f14dc0 100644 --- a/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerTryToFollowVaati SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index 8c2918ff..1959b1e5 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerAtEzlo SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc index fc956c5a..3b87ff9f 100644 --- a/data/scripts/cutscene/outro/script_PlayerAtOutro.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc @@ -10,5 +10,5 @@ SCRIPT_START script_PlayerAtOutro SetAnimationState 0x0006 Wait 0x000a SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc index 96af6e03..ab1e3e4c 100644 --- a/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc +++ b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc @@ -22,5 +22,5 @@ SCRIPT_START script_PlayerGetGreenCap SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc index b10a0ba5..dc408d43 100644 --- a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc +++ b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc @@ -7,4 +7,4 @@ SCRIPT_START script_PlayerSayGoodbye SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal diff --git a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index f7760051..106508d6 100644 --- a/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerAtPicture SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc index c44f1f6c..f3523b3d 100644 --- a/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc +++ b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc @@ -9,6 +9,6 @@ SCRIPT_START script_PlayerDistanceFromVaati DoPostScriptAction 0x0000 DoPostScriptAction 0x000c SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc index b40b2b9e..6593d60f 100644 --- a/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc +++ b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc @@ -12,6 +12,6 @@ SCRIPT_START script_PlayerFaintAgain _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc index b2af1dd9..5497e87e 100644 --- a/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc +++ b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerMoveToPicture WalkNorth 0x0020 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index 034b3197..c7689ff9 100644 --- a/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -16,5 +16,5 @@ SCRIPT_START script_PlayerAtTakeover SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000100 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc index ee4b78c3..3d9de90b 100644 --- a/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc +++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc @@ -9,6 +9,6 @@ SCRIPT_START script_PlayerAfterDefeatingV2 WalkSouth 0x0010 DoPostScriptAction 0x000c SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_PlayerAtDarkNut1.inc b/data/scripts/dhc/script_PlayerAtDarkNut1.inc index e37bcc9a..ad302065 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut1.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut1.inc @@ -11,5 +11,5 @@ SCRIPT_START script_PlayerAtDarkNut1 DoPostScriptAction 0x0001 Call sub_080752AC EnablePlayerControl - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut2.inc b/data/scripts/dhc/script_PlayerAtDarkNut2.inc index 60ee6ace..975bc5a2 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut2.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut2.inc @@ -11,5 +11,5 @@ SCRIPT_START script_PlayerAtDarkNut2 DoPostScriptAction 0x0001 Call sub_080752AC EnablePlayerControl - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerAtDarkNut3.inc b/data/scripts/dhc/script_PlayerAtDarkNut3.inc index b092a4c7..698c4108 100644 --- a/data/scripts/dhc/script_PlayerAtDarkNut3.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut3.inc @@ -11,5 +11,5 @@ SCRIPT_START script_PlayerAtDarkNut3 DoPostScriptAction 0x0001 Call sub_080752AC EnablePlayerControl - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleCollapsing.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc index 509a5e68..5ee0ccfe 100644 --- a/data/scripts/dhc/script_PlayerCastleCollapsing.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerCastleCollapsing DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerCastleEscape.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc index 5f57f7d8..45468213 100644 --- a/data/scripts/dhc/script_PlayerCastleEscape.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerCastleEscape SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerRescuedZelda.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc index 66d6d108..b792296a 100644 --- a/data/scripts/dhc/script_PlayerRescuedZelda.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerRescuedZelda SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_PlayerStonesFall.inc b/data/scripts/dhc/script_PlayerStonesFall.inc index 12ba8a9d..538adc2a 100644 --- a/data/scripts/dhc/script_PlayerStonesFall.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -6,5 +6,5 @@ SCRIPT_START script_PlayerStonesFall CallWithArg SetPlayerAnimation2, 0x000003c5 Call WaitForPlayerFrameHiBit SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/dhc/script_PlayerV2Defeated.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc index 33f6d785..f16621e5 100644 --- a/data/scripts/dhc/script_PlayerV2Defeated.inc +++ b/data/scripts/dhc/script_PlayerV2Defeated.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerV2Defeated DoPostScriptAction 0x0001 _0807EDD4 0x00a8, 0x002c SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index cbb2b2d3..99931985 100644 --- a/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -12,5 +12,5 @@ SCRIPT_START script_PlayerAtGraveyardHouseDoor DoPostScriptAction 0x000d SetEntitySpeed 0x0100 WalkSouth 0x0010 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/graveyard/script_PlayerAtKingGustav.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc index d2f7d3bd..96b9a99e 100644 --- a/data/scripts/graveyard/script_PlayerAtKingGustav.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerAtKingGustav SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc index 6133e319..bad5627b 100644 --- a/data/scripts/graveyard/script_PlayerGetKeyStolen.inc +++ b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc @@ -16,6 +16,6 @@ SCRIPT_START script_PlayerGetKeyStolen _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 SetSyncFlag 0x00000040 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc index 96b1b07b..6e931df0 100644 --- a/data/scripts/hyruleTown/script_Anju.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -45,7 +45,7 @@ script_080101AC: DoFade5 WaitForFadeFinish CallWithArg SetPlayerPos, 0x03400378 - Call sub_080791BC + Call SetPlayerActionNormal Call sub_0807FB74 _0807E8E4_1 Call SetPlayerCollisionLayer1 diff --git a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc index da2b3e4f..5580f5d1 100644 --- a/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc +++ b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc @@ -11,6 +11,6 @@ SCRIPT_START script_PlayerActivatedTrapCard DoPostScriptAction 0x0005 Wait 0x003c SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc index bcc539a8..1d878f5f 100644 --- a/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtDrLeftDoor DoPostScriptAction 0x0001 WalkSouth 0x0008 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc index 25411c1b..adef60a5 100644 --- a/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc +++ b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerAtInnDoor SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc index e7ef3883..581e1839 100644 --- a/data/scripts/hyruleTown/script_PlayerCannotEnter.inc +++ b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerCannotEnter SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc index 53d68d84..c432019d 100644 --- a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc +++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc @@ -15,6 +15,6 @@ script_08010A78: DoPostScriptAction 0x0014 EnablePlayerControl Call sub_0807DF50 - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index 261a7afb..bc6ae225 100644 --- a/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerStepOnTrap _0807EDD4 0x0078, 0x0080 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/hyruleTown/script_TownMinish5.inc b/data/scripts/hyruleTown/script_TownMinish5.inc index b69a9b3b..d4ae341c 100644 --- a/data/scripts/hyruleTown/script_TownMinish5.inc +++ b/data/scripts/hyruleTown/script_TownMinish5.inc @@ -60,5 +60,5 @@ script_0800EEFE: MessageFromTarget 0x4c09 WaitUntilTextboxCloses SetSyncFlag 0x00000048 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/lakeHylia/script_PlayerAfterToD.inc b/data/scripts/lakeHylia/script_PlayerAfterToD.inc index 8ad9a855..d53540ad 100644 --- a/data/scripts/lakeHylia/script_PlayerAfterToD.inc +++ b/data/scripts/lakeHylia/script_PlayerAfterToD.inc @@ -6,6 +6,6 @@ SCRIPT_START script_PlayerAfterToD DoPostScriptAction 0x0004 Wait 0x003c SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc index aa830e48..89e06331 100644 --- a/data/scripts/minishWoods/script_PlayerAtBombMinish.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -9,5 +9,5 @@ SCRIPT_START script_PlayerAtBombMinish Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/minishWoods/script_PlayerAtFestari.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc index 90ad2c76..ac2f94c3 100644 --- a/data/scripts/minishWoods/script_PlayerAtFestari.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerAtFestari Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/minishWoods/script_PlayerAtGentari.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc index 9e6468d3..0804180c 100644 --- a/data/scripts/minishWoods/script_PlayerAtGentari.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -9,5 +9,5 @@ SCRIPT_START script_PlayerAtGentari Wait 0x000f DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc index 4c48cc9f..b2fd8ee9 100644 --- a/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc +++ b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc @@ -12,5 +12,5 @@ SCRIPT_START script_PlayerAtMadderpillar DoPostScriptAction 0x0001 Call sub_080752AC EnablePlayerControl - Call sub_080791D0 + Call ResetPlayerAnimationAndAction SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerAtMelari.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc index 82b3248e..b4560caa 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMelari.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerAtMelari SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc index 0fda5e29..1d3e1947 100644 --- a/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerAtMountainMinishExit DoPostScriptAction 0x000d WalkSouth 0x0020 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc index 10eed28e..6c1f1237 100644 --- a/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc +++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerGetWhiteSword MessageNoOverlap 0x0502 WaitUntilTextboxCloses SetSyncFlag 0x00000008 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index 804412ab..fad1fc4f 100644 --- a/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerPlaceBrokenSword SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000008 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/npc/script_PlayerAtBladeBrothers.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc index d2025632..319170e6 100644 --- a/data/scripts/npc/script_PlayerAtBladeBrothers.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -5,5 +5,5 @@ SCRIPT_START script_PlayerAtBladeBrothers SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index 9a57f37f..36e26a82 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -60,7 +60,7 @@ script_080138D0: StartPlayerScript script_PlayerPickUpFinalSword SetSyncFlag 0x00000080 _0807F078 0x0006, 0x0001 - Call sub_0807AEE4 + Call UpdatePlayerSkills Call sub_0806DC3C Call sub_0806DC58 Call WaitForPlayerFrameHiBit diff --git a/data/scripts/sanctuary/script_PlayerAtPedestal.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc index 0f82e0a9..6f85106d 100644 --- a/data/scripts/sanctuary/script_PlayerAtPedestal.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -14,5 +14,5 @@ script_08013704: SetAnimationState 0x0004 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index b6c21762..69391d04 100644 --- a/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerAtSanctuaryEntrance DoPostScriptAction 0x0000 Wait 0x001e SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc index fd4063b1..a8148e96 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc @@ -9,5 +9,5 @@ SCRIPT_START script_PlayerPickUpFinalSword Call WaitForPlayerFrameHiBit Wait 0x0078 WaitForSyncFlagAndClear 0x00040000 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerPickUpSword.inc b/data/scripts/sanctuary/script_PlayerPickUpSword.inc index 0523c018..ca4a3ea3 100644 --- a/data/scripts/sanctuary/script_PlayerPickUpSword.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpSword.inc @@ -8,6 +8,6 @@ SCRIPT_START script_PlayerPickUpSword Call WaitForPlayerFrameHiBit Wait 0x0078 WaitForSyncFlagAndClear 0x00040000 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_PlayerSanctuary.inc b/data/scripts/sanctuary/script_PlayerSanctuary.inc index 05672507..0f2d0fee 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuary.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuary.inc @@ -7,6 +7,6 @@ SCRIPT_START script_PlayerSanctuary SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc index 9ea5a652..a71e0f6b 100644 --- a/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc @@ -5,5 +5,5 @@ SCRIPT_START script_PlayerSanctuaryIntro SetEntityPositionRelative 0x0098, 0x0070 EndBlock SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 77e9fc90..516cef54 100644 --- a/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerTextBoardAppears SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000002 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/unused/script_0800FB2C.inc b/data/scripts/unused/script_0800FB2C.inc index ec0ad048..1da1d47c 100644 --- a/data/scripts/unused/script_0800FB2C.inc +++ b/data/scripts/unused/script_0800FB2C.inc @@ -3,6 +3,6 @@ SCRIPT_START script_0800FB2C SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08012B24.inc b/data/scripts/unused/script_08012B24.inc index 5483ab0b..5691eba9 100644 --- a/data/scripts/unused/script_08012B24.inc +++ b/data/scripts/unused/script_08012B24.inc @@ -8,5 +8,5 @@ SCRIPT_START script_08012B24 WalkSouth 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/unused/script_08012B50.inc b/data/scripts/unused/script_08012B50.inc index a7a3f781..8fb1d22f 100644 --- a/data/scripts/unused/script_08012B50.inc +++ b/data/scripts/unused/script_08012B50.inc @@ -8,5 +8,5 @@ SCRIPT_START script_08012B50 WalkNorth 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/unused/script_08012B7C.inc b/data/scripts/unused/script_08012B7C.inc index 50328e8a..525c228e 100644 --- a/data/scripts/unused/script_08012B7C.inc +++ b/data/scripts/unused/script_08012B7C.inc @@ -8,5 +8,5 @@ SCRIPT_START script_08012B7C WalkEast 0x0008 SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END diff --git a/data/scripts/unused/script_08013D04.inc b/data/scripts/unused/script_08013D04.inc index 276d2f05..42887fa3 100644 --- a/data/scripts/unused/script_08013D04.inc +++ b/data/scripts/unused/script_08013D04.inc @@ -11,7 +11,7 @@ script_08013D1C: CallWithArg sub_08095D54, 0x00000000 PlaySound SFX_ELEMENT_PLACE SetSyncFlag 0x08000000 - Call sub_080791BC + Call SetPlayerActionNormal DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08013D44.inc b/data/scripts/unused/script_08013D44.inc index e375acd4..98c44d0d 100644 --- a/data/scripts/unused/script_08013D44.inc +++ b/data/scripts/unused/script_08013D44.inc @@ -11,7 +11,7 @@ script_08013D5C: CallWithArg sub_08095D54, 0x00000001 PlaySound SFX_ELEMENT_PLACE SetSyncFlag 0x10000000 - Call sub_080791BC + Call SetPlayerActionNormal DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08013D84.inc b/data/scripts/unused/script_08013D84.inc index 53a064ac..bc67ff99 100644 --- a/data/scripts/unused/script_08013D84.inc +++ b/data/scripts/unused/script_08013D84.inc @@ -11,7 +11,7 @@ script_08013D9C: CallWithArg sub_08095D54, 0x00000002 PlaySound SFX_ELEMENT_PLACE SetSyncFlag 0x20000000 - Call sub_080791BC + Call SetPlayerActionNormal DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08013DC4.inc b/data/scripts/unused/script_08013DC4.inc index 62c876c7..ac92c6db 100644 --- a/data/scripts/unused/script_08013DC4.inc +++ b/data/scripts/unused/script_08013DC4.inc @@ -11,7 +11,7 @@ script_08013DDC: CallWithArg sub_08095D54, 0x00000003 PlaySound SFX_ELEMENT_PLACE SetSyncFlag 0x40000000 - Call sub_080791BC + Call SetPlayerActionNormal DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08015A7C.inc b/data/scripts/unused/script_08015A7C.inc index 870e0b9d..babfa3f5 100644 --- a/data/scripts/unused/script_08015A7C.inc +++ b/data/scripts/unused/script_08015A7C.inc @@ -6,6 +6,6 @@ SCRIPT_START script_08015A7C SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/unused/script_08015AA0.inc b/data/scripts/unused/script_08015AA0.inc index 746324a2..460df964 100644 --- a/data/scripts/unused/script_08015AA0.inc +++ b/data/scripts/unused/script_08015AA0.inc @@ -6,6 +6,6 @@ SCRIPT_START script_08015AA0 SetAnimationState 0x0002 DoPostScriptAction 0x0000 SetSyncFlag 0x00000004 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/windRuins/script_PlayerAtTextboard.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc index b8b909df..c85f6145 100644 --- a/data/scripts/windRuins/script_PlayerAtTextboard.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -8,5 +8,5 @@ SCRIPT_START script_PlayerAtTextboard SetAnimationState 0x0000 DoPostScriptAction 0x0000 SetSyncFlag 0x00000001 - Call sub_080791BC + Call SetPlayerActionNormal SCRIPT_END -- cgit v1.2.3