mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-27 02:35:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Name and clean up some functions and structs

Browse Source
This commit is contained in:
Catobat
2023-04-30 21:43:22 +02:00
parent 4fd83717cd
commit 5145a6909e
16 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/scripts/cloudTops/script_Npc4EFirstCloud.inc
+1 -1
View File
@@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EFirstCloud
Call NPC4E_IsKinstoneFused
JumpIf script_0800D6AE
Call NPC4E_MakeFuserInteractable
CallWithArg sub_0806DA04, 0x00000002
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000002
EndBlock
script_0800D636:
_0807EA4C
data/scripts/hyruleTown/script_Beedle.inc
+3 -3
View File
@@ -19,7 +19,7 @@ script_08010502:
MessageNoOverlap TEXT_PICOLYTE, 0x10
WaitUntilTextboxCloses
script_0801052E:
Call sub_080634E4
Call Beedle_GetObjectType
JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570
script_08010544:
MessageNoOverlap TEXT_PICOLYTE, 0x0d
@@ -37,7 +37,7 @@ script_08010564:
JumpIfNot script_080105DC
Jump script_08010570
script_08010570:
Call sub_080634EC
Call Beedle_ConfirmBuyItem
CallWithArg ScriptCommand_SaleItemConfirmMessage, 0x00000000
WaitUntilTextboxCloses
CheckTextboxResult
@@ -46,7 +46,7 @@ script_08010570:
JumpIfNot script_080105C4
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_080105CC
Call sub_08063504
Call Beedle_IsBottleInInventory
JumpIf script_080105D4
MessageNoOverlap TEXT_PICOLYTE, 0x07
WaitUntilTextboxCloses
data/scripts/npc/script_MysteriousWall.inc
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_MysteriousWall
Call NPC4E_IsKinstoneFused
JumpIf script_0800B9AC
Call NPC4E_MakeFuserInteractable
CallWithArg sub_0806DA04, 0x00000005
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000005
EndBlock
script_0800B98A:
_0807EA4C
data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc
+1 -1
View File
@@ -8,7 +8,7 @@ script_0801427C:
JumpIfNot script_0801427C
BeginBlock
Call MakeCheckableObjectInteractable
CallWithArg sub_0806DA04, 0x00000008
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000008
EndBlock
script_08014298:
CheckEntityInteractType
data/scripts/sanctuary/script_Npc4EPedestal.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EPedestal
EndBlock
BeginBlock
Call MakePedestalInteractable
CallWithArg sub_0806DA04, 0x00000003
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000003
EndBlock
script_080134F8:
CheckEntityInteractType
data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4ESecondSanctuary
EndBlock
BeginBlock
Call MakePedestalInteractable
CallWithArg sub_0806DA04, 0x00000003
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000003
EndBlock
script_0801373C:
CheckEntityInteractType
data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_Npc4EThirdSanctuary
EndBlock
BeginBlock
Call MakePedestalInteractable
CallWithArg sub_0806DA04, 0x00000003
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000003
EndBlock
script_080138D0:
CheckEntityInteractType
data/scripts/unused/script_08012C68.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_08012C68
_0807E9D4
DoPostScriptAction 0x0008
SetIntVariable 0x00000000
Call sub_0806DA04
Call NPC4E_ChangeInteractableHitbox
EndBlock
script_08012C7E:
CheckEntityInteractType
data/scripts/unused/script_08013D04.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_08013D04
BeginBlock
Call MakePedestalInteractable
DoPostScriptAction 0x0008
CallWithArg sub_0806DA04, 0x00000004
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
EndBlock
script_08013D1C:
CheckEntityInteractType
data/scripts/unused/script_08013D44.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_08013D44
BeginBlock
Call MakePedestalInteractable
DoPostScriptAction 0x0008
CallWithArg sub_0806DA04, 0x00000004
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
EndBlock
script_08013D5C:
CheckEntityInteractType
data/scripts/unused/script_08013D84.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_08013D84
BeginBlock
Call MakePedestalInteractable
DoPostScriptAction 0x0008
CallWithArg sub_0806DA04, 0x00000004
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
EndBlock
script_08013D9C:
CheckEntityInteractType
data/scripts/unused/script_08013DC4.inc
+1 -1
View File
@@ -3,7 +3,7 @@ SCRIPT_START script_08013DC4
BeginBlock
Call MakePedestalInteractable
DoPostScriptAction 0x0008
CallWithArg sub_0806DA04, 0x00000004
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000004
EndBlock
script_08013DDC:
CheckEntityInteractType
data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc
+1 -1
View File
@@ -5,7 +5,7 @@ SCRIPT_START script_NPC4ESourceOfTheFlow
CheckKinstoneFused KINSTONE_SOURCE_FLOW
JumpIf script_08016028
_0807EA88 KINSTONE_SOURCE_FLOW
CallWithArg sub_0806DA04, 0x00000007
CallWithArg NPC4E_ChangeInteractableHitbox, 0x00000007
DoPostScriptAction 0x000a
EndBlock
script_08015FE4:
data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc
+1 -1
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_Npc4EWindRuinsTextBoard
Call MakeCheckableObjectInteractable
DoPostScriptAction 0x0008
SetIntVariable 0x00000001
Call sub_0806DA04
Call NPC4E_ChangeInteractableHitbox
EndBlock
script_0800D88E:
CheckEntityInteractType