diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc index cbd342aa..10e0f160 100644 --- a/data/scripts/cloudTops/script_GregalHealthy.inc +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -1,7 +1,7 @@ @ Cloud Tops Gregal healthy SCRIPT_START script_GregalHealthy BeginBlock - Call sub_0806CD58 + Call Gregal_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 SetAnimation 0x0006 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc index 126ad33e..b5245520 100644 --- a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -7,7 +7,7 @@ SCRIPT_START script_Npc4EFirstCloud DoPostScriptAction 0x0008 Call sub_0806DAAC JumpIf script_0800D6AE - Call sub_0806DAD0 + Call NPC4E_MakeFuserInteractable CallWithArg sub_0806DA04, 0x00000002 EndBlock script_0800D636: diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc index ba0c3e98..55efc778 100644 --- a/data/scripts/cloudTops/script_Siroc.inc +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -1,7 +1,7 @@ @ Cloud Tops Windtribespeople Leader Siroc SCRIPT_START script_Siroc BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08014AD2: diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc index 4b962633..e39b027f 100644 --- a/data/scripts/cloudTops/script_WindTribespeople1.inc +++ b/data/scripts/cloudTops/script_WindTribespeople1.inc @@ -1,7 +1,7 @@ @ Cloud Tops WindTribespeople blocking exit SCRIPT_START script_WindTribespeople1 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a CheckGlobalFlag WARP_EVENT_END JumpIf script_08014976 diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc index 37a99ee1..3eb9d71b 100644 --- a/data/scripts/cloudTops/script_WindTribespeople2.inc +++ b/data/scripts/cloudTops/script_WindTribespeople2.inc @@ -1,7 +1,7 @@ @ Cloud Top Windtribespeople woman on first floor SCRIPT_START script_WindTribespeople2 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a CheckGlobalFlag WARP_EVENT_END JumpIfNot script_080149C6 diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc index 84c60935..ba5b01cc 100644 --- a/data/scripts/cloudTops/script_WindTribespeople3.inc +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -2,7 +2,7 @@ SCRIPT_START script_WindTribespeople3 BeginBlock SetEntitySpeed 0x0080 - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_080149DE: diff --git a/data/scripts/cloudTops/script_WindTribespeople4.inc b/data/scripts/cloudTops/script_WindTribespeople4.inc index ba6fb854..33f31fe1 100644 --- a/data/scripts/cloudTops/script_WindTribespeople4.inc +++ b/data/scripts/cloudTops/script_WindTribespeople4.inc @@ -1,7 +1,7 @@ @ Cloud Tops Windtribespeople blocking way up SCRIPT_START script_WindTribespeople4 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08014A36: diff --git a/data/scripts/cloudTops/script_WindTribespeople5.inc b/data/scripts/cloudTops/script_WindTribespeople5.inc index 698f9bb2..cb93bd49 100644 --- a/data/scripts/cloudTops/script_WindTribespeople5.inc +++ b/data/scripts/cloudTops/script_WindTribespeople5.inc @@ -1,7 +1,7 @@ @ Cloud Tops Windtribespeople at the bed SCRIPT_START script_WindTribespeople5 BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08014A62: diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc index 36fc4fed..eb33c128 100644 --- a/data/scripts/cloudTops/script_WindTribespeople7.inc +++ b/data/scripts/cloudTops/script_WindTribespeople7.inc @@ -3,7 +3,7 @@ SCRIPT_START script_WindTribespeople7 BeginBlock CheckGlobalFlag KUMOTATSUMAKI JumpIf script_08014CD4 - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a DoPostScriptAction 0x0000 EndBlock diff --git a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index fa1a008d..101f2432 100644 --- a/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -17,7 +17,7 @@ SCRIPT_START script_HurdyGurdyManFirstKinstone _0807E8E4_0 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 - Call sub_0806E440 + Call HurdyGurdyMan_MakeInteractable Wait 0x0078 SetSyncFlag 0x00000040 WaitForSyncFlagAndClear 0x00000002 diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc index b4fa78a8..d09d7a9b 100644 --- a/data/scripts/dhc/script_MinishterPothoStone.inc +++ b/data/scripts/dhc/script_MinishterPothoStone.inc @@ -32,7 +32,7 @@ script_0800E0DE: WaitUntilTextboxCloses SetLocalFlag 0x0093 script_0800E12E: - Call sub_080668F0 + Call MinisterPotho_MakeInteractable EnablePlayerControl EndBlock script_0800E138: diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc index 4fabc7ad..428097ae 100644 --- a/data/scripts/dhc/script_MinisterPothoCell.inc +++ b/data/scripts/dhc/script_MinisterPothoCell.inc @@ -3,7 +3,7 @@ SCRIPT_START script_MinisterPothoCell BeginBlock SetAnimationState 0x0002 DoPostScriptAction 0x000a - Call sub_080668F0 + Call MinisterPotho_MakeInteractable EndBlock script_0800E41A: CheckEntityInteractType diff --git a/data/scripts/graveyard/script_DampeInside2.inc b/data/scripts/graveyard/script_DampeInside2.inc index fba10fd3..eb800d94 100644 --- a/data/scripts/graveyard/script_DampeInside2.inc +++ b/data/scripts/graveyard/script_DampeInside2.inc @@ -1,7 +1,7 @@ @ Graveyard Dampe in house 2? SCRIPT_START script_DampeInside2 BeginBlock - Call sub_0806BE3C + Call Dampe_MakeInteractable DoPostScriptAction 0x000a DoPostScriptAction 0x0007 EndBlock diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc index b1cede54..ff39fe74 100644 --- a/data/scripts/graveyard/script_DampeOuside.inc +++ b/data/scripts/graveyard/script_DampeOuside.inc @@ -14,7 +14,7 @@ script_08009646: Call sub_0806BF44 JumpIf script_08009646 EndBlock - Call sub_0806BE3C + Call Dampe_MakeInteractable DoPostScriptAction 0x000a DoPostScriptAction 0x0007 script_08009660: diff --git a/data/scripts/graveyard/script_GhostBrothers.inc b/data/scripts/graveyard/script_GhostBrothers.inc index b9fed2f1..5f9c6d81 100644 --- a/data/scripts/graveyard/script_GhostBrothers.inc +++ b/data/scripts/graveyard/script_GhostBrothers.inc @@ -1,7 +1,7 @@ @ Graveyard GhostBrothers SCRIPT_START script_GhostBrothers BeginBlock - Call sub_08065D00 + Call GhostBrothers_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleCastle/script_KingDaltus.inc b/data/scripts/hyruleCastle/script_KingDaltus.inc index 09965292..d62653a3 100644 --- a/data/scripts/hyruleCastle/script_KingDaltus.inc +++ b/data/scripts/hyruleCastle/script_KingDaltus.inc @@ -3,7 +3,7 @@ SCRIPT_START script_KingDaltus BeginBlock SetAnimationState 0x0004 DoPostScriptAction 0x0000 - Call sub_0806672C + Call KingDaltus_MakeInteractable DoPostScriptAction 0x000a EndBlock Jump script_0800917C diff --git a/data/scripts/hyruleCastle/script_MinisterPotho.inc b/data/scripts/hyruleCastle/script_MinisterPotho.inc index 6bd64932..a5b4e11c 100644 --- a/data/scripts/hyruleCastle/script_MinisterPotho.inc +++ b/data/scripts/hyruleCastle/script_MinisterPotho.inc @@ -4,7 +4,7 @@ SCRIPT_START script_MinisterPotho SetAnimationState 0x0004 DoPostScriptAction 0x0000 script_0800927E: - Call sub_080668F0 + Call MinisterPotho_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800928A: diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc index 09bf74c8..bf743b41 100644 --- a/data/scripts/hyruleTown/script_Anju.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Anju BeginBlock DoPostScriptAction 0x0001 - Call sub_0806C354 + Call Anju_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0801015A: diff --git a/data/scripts/hyruleTown/script_Brocco.inc b/data/scripts/hyruleTown/script_Brocco.inc index f01bc951..3637207a 100644 --- a/data/scripts/hyruleTown/script_Brocco.inc +++ b/data/scripts/hyruleTown/script_Brocco.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Brocco BeginBlock SetAnimationState 0x0004 SetAnimation 0x0000 - Call sub_080636F4 + Call Brocco_MakeInteractable DoPostScriptAction 0x000a Call SetPriorityMessage EndBlock diff --git a/data/scripts/hyruleTown/script_Carpenter.inc b/data/scripts/hyruleTown/script_Carpenter.inc index 9a29615b..3358f344 100644 --- a/data/scripts/hyruleTown/script_Carpenter.inc +++ b/data/scripts/hyruleTown/script_Carpenter.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Carpenter SetAnimationState 0x0004 CallWithArg sub_080672B0, 0x00000000 DoPostScriptAction 0x000a - Call sub_08067314 + Call Carpenter_MakeInteractable EndBlock script_08010AB4: CheckEntityInteractType diff --git a/data/scripts/hyruleTown/script_CatPerson.inc b/data/scripts/hyruleTown/script_CatPerson.inc index 73cfba96..975ff68d 100644 --- a/data/scripts/hyruleTown/script_CatPerson.inc +++ b/data/scripts/hyruleTown/script_CatPerson.inc @@ -1,7 +1,7 @@ @ Hyrule Townsperson house with cat SCRIPT_START script_CatPerson BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 Call sub_08061FD8 diff --git a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc index f81c9e64..2ef2df5a 100644 --- a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc +++ b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc @@ -1,7 +1,7 @@ @ Hyrule Town Cat person talking to Dog person SCRIPT_START script_CatPersonTalkingToDogPerson BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0002 Call sub_08061FD8 diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc index 3382477f..64cce82b 100644 --- a/data/scripts/hyruleTown/script_Din.inc +++ b/data/scripts/hyruleTown/script_Din.inc @@ -1,7 +1,7 @@ @ Hyrule Town Din SCRIPT_START script_Din BeginBlock - Call sub_08064828 + Call Din_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc index cf4f02a1..19993357 100644 --- a/data/scripts/hyruleTown/script_Din2.inc +++ b/data/scripts/hyruleTown/script_Din2.inc @@ -1,7 +1,7 @@ @ Hyrule Town Din when one of them has moved in SCRIPT_START script_Din2 BeginBlock - Call sub_08064828 + Call Din_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_DinAlone.inc b/data/scripts/hyruleTown/script_DinAlone.inc index 61ddd2c3..1e035f0a 100644 --- a/data/scripts/hyruleTown/script_DinAlone.inc +++ b/data/scripts/hyruleTown/script_DinAlone.inc @@ -1,7 +1,7 @@ @ Din completely alone SCRIPT_START script_DinAlone BeginBlock - Call sub_08064828 + Call Din_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc index 578f3182..e4b269a1 100644 --- a/data/scripts/hyruleTown/script_DinMovedIn.inc +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -1,7 +1,7 @@ @ Hyrule Town Din moved in SCRIPT_START script_DinMovedIn BeginBlock - Call sub_08064828 + Call Din_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc index 2cc56734..ddb3beef 100644 --- a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc +++ b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc @@ -1,7 +1,7 @@ @ Hyrule Town Dog person talking to Cat person SCRIPT_START script_DogPersonInCatHouse BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0006 Call sub_08061FD8 @@ -19,7 +19,7 @@ script_0800EB7C: Call sub_08061FD8 Jump script_0800EB7C BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0002 Call sub_08061FD8 diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc index 3477a9fb..5fc0a12b 100644 --- a/data/scripts/hyruleTown/script_Farore.inc +++ b/data/scripts/hyruleTown/script_Farore.inc @@ -1,7 +1,7 @@ @ Hyrule Town Farore SCRIPT_START script_Farore BeginBlock - Call sub_08064A28 + Call Farore_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc index 0f3e9303..252b83c8 100644 --- a/data/scripts/hyruleTown/script_Farore2.inc +++ b/data/scripts/hyruleTown/script_Farore2.inc @@ -1,7 +1,7 @@ @ Hyrule Town Farore when one of them has moved in SCRIPT_START script_Farore2 BeginBlock - Call sub_08064A28 + Call Farore_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_FaroreAlone.inc b/data/scripts/hyruleTown/script_FaroreAlone.inc index 03a869de..30b0b454 100644 --- a/data/scripts/hyruleTown/script_FaroreAlone.inc +++ b/data/scripts/hyruleTown/script_FaroreAlone.inc @@ -1,7 +1,7 @@ @ Farore completely alone SCRIPT_START script_FaroreAlone BeginBlock - Call sub_08064A28 + Call Farore_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc index 1ea10abe..5437e6ef 100644 --- a/data/scripts/hyruleTown/script_FaroreMovedIn.inc +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -1,7 +1,7 @@ @ Farore moved in SCRIPT_START script_FaroreMovedIn BeginBlock - Call sub_08064A28 + Call Farore_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_ForestMinish11.inc b/data/scripts/hyruleTown/script_ForestMinish11.inc index 9d5214c7..48fed47e 100644 --- a/data/scripts/hyruleTown/script_ForestMinish11.inc +++ b/data/scripts/hyruleTown/script_ForestMinish11.inc @@ -1,7 +1,7 @@ @ Forest Minish above cafe SCRIPT_START script_ForestMinish11 BeginBlock - Call sub_08060090 + Call ForestMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800E6BE: diff --git a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc index 7daf6e2c..1ebc20b4 100644 --- a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc +++ b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc @@ -4,7 +4,7 @@ SCRIPT_START script_HurdyGurdyMan DoPostScriptAction 0x000a SetAnimationState 0x0004 SetAnimation 0x0008 - Call sub_0806E440 + Call HurdyGurdyMan_MakeInteractable EndBlock script_08010BCA: CheckEntityInteractType diff --git a/data/scripts/hyruleTown/script_Kid1.inc b/data/scripts/hyruleTown/script_Kid1.inc index 732289b5..1b1af5dd 100644 --- a/data/scripts/hyruleTown/script_Kid1.inc +++ b/data/scripts/hyruleTown/script_Kid1.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Kid1 BeginBlock DoPostScriptAction 0x0000 - Call sub_08062A48 + Call Kid_MakeInteractable DoPostScriptAction 0x000a EndBlock script_080102A6: diff --git a/data/scripts/hyruleTown/script_Kid2.inc b/data/scripts/hyruleTown/script_Kid2.inc index 65a9125b..a0c65639 100644 --- a/data/scripts/hyruleTown/script_Kid2.inc +++ b/data/scripts/hyruleTown/script_Kid2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Kid2 BeginBlock DoPostScriptAction 0x0000 - Call sub_08062A48 + Call Kid_MakeInteractable DoPostScriptAction 0x000a EndBlock script_080102F2: diff --git a/data/scripts/hyruleTown/script_Kid4.inc b/data/scripts/hyruleTown/script_Kid4.inc index da188edd..4b15c564 100644 --- a/data/scripts/hyruleTown/script_Kid4.inc +++ b/data/scripts/hyruleTown/script_Kid4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Kid4 BeginBlock DoPostScriptAction 0x0000 - Call sub_08062A48 + Call Kid_MakeInteractable DoPostScriptAction 0x000a EndBlock script_080103C2: diff --git a/data/scripts/hyruleTown/script_Kid5.inc b/data/scripts/hyruleTown/script_Kid5.inc index 4465b197..ac7006a4 100644 --- a/data/scripts/hyruleTown/script_Kid5.inc +++ b/data/scripts/hyruleTown/script_Kid5.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Kid5 BeginBlock SetAnimation 0x0008 script_08010622: - Call sub_08062A48 + Call Kid_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0801062E: diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc index 43a709a2..1ba953ad 100644 --- a/data/scripts/hyruleTown/script_KidInn.inc +++ b/data/scripts/hyruleTown/script_KidInn.inc @@ -2,7 +2,7 @@ SCRIPT_START script_KidInn BeginBlock DoPostScriptAction 0x000a - Call sub_08062A48 + Call Kid_MakeInteractable DoPostScriptAction 0x0000 script_0800D5AC: EndBlock diff --git a/data/scripts/hyruleTown/script_LibraryVisitor.inc b/data/scripts/hyruleTown/script_LibraryVisitor.inc index 1d0d7132..680ac8e4 100644 --- a/data/scripts/hyruleTown/script_LibraryVisitor.inc +++ b/data/scripts/hyruleTown/script_LibraryVisitor.inc @@ -2,7 +2,7 @@ SCRIPT_START script_LibraryVisitor BeginBlock Call sub_08061FD8 - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08008DA0: diff --git a/data/scripts/hyruleTown/script_Mama.inc b/data/scripts/hyruleTown/script_Mama.inc index c286a0d2..f8ab1a20 100644 --- a/data/scripts/hyruleTown/script_Mama.inc +++ b/data/scripts/hyruleTown/script_Mama.inc @@ -1,7 +1,7 @@ @ Hyrule Town Mama SCRIPT_START script_Mama BeginBlock - Call sub_0806C4F8 + Call Mama_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0000 EndBlock diff --git a/data/scripts/hyruleTown/script_Mayor.inc b/data/scripts/hyruleTown/script_Mayor.inc index 1761b2cf..5b04586a 100644 --- a/data/scripts/hyruleTown/script_Mayor.inc +++ b/data/scripts/hyruleTown/script_Mayor.inc @@ -1,7 +1,7 @@ @ Hyrule Town Mayor Hagen SCRIPT_START script_Mayor BeginBlock - Call sub_0806CE5C + Call MayorHagen_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 SetAnimation 0x0008 diff --git a/data/scripts/hyruleTown/script_MutohInMill.inc b/data/scripts/hyruleTown/script_MutohInMill.inc index ee10eeba..ef84ee3e 100644 --- a/data/scripts/hyruleTown/script_MutohInMill.inc +++ b/data/scripts/hyruleTown/script_MutohInMill.inc @@ -1,7 +1,7 @@ @ Hyrule Town Mutoh SCRIPT_START script_MutohInMill BeginBlock - Call sub_08067100 + Call Mutoh_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc index e311efcc..6798b860 100644 --- a/data/scripts/hyruleTown/script_Nayru.inc +++ b/data/scripts/hyruleTown/script_Nayru.inc @@ -1,7 +1,7 @@ @ Hyrule Town Nayru SCRIPT_START script_Nayru BeginBlock - Call sub_08064928 + Call Nayru_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc index ab085b28..b4555057 100644 --- a/data/scripts/hyruleTown/script_Nayru2.inc +++ b/data/scripts/hyruleTown/script_Nayru2.inc @@ -1,7 +1,7 @@ @ Hyrule Town Nayru when one of them has moved in SCRIPT_START script_Nayru2 BeginBlock - Call sub_08064928 + Call Nayru_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_NayruAlone.inc b/data/scripts/hyruleTown/script_NayruAlone.inc index 6fbd687d..9b72c947 100644 --- a/data/scripts/hyruleTown/script_NayruAlone.inc +++ b/data/scripts/hyruleTown/script_NayruAlone.inc @@ -1,7 +1,7 @@ @ Nayru completely alone SCRIPT_START script_NayruAlone BeginBlock - Call sub_08064928 + Call Nayru_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc index 8a143338..50645ef0 100644 --- a/data/scripts/hyruleTown/script_NayruMovedIn.inc +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -1,7 +1,7 @@ @ Nayru moved in SCRIPT_START script_NayruMovedIn BeginBlock - Call sub_08064928 + Call Nayru_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc index c5905a83..3f6dcb4a 100644 --- a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc @@ -1,7 +1,7 @@ @ Older lady in cat persons house SCRIPT_START script_OldLadyCatHouse1 BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 Call sub_08061FD8 diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc index edaf3a11..1c1ce611 100644 --- a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc @@ -1,7 +1,7 @@ @ Older lady in cat persons house SCRIPT_START script_OldLadyCatHouse2 BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0006 Call sub_08061FD8 diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc index 12071bc5..ae6c6ed3 100644 --- a/data/scripts/hyruleTown/script_Phonograph.inc +++ b/data/scripts/hyruleTown/script_Phonograph.inc @@ -1,7 +1,7 @@ @ Phonograph SCRIPT_START script_Phonograph BeginBlock - Call sub_0807F934 + Call MakeCheckableObjectInteractable EndBlock script_0800BA46: CheckEntityInteractType diff --git a/data/scripts/hyruleTown/script_Pina.inc b/data/scripts/hyruleTown/script_Pina.inc index 866ef334..8cfc8f8d 100644 --- a/data/scripts/hyruleTown/script_Pina.inc +++ b/data/scripts/hyruleTown/script_Pina.inc @@ -3,7 +3,7 @@ SCRIPT_START script_Pina BeginBlock SetAnimationState 0x0004 SetAnimation 0x0000 - Call sub_08063CAC + Call Pina_MakeInteractable DoPostScriptAction 0x000a Call SetPriorityMessage EndBlock diff --git a/data/scripts/hyruleTown/script_Postman.inc b/data/scripts/hyruleTown/script_Postman.inc index 1aff3231..36f3a400 100644 --- a/data/scripts/hyruleTown/script_Postman.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -10,7 +10,7 @@ SCRIPT_START script_Postman Call sub_0806075C EndBlock WaitUntilTextboxCloses - Call sub_080606C0 + Call Postman_MakeInteractable script_08010B10: EndBlock Call sub_0806076C diff --git a/data/scripts/hyruleTown/script_Rem.inc b/data/scripts/hyruleTown/script_Rem.inc index fa58f73d..a7384e2a 100644 --- a/data/scripts/hyruleTown/script_Rem.inc +++ b/data/scripts/hyruleTown/script_Rem.inc @@ -1,7 +1,7 @@ @ Hyrule Town Rem SCRIPT_START script_Rem BeginBlock - CallWithArg sub_0806A93C, 0x12345678 + CallWithArg Rem_MakeInteractable, 0x12345678 SetAnimationState 0x0004 SetAnimation 0x0002 CheckInventory1 ITEM_PEGASUS_BOOTS diff --git a/data/scripts/hyruleTown/script_SittingPerson.inc b/data/scripts/hyruleTown/script_SittingPerson.inc index f61560d7..3fecc6df 100644 --- a/data/scripts/hyruleTown/script_SittingPerson.inc +++ b/data/scripts/hyruleTown/script_SittingPerson.inc @@ -1,7 +1,7 @@ @ Hyrule Town SittingPerson SCRIPT_START script_SittingPerson BeginBlock - Call sub_080639D0 + Call SittingPerson_MakeInteractable DoPostScriptAction 0x000a EndBlock BeginBlock diff --git a/data/scripts/hyruleTown/script_SmallTownMinish.inc b/data/scripts/hyruleTown/script_SmallTownMinish.inc index d97d0801..8c3b2727 100644 --- a/data/scripts/hyruleTown/script_SmallTownMinish.inc +++ b/data/scripts/hyruleTown/script_SmallTownMinish.inc @@ -3,7 +3,7 @@ SCRIPT_START script_SmallTownMinish BeginBlock CheckPlayerMinish JumpIfNot script_08010BAC - Call sub_0807F924 + Call MakeInteractableAsMinish SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 diff --git a/data/scripts/hyruleTown/script_Sturgeon.inc b/data/scripts/hyruleTown/script_Sturgeon.inc index db91eb49..a73997bd 100644 --- a/data/scripts/hyruleTown/script_Sturgeon.inc +++ b/data/scripts/hyruleTown/script_Sturgeon.inc @@ -1,7 +1,7 @@ @ Library Sturgeon SCRIPT_START script_Sturgeon BeginBlock - Call sub_08064CC0 + Call Sturgeon_MakeInteractable DoPostScriptAction 0x000a DoPostScriptAction 0x0007 SetAnimationState 0x0002 diff --git a/data/scripts/hyruleTown/script_Teachers.inc b/data/scripts/hyruleTown/script_Teachers.inc index b7898239..202a48dc 100644 --- a/data/scripts/hyruleTown/script_Teachers.inc +++ b/data/scripts/hyruleTown/script_Teachers.inc @@ -1,7 +1,7 @@ @ Hyrule Town Teachers SCRIPT_START script_Teachers BeginBlock - Call sub_0806C674 + Call Teachers_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 EndBlock diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc index 248f4c2d..30be6472 100644 --- a/data/scripts/hyruleTown/script_TownMinish1.inc +++ b/data/scripts/hyruleTown/script_TownMinish1.inc @@ -2,7 +2,7 @@ @ also in library, cafe SCRIPT_START script_TownMinish1 BeginBlock - Call sub_0806ADFC + Call TownMinish_MakeInteractable DoPostScriptAction 0x000a script_0800E6F4: EndBlock diff --git a/data/scripts/hyruleTown/script_Townsperson1.inc b/data/scripts/hyruleTown/script_Townsperson1.inc index 259d47b4..55bebc1f 100644 --- a/data/scripts/hyruleTown/script_Townsperson1.inc +++ b/data/scripts/hyruleTown/script_Townsperson1.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Townsperson1 BeginBlock Call sub_08061FE4 - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a EndBlock script_080100DC: diff --git a/data/scripts/hyruleTown/script_Townsperson2.inc b/data/scripts/hyruleTown/script_Townsperson2.inc index 535ade2e..f0b2e9ad 100644 --- a/data/scripts/hyruleTown/script_Townsperson2.inc +++ b/data/scripts/hyruleTown/script_Townsperson2.inc @@ -2,7 +2,7 @@ SCRIPT_START script_Townsperson2 BeginBlock Call sub_08061FE4 - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a EndBlock script_08010110: diff --git a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc index 7be84de5..a3da4d63 100644 --- a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc +++ b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc @@ -1,7 +1,7 @@ @ Hyrule Townsperson house with dog SCRIPT_START script_TownspersonInDogHouse BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 Call sub_08061FD8 diff --git a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc index ce39d48f..a1346c00 100644 --- a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc +++ b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc @@ -1,7 +1,7 @@ @ Hyrule Town Windstribepeople in house SCRIPT_START script_WindTribespeopleVisitor BeginBlock - Call sub_0806C870 + Call WindTribespeople_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 SetAnimation 0x0000 diff --git a/data/scripts/lakeHylia/script_ForestMinish3.inc b/data/scripts/lakeHylia/script_ForestMinish3.inc index 26ad3f5a..4a0ab477 100644 --- a/data/scripts/lakeHylia/script_ForestMinish3.inc +++ b/data/scripts/lakeHylia/script_ForestMinish3.inc @@ -1,7 +1,7 @@ @ Lake Hylia Forest Minish telling us to go to the library SCRIPT_START script_ForestMinish3 BeginBlock - Call sub_08060090 + Call ForestMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800C5D6: diff --git a/data/scripts/lonLonRanch/script_GoronPunching.inc b/data/scripts/lonLonRanch/script_GoronPunching.inc index ebe77add..992ee9eb 100644 --- a/data/scripts/lonLonRanch/script_GoronPunching.inc +++ b/data/scripts/lonLonRanch/script_GoronPunching.inc @@ -4,7 +4,7 @@ SCRIPT_START script_GoronPunching _0807E9D4 Call sub_080694EC DoPostScriptAction 0x000a - Call sub_080694B0 + Call Goron_MakeInteractable EndBlock script_0800B9CA: Call CheckInteractType diff --git a/data/scripts/minishWoods/script_BombMinish.inc b/data/scripts/minishWoods/script_BombMinish.inc index 2be316b6..5f2b461a 100644 --- a/data/scripts/minishWoods/script_BombMinish.inc +++ b/data/scripts/minishWoods/script_BombMinish.inc @@ -2,7 +2,7 @@ SCRIPT_START script_BombMinish BeginBlock SetAnimationState 0x0004 - Call sub_08060090 + Call ForestMinish_MakeInteractable DoPostScriptAction 0x000a CheckKinstoneFused KINSTONE_1C JumpIf script_08009FD2 diff --git a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc index 3856ef0a..ea855b06 100644 --- a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc +++ b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionBlue.inc @@ -1,7 +1,7 @@ @ Syrup CUTSCENE_ORCHESTRATOR Potion SCRIPT_START script_CutsceneOrchestratorPotionBlue BeginBlock - Call sub_080787B4 + Call AddInteractableCheckableObject EndBlock script_08016146: CheckEntityInteractType diff --git a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc index 4000dbfb..17b15a7b 100644 --- a/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc +++ b/data/scripts/minishWoods/script_CutsceneOrchestratorPotionRed.inc @@ -1,7 +1,7 @@ @ CUTSCENE_ORCHESTRATOR in witch hut? SCRIPT_START script_CutsceneOrchestratorPotionRed BeginBlock - Call sub_080787B4 + Call AddInteractableCheckableObject EndBlock script_0801619A: CheckEntityInteractType diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc index 9ee0b042..6c3c5fa8 100644 --- a/data/scripts/minishWoods/script_ForestMinish10.inc +++ b/data/scripts/minishWoods/script_ForestMinish10.inc @@ -3,7 +3,7 @@ SCRIPT_START script_ForestMinish10 BeginBlock CheckInventory1 ITEM_JABBERNUT JumpIfNot script_0800C5FE - Call sub_08060090 + Call ForestMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800CD92: diff --git a/data/scripts/minishWoods/script_ForestMinish4.inc b/data/scripts/minishWoods/script_ForestMinish4.inc index 2663d585..3008312b 100644 --- a/data/scripts/minishWoods/script_ForestMinish4.inc +++ b/data/scripts/minishWoods/script_ForestMinish4.inc @@ -2,7 +2,7 @@ SCRIPT_START script_ForestMinish4 BeginBlock script_0800C5FE: - Call sub_08060090 + Call ForestMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800C60A: diff --git a/data/scripts/mtCrenel/script_CrenelHermit.inc b/data/scripts/mtCrenel/script_CrenelHermit.inc index 91d499ad..59430538 100644 --- a/data/scripts/mtCrenel/script_CrenelHermit.inc +++ b/data/scripts/mtCrenel/script_CrenelHermit.inc @@ -1,7 +1,7 @@ @ Crenel Hermit SCRIPT_START script_CrenelHermit BeginBlock - Call sub_08061E70 + Call Townsperson_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 Call sub_08061FD8 diff --git a/data/scripts/mtCrenel/script_MelariInRoom.inc b/data/scripts/mtCrenel/script_MelariInRoom.inc index 3e5b9e8a..b0581826 100644 --- a/data/scripts/mtCrenel/script_MelariInRoom.inc +++ b/data/scripts/mtCrenel/script_MelariInRoom.inc @@ -1,7 +1,7 @@ @ Mines Melari in his room SCRIPT_START script_MelariInRoom BeginBlock - Call sub_08068884 + Call Melari_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 SetAnimation 0x0000 diff --git a/data/scripts/mtCrenel/script_MountainMinish1.inc b/data/scripts/mtCrenel/script_MountainMinish1.inc index 20e946d1..e745e8dd 100644 --- a/data/scripts/mtCrenel/script_MountainMinish1.inc +++ b/data/scripts/mtCrenel/script_MountainMinish1.inc @@ -1,7 +1,7 @@ @ Mines Mountain Minish before beds SCRIPT_START script_MountainMinish1 BeginBlock - Call sub_08068104 + Call MountainMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800CF5E: diff --git a/data/scripts/mtCrenel/script_MountainMinish2.inc b/data/scripts/mtCrenel/script_MountainMinish2.inc index de34aca9..cdf4e14d 100644 --- a/data/scripts/mtCrenel/script_MountainMinish2.inc +++ b/data/scripts/mtCrenel/script_MountainMinish2.inc @@ -1,7 +1,7 @@ @ Mines Mountain Minish SCRIPT_START script_MountainMinish2 BeginBlock - Call sub_08068104 + Call MountainMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800CF96: diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc index f1689e97..1716194d 100644 --- a/data/scripts/mtCrenel/script_MountainMinish4.inc +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -1,7 +1,7 @@ @ Mines Mountain Minish at exit SCRIPT_START script_MountainMinish4 BeginBlock - Call sub_08068104 + Call MountainMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800D35E: diff --git a/data/scripts/mtCrenel/script_MountainMinish5.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc index edbf2f01..2d54f64e 100644 --- a/data/scripts/mtCrenel/script_MountainMinish5.inc +++ b/data/scripts/mtCrenel/script_MountainMinish5.inc @@ -2,7 +2,7 @@ SCRIPT_START script_MountainMinish5 BeginBlock SetEntitySpeed 0x0100 - Call sub_08068104 + Call MountainMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800D426: @@ -42,7 +42,7 @@ script_0800D426: .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a - Call sub_08062A48 + Call Kid_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0000 script_0800D4E4: diff --git a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc index e9af8375..49beaa01 100644 --- a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc +++ b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc @@ -2,7 +2,7 @@ @ Hyrule Town Carpenter SCRIPT_START script_CarpenterOutsideTown BeginBlock - Call sub_08067314 + Call Carpenter_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 SetIntVariable 0x00000000 diff --git a/data/scripts/northHyruleField/script_MutohOutsideTown.inc b/data/scripts/northHyruleField/script_MutohOutsideTown.inc index 72f84118..a5f0a4f3 100644 --- a/data/scripts/northHyruleField/script_MutohOutsideTown.inc +++ b/data/scripts/northHyruleField/script_MutohOutsideTown.inc @@ -1,7 +1,7 @@ @ Outside Castle Mutoh SCRIPT_START script_MutohOutsideTown BeginBlock - Call sub_08067100 + Call Mutoh_MakeInteractable DoPostScriptAction 0x000a SetAnimationState 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc index 9d281c12..51eaf67e 100644 --- a/data/scripts/npc/script_Farmer.inc +++ b/data/scripts/npc/script_Farmer.inc @@ -1,7 +1,7 @@ @ Farmer SCRIPT_START script_Farmer BeginBlock - Call sub_0806BCD4 + Call Farmers_MakeInteractable DoPostScriptAction 0x000a CallWithArg sub_0806BC94, 0x00000000 EndBlock diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc index aa780c91..0c03e624 100644 --- a/data/scripts/npc/script_MysteriousWall.inc +++ b/data/scripts/npc/script_MysteriousWall.inc @@ -5,7 +5,7 @@ SCRIPT_START script_MysteriousWall DoPostScriptAction 0x0008 Call sub_0806DAAC JumpIf script_0800B9AC - Call sub_0806DAD0 + Call NPC4E_MakeFuserInteractable CallWithArg sub_0806DA04, 0x00000005 EndBlock script_0800B98A: diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc index d5ea4160..0719e620 100644 --- a/data/scripts/npc/script_TingleSiblings.inc +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -1,7 +1,7 @@ @ Tingle Siblings SCRIPT_START script_TingleSiblings BeginBlock - Call sub_08064EA4 + Call TingleSiblings_MakeInteractable SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a diff --git a/data/scripts/npc/script_Windcrest.inc b/data/scripts/npc/script_Windcrest.inc index 130ad98a..37417368 100644 --- a/data/scripts/npc/script_Windcrest.inc +++ b/data/scripts/npc/script_Windcrest.inc @@ -1,8 +1,8 @@ @ All Windcrests SCRIPT_START script_Windcrest BeginBlock - Call sub_0807F934 - Call sub_080A2124 + Call MakeCheckableObjectInteractable + Call Windcrest_ChangeInteractableHitbox DoPostScriptAction 0x000a DoPostScriptAction 0x0007 EndBlock diff --git a/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc index 520adfe2..54bf63fb 100644 --- a/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc +++ b/data/scripts/sanctuary/script_CutsceneMiscObjectTextBoard.inc @@ -23,7 +23,7 @@ script_08013C2A: script_08013C32: BeginBlock DoPostScriptAction 0x0007 - Call sub_0807F934 + Call MakeCheckableObjectInteractable DoPostScriptAction 0x000a CallWithArg sub_080962F8, 0x00000000 .ifndef EU diff --git a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc index 50f58794..f8734547 100644 --- a/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc +++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc @@ -7,7 +7,7 @@ script_0801427C: CheckLocalFlag 0x0078 JumpIfNot script_0801427C BeginBlock - Call sub_0807F934 + Call MakeCheckableObjectInteractable CallWithArg sub_0806DA04, 0x00000008 EndBlock script_08014298: diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc index 12cce538..ec28c798 100644 --- a/data/scripts/sanctuary/script_Npc4EPedestal.inc +++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EPedestal DoPostScriptAction 0x0008 EndBlock BeginBlock - Call sub_0807F92C + Call MakePedestalInteractable CallWithArg sub_0806DA04, 0x00000003 EndBlock script_080134F8: diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc index 5da4a9ad..4f456f91 100644 --- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Npc4ESecondSanctuary DoPostScriptAction 0x0008 EndBlock BeginBlock - Call sub_0807F92C + Call MakePedestalInteractable CallWithArg sub_0806DA04, 0x00000003 EndBlock script_0801373C: diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc index abe02e5b..c88ca358 100644 --- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EThirdSanctuary DoPostScriptAction 0x0008 EndBlock BeginBlock - Call sub_0807F92C + Call MakePedestalInteractable CallWithArg sub_0806DA04, 0x00000003 EndBlock script_080138D0: diff --git a/data/scripts/southHyruleField/script_ForestMinish2.inc b/data/scripts/southHyruleField/script_ForestMinish2.inc index 5fa3a178..3919af08 100644 --- a/data/scripts/southHyruleField/script_ForestMinish2.inc +++ b/data/scripts/southHyruleField/script_ForestMinish2.inc @@ -1,7 +1,7 @@ @ Hyrule Fields? ForestMinish with Beanstock left to Minish Woods SCRIPT_START script_ForestMinish2 BeginBlock - Call sub_08060090 + Call ForestMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800C592: diff --git a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc index 91e708c4..ce69f63d 100644 --- a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc +++ b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc @@ -2,8 +2,8 @@ SCRIPT_START script_SmithAtLinksHouse BeginBlock Call SetPriorityMessage - Call sub_08066288 - Call sub_08066274 + Call Smith_MakeInteractable + Call Smith_ChangeInteractableHitbox DoPostScriptAction 0x000a SetAnimation 0x000c SetAction 0x0003 diff --git a/data/scripts/unused/script_08013D04.inc b/data/scripts/unused/script_08013D04.inc index 42887fa3..d65b8f3d 100644 --- a/data/scripts/unused/script_08013D04.inc +++ b/data/scripts/unused/script_08013D04.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_08013D04 BeginBlock - Call sub_0807F92C + Call MakePedestalInteractable DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock diff --git a/data/scripts/unused/script_08013D44.inc b/data/scripts/unused/script_08013D44.inc index 98c44d0d..e8ea0b64 100644 --- a/data/scripts/unused/script_08013D44.inc +++ b/data/scripts/unused/script_08013D44.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_08013D44 BeginBlock - Call sub_0807F92C + Call MakePedestalInteractable DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock diff --git a/data/scripts/unused/script_08013D84.inc b/data/scripts/unused/script_08013D84.inc index bc67ff99..5eef78d1 100644 --- a/data/scripts/unused/script_08013D84.inc +++ b/data/scripts/unused/script_08013D84.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_08013D84 BeginBlock - Call sub_0807F92C + Call MakePedestalInteractable DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock diff --git a/data/scripts/unused/script_08013DC4.inc b/data/scripts/unused/script_08013DC4.inc index ac92c6db..3a744cbe 100644 --- a/data/scripts/unused/script_08013DC4.inc +++ b/data/scripts/unused/script_08013DC4.inc @@ -1,7 +1,7 @@ @ TODO UNUSED? SCRIPT_START script_08013DC4 BeginBlock - Call sub_0807F92C + Call MakePedestalInteractable DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 EndBlock diff --git a/data/scripts/westernWood/script_ForestMinish1.inc b/data/scripts/westernWood/script_ForestMinish1.inc index 3e681372..62197602 100644 --- a/data/scripts/westernWood/script_ForestMinish1.inc +++ b/data/scripts/westernWood/script_ForestMinish1.inc @@ -1,7 +1,7 @@ @ Western Wood Forest Minish SCRIPT_START script_ForestMinish1 BeginBlock - Call sub_08060090 + Call ForestMinish_MakeInteractable DoPostScriptAction 0x000a EndBlock script_0800C55E: diff --git a/data/scripts/westernWood/script_PercyInside.inc b/data/scripts/westernWood/script_PercyInside.inc index e1c5666a..a6a04076 100644 --- a/data/scripts/westernWood/script_PercyInside.inc +++ b/data/scripts/westernWood/script_PercyInside.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PercyInside SetAnimationState 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - Call sub_0806B60C + Call Percy_MakeInteractable EndBlock script_08012E9E: CheckEntityInteractType diff --git a/data/scripts/westernWood/script_PercyOutside.inc b/data/scripts/westernWood/script_PercyOutside.inc index 612d4b1a..a0f02b15 100644 --- a/data/scripts/westernWood/script_PercyOutside.inc +++ b/data/scripts/westernWood/script_PercyOutside.inc @@ -4,7 +4,7 @@ SCRIPT_START script_PercyOutside SetAnimationState 0x0004 CallWithArg sub_0807F3D8, 0x00000008 DoPostScriptAction 0x000a - Call sub_0806B60C + Call Percy_MakeInteractable EndBlock script_08012EDC: CheckEntityInteractType diff --git a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 84713eee..6dd84635 100644 --- a/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -1,7 +1,7 @@ @ After Mazaal NPC4E text board SCRIPT_START script_Npc4EWindRuinsTextBoard BeginBlock - Call sub_0807F934 + Call MakeCheckableObjectInteractable DoPostScriptAction 0x0008 SetIntVariable 0x00000001 Call sub_0806DA04 diff --git a/include/npc.h b/include/npc.h index 6588f1d4..d81ea4a7 100644 --- a/include/npc.h +++ b/include/npc.h @@ -84,12 +84,12 @@ void NPCInit(Entity* ent); void CollideFollowers(void); // TODO move? -void sub_08078784(Entity* ent, u32 arg1); +void AddInteractableWhenBigFuser(Entity* ent, u32 arg1); u32 sub_0806F5A4(u32); u32 GetFusionToOffer(Entity*); -void sub_08078778(Entity*); +void AddInteractableWhenBigObject(Entity*); void sub_0807000C(Entity*); -void sub_080787A8(Entity*, u32); +void AddInteractableAsMinishFuser(Entity*, u32); enum NPC { /*0x00*/ NPC_NONE_0, diff --git a/include/object.h b/include/object.h index 4d312d43..34160b18 100644 --- a/include/object.h +++ b/include/object.h @@ -14,8 +14,8 @@ #include "entity.h" #include "player.h" -void sub_080787C0(Entity*); -void sub_080787B4(Entity*); +void AddInteractablePedestal(Entity*); +void AddInteractableCheckableObject(Entity*); void sub_0808C650(Entity*, u32); u32 sub_0808C67C(void); void sub_0808C688(void); diff --git a/include/player.h b/include/player.h index 34c4b70e..1139d5f9 100644 --- a/include/player.h +++ b/include/player.h @@ -469,13 +469,13 @@ void UpdatePlayerSkills(void); u32 sub_0807AC54(Entity*); void sub_080792D8(void); u32 sub_08078F74(Entity*); -void sub_0807879C(Entity*); +void AddInteractableAsMinishObject(Entity*); void sub_08078D60(void); void PlayerSetNormalAndCollide(void); bool32 PlayerTryDropObject(ItemBehavior* arg0, u32 unk); void InitItemGetSequence(u32, u32, u32); void sub_0807B7D8(u32, u32, u32); -void sub_08078850(Entity*, u32, u32, const void*); +void SetInteractableObjectCollision(Entity*, u32, u32, const void*); void sub_08079D84(void); u32 sub_0807953C(void); void sub_0807BB68(const s16*, u32, u32); @@ -504,13 +504,13 @@ bool32 IsItemActivatedThisFrame(ItemBehavior*); bool32 IsItemActiveByInput(ItemBehavior*, PlayerInputState); bool32 sub_08077FEC(u32); void sub_08078180(void); -void sub_080784C8(); -void sub_08078790(Entity*, u32); -void sub_080787CC(Entity*); -s32 sub_08078800(Entity*); -s32 sub_0807887C(Entity*, u32, u32); -void sub_080788E0(Entity*); -s32 sub_08078904(); +void ResetPossibleInteraction(); +void AddInteractableFuser(Entity*, u32); +void AddInteractableSmallKeyLock(Entity*); +s32 AddInteractableBossDoor(Entity*); +s32 AddInteractableObject(Entity*, u32, u32); +void RemoveInteractableObject(Entity*); +s32 GetInteractableObjectIndex(); void sub_08078AC0(u32, u32, u32); void sub_08078B48(void); void sub_08078E84(Entity*, Entity*); diff --git a/include/structures.h b/include/structures.h index 9a50b897..eded84c7 100644 --- a/include/structures.h +++ b/include/structures.h @@ -260,7 +260,7 @@ typedef struct { typedef struct { /*0x00*/ u8 ignoreLayer; /* if bit 0 set, skip layer check for collision */ - /*0x01*/ u8 interactCondition; + /*0x01*/ u8 type; /*0x02*/ u8 interactDirections; /* lower 4 bits determine Link's allowed facing directions to interact, 0 to allow (0000WSEN) */ /*0x03*/ u8 kinstoneId; /*0x04*/ const u8* customHitbox; /* if set, array contains x, y, width and height */ diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index d1333784..97f67813 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -547,7 +547,7 @@ void sub_0802922C(Entity* this) { } void sub_0802925C(Entity* this) { - sub_08078784(this, GetFusionToOffer(this)); + AddInteractableWhenBigFuser(this, GetFusionToOffer(this)); } void sub_08029270(Entity* this) { diff --git a/src/entity.c b/src/entity.c index 18f11f75..2ac2b37f 100644 --- a/src/entity.c +++ b/src/entity.c @@ -351,7 +351,7 @@ void DeleteEntity(Entity* ent) { UnloadGFXSlots(ent); UnloadOBJPalette(ent); UnloadOBJPalette2(ent); - sub_080788E0(ent); + RemoveInteractableObject(ent); FreeCarryEntity(ent); sub_0805EC60(ent); sub_08017744(ent); diff --git a/src/gameUtils.c b/src/gameUtils.c index 8f9e9ace..eb2eb7fb 100644 --- a/src/gameUtils.c +++ b/src/gameUtils.c @@ -108,7 +108,7 @@ void InitializePlayer(void) { Entity* pl; - sub_080784C8(); + ResetPossibleInteraction(); MemClear(&gActiveItems, sizeof(gActiveItems)); MemClear(&gPlayerState, sizeof(gPlayerState)); MemFill32(0xffffffff, &gPlayerState.path_memory, sizeof(gPlayerState.path_memory)); diff --git a/src/npc/anju.c b/src/npc/anju.c index 59fa7ce1..fa66f537 100644 --- a/src/npc/anju.c +++ b/src/npc/anju.c @@ -28,9 +28,9 @@ void Anju(Entity* this) { } } -void sub_0806C354(Entity* this) { +void Anju_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Anju_Fusion(Entity* this) { diff --git a/src/npc/beedle.c b/src/npc/beedle.c index 351a53fb..28e124c6 100644 --- a/src/npc/beedle.c +++ b/src/npc/beedle.c @@ -72,7 +72,7 @@ void sub_080632C8(Entity* this) { void sub_080632E0(Entity* this) { if (LoadExtraSpriteData(this, gUnk_0810C8D4)) { InitializeAnimation(this, 0); - sub_08078778(this); + AddInteractableWhenBigObject(this); this->spriteSettings.draw = 1; this->action = 1; } @@ -103,7 +103,7 @@ void sub_08063390(Entity* this) { if (this->frame & ANIM_DONE) { this->action = 1; InitializeAnimation(this, GetAnimationState(this)); - sub_08078778(this); + AddInteractableWhenBigObject(this); } sub_0806ED78(this); } @@ -136,7 +136,7 @@ void sub_08063410(Entity* this) { this->type2 = 0; } sub_0807DD64(this); - sub_08078778(this); + AddInteractableWhenBigObject(this); } if (this->type != 0) { sub_0806346C(this); @@ -217,7 +217,7 @@ void sub_0806346C(Entity* this) { bVar1 = gUnk_0810C8F0[iVar2][iVar3][gPlayerEntity.animationState >> 1]; if (bVar1 != this->type2) { const gUnk_0810C89C_struct* temp = &gUnk_0810C89C[bVar1]; - sub_08078850(this, 1, temp->unk_04, temp); + SetInteractableObjectCollision(this, 1, temp->unk_04, temp); this->type2 = bVar1; } } diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c index 93dbfccc..4532cfaf 100644 --- a/src/npc/bladeBrothers.c +++ b/src/npc/bladeBrothers.c @@ -235,7 +235,7 @@ void sub_08068A1C(Entity* this) { bVar1 = 3; } else { - sub_08078778(this); + AddInteractableWhenBigObject(this); offset = 2; bVar1 = 1; } @@ -292,7 +292,7 @@ void sub_08068AFC(Entity* this) { this->action = 1; this->spriteSettings.draw = 1; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); sub_0807DD50(this); } diff --git a/src/npc/brocco.c b/src/npc/brocco.c index 28edb9a2..e02ca622 100644 --- a/src/npc/brocco.c +++ b/src/npc/brocco.c @@ -30,7 +30,7 @@ void sub_0806355C(Entity* this) { this->action = this->action + 1; this->spriteSettings.draw = 1; InitAnimationForceUpdate(this, 4); - sub_08078778(this); + AddInteractableWhenBigObject(this); } void sub_08063584(Entity* this) { @@ -114,9 +114,9 @@ void sub_080636D8(Entity* this) { ShowNPCDialogue(this, &gUnk_0810CAAC[gSave.global_progress]); } -void sub_080636F4(Entity* this) { +void Brocco_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Brocco_Fusion(Entity* this) { diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c index e7781a50..f54795e0 100644 --- a/src/npc/carpenter.c +++ b/src/npc/carpenter.c @@ -91,9 +91,9 @@ void sub_08067304(Entity* this) { ShowNPCDialogue(this, &dialog); } -void sub_08067314(Entity* this) { +void Carpenter_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Carpenter_Fusion(Entity* this) { diff --git a/src/npc/cat.c b/src/npc/cat.c index 7eebb148..33586cb9 100644 --- a/src/npc/cat.c +++ b/src/npc/cat.c @@ -281,7 +281,7 @@ void sub_08067AAC(Entity* this) { this->spriteSettings.flipX = this->direction >> 4 ^ 1; sub_08067DCC(this, 3); - sub_08078850(this, 0, gUnk_0811110C[2], gUnk_0811110F); + SetInteractableObjectCollision(this, 0, gUnk_0811110C[2], gUnk_0811110F); } void sub_08067B08(Entity* this) { @@ -293,7 +293,7 @@ void sub_08067B08(Entity* this) { void sub_08067B34(Entity* this) { sub_08067DCC(this, 0); this->frameDuration = (Random() & 0x30) + 0xb4; - sub_08078850(this, 0, gUnk_0811110C[this->spriteSettings.flipX], gUnk_0811110F); + SetInteractableObjectCollision(this, 0, gUnk_0811110C[this->spriteSettings.flipX], gUnk_0811110F); } void sub_08067B70(Entity* this) { @@ -350,9 +350,9 @@ void sub_08067C44(Entity* this) { if (uVar5 != this->field_0x68.HALF.HI) { if (uVar5 == 0) { - sub_08078778(this); + AddInteractableWhenBigObject(this); } else { - sub_080787A8(this, this->field_0x68.HALF.LO); + AddInteractableAsMinishFuser(this, this->field_0x68.HALF.LO); } } diff --git a/src/npc/cow.c b/src/npc/cow.c index 7c99efb9..e74ed30a 100644 --- a/src/npc/cow.c +++ b/src/npc/cow.c @@ -209,9 +209,9 @@ void sub_0806920C(Entity* ent) { if (var1 != ent->field_0x6c.HALF.HI) { if (var1 == 0) { - sub_08078778(ent); + AddInteractableWhenBigObject(ent); } else { - sub_080787A8(ent, ent->field_0x6c.HALF.LO); + AddInteractableAsMinishFuser(ent, ent->field_0x6c.HALF.LO); } } diff --git a/src/npc/cucco.c b/src/npc/cucco.c index 5710d40a..7f1ad66a 100644 --- a/src/npc/cucco.c +++ b/src/npc/cucco.c @@ -16,7 +16,7 @@ void Cucco(Entity* this) { void Cucco_Init(Entity* this) { this->action++; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_080787A8(this, this->field_0x68.HALF.LO); + AddInteractableAsMinishFuser(this, this->field_0x68.HALF.LO); SetDefaultPriority(this, PRIO_MESSAGE); this->subAction = 0; sub_0806E4EC(this); diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c index 22d29486..75ccdce3 100644 --- a/src/npc/cuccoChick.c +++ b/src/npc/cuccoChick.c @@ -24,7 +24,7 @@ void CuccoChick(Entity* this) { void CuccoChick_Init(Entity* this) { this->action++; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_080787A8(this, this->field_0x68.HALF.LO); + AddInteractableAsMinishFuser(this, this->field_0x68.HALF.LO); SetDefaultPriority(this, PRIO_MESSAGE); this->subAction = 0; sub_0806E764(this); diff --git a/src/npc/dampe.c b/src/npc/dampe.c index 6c587232..fad25893 100644 --- a/src/npc/dampe.c +++ b/src/npc/dampe.c @@ -33,9 +33,9 @@ void Dampe(Entity* this) { } } -void sub_0806BE3C(Entity* this) { +void Dampe_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Dampe_Fusion(Entity* this) { diff --git a/src/npc/din.c b/src/npc/din.c index b803d9a2..735f4282 100644 --- a/src/npc/din.c +++ b/src/npc/din.c @@ -29,12 +29,12 @@ void Din(Entity* this) { } } -void sub_08064828(Entity* this) { +void Din_MakeInteractable(Entity* this) { u32 tmp = GetFusionToOffer(this); if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) { tmp = 0; } - sub_08078784(this, tmp); + AddInteractableWhenBigFuser(this, tmp); } void Din_Fusion(Entity* this) { diff --git a/src/npc/dog.c b/src/npc/dog.c index e3c287d9..10427419 100644 --- a/src/npc/dog.c +++ b/src/npc/dog.c @@ -351,7 +351,7 @@ void sub_08069E50(Entity* this) { if (GetInventoryValue(ITEM_QST_DOGFOOD) == 2) { this->action = 7; InitAnimationForceUpdate(this, 0x29); - sub_080788E0(this); + RemoveInteractableObject(this); EnqueueSFX(SFX_VO_DOG); EnqueueSFX(SFX_TASK_COMPLETE); } @@ -432,9 +432,9 @@ void sub_08069FE8(Entity* this) { if (tmp != this->field_0x6a.HALF.LO) { if (tmp == 0) { - sub_08078778(this); + AddInteractableWhenBigObject(this); } else { - sub_080787A8(this, this->field_0x74.HALF.LO); + AddInteractableAsMinishFuser(this, this->field_0x74.HALF.LO); } } this->field_0x6a.HALF.LO = tmp; diff --git a/src/npc/drLeft.c b/src/npc/drLeft.c index d991340e..f8398668 100644 --- a/src/npc/drLeft.c +++ b/src/npc/drLeft.c @@ -83,5 +83,5 @@ void sub_0806C09C(Entity* this) { 8, 12, }; - sub_08078850(this, 1, 0, &gUnk_081133B4); + SetInteractableObjectCollision(this, 1, 0, &gUnk_081133B4); } diff --git a/src/npc/epona.c b/src/npc/epona.c index 544a749d..b06a7777 100644 --- a/src/npc/epona.c +++ b/src/npc/epona.c @@ -73,9 +73,9 @@ void sub_08065A64(Entity* this) { if (uVar2 != this->field_0x68.HALF.HI) { if (uVar2 == 0) { - sub_08078778(this); + AddInteractableWhenBigObject(this); } else { - sub_080787A8(this, this->field_0x68.HALF.LO); + AddInteractableAsMinishFuser(this, this->field_0x68.HALF.LO); } } this->field_0x68.HALF.HI = uVar2; diff --git a/src/npc/farmers.c b/src/npc/farmers.c index 1fa4357c..d3ccf5fd 100644 --- a/src/npc/farmers.c +++ b/src/npc/farmers.c @@ -59,8 +59,8 @@ void sub_0806BCC0(Entity* this) { } } -void sub_0806BCD4(Entity* this) { - sub_08078784(this, GetFusionToOffer(this)); +void Farmers_MakeInteractable(Entity* this) { + AddInteractableWhenBigFuser(this, GetFusionToOffer(this)); } void sub_0806BCE8(Entity* this) { diff --git a/src/npc/farore.c b/src/npc/farore.c index fa5f25c3..fc68d782 100644 --- a/src/npc/farore.c +++ b/src/npc/farore.c @@ -29,12 +29,12 @@ void Farore(Entity* this) { } } -void sub_08064A28(Entity* this) { +void Farore_MakeInteractable(Entity* this) { u32 tmp = GetFusionToOffer(this); if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) { tmp = 0; } - sub_08078784(this, tmp); + AddInteractableWhenBigFuser(this, tmp); } void Farore_Fusion(Entity* this) { diff --git a/src/npc/festari.c b/src/npc/festari.c index 781cc9cf..f9e0cb57 100644 --- a/src/npc/festari.c +++ b/src/npc/festari.c @@ -22,7 +22,7 @@ void sub_0805FE10(Entity* this) { this->spriteSettings.draw = TRUE; SetDefaultPriority(this, PRIO_MESSAGE); this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); sub_0807DD50(this); } diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c index 9a898c67..b002d976 100644 --- a/src/npc/forestMinish.c +++ b/src/npc/forestMinish.c @@ -534,9 +534,9 @@ void ForestMinish(Entity* this) { } } -void sub_08060090(Entity* this) { +void ForestMinish_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void ForestMinish_Head(Entity* this) { diff --git a/src/npc/gentari.c b/src/npc/gentari.c index 3ba91821..d2d36028 100644 --- a/src/npc/gentari.c +++ b/src/npc/gentari.c @@ -9,7 +9,7 @@ void Gentari(Entity* this) { this->spriteSettings.draw = TRUE; SetDefaultPriority(this, PRIO_MESSAGE); this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); sub_0807DD50(this); break; case 1: diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c index afcb7f2b..2fe80a97 100644 --- a/src/npc/ghostBrothers.c +++ b/src/npc/ghostBrothers.c @@ -110,9 +110,9 @@ void sub_08065CCC(Entity* this) { gScreen.controls.alphaBlend = 0x10; } -void sub_08065D00(Entity* this) { +void GhostBrothers_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void sub_08065D18(Entity* this) { @@ -219,7 +219,7 @@ void sub_08065EDC(Entity* this) { *(u16**)&this->field_0x6c = (++puVar3); } else { this->action++; - sub_08078778(this); + AddInteractableWhenBigObject(this); } } } diff --git a/src/npc/gina.c b/src/npc/gina.c index 0bb49f92..0095f7b3 100644 --- a/src/npc/gina.c +++ b/src/npc/gina.c @@ -10,7 +10,7 @@ void Gina(Entity* this) { this->spriteSettings.draw = 1; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); sub_0807DD50(this); break; case 1: diff --git a/src/npc/gorman.c b/src/npc/gorman.c index bec184f5..abec9aae 100644 --- a/src/npc/gorman.c +++ b/src/npc/gorman.c @@ -70,7 +70,7 @@ void sub_080697C4(Entity* this) { if (LoadExtraSpriteData(this, gUnk_08111C3C)) { this->action = 1; InitializeAnimation(this, 2); - sub_08078778(this); + AddInteractableWhenBigObject(this); } } diff --git a/src/npc/goron.c b/src/npc/goron.c index 8056bf52..ce2fb731 100644 --- a/src/npc/goron.c +++ b/src/npc/goron.c @@ -30,7 +30,7 @@ void Goron(Entity* this) { } void sub_08069310(Entity* this) { - sub_08078778(this); + AddInteractableWhenBigObject(this); this->action = 1; InitAnimationForceUpdate(this, 2); } @@ -113,12 +113,12 @@ void sub_0806948C(Entity* this, ScriptExecutionContext* context) { gActiveScriptInfo.flags |= 1; } -void sub_080694B0(Entity* this) { +void Goron_MakeInteractable(Entity* this) { u32 kinstone = (u8)sub_08069480(this); if (CheckKinstoneFused(kinstone)) { - sub_08078778(this); + AddInteractableWhenBigObject(this); } else { - sub_08078784(this, kinstone); + AddInteractableWhenBigFuser(this, kinstone); } } diff --git a/src/npc/gregal.c b/src/npc/gregal.c index 7d867bf0..8a279a06 100644 --- a/src/npc/gregal.c +++ b/src/npc/gregal.c @@ -42,8 +42,8 @@ void sub_0806CAF4(Entity* this) { SortEntityAbove(this, npc); } sub_0807DD64(this); - sub_08078778(this); - sub_08078850(this, 1, (u8)gUnk_08113D84[1], gUnk_08113D84); + AddInteractableWhenBigObject(this); + SetInteractableObjectCollision(this, 1, (u8)gUnk_08113D84[1], gUnk_08113D84); } ExecuteScriptForEntity(this, NULL); HandleEntity0x82Actions(this); @@ -154,9 +154,9 @@ void sub_0806CD4C(Entity* this) { ChangeObjPalette(this, 0x110); } -void sub_0806CD58(Entity* this) { +void Gregal_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Gregal_Fusion(Entity* this) { diff --git a/src/npc/guard.c b/src/npc/guard.c index 661739ee..834c2f1b 100644 --- a/src/npc/guard.c +++ b/src/npc/guard.c @@ -294,7 +294,7 @@ void sub_08063D44(Entity* this) { ent->subtimer = 60; break; case 4 ... 5: - sub_08078778(this); + AddInteractableWhenBigObject(this); break; } this->action++; diff --git a/src/npc/hurdyGurdyMan.c b/src/npc/hurdyGurdyMan.c index 46ee55f0..1c45bbf3 100644 --- a/src/npc/hurdyGurdyMan.c +++ b/src/npc/hurdyGurdyMan.c @@ -100,9 +100,9 @@ void sub_0806E418(Entity* this) { ShowNPCDialogue(this, &dialogs[tmp]); } -void sub_0806E440(Entity* this) { +void HurdyGurdyMan_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void HurdyGurdyMan_Fusion(Entity* this) { diff --git a/src/npc/kid.c b/src/npc/kid.c index c9ddc000..fe03c2ef 100644 --- a/src/npc/kid.c +++ b/src/npc/kid.c @@ -208,7 +208,7 @@ void sub_080620F4(Entity* this) { this->field_0x68.HALF.LO = 0; this->action = 1; InitAnimationForceUpdate(this, 2); - sub_08078778(this); + AddInteractableWhenBigObject(this); } } @@ -313,7 +313,7 @@ void sub_08062500(Entity* this) { this->myHeap = zMalloc(sizeof(KidHeap)); if (this->myHeap != NULL) { this->field_0x68.HALF.LO = 1; - sub_080788E0(this); + RemoveInteractableObject(this); this->hitbox = NULL; sub_0806252C(this); } @@ -596,9 +596,9 @@ void sub_08062948(Entity* this, ScriptExecutionContext* context) { } } -void sub_08062A48(Entity* this, ScriptExecutionContext* context) { +void Kid_MakeInteractable(Entity* this, ScriptExecutionContext* context) { this->field_0x6a.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x6a.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x6a.HALF.LO); } void Kid_Fusion(Entity* this) { diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c index 2d9c2989..3bdf60a2 100644 --- a/src/npc/kingDaltus.c +++ b/src/npc/kingDaltus.c @@ -40,7 +40,7 @@ void sub_08066654(Entity* this) { this->action = 1; this->spriteSettings.draw = 1; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); InitAnimationForceUpdate(this, 2); } @@ -86,8 +86,8 @@ void sub_08066718(Entity* this) { } } -void sub_0806672C(Entity* this) { - sub_08078784(this, this->field_0x68.HALF.LO); +void KingDaltus_MakeInteractable(Entity* this) { + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void sub_0806673C(Entity* this) { diff --git a/src/npc/librari.c b/src/npc/librari.c index 819b5a61..e725b669 100644 --- a/src/npc/librari.c +++ b/src/npc/librari.c @@ -10,7 +10,7 @@ void Librari(Entity* this) { this->spriteSettings.draw = TRUE; this->animationState = this->timer; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); SetDefaultPriority(this, PRIO_MESSAGE); sub_0807DD50(this); break; diff --git a/src/npc/malon.c b/src/npc/malon.c index 0270006d..1ab967c0 100644 --- a/src/npc/malon.c +++ b/src/npc/malon.c @@ -44,7 +44,7 @@ void sub_08065888(Entity* this) { this->spriteSettings.draw = 1; this->animationState = 4; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); sub_0807DD50(this); } diff --git a/src/npc/mama.c b/src/npc/mama.c index 95758b1c..0e2b7620 100644 --- a/src/npc/mama.c +++ b/src/npc/mama.c @@ -92,9 +92,9 @@ void sub_0806C4DC(Entity* this) { ShowNPCDialogue(this, &dialogs[gSave.global_progress]); } -void sub_0806C4F8(Entity* this) { +void Mama_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Mama_Fusion(Entity* this) { diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c index 1cef31bc..f2d8b0ee 100644 --- a/src/npc/mayorHagen.c +++ b/src/npc/mayorHagen.c @@ -37,15 +37,15 @@ void MayorHagen(Entity* this) { } } -void sub_0806CE5C(Entity* this) { +void MayorHagen_MakeInteractable(Entity* this) { static const u8 gUnk_08113F44[] = { 0, 8, 8, 16, }; - sub_08078784(this, GetFusionToOffer(this)); - sub_08078850(this, 1, 0, gUnk_08113F44); + AddInteractableWhenBigFuser(this, GetFusionToOffer(this)); + SetInteractableObjectCollision(this, 1, 0, gUnk_08113F44); } void sub_0806CE80(Entity* this) { diff --git a/src/npc/melari.c b/src/npc/melari.c index 5c72230b..59760a78 100644 --- a/src/npc/melari.c +++ b/src/npc/melari.c @@ -29,7 +29,7 @@ void sub_08068708(Entity* this) { if (LoadExtraSpriteData(this, gUnk_08111520)) { this->action = 1; InitializeAnimation(this, 0); - sub_08078778(this); + AddInteractableWhenBigObject(this); } } @@ -100,9 +100,9 @@ void sub_08068780(Entity* this) { } } -void sub_08068884(Entity* this) { +void Melari_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Melari_Head(Entity* this) { diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c index 9ee87713..fe5806c1 100644 --- a/src/npc/ministerPotho.c +++ b/src/npc/ministerPotho.c @@ -27,7 +27,7 @@ void sub_080667E4(Entity* this) { this->action = 1; this->spriteSettings.draw = 1; InitAnimationForceUpdate(this, 2); - sub_08078778(this); + AddInteractableWhenBigObject(this); } void sub_08066808(Entity* this) { @@ -81,8 +81,8 @@ void sub_08066864(Entity* this) { } } -void sub_080668F0(Entity* this) { - sub_08078784(this, GetFusionToOffer(this)); +void MinisterPotho_MakeInteractable(Entity* this) { + AddInteractableWhenBigFuser(this, GetFusionToOffer(this)); } void sub_08066904(Entity* this) { diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c index ca0d3574..bfa0e17c 100644 --- a/src/npc/mountainMinish.c +++ b/src/npc/mountainMinish.c @@ -57,7 +57,7 @@ void MountainMinish(Entity* this) { void sub_08067E60(Entity* this) { if (LoadExtraSpriteData(this, gUnk_08111358)) { this->action = 1; - sub_08078778(this); + AddInteractableWhenBigObject(this); InitializeAnimation(this, 2); } } @@ -179,9 +179,9 @@ void sub_08067EF0(Entity* this) { } } -void sub_08068104(Entity* this) { +void MountainMinish_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void sub_0806811C(Entity* this) { diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c index 5cb1691e..a93b7258 100644 --- a/src/npc/mutoh.c +++ b/src/npc/mutoh.c @@ -82,9 +82,9 @@ void sub_080670E4(Entity* this) { ShowNPCDialogue(this, &dialogs[gSave.global_progress]); } -void sub_08067100(Entity* this) { +void Mutoh_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Mutoh_Fusion(Entity* this) { diff --git a/src/npc/nayru.c b/src/npc/nayru.c index 35176f0b..f0949f24 100644 --- a/src/npc/nayru.c +++ b/src/npc/nayru.c @@ -29,12 +29,12 @@ void Nayru(Entity* this) { } } -void sub_08064928(Entity* this) { +void Nayru_MakeInteractable(Entity* this) { u32 tmp = GetFusionToOffer(this); if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) { tmp = 0; } - sub_08078784(this, tmp); + AddInteractableWhenBigFuser(this, tmp); } void Nayru_Fusion(Entity* this) { diff --git a/src/npc/npc23.c b/src/npc/npc23.c index eccd933c..a07b14b1 100644 --- a/src/npc/npc23.c +++ b/src/npc/npc23.c @@ -38,7 +38,7 @@ void sub_080662F8(Entity* this) { this->parent = &gPlayerEntity; this->cutsceneBeh.HWORD = 0; sub_08066490(this, this->parent); - sub_08078778(this); + AddInteractableWhenBigObject(this); } void sub_08066358(Entity* this) { @@ -56,7 +56,7 @@ void sub_08066358(Entity* this) { this->speed = 0x80; this->cutsceneBeh.HWORD = 1; gPauseMenuOptions.disabled = 1; - sub_080788E0(this); + RemoveInteractableObject(this); } } else { sub_08066490(this, this->parent); diff --git a/src/npc/npc26.c b/src/npc/npc26.c index a9c19cf2..fddbf460 100644 --- a/src/npc/npc26.c +++ b/src/npc/npc26.c @@ -18,7 +18,7 @@ static void sub_080669B8(Entity* this) { this->action = 1; this->spriteSettings.draw = 1; InitAnimationForceUpdate(this, 2); - sub_08078778(this); + AddInteractableWhenBigObject(this); } static void sub_080669DC(Entity* this) { diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c index 8baf84d3..18caefb0 100644 --- a/src/npc/npc4E.c +++ b/src/npc/npc4E.c @@ -46,14 +46,13 @@ void sub_0806DA04(Entity* this, ScriptExecutionContext* context) { // TODO gUnk_0811415C should be a gUnk_0810C89C_struct[], but then a lot of bytes everywhere are wrong? gUnk_0810C89C_struct* a = (gUnk_0810C89C_struct*)&( (gUnk_0810C89C_struct*)gUnk_0811415C)[context->intVariable]; // cast necessary to no longer make it a const* ? - sub_08078850(this, 1, (u8)a->unk_04, a); + SetInteractableObjectCollision(this, 1, (u8)a->unk_04, a); } void NPC4E_DoScreenTransition(Entity* this, ScriptExecutionContext* context) { sub_0808091C(gNpc4ETransitions[context->intVariable], gNpc4ETransitionTypes[context->intVariable]); } -// Returns the kinstone id? u8 NPC4E_GetKinstoneId(Entity* this) { u32 result; @@ -97,8 +96,8 @@ void sub_0806DAAC(Entity* this, ScriptExecutionContext* context) { } // maybe actually execute the kinstone fusion? -void sub_0806DAD0(Entity* this) { - sub_08078790(this, NPC4E_GetKinstoneId(this)); +void NPC4E_MakeFuserInteractable(Entity* this) { + AddInteractableFuser(this, NPC4E_GetKinstoneId(this)); } void sub_0806DAE8(Entity* this) { diff --git a/src/npc/npc5.c b/src/npc/npc5.c index 2a78cc26..f8e6707e 100644 --- a/src/npc/npc5.c +++ b/src/npc/npc5.c @@ -875,7 +875,7 @@ void sub_08061ACC(Entity* this) { this->subAction = 0xff; this->timer = 0; this->followerFlag = this->followerFlag & 0xfe; - sub_08078778(this); + AddInteractableWhenBigObject(this); sub_08061AFC(this); } diff --git a/src/npc/npc9.c b/src/npc/npc9.c index 76a69b93..a8361648 100644 --- a/src/npc/npc9.c +++ b/src/npc/npc9.c @@ -22,7 +22,7 @@ void sub_08062AF0(Entity* this) { this->action = 1; this->spriteSettings.draw = TRUE; InitializeAnimation(this, 0); - sub_08078778(this); + AddInteractableWhenBigObject(this); } void sub_08062B14(Entity* this) { diff --git a/src/npc/percy.c b/src/npc/percy.c index 22753a85..21a205f4 100644 --- a/src/npc/percy.c +++ b/src/npc/percy.c @@ -41,7 +41,7 @@ void sub_0806B3CC(Entity* this) { } this->action = 1; InitializeAnimation(this, 0); - sub_08078778(this); + AddInteractableWhenBigObject(this); } GetNextFrame(this); if (this->interactType != 0) { @@ -161,9 +161,9 @@ void sub_0806B540(Entity* this) { gActiveScriptInfo.commandSize = 0; } -void sub_0806B60C(Entity* this) { +void Percy_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Percy_Fusion(Entity* this) { diff --git a/src/npc/picolyteBottle.c b/src/npc/picolyteBottle.c index be49c2f3..80ebfc0a 100644 --- a/src/npc/picolyteBottle.c +++ b/src/npc/picolyteBottle.c @@ -26,7 +26,7 @@ void PicolyteBottle_Action1(PicolyteBottleEntity* this); void PicolyteBottle_Action2(PicolyteBottleEntity* this); void nullsub_111(PicolyteBottleEntity* this); -extern void sub_08078828(Entity*); +extern void AddInteractableChest(Entity*); void PicolyteBottle(Entity* this) { static void (*const PicolyteBottle_Actions[])(PicolyteBottleEntity*) = { @@ -97,7 +97,7 @@ void PicolyteBottle_Action2(PicolyteBottleEntity* this) { super->child = obj; CopyPosition(super, obj); } - sub_080788E0(super); + RemoveInteractableObject(super); sub_0807B7D8(0x74, this->unk76, 2); } } @@ -149,7 +149,7 @@ void sub_0806E0DC(PicolyteBottleEntity* this) { DeleteEntity(super->child); super->child = NULL; } - sub_08078828(super); + AddInteractableChest(super); sub_0807B7D8(0x73, this->unk76, 2); } else { super->action = 3; diff --git a/src/npc/pina.c b/src/npc/pina.c index 00d73a13..f11cbdd9 100644 --- a/src/npc/pina.c +++ b/src/npc/pina.c @@ -32,7 +32,7 @@ void sub_08063A98(Entity* this) { this->action++; this->spriteSettings.draw = 1; InitAnimationForceUpdate(this, 4); - sub_08078778(this); + AddInteractableWhenBigObject(this); } void sub_08063AC0(Entity* this) { @@ -150,9 +150,9 @@ void sub_08063C90(Entity* this) { ShowNPCDialogue(this, &gUnk_0810CE04[gSave.global_progress]); } -void sub_08063CAC(Entity* this) { +void Pina_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Pina_Fusion(Entity* this) { diff --git a/src/npc/postman.c b/src/npc/postman.c index 06fa095c..9e7ce529 100644 --- a/src/npc/postman.c +++ b/src/npc/postman.c @@ -8,7 +8,7 @@ extern void sub_08060528(Entity*); extern void sub_080604DC(Entity*); extern void sub_080606D8(Entity*); -extern void sub_080606C0(Entity*); +extern void Postman_MakeInteractable(Entity*); const Coords gUnk_0810A66C[] = { { .HALF = { 0x0, 0x0 } }, { .HALF = { 0x48, 0xa8 } }, { .HALF = { 0x0, 0xf0 } }, @@ -274,7 +274,7 @@ void sub_08060528(Entity* this) { this->field_0x6a.HWORD = 0; this->zVelocity = Q_16_16(2.0); this->field_0x6c.HALF.HI = 1; - sub_080788E0(this); + RemoveInteractableObject(this); EnqueueSFX(SFX_PLY_JUMP); } else { this->field_0x6a.HWORD--; @@ -283,7 +283,7 @@ void sub_08060528(Entity* this) { GravityUpdate(this, Q_8_8(24.0)); if (((this->field_0x6c.HALF.HI != 0) && (this->zVelocity == 0)) && this->z.WORD == 0) { this->field_0x6c.HALF.HI = 0; - sub_080606C0(this); + Postman_MakeInteractable(this); } if (this->z.WORD >= 0 && ((gPlayerEntity.collisionLayer == 0 || (this->collisionLayer == gPlayerEntity.collisionLayer)))) { @@ -292,9 +292,9 @@ void sub_08060528(Entity* this) { sub_0800451C(this); } -void sub_080606C0(Entity* this) { +void Postman_MakeInteractable(Entity* this) { this->field_0x6c.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x6c.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x6c.HALF.LO); } void sub_080606D8(Entity* this) { @@ -336,7 +336,7 @@ void sub_0806076C(Entity* this, ScriptExecutionContext* context) { } this->field_0x68.HALF.HI++; this->collisionLayer = 1; - sub_080606C0(this); + Postman_MakeInteractable(this); pbVar10 = gUnk_0810A918[(s8)this->field_0x68.HALF.LO]; pbVar10 += (s8)this->field_0x68.HALF.HI; do { diff --git a/src/npc/rem.c b/src/npc/rem.c index c8834192..b9b5f61e 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -328,10 +328,10 @@ void sub_0806A914(Entity* this) { } } -void sub_0806A93C(Entity* this) { +void Rem_MakeInteractable(Entity* this) { static const u8 gUnk_0811229C[] = { 0, 6, 10, 16 }; - sub_08078778(this); - sub_08078850(this, 0, 0, &gUnk_0811229C); + AddInteractableWhenBigObject(this); + SetInteractableObjectCollision(this, 0, 0, &gUnk_0811229C); } void sub_0806A958(Entity* this) { diff --git a/src/npc/sittingPerson.c b/src/npc/sittingPerson.c index b7f7af0c..c5f63d07 100644 --- a/src/npc/sittingPerson.c +++ b/src/npc/sittingPerson.c @@ -235,9 +235,9 @@ void SittingPerson_Head(Entity* this) { sub_0807000C(this); } -void sub_080639D0(Entity* this) { +void SittingPerson_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void SittingPerson_Fusion(Entity* this) { diff --git a/src/npc/smallTownMinish.c b/src/npc/smallTownMinish.c index 96e4d1b4..7c35917d 100644 --- a/src/npc/smallTownMinish.c +++ b/src/npc/smallTownMinish.c @@ -14,7 +14,7 @@ void SmallTownMinish(Entity* this) { this->action++; this->hitbox = (Hitbox*)&gUnk_081142FC; sub_0807DD50(this); - sub_08078850(this, 1, 0, gUnk_08114304); + SetInteractableObjectCollision(this, 1, 0, gUnk_08114304); } else { sub_0807DD94(this, NULL); } diff --git a/src/npc/smith.c b/src/npc/smith.c index 08013aa7..df3bf7c4 100644 --- a/src/npc/smith.c +++ b/src/npc/smith.c @@ -205,18 +205,18 @@ void sub_08066258(void) { SoundReq(hammerSounds[Random() & 7]); } -void sub_08066274(Entity* this) { +void Smith_ChangeInteractableHitbox(Entity* this) { static const u8 gUnk_081103E0[] = { 0, 6, 8, 12, }; - sub_08078850(this, 1, 0, &gUnk_081103E0); + SetInteractableObjectCollision(this, 1, 0, &gUnk_081103E0); } -void sub_08066288(Entity* this) { - sub_08078784(this, this->field_0x68.HALF.LO); +void Smith_MakeInteractable(Entity* this) { + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Smith_Fusion(Entity* this) { diff --git a/src/npc/stamp.c b/src/npc/stamp.c index 3c932d97..0ac805ec 100644 --- a/src/npc/stamp.c +++ b/src/npc/stamp.c @@ -35,7 +35,7 @@ void sub_08062BD4(Entity* ent) { ent->action = 1; ent->spriteSettings.draw = 1; InitializeAnimation(ent, 0); - sub_08078778(ent); + AddInteractableWhenBigObject(ent); } void sub_08062BF8(Entity* ent) { diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c index d7187ee3..b3480117 100644 --- a/src/npc/stockwell.c +++ b/src/npc/stockwell.c @@ -48,9 +48,9 @@ void sub_08065080(Entity* this) { this->spriteSettings.draw = 1; SetDefaultPriority(this, PRIO_MESSAGE); InitializeAnimation(this, 4); - sub_08078778(this); + AddInteractableWhenBigObject(this); #ifndef EU - sub_08078850(this, 0, 0, &gUnk_0810FDA0); + SetInteractableObjectCollision(this, 0, 0, &gUnk_0810FDA0); #endif context = StartCutscene(this, &script_Stockwell); *(ScriptExecutionContext**)&this->cutsceneBeh = context; diff --git a/src/npc/sturgeon.c b/src/npc/sturgeon.c index d4902142..05416de9 100644 --- a/src/npc/sturgeon.c +++ b/src/npc/sturgeon.c @@ -28,7 +28,7 @@ extern const u16 gUnk_0810FA54[]; // }; extern u32 gUnk_0810FA5A; // TODO second parameter of sub_0806EE04 -void sub_08064CC0(Entity* this); +void Sturgeon_MakeInteractable(Entity* this); void sub_08064C9C(Entity* this); void sub_08064CD8(Entity* this); @@ -68,7 +68,7 @@ void sub_08064B44(Entity* this) { if (LoadExtraSpriteData(this, gUnk_0810FA38)) { InitializeAnimation(this, 2); sub_0806EE04(this, &gUnk_0810FA5A, 0); - sub_08064CC0(this); + Sturgeon_MakeInteractable(this); this->action = 1; this->subAction = 0; this->spriteSettings.draw = 1; @@ -140,9 +140,9 @@ void sub_08064C9C(Entity* this) { } } -void sub_08064CC0(Entity* this) { +void Sturgeon_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void sub_08064CD8(Entity* this) { diff --git a/src/npc/talon.c b/src/npc/talon.c index b2d99ca8..dc86ba85 100644 --- a/src/npc/talon.c +++ b/src/npc/talon.c @@ -37,7 +37,7 @@ void Talon(Entity* this) { void sub_08065570(Entity* this) { if (LoadExtraSpriteData(this, gUnk_0810FEB0)) { InitializeAnimation(this, 0); - sub_08078778(this); + AddInteractableWhenBigObject(this); this->action = 1; this->subtimer = 1; this->animationState = 2; @@ -79,7 +79,7 @@ void sub_08065608(Entity* this) { this->action = 1; this->spriteSettings.draw = 1; this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); sub_0807DD50(this); } } diff --git a/src/npc/teachers.c b/src/npc/teachers.c index 763bf448..05e0d3f6 100644 --- a/src/npc/teachers.c +++ b/src/npc/teachers.c @@ -42,9 +42,9 @@ void Teachers(Entity* this) { } } -void sub_0806C674(Entity* this) { +void Teachers_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void Teachers_Head(Entity* this) { diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c index cb22cf1d..1d5cfabf 100644 --- a/src/npc/tingleSiblings.c +++ b/src/npc/tingleSiblings.c @@ -83,7 +83,7 @@ void sub_08064DE4(Entity* this) { } } -void sub_08064EA4(Entity* this) { +void TingleSiblings_MakeInteractable(Entity* this) { this->field_0x68.HALF.LO = GetFusionToOffer(this); switch (this->type) { case 0: @@ -99,7 +99,7 @@ void sub_08064EA4(Entity* this) { default: break; } - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void sub_08064EE8(Entity* this) { diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c index 69f729d7..6cf3aa45 100644 --- a/src/npc/townMinish.c +++ b/src/npc/townMinish.c @@ -228,7 +228,7 @@ void sub_0806ACC4(Entity* this) { } if (this->type == 1) { u8 idx = gPlayerEntity.animationState >> 1; - sub_08078850(this, 1, gUnk_081126E4[idx], gUnk_081126D4[idx]); + SetInteractableObjectCollision(this, 1, gUnk_081126E4[idx], gUnk_081126D4[idx]); } } break; @@ -250,8 +250,8 @@ void sub_0806ACC4(Entity* this) { } } -void sub_0806ADFC(Entity* this) { - sub_08078784(this, this->field_0x68.HALF.LO); +void TownMinish_MakeInteractable(Entity* this) { + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void TownMinish_Head(Entity* this) { diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c index 862e00f5..adb973cb 100644 --- a/src/npc/townsperson.c +++ b/src/npc/townsperson.c @@ -15,8 +15,8 @@ extern void sub_08062048(Entity*); extern struct_0810B680 gUnk_0810B680[]; extern SpriteLoadData* gUnk_0810B6EC[]; -extern u32 gUnk_0810B740[]; // TODO fourth parameter of sub_08078850 -extern u8 gUnk_0810B748[]; // TODO third parameter of sub_08078850 +extern u32 gUnk_0810B740[]; // TODO fourth parameter of SetInteractableObjectCollision +extern u8 gUnk_0810B748[]; // TODO third parameter of SetInteractableObjectCollision extern u16 gUnk_0810B74A[]; extern void (*const gUnk_0810B774[])(Entity*); extern void (*const gUnk_0810B77C[])(Entity*); @@ -150,11 +150,11 @@ void sub_08061E50(Entity* this) { } } -void sub_08061E70(Entity* this) { +void Townsperson_MakeInteractable(Entity* this) { if (this->id == 6) { - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } else { - sub_08078778(this); + AddInteractableWhenBigObject(this); } } @@ -236,7 +236,7 @@ void sub_08061FB0(Entity* this) { void sub_08061FB8(Entity* this, ScriptExecutionContext* context) { u8* temp = gUnk_0810B748; - sub_08078850(this, 1, temp[context->intVariable], &gUnk_0810B740[context->intVariable]); + SetInteractableObjectCollision(this, 1, temp[context->intVariable], &gUnk_0810B740[context->intVariable]); } void sub_08061FD8(Entity* this) { diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index d60e0b37..aa4f9b31 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -78,12 +78,12 @@ void sub_0806C85C(Entity* this) { } } -void sub_0806C870(Entity* this) { +void WindTribespeople_MakeInteractable(Entity* this) { u8 bVar1; bVar1 = GetFusionToOffer(this); this->field_0x68.HALF.LO = bVar1; - sub_08078784(this, this->field_0x68.HALF.LO); + AddInteractableWhenBigFuser(this, this->field_0x68.HALF.LO); } void WindTribespeople_Head(Entity* this) { diff --git a/src/npc/zeldaFollower.c b/src/npc/zeldaFollower.c index ae67fcba..38a89062 100644 --- a/src/npc/zeldaFollower.c +++ b/src/npc/zeldaFollower.c @@ -42,7 +42,7 @@ void sub_0806854C(Entity* this, u32* none) { this->myHeap = zMalloc(sizeof(ZeldaFollowerHeap)); if (this->myHeap != NULL) { this->field_0x68.HALF.LO = 1; - sub_080788E0(this); + RemoveInteractableObject(this); this->hitbox = NULL; sub_08068578(this); } diff --git a/src/object/bossDoor.c b/src/object/bossDoor.c index 62ce4aeb..c1b3bcff 100644 --- a/src/object/bossDoor.c +++ b/src/object/bossDoor.c @@ -69,8 +69,8 @@ void BossDoor_Init(BossDoorEntity* this) { super->action = 1; super->spriteSettings.draw = 1; sub_0808C500(this); - sub_08078800(super); - sub_08078850(super, 0, gLockedDoorInteractDirections[this->unk_76], 0); + AddInteractableBossDoor(super); + SetInteractableObjectCollision(super, 0, gLockedDoorInteractDirections[this->unk_76], NULL); break; case 1: super->action = 4; @@ -87,7 +87,7 @@ void BossDoor_Init(BossDoorEntity* this) { void BossDoor_Action1(BossDoorEntity* this) { if (super->interactType != 0) { super->action = 2; - sub_080788E0(super); + RemoveInteractableObject(super); SetFlag(this->unk_86); } } diff --git a/src/object/chestSpawner.c b/src/object/chestSpawner.c index dfe03a92..8a721a58 100644 --- a/src/object/chestSpawner.c +++ b/src/object/chestSpawner.c @@ -26,7 +26,7 @@ extern const Hitbox gUnk_0811F8A8; extern const Hitbox gUnk_0811F8B0; void sub_080842D8(ChestSpawnerEntity*); -void sub_08078828(ChestSpawnerEntity*); +void AddInteractableChest(ChestSpawnerEntity*); void sub_08083E20(ChestSpawnerEntity*); void sub_08084074(u32); void sub_080840A8(s32, s32); @@ -76,7 +76,7 @@ void sub_08083E20(ChestSpawnerEntity* this) { super->spriteSettings.draw = 1; super->spriteRendering.alphaBlend = 0; sub_080842D8(this); - sub_08078828(this); + AddInteractableChest(this); } void ChestSpawner_Type2Init(ChestSpawnerEntity* this) { super->hitbox = (Hitbox*)&gUnk_0811F8B0; @@ -153,7 +153,7 @@ void ChestSpawner_Type2Action3(ChestSpawnerEntity* this) { if (super->interactType != 0) { super->action = 4; super->subtimer = 30; - sub_080788E0(super); + RemoveInteractableObject(super); RequestPriorityDuration(super, 60); SoundReq(SFX_CHEST_OPEN); } diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c index 75911fe8..54423cc0 100644 --- a/src/object/cutsceneMiscObject.c +++ b/src/object/cutsceneMiscObject.c @@ -22,7 +22,7 @@ extern u16 gUnk_08122B1E[]; extern Coords8 gUnk_08122B2E[]; // TODO struct xy typedef struct { Hitbox hit; - u8 _8[4]; // TODO fourth param of sub_08078850 + u8 _8[4]; // TODO fourth param of SetInteractableObjectCollision u8 _c; } HitboxCfg; extern HitboxCfg gUnk_08122B3C[]; @@ -395,13 +395,13 @@ void sub_08094FA8(CutsceneMiscObjectEntity* this) { super->action = 1; super->frameIndex = 0; super->spritePriority.b0 = 7; - sub_080787B4(super); + AddInteractableCheckableObject(super); break; case 1: if (super->interactType != 0) { super->interactType = 0; super->action = 2; - sub_080788E0(super); + RemoveInteractableObject(super); gPlayerState.queued_action = PLAYER_EMPTYBOTTLE; gPlayerState.field_0x38 = 54; #ifndef EU @@ -449,13 +449,13 @@ void sub_08095088(CutsceneMiscObjectEntity* this) { DeleteThisEntity(); super->action = 1; super->spritePriority.b0 = 7; - sub_080787B4(super); + AddInteractableCheckableObject(super); break; case 1: if (super->interactType != 0) { super->interactType = 0; super->action = 2; - sub_080788E0(super); + RemoveInteractableObject(super); CreateEzloHint(TEXT_INDEX(TEXT_BELARI, 0x1F), 0); } break; @@ -1322,6 +1322,6 @@ void sub_080962E8(CutsceneMiscObjectEntity* this) { void sub_080962F8(CutsceneMiscObjectEntity* this, ScriptExecutionContext* ctx) { HitboxCfg* cfg = &gUnk_08122B3C[ctx->intVariable]; - sub_08078850(super, 1, cfg->_c, cfg->_8); + SetInteractableObjectCollision(super, 1, cfg->_c, cfg->_8); super->hitbox = &cfg->hit; } diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c index d52ac049..bf406be3 100644 --- a/src/object/figurineDevice.c +++ b/src/object/figurineDevice.c @@ -79,7 +79,7 @@ void FigurineDevice_Init(FigurineDeviceEntity* this) { case 0: if (CheckLocalFlag(SHOP07_TANA)) { this->unk_7a = 1; - sub_080787B4(super); + AddInteractableCheckableObject(super); } else { this->unk_7a = 0; } @@ -123,7 +123,7 @@ void FigurineDevice_Action1(FigurineDeviceEntity* this) { switch (this->unk_7a) { case 0: this->unk_7a = 1; - sub_080787B4(super); + AddInteractableCheckableObject(super); break; case 1: if (super->interactType != 0) { @@ -142,7 +142,7 @@ void FigurineDevice_Action1(FigurineDeviceEntity* this) { default: if (CheckRoomFlag(2) == 0) { this->unk_7a = 1; - sub_080787B4(super); + AddInteractableCheckableObject(super); } break; } diff --git a/src/object/itemForSale.c b/src/object/itemForSale.c index 342ba851..0f4b1fa5 100644 --- a/src/object/itemForSale.c +++ b/src/object/itemForSale.c @@ -27,14 +27,14 @@ typedef struct { // not match. } ModifiedParentEntity; -extern u32 sub_080787D8(Entity*); +extern u32 AddInteractableShopItem(Entity*); extern void* sub_080784E4(void); void ItemForSale_Init(ItemForSaleEntity*); void ItemForSale_Action1(ItemForSaleEntity*); void ItemForSale_Action2(ItemForSaleEntity*); void ItemForSale_Action3(ItemForSaleEntity*); -void sub_08081A5C(ItemForSaleEntity*); +void ItemForSale_MakeInteractable(ItemForSaleEntity*); void sub_080819B4(ItemForSaleEntity*); void sub_08081AB0(void); @@ -71,7 +71,7 @@ void ItemForSale_Init(ItemForSaleEntity* this) { SetDefaultPriority(super, 6); #endif super->child = super; - sub_08081A5C(this); + ItemForSale_MakeInteractable(this); switch (super->timer) { case 0: super->hitbox = (Hitbox*)&gUnk_080FD328; @@ -154,11 +154,11 @@ void sub_080819B4(ItemForSaleEntity* this) { super->collisionLayer = 1; super->spritePriority.b0 = 4; UpdateSpriteForCollisionLayer(super); - sub_08081A5C(this); + ItemForSale_MakeInteractable(this); } -void sub_08081A5C(ItemForSaleEntity* this) { - u32 tmp = sub_080787D8(super); +void ItemForSale_MakeInteractable(ItemForSaleEntity* this) { + u32 tmp = AddInteractableShopItem(super); if (super->timer == 1) { gPossibleInteraction.candidates[tmp].interactDirections = 0; } diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c index 91cc9ea7..c4d3d8bf 100644 --- a/src/object/lockedDoor.c +++ b/src/object/lockedDoor.c @@ -133,8 +133,8 @@ void LockedDoor_Init(Entity* this) { this->action = 5; } else { this->action = 8; - sub_080787CC(this); - sub_08078850(this, 0, gLockedDoorInteractDirections[this->field_0x7c.BYTES.byte2], 0); + AddInteractableSmallKeyLock(this); + SetInteractableObjectCollision(this, 0, gLockedDoorInteractDirections[this->field_0x7c.BYTES.byte2], NULL); } } else { DeleteThisEntity(); diff --git a/src/object/objectA.c b/src/object/objectA.c index f9db55e0..77622f1f 100644 --- a/src/object/objectA.c +++ b/src/object/objectA.c @@ -34,7 +34,7 @@ void ObjectA(Entity* this) { } DeleteThisEntity(); } else { - sub_080787CC(this); + AddInteractableSmallKeyLock(this); } } else if (this->interactType != 0) { SetTileType(*(u16*)&this->field_0x70.HALF.LO, COORD_TO_TILE(this), this->collisionLayer); diff --git a/src/object/specialChest.c b/src/object/specialChest.c index 2d0264be..8d8fd2f1 100644 --- a/src/object/specialChest.c +++ b/src/object/specialChest.c @@ -9,7 +9,7 @@ #include "flags.h" #include "room.h" -extern void sub_08078828(Entity*); +extern void AddInteractableChest(Entity*); extern void OpenSmallChest(u32 pos, u32 layer); void SpecialChest(Entity* this) { @@ -19,7 +19,7 @@ void SpecialChest(Entity* this) { } this->action = 1; this->collisionLayer = 1; - sub_08078828(this); + AddInteractableChest(this); } if (this->interactType != 0) { OpenSmallChest(COORD_TO_TILE(this), 2); diff --git a/src/object/swordsmanNewsletter.c b/src/object/swordsmanNewsletter.c index f296de5a..15f8eef5 100644 --- a/src/object/swordsmanNewsletter.c +++ b/src/object/swordsmanNewsletter.c @@ -8,7 +8,7 @@ #include "global.h" #include "message.h" -extern void sub_080787B4(Entity*); +extern void AddInteractableCheckableObject(Entity*); void SwordsmanNewsletter_Init(Entity*); void SwordsmanNewsletter_Action1(Entity*); @@ -27,7 +27,7 @@ void SwordsmanNewsletter_Init(Entity* this) { this->frameIndex = this->type; UpdateSpriteForCollisionLayer(this); this->hitbox = (Hitbox*)&gUnk_081228A8; - sub_080787B4(this); + AddInteractableCheckableObject(this); } void SwordsmanNewsletter_Action1(Entity* this) { diff --git a/src/object/windcrest.c b/src/object/windcrest.c index 56bc6459..e552126d 100644 --- a/src/object/windcrest.c +++ b/src/object/windcrest.c @@ -22,9 +22,9 @@ void Windcrest(Entity* this) { HandleEntity0x82Actions(this); } -void sub_080A2124(Entity* this) { +void Windcrest_ChangeInteractableHitbox(Entity* this) { static const u8 gUnk_08125010[] = { 0, 0, 12, 12 }; - sub_08078850(this, 1, 0xe, gUnk_08125010); + SetInteractableObjectCollision(this, 1, 0xe, gUnk_08125010); } void Windcrest_Unlock(Entity* this) { diff --git a/src/playerUtils.c b/src/playerUtils.c index f6745116..67555c86 100644 --- a/src/playerUtils.c +++ b/src/playerUtils.c @@ -995,7 +995,7 @@ void sub_08078180(void) { ptr = sub_080784E4(); if (ptr->entity->interactType == 0) { - switch (ptr->interactCondition) { + switch (ptr->type) { case 1: case 7: uVar1 = 7; @@ -1106,7 +1106,7 @@ bool32 sub_080782C0(void) { if ((gPlayerState.playerInput.newInput & (PLAYER_INPUT_80 | PLAYER_INPUT_8)) == 0) { return FALSE; } - switch (gPossibleInteraction.currentObject->interactCondition) { + switch (gPossibleInteraction.currentObject->type) { default: case 0: return TRUE; @@ -1134,99 +1134,102 @@ bool32 sub_080782C0(void) { return TRUE; } -void sub_080784C8(void) { +void ResetPossibleInteraction(void) { MemClear(&gPossibleInteraction, sizeof(gPossibleInteraction)); gPossibleInteraction.currentObject = (InteractableObject*)&gNoInteraction; } +// determines which (if any) object the player is currently able to interact with ASM_FUNC("asm/non_matching/playerUtils/sub_080784E4.inc", InteractableObject* sub_080784E4(void)) -void sub_08078778(Entity* ent) { - sub_0807887C(ent, 1, 0); +void AddInteractableWhenBigObject(Entity* ent) { + AddInteractableObject(ent, 1, 0); } -void sub_08078784(Entity* ent, u32 arg1) { - sub_0807887C(ent, 1, arg1); +void AddInteractableWhenBigFuser(Entity* ent, u32 kinstoneId) { + AddInteractableObject(ent, 1, kinstoneId); } -void sub_08078790(Entity* ent, u32 arg1) { - sub_0807887C(ent, 2, arg1); +void AddInteractableFuser(Entity* ent, u32 kinstoneId) { + AddInteractableObject(ent, 2, kinstoneId); } -void sub_0807879C(Entity* ent) { - sub_0807887C(ent, 7, 0); +void AddInteractableAsMinishObject(Entity* ent) { + AddInteractableObject(ent, 7, 0); } -void sub_080787A8(Entity* ent, u32 arg1) { - sub_0807887C(ent, 7, arg1); +void AddInteractableAsMinishFuser(Entity* ent, u32 kinstoneId) { + AddInteractableObject(ent, 7, kinstoneId); } -void sub_080787B4(Entity* ent) { - sub_0807887C(ent, 9, 0); +void AddInteractableCheckableObject(Entity* ent) { + AddInteractableObject(ent, 9, 0); } -void sub_080787C0(Entity* ent) { - sub_0807887C(ent, 10, 0); +void AddInteractablePedestal(Entity* ent) { + AddInteractableObject(ent, 10, 0); } -void sub_080787CC(Entity* ent) { - sub_0807887C(ent, 5, 0); +void AddInteractableSmallKeyLock(Entity* ent) { + AddInteractableObject(ent, 5, 0); } -s32 sub_080787D8(Entity* ent) { +s32 AddInteractableShopItem(Entity* ent) { s32 iVar1; - iVar1 = sub_0807887C(ent, 8, 0); + iVar1 = AddInteractableObject(ent, 8, 0); if (iVar1 >= 0) { gPossibleInteraction.candidates[iVar1].interactDirections = 0xbe; } return iVar1; } -s32 sub_08078800(Entity* ent) { +s32 AddInteractableBossDoor(Entity* ent) { s32 iVar1; - iVar1 = sub_0807887C(ent, 6, 0); + iVar1 = AddInteractableObject(ent, 6, 0); + if (iVar1 >= 0) { + // weird, this line assumes it's a north door, and is unnecessary + // anyway because this is overwritten right after returning + gPossibleInteraction.candidates[iVar1].interactDirections = 0xbe; + } + return iVar1; +} + +s32 AddInteractableChest(Entity* ent) { + s32 iVar1; + + iVar1 = AddInteractableObject(ent, 3, 0); if (iVar1 >= 0) { gPossibleInteraction.candidates[iVar1].interactDirections = 0xbe; } return iVar1; } -s32 sub_08078828(Entity* ent) { +void SetInteractableObjectCollision(Entity* arg0, u32 ignoreLayer, u32 interactDirections, const void* customHitbox) { s32 iVar1; - iVar1 = sub_0807887C(ent, 3, 0); + iVar1 = GetInteractableObjectIndex(arg0); if (iVar1 >= 0) { - gPossibleInteraction.candidates[iVar1].interactDirections = 0xbe; - } - return iVar1; -} - -void sub_08078850(Entity* arg0, u32 arg1, u32 arg2, const void* arg3) { - s32 iVar1; - - iVar1 = sub_08078904(arg0); - if (iVar1 >= 0) { - gPossibleInteraction.candidates[iVar1].ignoreLayer = arg1; - gPossibleInteraction.candidates[iVar1].interactDirections = arg2; - gPossibleInteraction.candidates[iVar1].customHitbox = arg3; + gPossibleInteraction.candidates[iVar1].ignoreLayer = ignoreLayer; + gPossibleInteraction.candidates[iVar1].interactDirections = interactDirections; + gPossibleInteraction.candidates[iVar1].customHitbox = customHitbox; } } -s32 sub_0807887C(Entity* entity, u32 param_2, u32 param_3) { +s32 AddInteractableObject(Entity* entity, u32 type, u32 kinstoneId) { s32 index; entity->interactType = 0; - index = sub_08078904(entity); + index = GetInteractableObjectIndex(entity); if (index < 0) { - index = sub_08078904(0); + index = GetInteractableObjectIndex(0); } if (index >= 0) { gPossibleInteraction.candidates[index].entity = entity; - gPossibleInteraction.candidates[index].interactCondition = param_2; - gPossibleInteraction.candidates[index].kinstoneId = param_3; + gPossibleInteraction.candidates[index].type = type; + gPossibleInteraction.candidates[index].kinstoneId = kinstoneId; } - if (param_3 != 0) { + if (kinstoneId != 0) { Entity* entity = FindEntityByID(OBJECT, CAMERA_TARGET, 6); if (entity == NULL) { CreateObject(CAMERA_TARGET, 0, 0); @@ -1236,15 +1239,15 @@ s32 sub_0807887C(Entity* entity, u32 param_2, u32 param_3) { } /** Clear entry for Entity. */ -void sub_080788E0(Entity* entity) { - s32 index = sub_08078904(entity); +void RemoveInteractableObject(Entity* entity) { + s32 index = GetInteractableObjectIndex(entity); if (index > -1) { MemClear(&gPossibleInteraction.candidates[index], sizeof(InteractableObject)); } } /** Find entry for Entity. */ -s32 sub_08078904(Entity* entity) { +s32 GetInteractableObjectIndex(Entity* entity) { u32 index; for (index = 0; index < 0x20; index++) { if (entity == gPossibleInteraction.candidates[index].entity) { diff --git a/src/script.c b/src/script.c index 91bc5e95..23387340 100644 --- a/src/script.c +++ b/src/script.c @@ -94,12 +94,12 @@ void ScriptCommand_SetVariableToFrame(Entity* entity, ScriptExecutionContext* co void ScriptCommand_SetAnimation(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_TriggerInteract(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E974(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E9D4(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E9DC(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E9E4(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_AddInteractableWhenBigObject(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_RemoveInteractableObject(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_AddInteractableWhenBigFuser(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807EA4C(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807EA88(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_AddInteractableFuser(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitUntilTextboxCloses(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_MessageFromTarget(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_MessageNoOverlap(Entity* entity, ScriptExecutionContext* context); @@ -543,12 +543,12 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_SetAnimation, ScriptCommand_TriggerInteract, ScriptCommand_0807E974, - ScriptCommand_0807E9D4, - ScriptCommand_0807E9DC, - ScriptCommand_0807E9E4, + ScriptCommand_AddInteractableWhenBigObject, + ScriptCommand_RemoveInteractableObject, + ScriptCommand_AddInteractableWhenBigFuser, ScriptCommand_0807E9F0, ScriptCommand_0807EA4C, - ScriptCommand_0807EA88, + ScriptCommand_AddInteractableFuser, ScriptCommand_WaitUntilTextboxCloses, ScriptCommand_MessageFromTarget, ScriptCommand_MessageNoOverlap, @@ -1136,16 +1136,16 @@ void ScriptCommand_0807E974(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.commandSize = 0; } -void ScriptCommand_0807E9D4(Entity* entity, ScriptExecutionContext* context) { - sub_08078778(entity); +void ScriptCommand_AddInteractableWhenBigObject(Entity* entity, ScriptExecutionContext* context) { + AddInteractableWhenBigObject(entity); } -void ScriptCommand_0807E9DC(Entity* entity, ScriptExecutionContext* context) { - sub_080788E0(entity); +void ScriptCommand_RemoveInteractableObject(Entity* entity, ScriptExecutionContext* context) { + RemoveInteractableObject(entity); } -void ScriptCommand_0807E9E4(Entity* entity, ScriptExecutionContext* context) { - sub_08078784(entity, context->scriptInstructionPointer[1]); +void ScriptCommand_AddInteractableWhenBigFuser(Entity* entity, ScriptExecutionContext* context) { + AddInteractableWhenBigFuser(entity, context->scriptInstructionPointer[1]); } void ScriptCommand_0807E9F0(Entity* entity, ScriptExecutionContext* context) { @@ -1184,8 +1184,8 @@ void ScriptCommand_0807EA4C(Entity* entity, ScriptExecutionContext* context) { } } -void ScriptCommand_0807EA88(Entity* entity, ScriptExecutionContext* context) { - sub_08078790(entity, context->scriptInstructionPointer[1]); +void ScriptCommand_AddInteractableFuser(Entity* entity, ScriptExecutionContext* context) { + AddInteractableFuser(entity, context->scriptInstructionPointer[1]); } void ScriptCommand_WaitUntilTextboxCloses(Entity* entity, ScriptExecutionContext* context) { @@ -1966,16 +1966,16 @@ void PutItemAnySlot(Entity* entity, ScriptExecutionContext* context) { PutItemOnSlot(context->intVariable); } -void sub_0807F924(Entity* entity, ScriptExecutionContext* context) { - sub_0807879C(entity); +void MakeInteractableAsMinish(Entity* entity, ScriptExecutionContext* context) { + AddInteractableAsMinishObject(entity); } -void sub_0807F92C(Entity* entity, ScriptExecutionContext* context) { - sub_080787C0(entity); +void MakePedestalInteractable(Entity* entity, ScriptExecutionContext* context) { + AddInteractablePedestal(entity); } -void sub_0807F934(Entity* entity, ScriptExecutionContext* context) { - sub_080787B4(entity); +void MakeCheckableObjectInteractable(Entity* entity, ScriptExecutionContext* context) { + AddInteractableCheckableObject(entity); } void sub_0807F93C(Entity* entity, ScriptExecutionContext* context) {