Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Made it clear which message box comes and renamed more functions in figurineDevice,c #629

Merged
merged 3 commits into from
Sep 15, 2023
Merged

Made it clear which message box comes and renamed more functions in figurineDevice,c #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d9edca
Commented a bunch and renamed functions
TimeStepYT Aug 23, 2023
58a7b44
why didn't this commit what the heck
TimeStepYT Aug 23, 2023
a616ac6
formatting
TimeStepYT Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions data/scripts/hyruleTown/script_Carlov2.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -135,7 +135,7 @@ script_08014720:
.else
SetRoomFlag 0x0009
.endif
Call sub_08088504
Call FigurineDevice_NothingNewToDrawMessage
Jump script_0801473C
script_0801472E:
.ifdef EU
Expand All @@ -144,7 +144,7 @@ script_0801472E:
SetRoomFlag 0x0009
.endif
ClearRoomFlag 0x0006
Call sub_08088544
Call FigurineDevice_NewFigurinesMessage
script_0801473C:
CheckTextboxResult
JumpIfNot script_08014770
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading