From c6a8d669013e9ba67aa4dcafd0625ab3db261d71 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Tue, 4 Jan 2022 22:20:41 -0800
Subject: [PATCH 1/2] set doxygen hue aptly

---
 Doxyfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doxyfile b/Doxyfile
index a7cf6ded..4458b22c 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1232,7 +1232,7 @@ HTML_EXTRA_FILES       =
 # Minimum value: 0, maximum value: 359, default value: 220.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_HUE    = 120
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A

From a1da1889e3f7a7d1e0976106068d526864a0e0d1 Mon Sep 17 00:00:00 2001
From: theo3 <arisstephenson2@gmail.com>
Date: Wed, 5 Jan 2022 12:47:34 -0800
Subject: [PATCH 2/2] Fade documentation

---
 Doxyfile                                      |  10 +-
 asm/beanstalkSubtask.s                        |   2 +-
 asm/code_080526F8.s                           |  48 ++++----
 asm/code_0805436C.s                           |   2 +-
 asm/code_08054C04.s                           |  70 ++++++------
 asm/enemy/enemy64.s                           |   4 +-
 asm/enemy/gleerok.s                           |   4 +-
 asm/enterPortalSubtask.s                      |   4 +-
 asm/macros/scripts.inc                        |   8 +-
 asm/non_matching/sub_unk3_HyruleTown_0.inc    |   4 +-
 asm/object/fourElements.s                     |   2 +-
 asm/object/gyorgBossObject.s                  |   2 +-
 asm/object/object3D.s                         |   2 +-
 asm/object/object8E.s                         |   2 +-
 asm/staffroll.s                               |  22 ++--
 asm/subtask.s                                 |   4 +-
 asm/subtask2.s                                |  20 ++--
 .../intro/script_IntroCameraTarget.inc        |   2 +-
 .../intro/script_Npc4EOutsideLinksHouse.inc   |   2 +-
 .../cutscene/intro/script_SmithIntro.inc      |   2 +-
 .../intro/script_ZeldaLeaveLinksHouse.inc     |   2 +-
 .../script_PlayerWakingUpInHyruleCastle.inc   |   2 +-
 .../introCeremony/script_Npc4EMonsters.inc    |   4 +-
 .../introTown/script_Npc4EIntroCastle.inc     |   4 +-
 .../introTown/script_Npc4EIntroTown.inc       |   2 +-
 .../script_Object69CameraTarget.inc           |   2 +-
 .../script_Object69MinishVaati.inc            |   2 +-
 .../script_Object69VaatiAppears.inc           |   2 +-
 .../outro/script_Npc4EMinishPortalClosing.inc |   4 +-
 .../outro/script_Npc4EUnfreezeCastleStaff.inc |   4 +-
 .../reveal/script_Object3EPictureBackRoom.inc |   6 +-
 .../takeover/script_Object69Takeover.inc      |   2 +-
 .../script_Object69TakeoverCutscene.inc       |   8 +-
 data/scripts/dhc/script_Npc4EV3Defeated.inc   |   2 +-
 .../graveyard/script_GreatFairyArrows.inc     |   4 +-
 data/scripts/hyruleTown/script_Anju.inc       |   4 +-
 .../hyruleTown/script_PlayerSleepingInn.inc   |   2 +-
 .../lakeHylia/script_KingGustafHologram.inc   |   4 +-
 .../mtCrenel/script_GreatFairyBombs.inc       |   4 +-
 .../sanctuary/script_Npc4EPedestal.inc        |   4 +-
 .../sanctuary/script_Npc4ESecondSanctuary.inc |   4 +-
 .../sanctuary/script_Npc4EThirdSanctuary.inc  |   4 +-
 .../script_Object69LinksHouseBed.inc          |   2 +-
 .../script_PlayerWakeAfterRest.inc            |   2 +-
 data/scripts/unused/script_08016482.inc       |   8 +-
 docs/beanstalk-bg.png                         | Bin 0 -> 30419 bytes
 docs/doxygen-extra.css                        |   5 +
 include/fade.h                                |  89 ++++++++++++++-
 include/structures.h                          |  19 ---
 src/debugScreen.c                             |   2 +-
 src/demoScreen.c                              |   4 +-
 src/enemy/vaatiWrath.c                        |   2 +-
 src/fade.c                                    | 108 +++++++++---------
 src/fileselect.c                              |   4 +-
 src/game.c                                    |  50 ++++----
 src/main.c                                    |   8 ++
 src/manager/manager37.c                       |   4 +-
 src/npc/simon.c                               |   4 +-
 src/object/greatFairy.c                       |   2 +-
 src/object/object6A.c                         |   4 +-
 src/player.c                                  |   8 +-
 src/roomInit.c                                |  12 +-
 src/script.c                                  |  42 +++----
 src/sub_08055E08.c                            |   2 +-
 src/subtask.c                                 |   2 +-
 src/title.c                                   |  12 +-
 66 files changed, 379 insertions(+), 308 deletions(-)
 create mode 100644 docs/beanstalk-bg.png
 create mode 100644 docs/doxygen-extra.css

diff --git a/Doxyfile b/Doxyfile
index 4458b22c..3fd6d9dd 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -195,7 +195,7 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
 
 # If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
 # such as
@@ -1211,7 +1211,7 @@ HTML_STYLESHEET        =
 # list). For an example see the documentation.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_EXTRA_STYLESHEET  =
+HTML_EXTRA_STYLESHEET  = "./docs/doxygen-extra.css"
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
@@ -1232,7 +1232,7 @@ HTML_EXTRA_FILES       =
 # Minimum value: 0, maximum value: 359, default value: 220.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_HUE    = 120
+HTML_COLORSTYLE_HUE    = 220
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A
@@ -1240,7 +1240,7 @@ HTML_COLORSTYLE_HUE    = 120
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_SAT    = 120
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
 # luminance component of the colors in the HTML output. Values below 100
@@ -2275,7 +2275,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of
diff --git a/asm/beanstalkSubtask.s b/asm/beanstalkSubtask.s
index e2cee5a3..faf5cdf2 100644
--- a/asm/beanstalkSubtask.s
+++ b/asm/beanstalkSubtask.s
@@ -79,7 +79,7 @@ _08019700:
 	bl CopyOAM
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	ldr r1, _0801973C @ =gUnk_02018EB0
 	ldrb r0, [r1]
 	adds r0, #1
diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s
index bf115971..91189661 100644
--- a/asm/code_080526F8.s
+++ b/asm/code_080526F8.s
@@ -42,7 +42,7 @@ sub_080535AC: @ 0x080535AC
 	bl LoadRoomEntityList
 	movs r0, #6
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _080535DC: .4byte gMenu
@@ -175,7 +175,7 @@ sub_080536B8: @ 0x080536B8
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #5
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 
@@ -224,7 +224,7 @@ sub_0805370C: @ 0x0805370C
 	bl LoadRoomEntityList
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _08053730: .4byte gMenu
@@ -306,7 +306,7 @@ sub_08053758: @ 0x08053758
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #5
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _080537DC: .4byte gMenu
@@ -376,7 +376,7 @@ sub_08053800: @ 0x08053800
 	strh r1, [r0]
 	ldrh r1, [r4, #0xa]
 	movs r0, #4
-	bl DoFade
+	bl SetFade
 _0805387A:
 	pop {r4, r5, pc}
 	.align 2, 0
@@ -438,7 +438,7 @@ _080538E4:
 	strb r0, [r4, #6]
 	movs r0, #5
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 _080538F8:
 	pop {r4, pc}
 	.align 2, 0
@@ -496,7 +496,7 @@ _08053954:
 	strb r0, [r4, #6]
 	movs r0, #5
 	movs r1, #1
-	bl DoFade
+	bl SetFade
 _08053968:
 	pop {r4, pc}
 	.align 2, 0
@@ -520,7 +520,7 @@ sub_08053974: @ 0x08053974
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #5
-	bl DoFade
+	bl SetFade
 	ldr r1, _080539B4 @ =gMenu
 	ldrb r0, [r1, #6]
 	adds r0, #1
@@ -606,7 +606,7 @@ sub_08053A1C: @ 0x08053A1C
 	strb r4, [r1, #7]
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 _08053A4E:
 	pop {r4, pc}
 	.align 2, 0
@@ -635,7 +635,7 @@ sub_08053A5C: @ 0x08053A5C
 	strb r0, [r1, #6]
 	movs r0, #5
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 _08053A86:
 	pop {pc}
 	.align 2, 0
@@ -690,7 +690,7 @@ sub_08053ACC: @ 0x08053ACC
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #5
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _08053AF4: .4byte gMenu
@@ -723,7 +723,7 @@ sub_08053B10: @ 0x08053B10
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #4
-	bl DoFade
+	bl SetFade
 _08053B34:
 	pop {pc}
 	.align 2, 0
@@ -741,7 +741,7 @@ sub_08053B3C: @ 0x08053B3C
 	bl sub_080A71C4
 	movs r0, #5
 	adds r1, r4, #0
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 
 	thumb_func_start sub_08053B58
@@ -776,7 +776,7 @@ sub_08053B74: @ 0x08053B74
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #5
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _08053BA0: .4byte gMenu
@@ -809,7 +809,7 @@ sub_08053BBC: @ 0x08053BBC
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #4
-	bl DoFade
+	bl SetFade
 _08053BE0:
 	pop {pc}
 	.align 2, 0
@@ -827,7 +827,7 @@ sub_08053BE8: @ 0x08053BE8
 	bl sub_080A71C4
 	movs r0, #5
 	adds r1, r4, #0
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 
 	thumb_func_start sub_08053C04
@@ -862,7 +862,7 @@ sub_08053C20: @ 0x08053C20
 	bl LoadRoomEntityList
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	movs r0, #0x33
 	bl SoundReq
 	pop {pc}
@@ -881,7 +881,7 @@ sub_08053C60: @ 0x08053C60
 	push {lr}
 	movs r0, #5
 	movs r1, #2
-	bl DoFade
+	bl SetFade
 	movs r0, #0xf4
 	bl SoundReq
 	ldr r0, _08053C80 @ =0x80100000
@@ -965,7 +965,7 @@ sub_08053CC8: @ 0x08053CC8
 	strb r5, [r0]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	ldrb r0, [r4, #5]
 	cmp r0, #0x1d
 	bne _08053D1E
@@ -1040,7 +1040,7 @@ sub_08053D90: @ 0x08053D90
 	adds r0, #1
 	strb r0, [r1, #6]
 	movs r0, #0x10
-	bl sub_080500F4
+	bl SetFadeInverted
 _08053DAC:
 	pop {pc}
 	.align 2, 0
@@ -1091,7 +1091,7 @@ sub_08053DB4: @ 0x08053DB4
 	adds r0, #1
 	strb r0, [r5, #6]
 	movs r0, #0x10
-	bl sub_080500F4
+	bl SetFadeInverted
 _08053E1C:
 	pop {r4, r5, pc}
 	.align 2, 0
@@ -1165,7 +1165,7 @@ sub_08053E74: @ 0x08053E74
 	bl SetMinPriority
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08053EB0: .4byte gUnk_080FCFB8
@@ -1217,7 +1217,7 @@ sub_08053EFC: @ 0x08053EFC
 	adds r0, #1
 	strb r0, [r1, #6]
 	movs r0, #8
-	bl sub_080500F4
+	bl SetFadeInverted
 _08053F18:
 	pop {pc}
 	.align 2, 0
@@ -1261,7 +1261,7 @@ sub_08053F20: @ 0x08053F20
 	adds r0, #1
 	strb r0, [r5, #6]
 	movs r0, #8
-	bl sub_080500F4
+	bl SetFadeInverted
 _08053F74:
 	pop {r4, r5, pc}
 	.align 2, 0
diff --git a/asm/code_0805436C.s b/asm/code_0805436C.s
index 50ac313b..7bfaa60a 100644
--- a/asm/code_0805436C.s
+++ b/asm/code_0805436C.s
@@ -97,7 +97,7 @@ _08054954:
 	strb r0, [r1]
 	movs r0, #7
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 _08054962:
 	pop {pc}
 	.align 2, 0
diff --git a/asm/code_08054C04.s b/asm/code_08054C04.s
index 82cf774f..caacf860 100644
--- a/asm/code_08054C04.s
+++ b/asm/code_08054C04.s
@@ -41,7 +41,7 @@ sub_08054C20: @ 0x08054C20
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08054C50: .4byte gMenu
@@ -60,7 +60,7 @@ sub_08054C58: @ 0x08054C58
 	beq _08054C7C
 	movs r0, #7
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	ldr r1, _08054C84 @ =gMenu
 	ldrb r0, [r1, #6]
 	adds r0, #1
@@ -84,7 +84,7 @@ sub_08054C88: @ 0x08054C88
 	bl sub_08054974
 	movs r0, #6
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	movs r0, #0x73
 	bl SoundReq
 	ldrb r0, [r4, #6]
@@ -157,7 +157,7 @@ sub_08054D04: @ 0x08054D04
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08054D34: .4byte gMenu
@@ -251,7 +251,7 @@ sub_08054DAC: @ 0x08054DAC
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08054DF0: .4byte gMenu
@@ -302,7 +302,7 @@ sub_08054E1C: @ 0x08054E1C
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, r5, pc}
 	.align 2, 0
 _08054E54: .4byte gMenu
@@ -327,7 +327,7 @@ sub_08054E5C: @ 0x08054E5C
 	strh r0, [r4, #8]
 	movs r0, #6
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	ldrb r0, [r4, #4]
 	bl sub_080553E0
 	ldrb r0, [r4, #4]
@@ -526,7 +526,7 @@ _08054FCA:
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	strh r4, [r6, #0xa]
 	movs r0, #0x80
 	lsls r0, r0, #3
@@ -599,7 +599,7 @@ sub_08055054: @ 0x08055054
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055080: .4byte gUnk_080FF128
@@ -654,7 +654,7 @@ sub_080550B0: @ 0x080550B0
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _080550E8: .4byte gMenu
@@ -707,7 +707,7 @@ _0805512A:
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055150: .4byte gUnk_080FF17C
@@ -798,7 +798,7 @@ sub_08055184: @ 0x08055184
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r3}
 	mov r8, r3
 	pop {r4, r5, r6, pc}
@@ -959,7 +959,7 @@ sub_08055318: @ 0x08055318
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055348: .4byte gMenu
@@ -978,7 +978,7 @@ sub_08055350: @ 0x08055350
 	beq _08055374
 	movs r0, #7
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	ldr r1, _0805537C @ =gMenu
 	ldrb r0, [r1, #6]
 	adds r0, #1
@@ -1002,7 +1002,7 @@ sub_08055380: @ 0x08055380
 	bl sub_08054974
 	movs r0, #6
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	movs r0, #0x73
 	bl SoundReq
 	ldrb r0, [r4, #6]
@@ -1102,7 +1102,7 @@ sub_08055430: @ 0x08055430
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055460: .4byte gMenu
@@ -1121,7 +1121,7 @@ sub_08055468: @ 0x08055468
 	beq _0805548C
 	movs r0, #7
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	ldr r1, _08055494 @ =gMenu
 	ldrb r0, [r1, #6]
 	adds r0, #1
@@ -1147,7 +1147,7 @@ sub_08055498: @ 0x08055498
 	bl sub_080553E0
 	movs r0, #6
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	movs r0, #0x73
 	bl SoundReq
 	ldrb r0, [r4, #6]
@@ -1216,7 +1216,7 @@ sub_08055518: @ 0x08055518
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055540: .4byte gMenu
@@ -1313,7 +1313,7 @@ sub_080555B8: @ 0x080555B8
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, r5, pc}
 	.align 2, 0
 _08055600: .4byte gMenu
@@ -1430,7 +1430,7 @@ sub_080556AC: @ 0x080556AC
 	bl sub_08055B70
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _080556E4: .4byte gMenu
@@ -1491,7 +1491,7 @@ _08055734:
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _0805575C: .4byte gMenu
@@ -1578,7 +1578,7 @@ sub_080557D0: @ 0x080557D0
 	bl sub_08055B70
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055808: .4byte gMenu
@@ -1631,7 +1631,7 @@ _0805584A:
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055870: .4byte gUnk_080FF2C0
@@ -1683,7 +1683,7 @@ sub_080558A4: @ 0x080558A4
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _080558DC: .4byte gMenu
@@ -1734,7 +1734,7 @@ sub_08055908: @ 0x08055908
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, r5, pc}
 	.align 2, 0
 _08055940: .4byte gMenu
@@ -1859,7 +1859,7 @@ _08055A0E:
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055A30: .4byte gMenu
@@ -1879,7 +1879,7 @@ sub_08055A3C: @ 0x08055A3C
 	beq _08055A60
 	movs r0, #7
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	ldr r1, _08055A68 @ =gMenu
 	ldrb r0, [r1, #6]
 	adds r0, #1
@@ -1905,7 +1905,7 @@ sub_08055A6C: @ 0x08055A6C
 	bl sub_080553E0
 	movs r0, #6
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	movs r0, #0x73
 	bl SoundReq
 	ldrb r0, [r4, #6]
@@ -1986,7 +1986,7 @@ _08055B14:
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055B2C: .4byte gMenu
@@ -2095,7 +2095,7 @@ sub_08055BCC: @ 0x08055BCC
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055BFC: .4byte gMenu
@@ -2114,7 +2114,7 @@ sub_08055C04: @ 0x08055C04
 	beq _08055C28
 	movs r0, #7
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	ldr r1, _08055C30 @ =gMenu
 	ldrb r0, [r1, #6]
 	adds r0, #1
@@ -2168,7 +2168,7 @@ _08055C6C:
 _08055C8C:
 	movs r0, #6
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	movs r0, #0x73
 	bl SoundReq
 	ldr r0, _08055CAC @ =gMenu
@@ -2242,7 +2242,7 @@ sub_08055CF4: @ 0x08055CF4
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _08055D24: .4byte gMenu
@@ -2321,7 +2321,7 @@ sub_08055D9C: @ 0x08055D9C
 	strb r0, [r1]
 	movs r0, #4
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _08055DB8: .4byte gMenu
diff --git a/asm/enemy/enemy64.s b/asm/enemy/enemy64.s
index 8d706fde..4e8c8401 100644
--- a/asm/enemy/enemy64.s
+++ b/asm/enemy/enemy64.s
@@ -1013,7 +1013,7 @@ sub_080497D0: @ 0x080497D0
 	movs r0, #5
 	strb r0, [r4, #0xd]
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 _08049802:
 	pop {r4, pc}
 
@@ -1073,7 +1073,7 @@ sub_08049804: @ 0x08049804
 	bl sub_080809D4
 	movs r0, #4
 	movs r1, #4
-	bl DoFade
+	bl SetFade
 _08049878:
 	pop {r4, pc}
 	.align 2, 0
diff --git a/asm/enemy/gleerok.s b/asm/enemy/gleerok.s
index 308afc87..0be3735b 100644
--- a/asm/enemy/gleerok.s
+++ b/asm/enemy/gleerok.s
@@ -169,7 +169,7 @@ sub_0802D158: @ 0x0802D158
 	strb r1, [r0]
 	movs r0, #7
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _0802D16C: .4byte gUnk_02034490
@@ -234,7 +234,7 @@ sub_0802D170: @ 0x0802D170
 	str r5, [r4, #0x30]
 	movs r0, #6
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	b _0802D216
 	.align 2, 0
 _0802D1F0: .4byte gFadeControl
diff --git a/asm/enterPortalSubtask.s b/asm/enterPortalSubtask.s
index 5a9688cb..a7a9aecf 100644
--- a/asm/enterPortalSubtask.s
+++ b/asm/enterPortalSubtask.s
@@ -65,7 +65,7 @@ _0804ABA4:
 	strb r0, [r1, #0xe]
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {r4, r5, pc}
 	.align 2, 0
 _0804ABF8: .4byte gScreen
@@ -137,7 +137,7 @@ _0804AC86:
 	strb r0, [r1, #0xe]
 	movs r0, #7
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 _0804AC96:
 	pop {r4, pc}
 	.align 2, 0
diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc
index 145b24d1..5da59cf1 100644
--- a/asm/macros/scripts.inc
+++ b/asm/macros/scripts.inc
@@ -343,19 +343,19 @@
 	.2byte \s
 .endm
 
-.macro DoFade4 
+.macro SetFade4 
 	.2byte 0x043c
 .endm
 
-.macro DoFade5 
+.macro SetFade5 
 	.2byte 0x043d
 .endm
 
-.macro DoFade6 
+.macro SetFade6 
 	.2byte 0x043e
 .endm
 
-.macro DoFade7 
+.macro SetFade7 
 	.2byte 0x043f
 .endm
 
diff --git a/asm/non_matching/sub_unk3_HyruleTown_0.inc b/asm/non_matching/sub_unk3_HyruleTown_0.inc
index 0dc72abe..d916de13 100644
--- a/asm/non_matching/sub_unk3_HyruleTown_0.inc
+++ b/asm/non_matching/sub_unk3_HyruleTown_0.inc
@@ -86,7 +86,7 @@ _0804DE5C:
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #7
-	bl DoFade
+	bl SetFade
 	b _0804DECC
 	.align 2, 0
 _0804DEB4: .4byte gArea
@@ -96,7 +96,7 @@ _0804DEC0: .4byte gRoomTransition
 _0804DEC4:
 	movs r0, #6
 	movs r1, #0x10
-	bl DoFade
+	bl SetFade
 _0804DECC:
 	movs r0, #1
 	pop {r4, r5, r6, pc}
diff --git a/asm/object/fourElements.s b/asm/object/fourElements.s
index f59c48cc..0e248794 100644
--- a/asm/object/fourElements.s
+++ b/asm/object/fourElements.s
@@ -183,7 +183,7 @@ sub_080A02CC: @ 0x080A02CC
 	bl sub_0808C650
 	movs r0, #6
 	movs r1, #2
-	bl DoFade
+	bl SetFade
 	movs r0, #0xf8
 	bl SoundReq
 	movs r0, #0xa4
diff --git a/asm/object/gyorgBossObject.s b/asm/object/gyorgBossObject.s
index 4066ef56..11eb2ff4 100644
--- a/asm/object/gyorgBossObject.s
+++ b/asm/object/gyorgBossObject.s
@@ -832,7 +832,7 @@ _080A1C40:
 	bne _080A1C9A
 	movs r0, #7
 	movs r1, #4
-	bl DoFade
+	bl SetFade
 	b _080A1C9A
 _080A1C52:
 	subs r0, #1
diff --git a/asm/object/object3D.s b/asm/object/object3D.s
index c04687c7..612f9772 100644
--- a/asm/object/object3D.s
+++ b/asm/object/object3D.s
@@ -153,7 +153,7 @@ _0808CFC6:
 	strh r6, [r0, #0x10]
 	movs r0, #5
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 _0808D01E:
 	pop {r4, r5, r6, pc}
 	.align 2, 0
diff --git a/asm/object/object8E.s b/asm/object/object8E.s
index 16e40405..c52b9c7b 100644
--- a/asm/object/object8E.s
+++ b/asm/object/object8E.s
@@ -611,7 +611,7 @@ _0809BCDC:
 	bne _0809BDAE
 	movs r0, #6
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	movs r0, #3
 	bl sub_0805AAF0
 	ldr r2, _0809BD18 @ =gScreen
diff --git a/asm/staffroll.s b/asm/staffroll.s
index cf064177..0e876b9b 100644
--- a/asm/staffroll.s
+++ b/asm/staffroll.s
@@ -100,7 +100,7 @@ _080A365E:
 	movs r1, #0x80
 	lsls r1, r1, #1
 	movs r0, #5
-	bl DoFade
+	bl SetFade
 	pop {r4, r5, pc}
 	.align 2, 0
 _080A36B0: .4byte gUnk_081272F0
@@ -181,7 +181,7 @@ sub_080A36F8: @ 0x080A36F8
 _080A374A:
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 _080A3752:
 	pop {r4, r5, pc}
 	.align 2, 0
@@ -333,7 +333,7 @@ sub_080A3864: @ 0x080A3864
 	bl sub_080A3954
 	movs r0, #5
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 _080A3880:
 	pop {pc}
 	.align 2, 0
@@ -347,10 +347,10 @@ sub_080A3888: @ 0x080A3888
 	str r0, [r1, #4]
 	movs r0, #5
 	movs r1, #4
-	bl DoFade
+	bl SetFade
 	ldr r0, _080A38B0 @ =gMenu
 	ldrh r0, [r0, #8]
-	bl sub_08050038
+	bl SetFadeProgress
 	bl sub_080A3954
 	pop {pc}
 	.align 2, 0
@@ -363,10 +363,10 @@ sub_080A38B4: @ 0x080A38B4
 	push {lr}
 	movs r0, #4
 	movs r1, #4
-	bl DoFade
+	bl SetFade
 	ldr r0, _080A38CC @ =gMenu
 	ldrh r0, [r0, #8]
-	bl sub_08050038
+	bl SetFadeProgress
 	bl sub_080A3954
 	pop {pc}
 	.align 2, 0
@@ -404,7 +404,7 @@ sub_080A38D0: @ 0x080A38D0
 	strb r1, [r0, #5]
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 _080A3914:
 	pop {r3}
 	mov r8, r3
@@ -425,7 +425,7 @@ sub_080A3930: @ 0x080A3930
 	bne _080A3948
 	movs r0, #7
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	ldr r1, _080A3950 @ =gMain
 	movs r0, #2
 	strb r0, [r1, #3]
@@ -535,7 +535,7 @@ _080A39C8:
 	strh r5, [r2, #0x26]
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	b _080A3B36
 	.align 2, 0
 _080A3A2C: .4byte gScreen
@@ -666,7 +666,7 @@ _080A3B14:
 	bl sub_08050384
 	movs r0, #7
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	ldr r1, _080A3B40 @ =gMain
 	movs r0, #3
 	strb r0, [r1, #3]
diff --git a/asm/subtask.s b/asm/subtask.s
index ea7d1839..a643ad7b 100644
--- a/asm/subtask.s
+++ b/asm/subtask.s
@@ -1423,7 +1423,7 @@ _080A4694:
 	strb r1, [r3, #0x1c]
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _080A46A0: .4byte gPaletteBuffer
@@ -2773,7 +2773,7 @@ _080A4F66:
 	bl sub_080A4DB8
 	movs r0, #4
 	movs r1, #0x20
-	bl DoFade
+	bl SetFade
 	movs r0, #1
 	bl sub_080A4E90
 	pop {r4, pc}
diff --git a/asm/subtask2.s b/asm/subtask2.s
index e8bd02cf..58b34906 100644
--- a/asm/subtask2.s
+++ b/asm/subtask2.s
@@ -1087,7 +1087,7 @@ _080A5B8E:
 	bne _080A5BAA
 	movs r0, #7
 	movs r1, #0x20
-	bl DoFade
+	bl SetFade
 	movs r0, #0x3c
 	strh r0, [r6, #8]
 	movs r0, #2
@@ -1115,7 +1115,7 @@ sub_080A5BB8: @ 0x080A5BB8
 	strb r0, [r1, #1]
 	movs r0, #6
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	movs r0, #2
 	bl sub_080A4E84
 	ldr r1, _080A5BEC @ =gUnk_02034490
@@ -2896,7 +2896,7 @@ sub_080A6534: @ 0x080A6534
 	bl sub_080A7114
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {r4, pc}
 	.align 2, 0
 _080A6590: .4byte gScreen
@@ -3920,7 +3920,7 @@ _080A6BD4:
 	bl sub_080A7114
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {r3}
 	mov r8, r3
 	pop {r4, r5, r6, r7, pc}
@@ -4023,7 +4023,7 @@ sub_080A6CA8: @ 0x080A6CA8
 	bl sub_080A7114
 	movs r0, #4
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _080A6CD4: .4byte gMenu
@@ -4229,7 +4229,7 @@ sub_080A6DF8: @ 0x080A6DF8
 	bl sub_080A7114
 	movs r0, #5
 	movs r1, #8
-	bl DoFade
+	bl SetFade
 	b _080A6E3A
 	.align 2, 0
 _080A6E14: .4byte gMenu
@@ -4729,7 +4729,7 @@ _080A716C:
 	strb r0, [r1, #4]
 	movs r0, #5
 	movs r1, #0x20
-	bl DoFade
+	bl SetFade
 	ldr r0, _080A71A0 @ =gUnk_02018EB0
 	strb r4, [r0]
 	strb r4, [r0, #1]
@@ -4781,7 +4781,7 @@ Subtask_Exit: @ 0x080A71DC
 	strb r0, [r1]
 	movs r0, #5
 	movs r1, #0x20
-	bl DoFade
+	bl SetFade
 	pop {pc}
 	.align 2, 0
 _080A71F0: .4byte gUnk_02032EC0
@@ -5054,7 +5054,7 @@ _080A73B4:
 	beq _080A74A8
 	adds r0, r1, #0
 	ldrh r1, [r5, #0xa]
-	bl DoFade
+	bl SetFade
 	b _080A74AE
 	.align 2, 0
 _080A7468: .4byte gFadeControl
@@ -5075,7 +5075,7 @@ _080A74A0: .4byte 0x0000085C
 _080A74A4: .4byte 0x0000FFFF
 _080A74A8:
 	ldrh r0, [r5, #0xa]
-	bl sub_080500F4
+	bl SetFadeInverted
 _080A74AE:
 	ldr r1, _080A74C0 @ =gUnk_02032EC0
 	movs r2, #0
diff --git a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc
index 764464ad..3c3d8b38 100644
--- a/data/scripts/cutscene/intro/script_IntroCameraTarget.inc
+++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_IntroCameraTarget
 	PlayBgm BGM_MINISH_CAP
 	SetFadeTime 0x0002
 	@ Fade in
-	DoFade4
+	SetFade4
 	WaitForFadeFinish @ TODO wait for fade to be finished
 	Wait 0x0078
 	SetSyncFlag 0x00000004
diff --git a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc
index 9acf2548..7a526696 100644
--- a/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc
+++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc
@@ -8,7 +8,7 @@ SCRIPT_START script_Npc4EOutsideLinksHouse
 	Call sub_0807DF28
 	EndBlock
 	SetFadeTime 0x0010
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	SetSyncFlag 0x00000001
 	WaitForSyncFlagAndClear 0x00000002
diff --git a/data/scripts/cutscene/intro/script_SmithIntro.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc
index ae998135..832e37cb 100644
--- a/data/scripts/cutscene/intro/script_SmithIntro.inc
+++ b/data/scripts/cutscene/intro/script_SmithIntro.inc
@@ -32,7 +32,7 @@ SCRIPT_START script_SmithIntro
 	DoPostScriptAction 0x0000
 	Wait 0x001e
 	SetFadeTime 0x0002
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_08053634
 SCRIPT_END
diff --git a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc
index 164293e8..0b496f45 100644
--- a/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc
+++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_ZeldaLeaveLinksHouse
 	_0807EDD4 0x0078, 0x0098
 	DoPostScriptAction 0x0008
 	SetFadeTime 0x0010
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_08053634
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc
index 79078065..97319c8f 100644
--- a/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc
+++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_PlayerWakingUpInHyruleCastle
 	EndBlock
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 script_08009EA4:
 	Call CheckAnyKeyPressed
diff --git a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
index 0e733e50..a25fa93f 100644
--- a/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
@@ -14,7 +14,7 @@ SCRIPT_START script_Npc4EMonsters
 	SetSyncFlag 0x00800000
 	WaitForSyncFlagAndClear 0x01000000
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	Wait 0x003c
 	PlaySound SFX_SPIRITS_RELEASE
@@ -23,7 +23,7 @@ SCRIPT_START script_Npc4EMonsters
 	SetSyncFlag 0x00000010
 	WaitForSyncFlagAndClear 0x00000020
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	CallWithArg DeleteManager36, 0x00000002
 	_0807F0C8 0x0000, 0x0000
diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
index 722006a3..9e1c5a94 100644
--- a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
+++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc
@@ -18,7 +18,7 @@ SCRIPT_START script_Npc4EIntroCastle
 	WaitUntilTextboxCloses
 	StopBgm
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_08064180
 	Call sub_08064180
@@ -39,7 +39,7 @@ SCRIPT_START script_Npc4EIntroCastle
 	Wait 0x000a
 	_0807F0B4 0x0001
 	SetFadeTime 0x0001
-	DoFade4
+	SetFade4
 	SetSyncFlag 0x0002a800
 	WaitForSyncFlagAndClear 0x00055000
 	SetEntityPositionRelative 0x01f8, 0x0078
diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
index 1b23ef0d..0f8cf461 100644
--- a/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
+++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
@@ -19,7 +19,7 @@ SCRIPT_START script_Npc4EIntroTown
 	SetEntityPositionRelative 0x00c8, 0x0148
 	Call sub_0807F844
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	StartPlayerScript script_PlayerIntro1
 	SetSyncFlag 0x00000002
diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
index b6217240..9706a139 100644
--- a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
+++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc
@@ -20,7 +20,7 @@ SCRIPT_START script_Object69CameraTarget
 	WaitForSyncFlagAndClear 0x00001000
 	StopBgm
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	SetRoomFlag 0x0001
 	DoPostScriptAction 0x0006
diff --git a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
index 8f2e5cee..cc7d99f5 100644
--- a/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
+++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_Object69MinishVaati
 	EndBlock
 	PlayBgm BGM_EZLO_STORY
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000080
diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc
index 411aae34..79a9e79c 100644
--- a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc
+++ b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc
@@ -135,7 +135,7 @@ script_08015104:
 	_0807F0B4 0x0004
 	CameraTargetEntity
 	SetFadeTime 0x0100
-	DoFade4
+	SetFade4
 	_0807E80C 0x00000000
 	EndBlock
 	StartPlayerScript script_PlayerSeenOriginStory
diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
index 75cd30d5..804f04ec 100644
--- a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc
@@ -54,7 +54,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
 	Call sub_0808D280
 	Wait 0x0078
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_0807FB94 @ Roll Credits
 	MoveEntityToPlayer
@@ -62,7 +62,7 @@ SCRIPT_START script_Npc4EMinishPortalClosing
 	_0807F0B4 0x0004
 	CameraTargetPlayer
 	SetSyncFlag 0x80000000
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	Call sub_0807DF50
 	EnablePlayerControl
diff --git a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
index 0430d9ce..c3879751 100644
--- a/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
+++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc
@@ -9,12 +9,12 @@ SCRIPT_START script_Npc4EUnfreezeCastleStaff
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	SetSyncFlag 0x00000001
 	PlaySound SFX_APPARATE
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	Wait 0x001e
 	SetSyncFlag 0x00000002
diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc
index a0dc7eb6..b8dd72eb 100644
--- a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc
+++ b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc
@@ -12,7 +12,7 @@ SCRIPT_START script_Object3EPictureBackRoom
 	StartPlayerScript script_PlayerMoveToPicture
 	WaitForSyncFlagAndClear 0x00000002
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	LoadRoomEntityList gUnk_080F5680
 	StartPlayerScript script_PlayerSanctuaryIntro
@@ -45,7 +45,7 @@ SCRIPT_START script_Object3EPictureBackRoom
 	WaitForSyncFlagAndClear 0x00000040
 	SetFadeMask 0xffff7fff
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	StopBgm
 	_0807E858 0x0000
@@ -56,7 +56,7 @@ SCRIPT_START script_Object3EPictureBackRoom
 	WaitUntilTextboxCloses
 	SetFadeMask 0xffffffff
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000002
diff --git a/data/scripts/cutscene/takeover/script_Object69Takeover.inc b/data/scripts/cutscene/takeover/script_Object69Takeover.inc
index 773a0fef..5aba0ef9 100644
--- a/data/scripts/cutscene/takeover/script_Object69Takeover.inc
+++ b/data/scripts/cutscene/takeover/script_Object69Takeover.inc
@@ -23,7 +23,7 @@ script_08015BF0:
 	Call sub_0807FBC4
 	CameraTargetPlayer
 	SetFadeTime 0x0100
-	DoFade4
+	SetFade4
 	_0807E80C 0x00000000
 	EndBlock
 	SetFadeTime 0x0004
diff --git a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc
index dea65804..0503d6ce 100644
--- a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc
+++ b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc
@@ -6,7 +6,7 @@ SCRIPT_START script_Object69TakeoverCutscene
 	CameraTargetEntity
 	EndBlock
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	Wait 0x003c
 	_0807F0B4 0x0004
@@ -39,14 +39,14 @@ SCRIPT_START script_Object69TakeoverCutscene
 	SetSyncFlag 0x00000010
 	WaitForSyncFlagAndClear 0x00000020
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	SetSyncFlag 0x00000010
 	LoadRoomEntityList gUnk_080FCE30
 	StopBgm
 	Wait 0x0078
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	PlayBgm BGM_DIGGING_CAVE
 	SetSyncFlag 0x00000040
@@ -60,7 +60,7 @@ SCRIPT_START script_Object69TakeoverCutscene
 	SetSyncFlag 0x00000004
 	WaitForSyncFlagAndClear 0x00000008
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	StopBgm
 	SetRoomFlag 0x0000
diff --git a/data/scripts/dhc/script_Npc4EV3Defeated.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc
index 09f214d5..6788d7e5 100644
--- a/data/scripts/dhc/script_Npc4EV3Defeated.inc
+++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc
@@ -18,7 +18,7 @@ script_0800A0FE:
 	CallWithArg sub_08094AE8, script_Object6AV3DefeatedMinishCap
 	PlaySound SFX_APPARATE
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	EndBlock
 	WaitForFadeFinish
 	WaitForSyncFlagAndClear 0x00000004
diff --git a/data/scripts/graveyard/script_GreatFairyArrows.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc
index 9979e761..c032efd8 100644
--- a/data/scripts/graveyard/script_GreatFairyArrows.inc
+++ b/data/scripts/graveyard/script_GreatFairyArrows.inc
@@ -41,10 +41,10 @@ script_0800B698:
 	WaitUntilTextboxCloses
 script_0800B6A6:
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	Call sub_080873FC
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	CameraTargetPlayer
 	Wait 0x001e
diff --git a/data/scripts/hyruleTown/script_Anju.inc b/data/scripts/hyruleTown/script_Anju.inc
index 6e931df0..627bc9b1 100644
--- a/data/scripts/hyruleTown/script_Anju.inc
+++ b/data/scripts/hyruleTown/script_Anju.inc
@@ -42,7 +42,7 @@ script_080101AC:
 	WaitUntilTextboxCloses
 	StopBgm
 	SetFadeTime 0x0004
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	CallWithArg SetPlayerPos, 0x03400378
 	Call SetPlayerActionNormal
@@ -57,7 +57,7 @@ script_080101AC:
 	CameraTargetPlayer
 	EndBlock
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	PlayBGM
 	Call sub_080A13B4
diff --git a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc
index c432019d..b782d895 100644
--- a/data/scripts/hyruleTown/script_PlayerSleepingInn.inc
+++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc
@@ -7,7 +7,7 @@ SCRIPT_START script_PlayerSleepingInn
 	EndBlock
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 script_08010A78:
 	Call CheckAnyKeyPressed
diff --git a/data/scripts/lakeHylia/script_KingGustafHologram.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc
index 295cd219..a79fcdc2 100644
--- a/data/scripts/lakeHylia/script_KingGustafHologram.inc
+++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc
@@ -12,7 +12,7 @@ script_08012368:
 	BeginBlock
 	SetFadeTime 0x0004
 	SetFadeMask 0x00007fff
-	DoFade5
+	SetFade5
 	_0807E858 0x0080
 	EndBlock
 	WaitForFadeFinish
@@ -36,7 +36,7 @@ script_08012368:
 	BeginBlock
 	SetFadeTime 0x0004
 	SetFadeMask 0xffffffff
-	DoFade4
+	SetFade4
 	_0807E858 0x0080
 	EndBlock
 	WaitForFadeFinish
diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc
index 05470c3d..bfde8c90 100644
--- a/data/scripts/mtCrenel/script_GreatFairyBombs.inc
+++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc
@@ -31,10 +31,10 @@ script_0800B7A2:
 	MessageNoOverlap 0x0590
 	WaitUntilTextboxCloses
 	SetFadeTime 0x0010
-	DoFade7
+	SetFade7
 	WaitForFadeFinish
 	ModHealth 0x00a0
-	DoFade6 
+	SetFade6 
 	WaitForFadeFinish 
 	MessageNoOverlap 0x057f
 	WaitUntilTextboxCloses
diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc
index 6662c61f..6abf95dc 100644
--- a/data/scripts/sanctuary/script_Npc4EPedestal.inc
+++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc
@@ -58,13 +58,13 @@ script_080134F8:
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	PlaySound SFX_EVAPORATE
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000010
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	PlaySound SFX_109
 	MessageFromTargetPos 0x0503, 0x000c
diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
index 155c1dbf..e36bf5f1 100644
--- a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc
@@ -61,13 +61,13 @@ script_0801373C:
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	PlaySound SFX_EVAPORATE
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000010
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	PlaySound SFX_109
 	MessageFromTargetPos 0x0504, 0x000c
diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
index 36e26a82..ae46129d 100644
--- a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
@@ -66,13 +66,13 @@ script_080138D0:
 	Call WaitForPlayerFrameHiBit
 	Wait 0x003c
 	SetFadeTime 0x0004
-	DoFade7
+	SetFade7
 	PlaySound SFX_EVAPORATE
 	WaitForFadeFinish
 	Wait 0x003c
 	SetSyncFlag 0x00000010
 	SetFadeTime 0x0002
-	DoFade6
+	SetFade6
 	WaitForFadeFinish
 	PlaySound SFX_109
 	MessageFromTargetPos 0x0505, 0x000c
diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc
index 2474bfb8..95402c27 100644
--- a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc
+++ b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc
@@ -13,7 +13,7 @@ script_08009DF0:
 	JumpIfNot script_08009E4E
 	Call sub_0807DF28
 	SetFadeTime 0x0002
-	DoFade5
+	SetFade5
 	WaitForFadeFinish
 	Call sub_0804E864
 	Wait 0x001e
diff --git a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc
index e7d0ce43..dc707d43 100644
--- a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc
+++ b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc
@@ -5,7 +5,7 @@ SCRIPT_START script_PlayerWakeAfterRest
 	EndBlock
 	WaitForSyncFlagAndClear 0x00000002
 	SetFadeTime 0x0002
-	DoFade4
+	SetFade4
 	WaitForFadeFinish
 	DoPostScriptAction 0x0014
 	Wait 0x001e
diff --git a/data/scripts/unused/script_08016482.inc b/data/scripts/unused/script_08016482.inc
index 4d1bcbe0..2e4770e6 100644
--- a/data/scripts/unused/script_08016482.inc
+++ b/data/scripts/unused/script_08016482.inc
@@ -2,10 +2,10 @@
 SCRIPT_START script_08016482
 	FadeInvert
 	Nop2 0x0080
-	DoFade4
-	DoFade5
-	DoFade6
-	DoFade7
+	SetFade4
+	SetFade5
+	SetFade6
+	SetFade7
 	_0807E800 0x00000000
 	_0807E80C 0x00000000
 	_0807E858_0
diff --git a/docs/beanstalk-bg.png b/docs/beanstalk-bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2662231bd504f009a050b0b7f045f277d8cdcd1
GIT binary patch
literal 30419
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
CW&vdY

literal 0
HcmV?d00001

diff --git a/docs/doxygen-extra.css b/docs/doxygen-extra.css
new file mode 100644
index 00000000..bca8e29c
--- /dev/null
+++ b/docs/doxygen-extra.css
@@ -0,0 +1,5 @@
+body {
+    background-image:  url("../../beanstalk-bg.png");
+    background-attachment: fixed;
+    background-size: cover;
+}
diff --git a/include/fade.h b/include/fade.h
index 7e71a435..4e830fca 100644
--- a/include/fade.h
+++ b/include/fade.h
@@ -3,16 +3,93 @@
 
 #include "global.h"
 
-void SetBrightness(u32 arg0);
-void DoFade(u32 type, u32 speed);
+/**
+ * @struct FadeControl
+ * @brief Controls screen fading effects.
+ * @see gFadeControl
+ */
+typedef struct {
+    bool8 active; /**< Currently fading. */
+    u8 unused1;
+    u8 color;
+    u8 unused2;
+    u32 mask; /**< Fade palette mask.
+               * LSB = foreground, MSB = background. */
+    u16 type;
+    u16 speed;
+    u16 progress;
+    u16 sustain; /**< Fade progress to sustain. */
+    s16 iris_size;
+    s16 iris_x;
+    s16 iris_y;
+    u16 win_inside_cnt;
+    u16 win_outside_cnt;
+} FadeControl;
+extern FadeControl gFadeControl; /**< Fade control instance. */
 
-void sub_08050008(void);
-void sub_08050038(u32);
-void sub_080500F4(u32 arg0);
-void sub_08050110(u32 param_1, u32 param_2, u32 fadeType, u32 fadeSpeed);
+/** Set game brightness.
+ * @param brightness brightness level, 0-2
+ */
+void SetBrightness(u32 brightness);
 
+/**
+ * Start a fade effect.
+ *
+ * @param type Fade type. The following flags are supported:
+ *  0x1    | 0x2         | 0x4     | 0x8    | 0x10
+ * :-------|:------------|:--------|:-------|:-------------------------
+ *  in/out | black/white | instant | mosaic | iris fade
+ * @param speed Effect speed, lower is slower. Negative values trigger an acid-like experience.
+ */
+void SetFade(u32 type, u32 speed);
+
+/**
+ * Perform the last fade effect in reverse.
+ *
+ * @param speed Fade speed.
+ */
+void SetFadeInverted(u32 speed);
+
+/**
+ * Peform an iris fade.
+ *
+ * @param x Screen x coordinate.
+ * @param y Screen y coordinate.
+ * @param type Fade type.
+ * @param speed Fade speed.
+ */
+void SetFadeIris(u32 x, u32 y, u32 type, u32 speed);
+
+/**
+ * Set the fade progress.
+ *
+ * When used on a fade in effect, this will set the progress of the fade.
+ * When used on a fade out effect, progress will be sustained at the value.
+ *
+ * @param progress Progress value. 0-256.
+ */
+void SetFadeProgress(u32 progress);
+
+/**
+ * Initialize the fade system.
+ *
+ * This will misbehave if called while a fade is active.
+ */
 void InitFade(void);
+
+/**
+ * Entry point for the fade system.
+ */
 void FadeMain(void);
+
+/**
+ * Fade VBlank entry point.
+ */
 void FadeVBlank(void);
 
+/**
+ * Reset the fade palette mask.
+ */
+void ResetFadeMask(void);
+
 #endif // FADE_H
diff --git a/include/structures.h b/include/structures.h
index 95a22ffc..5a2fa8c1 100644
--- a/include/structures.h
+++ b/include/structures.h
@@ -38,25 +38,6 @@ static_assert(sizeof(struct_02000010) == 0x20);
 
 extern struct_02000010 gUnk_02000010;
 
-typedef struct {
-    u8 active;
-    u8 field_0x1;
-    u8 field_0x2;
-    u8 field_0x3;
-    u32 mask;
-    u16 fadeType;  // fade in or out, are there others?
-    u16 fadeSpeed; // subtracted from duration
-    u16 fadeDuration;
-    u16 field_0xe;
-    s16 field_0x10;
-    s16 field_0x12;
-    s16 field_0x14;
-    u16 field_0x16;
-    u16 field_0x18;
-} FadeControl;
-
-extern FadeControl gFadeControl;
-
 typedef struct {
     u8 unk0;
     u8 unk1;
diff --git a/src/debugScreen.c b/src/debugScreen.c
index 9e85a178..a4772841 100644
--- a/src/debugScreen.c
+++ b/src/debugScreen.c
@@ -33,7 +33,7 @@ void sub_0805FA04(void) {
     SetColor(0, 0x1144);
     gMain.state = 1;
     InitSoundPlayingInfo();
-    sub_08050008();
+    ResetFadeMask();
 }
 
 void sub_0805FA98(void) {
diff --git a/src/demoScreen.c b/src/demoScreen.c
index 98cbc68d..dd8e29b4 100644
--- a/src/demoScreen.c
+++ b/src/demoScreen.c
@@ -68,7 +68,7 @@ void sub_080A2E40(void) {
     sub_080A3198(0, 0);
     gMain.state = 1;
     SoundReq(BGM_FILE_SELECT);
-    DoFade(4, 8);
+    SetFade(4, 8);
 }
 
 void sub_080A2F8C(void) {
@@ -83,7 +83,7 @@ void sub_080A2F8C(void) {
                     *(u8*)(addr + 6) = 1;
                 }
                 gMain.state = 2;
-                DoFade(5, 8);
+                SetFade(5, 8);
                 break;
             case 1:
                 SetTask(TASK_GAME);
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index f0877357..6898a7c9 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -659,7 +659,7 @@ void sub_08041D84(Entity* this) {
                 ChangeObjPalette(this->child, gUnk_080D0E80[(this->field_0xf - 0xb8) >> 3]);
             }
             if (this->field_0xf == 0xe6) {
-                DoFade(7, 4);
+                SetFade(7, 4);
             }
         } else {
             this->subAction = 4;
diff --git a/src/fade.c b/src/fade.c
index dab44d41..92ce3b08 100644
--- a/src/fade.c
+++ b/src/fade.c
@@ -16,8 +16,8 @@ extern u16 gUnk_080FC3C4[];
 extern u32 gMakeFadeBuff256;
 typedef void (*fptrMakeFadeBuff256)(u8*, u8*, u16, u8);
 
-void SetBrightness(u32 arg0) {
-    gSaveHeader->brightness = arg0;
+void SetBrightness(u32 brightness) {
+    gSaveHeader->brightness = brightness;
     gUsedPalettes = 0xffffffff;
 }
 
@@ -48,34 +48,34 @@ void InitFade(void) {
     gFadeControl.mask = 0xffffffff;
 }
 
-void sub_08050008(void) {
+void ResetFadeMask(void) {
     MemClear(&gUnk_020354C0, sizeof(gUnk_020354C0));
     gFadeControl.mask = 0xFFFFFFFF;
 }
 
 static void sub_08050024(void) {
     sub_0801E104();
-    DoFade(5, 256);
+    SetFade(5, 256);
 }
 
-void sub_08050038(u32 arg0) {
-    if ((gFadeControl.fadeType & 1) != 0) {
-        gFadeControl.field_0xe = arg0;
+void SetFadeProgress(u32 arg0) {
+    if ((gFadeControl.type & 1) != 0) {
+        gFadeControl.sustain = arg0;
     } else {
-        gFadeControl.fadeDuration = arg0;
+        gFadeControl.progress = arg0;
     }
 }
 
-void DoFade(u32 type, u32 speed) {
-    gFadeControl.fadeSpeed = speed;
-    gFadeControl.fadeType = type;
+void SetFade(u32 type, u32 speed) {
+    gFadeControl.speed = speed;
+    gFadeControl.type = type;
     gFadeControl.active = 1;
-    gFadeControl.fadeDuration = 0x100;
-    gFadeControl.field_0xe = 0;
-    if (gFadeControl.fadeType & 2) {
-        gFadeControl.field_0x2 = 0xf8;
+    gFadeControl.progress = 0x100;
+    gFadeControl.sustain = 0;
+    if (gFadeControl.type & 2) {
+        gFadeControl.color = 0xf8;
     } else {
-        gFadeControl.field_0x2 = 0;
+        gFadeControl.color = 0;
     }
     if (type & 8) {
         gOAMControls.spritesOffset = 1;
@@ -84,46 +84,46 @@ void DoFade(u32 type, u32 speed) {
         gScreen.bg3.control |= BGCNT_MOSAIC;
     }
     if (type & 0x10) {
-        sub_0801E1B8(gFadeControl.field_0x16, gFadeControl.field_0x18);
-        sub_0801E1EC(gFadeControl.field_0x12, gFadeControl.field_0x14, gFadeControl.field_0x10);
+        sub_0801E1B8(gFadeControl.win_inside_cnt, gFadeControl.win_outside_cnt);
+        sub_0801E1EC(gFadeControl.iris_x, gFadeControl.iris_y, gFadeControl.iris_size);
         if ((type & 1) == 0) {
-            gFadeControl.fadeType &= ~4;
-            sub_08050008();
+            gFadeControl.type &= ~4;
+            ResetFadeMask();
             gUsedPalettes = 0xffffffff;
         }
     }
 }
 
-void sub_080500F4(u32 arg0) {
-    gFadeControl.fadeSpeed = arg0;
-    gFadeControl.fadeType ^= 1;
+void SetFadeInverted(u32 arg0) {
+    gFadeControl.speed = arg0;
+    gFadeControl.type ^= 1;
     gFadeControl.active = 1;
-    gFadeControl.fadeDuration = 256;
+    gFadeControl.progress = 256;
 }
 
-void sub_08050110(u32 param_1, u32 param_2, u32 fadeType, u32 fadeSpeed) {
-    if ((fadeType & 1) != 0) {
-        gFadeControl.field_0x10 = 0x96;
+void SetFadeIris(u32 x, u32 y, u32 type, u32 speed) {
+    if ((type & 1) != 0) {
+        gFadeControl.iris_size = 0x96;
     } else {
-        gFadeControl.field_0x10 = 0;
+        gFadeControl.iris_size = 0;
     }
-    gFadeControl.field_0x12 = param_1;
-    gFadeControl.field_0x14 = param_2;
-    gFadeControl.field_0x16 = 0x3f3f;
-    gFadeControl.field_0x18 = 0;
-    DoFade(fadeType, fadeSpeed);
+    gFadeControl.iris_x = x;
+    gFadeControl.iris_y = y;
+    gFadeControl.win_inside_cnt = 0x3f3f;
+    gFadeControl.win_outside_cnt = 0;
+    SetFade(type, speed);
 }
 
 void FadeMain(void) {
     FadeControl* ctl = &gFadeControl;
-    u32 flags = ctl->fadeType & 0x1C;
+    u32 flags = ctl->type & 0x1C;
     u32 active = 0;
     u32 bit;
 
     if (ctl->active) {
-        ctl->fadeDuration -= ctl->fadeSpeed;
-        if ((s16)ctl->fadeDuration <= (s16)ctl->field_0xe)
-            ctl->fadeDuration = ctl->field_0xe;
+        ctl->progress -= ctl->speed;
+        if ((s16)ctl->progress <= (s16)ctl->sustain)
+            ctl->progress = ctl->sustain;
         while (flags) {
             bit = (~flags + 1) & flags;
             flags ^= bit;
@@ -149,10 +149,10 @@ static u32 sub_080501C0(FadeControl* ctl) {
     struct_020354C0* v3;
     u32 i;
 
-    if (ctl->fadeType & 1) {
-        v1 = 256 - (s16)ctl->fadeDuration;
+    if (ctl->type & 1) {
+        v1 = 256 - (s16)ctl->progress;
     } else {
-        v1 = (s16)ctl->fadeDuration;
+        v1 = (s16)ctl->progress;
     }
     v2 = gFadeControl.mask;
     v3 = gUnk_020354C0;
@@ -164,21 +164,21 @@ static u32 sub_080501C0(FadeControl* ctl) {
             v3->unk0 = 0;
             v3->unk2 = 0;
         }
-        v3->unk1 = ctl->field_0x2;
+        v3->unk1 = ctl->color;
         v2 >>= 1;
     }
     gUsedPalettes = 0xffffffff;
 
-    return !!((s16)ctl->field_0xe ^ (s16)ctl->fadeDuration);
+    return !!((s16)ctl->sustain ^ (s16)ctl->progress);
 }
 
 static u32 sub_08050230(FadeControl* ctl) {
-    u32 type = ctl->fadeType;
-    u32 idx = ((s16)ctl->fadeDuration >> 4) & 0xF;
+    u32 type = ctl->type;
+    u32 idx = ((s16)ctl->progress >> 4) & 0xF;
     if (type & 1)
         idx = 0xF - idx;
     gScreen.controls.mosaicSize = gUnk_080FC3C4[idx];
-    if (ctl->fadeDuration != 0)
+    if (ctl->progress != 0)
         return 1;
 
     // fade is finished
@@ -194,18 +194,18 @@ static u32 sub_08050230(FadeControl* ctl) {
 }
 
 static u32 sub_080502A4(FadeControl* ctl) {
-    if (ctl->fadeType & 1) {
-        s32 delta = (u16)gFadeControl.field_0x10 - gFadeControl.fadeSpeed;
-        gFadeControl.field_0x10 -= gFadeControl.fadeSpeed;
+    if (ctl->type & 1) {
+        s32 delta = (u16)gFadeControl.iris_size - gFadeControl.speed;
+        gFadeControl.iris_size -= gFadeControl.speed;
         if (delta << 16 <= 0)
-            gFadeControl.field_0x10 = 0;
-        sub_0801E1EC(gFadeControl.field_0x12, gFadeControl.field_0x14, gFadeControl.field_0x10);
-        if (!gFadeControl.field_0x10)
+            gFadeControl.iris_size = 0;
+        sub_0801E1EC(gFadeControl.iris_x, gFadeControl.iris_y, gFadeControl.iris_size);
+        if (!gFadeControl.iris_size)
             return 0;
     } else {
-        gFadeControl.field_0x10 += gFadeControl.fadeSpeed;
-        sub_0801E1EC(gFadeControl.field_0x12, gFadeControl.field_0x14, gFadeControl.field_0x10);
-        if (gFadeControl.field_0x10 > 150) {
+        gFadeControl.iris_size += gFadeControl.speed;
+        sub_0801E1EC(gFadeControl.iris_x, gFadeControl.iris_y, gFadeControl.iris_size);
+        if (gFadeControl.iris_size > 150) {
             sub_0801E104();
             return 0;
         }
diff --git a/src/fileselect.c b/src/fileselect.c
index 2a26ad02..3e3d25a9 100644
--- a/src/fileselect.c
+++ b/src/fileselect.c
@@ -225,7 +225,7 @@ static void HandleFileScreenEnter(void) {
     gGFXSlots.unk0 = 1;
     gMain.state = 1;
     SoundReq(BGM_FILE_SELECT);
-    DoFade(4, 8);
+    SetFade(4, 8);
 }
 
 static void HandleFileScreenActive(void) {
@@ -1204,7 +1204,7 @@ void HandleFileStart(void) {
         gSaveHeader->msg_speed = gSave.msg_speed;
         gSaveHeader->brightness = gSave.brightness;
         gMain.state = 2;
-        DoFade(5, 8);
+        SetFade(5, 8);
     }
 }
 
diff --git a/src/game.c b/src/game.c
index 37cda100..2c98819a 100644
--- a/src/game.c
+++ b/src/game.c
@@ -203,7 +203,7 @@ void GameTask(void) {
 #ifdef DEMO_USA
     if (gSave.demo_timer != 0) {
         if (--gSave.demo_timer == 0) {
-            DoFade(7, 2);
+            SetFade(7, 2);
             gMain.state = GAMETASK_EXIT;
         }
     }
@@ -430,7 +430,7 @@ static void GameTask_Exit(void) {
     if (!gFadeControl.active)
         DoSoftReset();
 #else
-    DoFade(7, 8);
+    SetFade(7, 8);
     SetTask(TASK_GAMEOVER);
 #endif
 }
@@ -574,7 +574,7 @@ static void AuxCutscene_Exit(void) {
         MenuFadeIn(2, flag >> 4);
     } else {
         gUnk_02032EC0.nextToLoad = 3;
-        sub_080500F4(0x10);
+        SetFadeInverted(0x10);
         MessageInitialize();
     }
 }
@@ -650,7 +650,7 @@ static void GameOver_Init(void) {
     gSave.stats.health = 24;
     gMain.field_0x5 = 60;
     SoundReq(BGM_GAMEOVER);
-    sub_080500F4(4);
+    SetFadeInverted(4);
     gFadeControl.mask = 0xFFFF0001;
     switch_state(1);
 }
@@ -668,12 +668,12 @@ static void GameOver_FadeIn(void) {
                 switch_state(2);
 #if defined(DEMO_USA) || defined(DEMO_JP)
                 SoundReq(SONG_VOL_FADE_OUT);
-                DoFade(7, 4);
+                SetFade(7, 4);
 #else
                 SetPopupState(0, 0);
                 gScreen.lcd.displayControl |= DISPCNT_BG1_ON | DISPCNT_BG2_ON;
                 gFadeControl.mask = 0x0000ffff;
-                DoFade(4, 16);
+                SetFade(4, 16);
 #endif
             }
         }
@@ -791,9 +791,9 @@ static void GameOver_Update(void) {
                         sub_080A7114(2);
                         SoundReq(SFX_TEXTBOX_SELECT);
                         if (temp == 0) {
-                            DoFade(5, 8);
+                            SetFade(5, 8);
                         } else {
-                            DoFade(7, 8);
+                            SetFade(7, 8);
                         }
                         break;
                 }
@@ -1105,7 +1105,7 @@ static u32 CheckGameOver(void) {
         InitFade();
         gMain.state = 3;
         gMain.substate = 0;
-        DoFade(5, 8);
+        SetFade(5, 8);
         SoundReq(SONG_STOP_BGM);
         return 1;
     }
@@ -1126,29 +1126,29 @@ static u32 CheckRoomExit(void) {
 
         switch (gRoomTransition.type) {
             case TRANSITION_CUT:
-                DoFade(13, 8);
+                SetFade(13, 8);
                 break;
             case TRANSITION_CUT_FAST:
-                DoFade(13, 3);
+                SetFade(13, 3);
                 break;
             case TRANSITION_FADE_WHITE_SLOW:
-                DoFade(7, 4);
+                SetFade(7, 4);
                 break;
             case TRANSITION_FADE_BLACK_SLOW:
-                DoFade(5, 4);
+                SetFade(5, 4);
                 break;
             case TRANSITION_FADE_BLACK:
-                DoFade(5, 16);
+                SetFade(5, 16);
                 break;
             case TRANSITION_FADE_BLACK_FAST:
-                DoFade(5, 256);
+                SetFade(5, 256);
                 break;
             case TRANSITION_7:
             case TRANSITION_FADE_WHITE_FAST:
-                DoFade(7, 256);
+                SetFade(7, 256);
                 break;
             default:
-                DoFade(7, 16);
+                SetFade(7, 16);
                 break;
         }
         RoomExitCallback();
@@ -1195,30 +1195,30 @@ void InitParachuteRoom(void) {
 static void InitRoomTransition(void) {
     switch (gRoomTransition.type) {
         case TRANSITION_CUT:
-            DoFade(12, 8);
+            SetFade(12, 8);
             break;
         case TRANSITION_CUT_FAST:
-            DoFade(12, 3);
+            SetFade(12, 3);
             break;
         case TRANSITION_FADE_WHITE_SLOW:
-            DoFade(6, 4);
+            SetFade(6, 4);
             break;
         case TRANSITION_3:
             break;
         case TRANSITION_FADE_BLACK_FAST:
-            DoFade(5, 256);
+            SetFade(5, 256);
             break;
         case TRANSITION_7:
-            DoFade(7, 256);
+            SetFade(7, 256);
             break;
         case TRANSITION_FADE_BLACK:
-            DoFade(4, 16);
+            SetFade(4, 16);
             break;
         case TRANSITION_FADE_WHITE_FAST:
-            DoFade(6, 8);
+            SetFade(6, 8);
             break;
         default:
-            sub_080500F4(16);
+            SetFadeInverted(16);
             break;
     }
 }
diff --git a/src/main.c b/src/main.c
index ced56ca5..a93ad7eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,6 +57,14 @@ void AgbMain(void) {
             DoSoftReset();
         }
 
+        // if (gInput.newKeys & B_BUTTON) {
+        //     ResetFadeMask();
+        // }
+
+        // if (gInput.newKeys & A_BUTTON) {
+        //     SetFade(0x7, 1);
+        // }
+
         switch (gMain.sleepStatus) {
             case SLEEP:
                 SetSleepMode();
diff --git a/src/manager/manager37.c b/src/manager/manager37.c
index 9f196c25..fc7a4908 100644
--- a/src/manager/manager37.c
+++ b/src/manager/manager37.c
@@ -89,7 +89,7 @@ void sub_0805DF98(Manager* this) {
             this->unk_0e -= 1;
         } else {
             this->action = 4;
-            DoFade(7, 4);
+            SetFade(7, 4);
             SoundReq(SFX_EVAPORATE);
         }
     }
@@ -120,7 +120,7 @@ void sub_0805E000(Manager* this) {
         this->action = 1;
         SetPlayerControl(3);
         gArea.queued_bgm = 0x80010000;
-        DoFade(6, 4);
+        SetFade(6, 4);
         SoundReq(SFX_APPARATE);
     }
 }
diff --git a/src/npc/simon.c b/src/npc/simon.c
index a41b7005..d59d3b16 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -45,10 +45,10 @@ void sub_0806C280(void) {
 void sub_0806C2A0(Entity* this, ScriptExecutionContext* context) {
     switch (context->intVariable) {
         case 0:
-            DoFade(0xd, 4);
+            SetFade(0xd, 4);
             break;
         case 1:
-            DoFade(0xc, 4);
+            SetFade(0xc, 4);
             break;
     }
 }
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index 9232fd21..3a1f9a13 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -119,7 +119,7 @@ void GreatFairy_SpawningUpdate(Entity* this) {
         mini = GreatFairy_CreateForm(this, WAKE, 0); //???
         if (mini != NULL) {
             CopyPosition(this, mini);
-            DoFade(6, 4);
+            SetFade(6, 4);
             SoundReq(SFX_145);
             this->action = 4;
             this->actionDelay = 60;
diff --git a/src/object/object6A.c b/src/object/object6A.c
index f02d7660..6813f69c 100644
--- a/src/object/object6A.c
+++ b/src/object/object6A.c
@@ -1310,11 +1310,11 @@ void sub_0809629C(Object6AEntity* this, u32 type) {
 }
 
 void sub_080962D8(Object6AEntity* this) {
-    DoFade(6, 0x100);
+    SetFade(6, 0x100);
 }
 
 void sub_080962E8(Object6AEntity* this) {
-    DoFade(7, 0x100);
+    SetFade(7, 0x100);
 }
 
 void sub_080962F8(Object6AEntity* this, ScriptExecutionContext* ctx) {
diff --git a/src/player.c b/src/player.c
index 1f6b0cc7..cac85584 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1053,7 +1053,7 @@ static void PlayerUsePortal(Entity* this) {
     if (AreaIsDungeon() || gArea.curPortalType == 3) {
         this->subAction = 7;
         this->actionDelay = 30;
-        DoFade(7, 16);
+        SetFade(7, 16);
         SoundReq(SFX_F8);
     } else {
         RespawnAsMinish();
@@ -1209,7 +1209,7 @@ static void PortalUnknownUpdate(Entity* this) {
     }
 
     sub_080717F8(this);
-    sub_080500F4(0x10);
+    SetFadeInverted(0x10);
 }
 
 static void sub_080717F8(Entity* this) {
@@ -2627,7 +2627,7 @@ static void sub_0807332C(Entity* this) {
     } else {
         gMain.substate = 3;
         *(&gMain.pauseInterval + 1) = 1;
-        DoFade(5, 8);
+        SetFade(5, 8);
     }
 }
 
@@ -3747,7 +3747,7 @@ static void sub_08074C68(Entity* this) {
             gPlayerState.animation = 1850;
         else
             gPlayerState.animation = 1846;
-        DoFade(5, 0x100);
+        SetFade(5, 0x100);
     }
 }
 
diff --git a/src/roomInit.c b/src/roomInit.c
index 5f6ee01a..f0b1fa5a 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -398,7 +398,7 @@ extern void* script_PlayerSleepingInn[];
 void sub_StateChange_HouseInteriors1_InnWestRoom(void) {
     if (CheckLocalFlag(YADO_CHECKIN)) {
         ClearLocalFlag(YADO_CHECKIN);
-        DoFade(5, 256);
+        SetFade(5, 256);
         gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x50;
         gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x38;
         sub_080751E8(1, 2, &script_PlayerSleepingInn);
@@ -424,7 +424,7 @@ u32 sub_unk3_HouseInteriors1_InnMiddleRoom(void) {
 void sub_StateChange_HouseInteriors1_InnMiddleRoom(void) {
     if (CheckLocalFlag(YADO_CHECKIN) != 0) {
         ClearLocalFlag(YADO_CHECKIN);
-        DoFade(5, 256);
+        SetFade(5, 256);
         gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x50;
         gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x38;
         sub_080751E8(1, 2, &script_PlayerSleepingInn);
@@ -450,7 +450,7 @@ u32 sub_unk3_HouseInteriors1_InnEastRoom(void) {
 void sub_StateChange_HouseInteriors1_InnEastRoom(void) {
     if (CheckLocalFlag(YADO_CHECKIN)) {
         ClearLocalFlag(YADO_CHECKIN);
-        DoFade(5, 256);
+        SetFade(5, 256);
         gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0x60;
         gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x38;
         sub_080751E8(1, 2, &script_PlayerSleepingInn);
@@ -672,7 +672,7 @@ extern u32 script_PlayerWakingUpInHyruleCastle;
 
 void sub_StateChange_HyruleCastle_4(void) {
     if (!CheckLocalFlag(CASTLE_04_MEZAME)) {
-        DoFade(5, 256);
+        SetFade(5, 256);
         gPlayerEntity.x.HALF.HI = gRoomControls.origin_x + 0xb0;
         gPlayerEntity.y.HALF.HI = gRoomControls.origin_y + 0x40;
         sub_080751E8(0, 6, &script_PlayerWakingUpInHyruleCastle);
@@ -4815,7 +4815,7 @@ void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) {
     if (!CheckGlobalFlag(START) && !CheckLocalFlag(0x46)) {
         sub_080A71C4(5, 1, 4, 4);
         gUpdateVisibleTiles = 0;
-        DoFade(5, 256);
+        SetFade(5, 256);
         sub_080751E8(0, 6, &script_PlayerIntro);
     }
     if (!CheckGlobalFlag(OUTDOOR)) {
@@ -5550,7 +5550,7 @@ u32 sub_unk3_HyruleField_LinksHouseExterior(void) {
 #else
     if (!CheckLocalFlag(0x6d)) {
 #endif
-        DoFade(7, 256);
+        SetFade(7, 256);
     }
     SetGlobalFlag(OUTDOOR);
     return 1;
diff --git a/src/script.c b/src/script.c
index 64324a43..02cf220a 100644
--- a/src/script.c
+++ b/src/script.c
@@ -74,10 +74,10 @@ void ScriptCommand_SetFadeTime(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_FadeInvert(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_DoFade4(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_DoFade5(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_DoFade6(Entity* entity, ScriptExecutionContext* context);
-void ScriptCommand_DoFade7(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetFade4(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetFade5(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetFade6(Entity* entity, ScriptExecutionContext* context);
+void ScriptCommand_SetFade7(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E800(Entity* entity, ScriptExecutionContext* context);
 void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context);
 void sub_0807E818(u32);
@@ -523,10 +523,10 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) {
         ScriptCommand_SetFadeMask,
         ScriptCommand_FadeInvert,
         ScriptCommandNop2,
-        ScriptCommand_DoFade4,
-        ScriptCommand_DoFade5,
-        ScriptCommand_DoFade6,
-        ScriptCommand_DoFade7,
+        ScriptCommand_SetFade4,
+        ScriptCommand_SetFade5,
+        ScriptCommand_SetFade6,
+        ScriptCommand_SetFade7,
         ScriptCommand_0807E800,
         ScriptCommand_0807E80C,
         ScriptCommand_0807E858,
@@ -1006,26 +1006,26 @@ void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context)
 }
 
 void ScriptCommand_FadeInvert(Entity* entity, ScriptExecutionContext* context) {
-    sub_080500F4(gActiveScriptInfo.unk_08);
+    SetFadeInverted(gActiveScriptInfo.unk_08);
 }
 
 void ScriptCommandNop2(Entity* entity, ScriptExecutionContext* context) {
 }
 
-void ScriptCommand_DoFade4(Entity* entity, ScriptExecutionContext* context) {
-    DoFade(4, gActiveScriptInfo.unk_08);
+void ScriptCommand_SetFade4(Entity* entity, ScriptExecutionContext* context) {
+    SetFade(4, gActiveScriptInfo.unk_08);
 }
 
-void ScriptCommand_DoFade5(Entity* entity, ScriptExecutionContext* context) {
-    DoFade(5, gActiveScriptInfo.unk_08);
+void ScriptCommand_SetFade5(Entity* entity, ScriptExecutionContext* context) {
+    SetFade(5, gActiveScriptInfo.unk_08);
 }
 
-void ScriptCommand_DoFade6(Entity* entity, ScriptExecutionContext* context) {
-    DoFade(6, gActiveScriptInfo.unk_08);
+void ScriptCommand_SetFade6(Entity* entity, ScriptExecutionContext* context) {
+    SetFade(6, gActiveScriptInfo.unk_08);
 }
 
-void ScriptCommand_DoFade7(Entity* entity, ScriptExecutionContext* context) {
-    DoFade(7, gActiveScriptInfo.unk_08);
+void ScriptCommand_SetFade7(Entity* entity, ScriptExecutionContext* context) {
+    SetFade(7, gActiveScriptInfo.unk_08);
 }
 
 void ScriptCommand_0807E800(Entity* entity, ScriptExecutionContext* context) {
@@ -1036,7 +1036,7 @@ void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context) {
     sub_0807E818(0x11);
 }
 
-void sub_0807E818(u32 fadeType) {
+void sub_0807E818(u32 type) {
     Entity* cameraTarget = gRoomControls.camera_target;
     u32 x, y;
     if (cameraTarget) {
@@ -1046,11 +1046,11 @@ void sub_0807E818(u32 fadeType) {
         x = 0x78;
         y = 0x50;
     }
-    sub_08050110(x, y, fadeType, gActiveScriptInfo.unk_08);
+    SetFadeIris(x, y, type, gActiveScriptInfo.unk_08);
 }
 
 void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context) {
-    sub_08050038(context->scriptInstructionPointer[1]);
+    SetFadeProgress(context->scriptInstructionPointer[1]);
 }
 
 void ScriptCommand_SetPlayerIdle(Entity* entity, ScriptExecutionContext* context) {
@@ -1571,7 +1571,7 @@ void SetCollisionLayer2(Entity* entity, ScriptExecutionContext* context) {
 }
 
 void sub_0807F190(Entity* entity, ScriptExecutionContext* context) {
-    DoFade(4, 256);
+    SetFade(4, 256);
 }
 
 void sub_0807F1A0(Entity* entity, ScriptExecutionContext* context) {
diff --git a/src/sub_08055E08.c b/src/sub_08055E08.c
index 3070b26f..50d268c4 100644
--- a/src/sub_08055E08.c
+++ b/src/sub_08055E08.c
@@ -29,7 +29,7 @@ void sub_08055E24(void) {
     sub_0804B0B0(gMenu.field_0xc[2], gMenu.field_0xc[3]);
     LoadRoomEntityList(&gUnk_080FF400);
     sub_08055B70(gMenu.field_0x4, 0, 0, 0);
-    DoFade(4, 0x10);
+    SetFade(4, 0x10);
 }
 
 void nullsub_493(void) {
diff --git a/src/subtask.c b/src/subtask.c
index 4b7352ef..f73b719f 100644
--- a/src/subtask.c
+++ b/src/subtask.c
@@ -58,5 +58,5 @@ void sub_080A3BD0(void) {
     sub_0801E738(0);
     sub_080A70AC(&gUnk_081280DC);
     sub_080A7114(1);
-    DoFade(6, 8);
+    SetFade(6, 8);
 }
diff --git a/src/title.c b/src/title.c
index 2b134d60..6eebfbb4 100644
--- a/src/title.c
+++ b/src/title.c
@@ -120,7 +120,7 @@ static u32 AdvanceIntroSequence(u32 transition) {
     gUnk_02032EC0.lastState = transition;
     gMain.state = 2;
     MemClear(&gIntroState, sizeof(gIntroState));
-    DoFade(7, 8);
+    SetFade(7, 8);
 }
 
 void TitleTask(void) {
@@ -164,7 +164,7 @@ static void HandleNintendoCapcomLogos(void) {
         LoadPaletteGroup(paletteGroup);
         gScreen.lcd.displayControl |= DISPCNT_BG2_ON;
         gScreen.bg1.updated = 1;
-        DoFade(6, 8);
+        SetFade(6, 8);
         advance = ADVANCE_NONE;
 #if defined(DEMO_USA)
         if (gUnk_02000010.listenForKeyPresses == 0) {
@@ -239,7 +239,7 @@ static void HandleTitlescreen(void) {
             }
             InitSoundPlayingInfo();
             SoundReq(BGM_TITLE_SCREEN);
-            DoFade(6, 8);
+            SetFade(6, 8);
             break;
         case 1:
             if (gFadeControl.active) {
@@ -348,7 +348,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) {
                     gScreen.bg1.yOffset = 0;
                     gScreen.bg1.control = BGCNT_SCREENBASE(12) | BGCNT_PRIORITY(1) | BGCNT_CHARBASE(2);
                     gFadeControl.mask = 0x00000040;
-                    DoFade(6, 0x10);
+                    SetFade(6, 0x10);
                     SoundReq(SFX_F8);
                 }
             }
@@ -396,7 +396,7 @@ static void HandleTitlescreenAnimationIntro(void) {
                 gIntroState.swordBgScaleRatio = 0x100;
                 gIntroState.timer = 40;
                 gIntroState.subState++;
-                DoFade(6, 16);
+                SetFade(6, 16);
             }
             UpdateSwordBgAffineData();
             break;
@@ -409,7 +409,7 @@ static void HandleTitlescreenAnimationIntro(void) {
 #endif
                 gIntroState.subState++;
                 CreateObject(OBJECT_BD, 0, 0);
-                DoFade(6, 16);
+                SetFade(6, 16);
                 SoundReq(SFX_F8);
             }
             break;