diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-03-28 12:20:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-28 12:20:12 -0700 |
| commit | 270476488f5beee2fec7bf0b8b160cb72cbade70 (patch) | |
| tree | 2bbfce5aa06af9a5fc6de395fbb72c1e5c960f82 /data/scripts | |
| parent | 2043b59ec67320aad5008d35cbd6be1511de1f75 (diff) | |
| parent | bfa69f594ce38e34ab3bcc9fb51ec45edae044d8 (diff) | |
Merge pull request #474 from notyourav/fnsfns
identify some player util funds
Diffstat (limited to 'data/scripts')
8 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc index 9ab8427f..5dea3e4d 100644 --- a/data/scripts/castorWilds/script_GreatFairyRupees.inc +++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc @@ -8,7 +8,7 @@ script_0800B6CC: script_0800B6D4: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B6D4 - Call sub_08079184 + Call PlayerDropHeldObject SetPlayerIdle Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy diff --git a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc index 1c974574..c09e6ed0 100644 --- a/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc +++ b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc @@ -13,5 +13,5 @@ SCRIPT_START script_PlayerAtDarknutFight LoadRoomEntityList gUnk_080DA260 Wait 0x001e SetSyncFlag 0x00000001 - Call sub_0807921C + Call PlayerSetNormalAndCollide SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_Object69Intro.inc b/data/scripts/cutscene/intro/script_Object69Intro.inc index 1e643580..9fe815c9 100644 --- a/data/scripts/cutscene/intro/script_Object69Intro.inc +++ b/data/scripts/cutscene/intro/script_Object69Intro.inc @@ -12,5 +12,5 @@ SCRIPT_START script_Object69Intro SetGlobalFlag 0x001c Call sub_0807DF50 EnablePlayerControl - Call sub_0807921C + Call PlayerSetNormalAndCollide SCRIPT_END diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc index c032efd8..24b6ba6f 100644 --- a/data/scripts/graveyard/script_GreatFairyArrows.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -5,7 +5,7 @@ SCRIPT_START script_GreatFairyArrows script_0800B618: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B618 - Call sub_08079184 + Call PlayerDropHeldObject SetPlayerIdle Call WaitForPlayerNormal StartPlayerScript script_PlayerAtGreatFairy diff --git a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc index 68bd0226..1b37c9d3 100644 --- a/data/scripts/hyruleTown/script_PlayerAtCarlov.inc +++ b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerAtCarlov DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000001 - Call sub_0807921C + Call PlayerSetNormalAndCollide SCRIPT_END diff --git a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc index be67e071..9e17ee23 100644 --- a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc +++ b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc @@ -7,5 +7,5 @@ SCRIPT_START script_PlayerWhenLeavingCarlovAlreadyPaid DoPostScriptAction 0x0000 Wait 0x0010 SetSyncFlag 0x00000002 - Call sub_0807921C + Call PlayerSetNormalAndCollide SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_MalonLostKey.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc index 664c68c2..07d170b8 100644 --- a/data/scripts/lonLonRanch/script_MalonLostKey.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -40,7 +40,7 @@ script_0800B4F0: Wait 0x001e SetSyncFlag 0x00000010 SetGlobalFlag 0x001d - Call sub_0807921C + Call PlayerSetNormalAndCollide EnablePlayerControl Call sub_0807FBCC DoPostScriptAction 0x0006 diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc index bfde8c90..828ff5c0 100644 --- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -5,7 +5,7 @@ SCRIPT_START script_GreatFairyBombs script_0800B734: Call sub_0808747C JumpIfNot script_0800B734 - Call sub_08079184 + Call PlayerDropHeldObject SetPlayerIdle Wait 0x000a Call WaitForPlayerNormal |