summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/hyruleTown/script_Anju.inc2
-rw-r--r--data/scripts/hyruleTown/script_Beedle.inc6
-rw-r--r--data/scripts/hyruleTown/script_Emma.inc8
-rw-r--r--data/scripts/hyruleTown/script_GoronMerchant.inc2
-rw-r--r--data/scripts/hyruleTown/script_MalonHyruleTown.inc2
-rw-r--r--data/scripts/hyruleTown/script_Pita.inc2
-rw-r--r--data/scripts/hyruleTown/script_RemFallingAsleep.inc2
-rw-r--r--data/scripts/hyruleTown/script_RentRegularRoom.inc2
-rw-r--r--data/scripts/hyruleTown/script_RentSmallRoom.inc2
-rw-r--r--data/scripts/lonLonRanch/script_TalonInside.inc6
-rw-r--r--data/scripts/unused/script_08012B24.inc2
-rw-r--r--data/scripts/unused/script_08012B50.inc2
-rw-r--r--data/scripts/unused/script_08012B7C.inc2
13 files changed, 20 insertions, 20 deletions
diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc
index 2c67d555..adfccdb4 100644
--- a/data/scripts/hyruleTown/script_Anju.inc
+++ b/data/scripts/hyruleTown/script_Anju.inc
@@ -46,7 +46,7 @@ script_080101AC:
WaitForFadeFinish
CallWithArg SetPlayerPos, 0x03400378
Call SetPlayerActionNormal
- Call sub_0807FB74
+ Call DisablePlayerSwimState
_0807E8E4_1
Call SetPlayerCollisionLayer1
Call CuccoMinigame_Cleanup
diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc
index 4b58971b..49342981 100644
--- a/data/scripts/hyruleTown/script_Beedle.inc
+++ b/data/scripts/hyruleTown/script_Beedle.inc
@@ -38,11 +38,11 @@ script_08010564:
Jump script_08010570
script_08010570:
Call sub_080634EC
- CallWithArg sub_0807F78C, 0x00000000
+ CallWithArg ScriptCommand_SaleItemConfirmMessage, 0x00000000
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_080105E0
- CallWithArg sub_0807F7C4, 0x00000000
+ CallWithArg ScriptCommand_CheckShopItemPrice, 0x00000000
JumpIfNot script_080105C4
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_080105CC
@@ -50,7 +50,7 @@ script_08010570:
JumpIf script_080105D4
MessageNoOverlap TEXT_PICOLYTE, 0x07
WaitUntilTextboxCloses
- CallWithArg sub_0807F800, 0x00000000
+ CallWithArg ScriptCommand_BuyShopItem, 0x00000000
WaitPlayerGetItem
WaitUntilTextboxCloses
MessageNoOverlap TEXT_PICOLYTE, 0x0c
diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc
index e3e87ca5..345d8afd 100644
--- a/data/scripts/hyruleTown/script_Emma.inc
+++ b/data/scripts/hyruleTown/script_Emma.inc
@@ -12,9 +12,9 @@ script_0800E832:
SetAnimationState 0x0004
BeginBlock
MessageFromTarget TEXT_HAPPY_HEARTH, 0x01
- CallWithArg sub_0807F854, 0x00010032
- CallWithArg sub_0807F854, 0x000200c8
- CallWithArg sub_0807F854, 0x00030190
+ CallWithArg ScriptCommand_SetMessageValue, (SMV_RUPEES << 16) | 50
+ CallWithArg ScriptCommand_SetMessageValue, (SMV_FIELD_0X14 << 16) | 200
+ CallWithArg ScriptCommand_SetMessageValue, (SMV_FIELD_0X18 << 16) | 400
EndBlock
WaitUntilTextboxCloses
_0807EB38
@@ -22,7 +22,7 @@ script_0800E832:
script_0800E872: @ Rent large room
BeginBlock
MessageFromTarget TEXT_HAPPY_HEARTH, 0x05
- CallWithArg sub_0807F854, 0x00010190
+ CallWithArg ScriptCommand_SetMessageValue, (SMV_RUPEES << 16) | 400
EndBlock
WaitUntilTextboxCloses
HasRupees 400
diff --git a/data/scripts/hyruleTown/script_GoronMerchant.inc b/data/scripts/hyruleTown/script_GoronMerchant.inc
index 460e9226..e2aee53a 100644
--- a/data/scripts/hyruleTown/script_GoronMerchant.inc
+++ b/data/scripts/hyruleTown/script_GoronMerchant.inc
@@ -77,7 +77,7 @@ script_080108AA:
MessageNoOverlap TEXT_STOCKWELL, 0x20
script_080108B2:
WaitUntilTextboxCloses
- Call sub_0807F83C
+ Call ScriptCommand_PlayerDropHeldObject
script_080108BA:
WaitUntilTextboxCloses
Call EnablePauseMenu
diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc
index 377db839..4128f658 100644
--- a/data/scripts/hyruleTown/script_MalonHyruleTown.inc
+++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc
@@ -16,7 +16,7 @@ script_08014F4A:
DoPostScriptAction 0x0000
BeginBlock
MessageNoOverlap TEXT_MILK, 0x0b
- CallWithArg sub_0807F854, 0x00010064
+ CallWithArg ScriptCommand_SetMessageValue, (SMV_RUPEES << 16) | 100
EndBlock
WaitUntilTextboxCloses
CheckTextboxResult
diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc
index c026e4cf..360afd7a 100644
--- a/data/scripts/hyruleTown/script_Pita.inc
+++ b/data/scripts/hyruleTown/script_Pita.inc
@@ -19,7 +19,7 @@ script_080106BE:
Jump script_08010726
script_080106E0:
Call RemoveAllBakedGoods
- CallWithArg sub_0807F78C, 0x00000000
+ CallWithArg ScriptCommand_SaleItemConfirmMessage, 0x00000000
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_08010726
diff --git a/data/scripts/hyruleTown/script_RemFallingAsleep.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc
index 36e0a0de..08b5211f 100644
--- a/data/scripts/hyruleTown/script_RemFallingAsleep.inc
+++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc
@@ -43,7 +43,7 @@ script_08013006:
WaitPlayerGetItem
Wait 0x001e
_0807E8E4_0
- Call sub_0806AB9C
+ Call DeleteNpcRem
SetAnimation 0x000b
Wait 0x003c
DoPostScriptAction 0x0004
diff --git a/data/scripts/hyruleTown/script_RentRegularRoom.inc b/data/scripts/hyruleTown/script_RentRegularRoom.inc
index e1b15506..3ae62d24 100644
--- a/data/scripts/hyruleTown/script_RentRegularRoom.inc
+++ b/data/scripts/hyruleTown/script_RentRegularRoom.inc
@@ -2,7 +2,7 @@
SCRIPT_START script_RentRegularRoom
BeginBlock
MessageFromTarget TEXT_HAPPY_HEARTH, 0x04
- CallWithArg sub_0807F854, 0x000100c8
+ CallWithArg ScriptCommand_SetMessageValue, (SMV_RUPEES << 16) | 200
EndBlock
WaitUntilTextboxCloses
HasRupees 200
diff --git a/data/scripts/hyruleTown/script_RentSmallRoom.inc b/data/scripts/hyruleTown/script_RentSmallRoom.inc
index d214c5c8..2feb3f13 100644
--- a/data/scripts/hyruleTown/script_RentSmallRoom.inc
+++ b/data/scripts/hyruleTown/script_RentSmallRoom.inc
@@ -2,7 +2,7 @@
SCRIPT_START script_RentSmallRoom
BeginBlock
MessageFromTarget TEXT_HAPPY_HEARTH, 0x03
- CallWithArg sub_0807F854, 0x00010032
+ CallWithArg ScriptCommand_SetMessageValue, (SMV_RUPEES << 16) | 50
EndBlock
WaitUntilTextboxCloses
HasRupees 50
diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc
index 75a00919..e5b898fc 100644
--- a/data/scripts/lonLonRanch/script_TalonInside.inc
+++ b/data/scripts/lonLonRanch/script_TalonInside.inc
@@ -12,15 +12,15 @@ script_08014E64:
SetPlayerIdle
Call DisablePauseMenuAndPutAwayItems
FacePlayer
- CallWithArg sub_0807F78C, 0x00000022
+ CallWithArg ScriptCommand_SaleItemConfirmMessage, 0x00000022
WaitUntilTextboxCloses
CheckTextboxResult
JumpIfNot script_08014EBC
- CallWithArg sub_0807F7C4, 0x00000022
+ CallWithArg ScriptCommand_CheckShopItemPrice, 0x00000022
JumpIfNot script_08014EB0
CheckBottleContaining ITEM_BOTTLE_EMPTY
JumpIfNot script_08014EB8
- CallWithArg sub_0807F800, 0x00000022
+ CallWithArg ScriptCommand_BuyShopItem, 0x00000022
WaitPlayerGetItem
MessageNoOverlap TEXT_EMPTY, 0x04
Jump script_08014EBC
diff --git a/data/scripts/unused/script_08012B24.inc b/data/scripts/unused/script_08012B24.inc
index 5691eba9..72138857 100644
--- a/data/scripts/unused/script_08012B24.inc
+++ b/data/scripts/unused/script_08012B24.inc
@@ -7,6 +7,6 @@ SCRIPT_START script_08012B24
DoPostScriptAction 0x0001
WalkSouth 0x0008
SetSyncFlag 0x00000002
- CallWithArg sub_0807FB64, 0xffffffe2
+ CallWithArg SetPlayerIFrames, 0xffffffe2
Call SetPlayerActionNormal
SCRIPT_END
diff --git a/data/scripts/unused/script_08012B50.inc b/data/scripts/unused/script_08012B50.inc
index 8fb1d22f..8d48f7f2 100644
--- a/data/scripts/unused/script_08012B50.inc
+++ b/data/scripts/unused/script_08012B50.inc
@@ -7,6 +7,6 @@ SCRIPT_START script_08012B50
DoPostScriptAction 0x0001
WalkNorth 0x0008
SetSyncFlag 0x00000002
- CallWithArg sub_0807FB64, 0xffffffe2
+ CallWithArg SetPlayerIFrames, 0xffffffe2
Call SetPlayerActionNormal
SCRIPT_END
diff --git a/data/scripts/unused/script_08012B7C.inc b/data/scripts/unused/script_08012B7C.inc
index 525c228e..228ba8b9 100644
--- a/data/scripts/unused/script_08012B7C.inc
+++ b/data/scripts/unused/script_08012B7C.inc
@@ -7,6 +7,6 @@ SCRIPT_START script_08012B7C
DoPostScriptAction 0x0001
WalkEast 0x0008
SetSyncFlag 0x00000002
- CallWithArg sub_0807FB64, 0xffffffe2
+ CallWithArg SetPlayerIFrames, 0xffffffe2
Call SetPlayerActionNormal
SCRIPT_END
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 12:25:20 +0000