summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authornotyourav <65437533+notyourav@users.noreply.github.com>2023-09-14 18:24:01 -0700
committerGitHub <noreply@github.com>2023-09-14 18:24:01 -0700
commit098e61f0e7b33772974460932af8061d16d149d3 (patch)
tree7e7003570c472e44a83b89f65d71b3601961593e /data/scripts
parent968c0ba5cc8d9c353833ca64ce1f077852689466 (diff)
parenta616ac6376fcb71d284ada7730a7cfebcc752746 (diff)
Merge pull request #629 from Reinmmar/FigurineDeviceMessages
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/hyruleTown/script_Carlov2.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/hyruleTown/script_Carlov2.inc b/data/scripts/hyruleTown/script_Carlov2.inc
index de16ca9f..d1b49cc9 100644
--- a/data/scripts/hyruleTown/script_Carlov2.inc
+++ b/data/scripts/hyruleTown/script_Carlov2.inc
@@ -47,7 +47,7 @@ script_080146E2:
JumpIf script_0801472E
CheckLocalFlag 0x005f
JumpIf script_08014720
- Call sub_08088574
+ Call FigurineDevice_TryAgainMessage
SetRoomFlag 0x000a
Jump script_0801473C
script_0801472E_2:
@@ -104,7 +104,7 @@ script_080146C6:
JumpIf script_0801472E
CheckLocalFlag 0x005f
JumpIf script_08014720
- Call sub_08088574
+ Call FigurineDevice_TryAgainMessage
SetRoomFlag 0x0009
Jump script_0801473C
.endif
@@ -135,7 +135,7 @@ script_08014720:
.else
SetRoomFlag 0x0009
.endif
- Call sub_08088504
+ Call FigurineDevice_NothingNewToDrawMessage
Jump script_0801473C
script_0801472E:
.ifdef EU
@@ -144,7 +144,7 @@ script_0801472E:
SetRoomFlag 0x0009
.endif
ClearRoomFlag 0x0006
- Call sub_08088544
+ Call FigurineDevice_NewFigurinesMessage
script_0801473C:
CheckTextboxResult
JumpIfNot script_08014770
@@ -179,9 +179,9 @@ script_0801477A:
CheckRoomFlag 0x0007
JumpIf script_080147A4
script_0801478A:
- Call sub_08088478
+ Call FigurineDevice_NoFigurinesLeftMessage
WaitUntilTextboxCloses
- Call sub_080885B0
+ Call FigurineDevice_LostOrFinishedMessage
WaitPlayerGetItem
SetSyncFlag 0x00000008
Jump script_080147CE