10 files changed, 25 insertions, 25 deletions
diff --git a/engine/copyright_screen.asm b/engine/copyright_screen.asm
index 41ae974..35a5329 100755
--- a/engine/copyright_screen.asm
+++ b/engine/copyright_screen.asm
@@ -25,7 +25,7 @@ FadeInCopyrightScreen: ; 0x8228
 	call SGBNormal
 	ld bc, $0050
 	call AdvanceFrames
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -67,7 +67,7 @@ DisplayCopyrightScreen: ; 0x8290
 	ret
 
 FadeOutCopyrightScreenAndLoadData: ; 0x82a8
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld hl, sHighScores
 	ld de, wRedHighScore1Points
diff --git a/engine/erase_all_data_menu.asm b/engine/erase_all_data_menu.asm
index ae0b780..7504cf5 100755
--- a/engine/erase_all_data_menu.asm
+++ b/engine/erase_all_data_menu.asm
@@ -31,7 +31,7 @@ CheckForResetButtonCombo: ; 0x8167
 	call Func_b66
 	call Func_588
 	call SGBNormal
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -106,7 +106,7 @@ HandleEraseAllDataInput: ; 0x81d4
 	ret
 
 ExitEraseAllDataMenu: ; 0x820f
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld hl, wCurrentScreen
 	inc [hl]
diff --git a/engine/field_select_screen.asm b/engine/field_select_screen.asm
index 2d5cd7c..0033488 100755
--- a/engine/field_select_screen.asm
+++ b/engine/field_select_screen.asm
@@ -29,7 +29,7 @@ LoadFieldSelectScreen: ; 0xd6dd
 	ld de, $0003
 	call PlaySong
 	call Func_588
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -81,7 +81,7 @@ ExitFieldSelectScreen: ; 0xd774
 .didntPressA
 	ld a, [hJoypadState]
 	push af
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld a, [wd8f6]
 	bit BIT_A_BUTTON, a
diff --git a/engine/high_scores_screen.asm b/engine/high_scores_screen.asm
index 1969f62..bc48dc7 100755
--- a/engine/high_scores_screen.asm
+++ b/engine/high_scores_screen.asm
@@ -169,7 +169,7 @@ Func_cb14: ; 0xcb14
 	call Func_d68a
 	ld bc, $03c9
 	call Func_d68a
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -184,7 +184,7 @@ Func_cb14: ; 0xcb14
 	call Func_d68a
 	ld bc, $03c9
 	call Func_d68a
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ld hl, wScreenState
@@ -943,7 +943,7 @@ Func_d159: ; 0xd159
 	ret
 
 ExitHighScoresScreen: ; 0xd171
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld hl, hSTAT
 	res 6, [hl]
diff --git a/engine/options_screen.asm b/engine/options_screen.asm
index 427e6d2..e29c96f 100755
--- a/engine/options_screen.asm
+++ b/engine/options_screen.asm
@@ -43,7 +43,7 @@ Func_c35a: ; 0xc35a
 	ld a, [wSoundTextCurrentSoundEffect]
 	hlCoord 7, 13, vBGMap
 	call RedrawSoundTestID
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -145,7 +145,7 @@ Func_c447: ; 0xc447
 	ret
 
 Func_c483: ; 0xc483
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld a, SCREEN_TITLESCREEN
 	ld [wCurrentScreen], a
diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm
index 23c6490..d1459e5 100755
--- a/engine/pinball_game.asm
+++ b/engine/pinball_game.asm
@@ -61,7 +61,7 @@ GameScreenFunction_StartBall: ; 0xd87f
 	ld [wd7c1], a
 	call Func_b66
 	call Func_588
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -230,7 +230,7 @@ GameScreenFunction_EndBall: ; 0xdab2
 	ld a, [wd496]
 	and a
 	jr nz, .asm_db28
-	call Func_cb5
+	call FadeOut
 	ld a, [wd849]
 	and a
 	call z, Func_e5d
@@ -248,7 +248,7 @@ GameScreenFunction_EndBall: ; 0xdab2
 	call PlaySong
 	ld bc, $0004
 	call AdvanceFrames
-	call Func_cb5
+	call FadeOut
 	ld a, [wd849]
 	and a
 	call nz, Func_e5d
@@ -275,7 +275,7 @@ GameScreenFunction_EndBall: ; 0xdab2
 	call PlaySong
 	ld bc, $0004
 	call AdvanceFrames
-	call Func_cb5
+	call FadeOut
 	ld a, [wd849]
 	and a
 	call nz, Func_e5d
@@ -299,7 +299,7 @@ TransitionToHighScoresScreen: ; 0xdb5d
 	call PlaySong
 	ld bc, $0004
 	call AdvanceFrames
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld hl, hSTAT
 	res 6, [hl]
diff --git a/engine/pinball_game/save_game.asm b/engine/pinball_game/save_game.asm
index e9d5e8f..644abb3 100755
--- a/engine/pinball_game/save_game.asm
+++ b/engine/pinball_game/save_game.asm
@@ -3,7 +3,7 @@ SaveGame: ; 0xda05
 	call PlaySong
 	ld bc, $0004
 	call AdvanceFrames
-	call Func_cb5
+	call FadeOut
 	ld a, [wd849]
 	and a
 	call nz, Func_e5d
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 69af64c..8b624a4 100755
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -65,7 +65,7 @@ LoadPokedexScreen: ; 0x2800e
 	ld de, $0004
 	call PlaySong
 	call Func_588
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -710,7 +710,7 @@ Func_284bc: ; 0x284bc
 	ret
 
 ExitPokedexScreen: ; 0x284f9
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld hl, hSTAT
 	res 6, [hl]
diff --git a/engine/select_gameboy_target_menu.asm b/engine/select_gameboy_target_menu.asm
index 9ee76bb..3f18b60 100755
--- a/engine/select_gameboy_target_menu.asm
+++ b/engine/select_gameboy_target_menu.asm
@@ -41,7 +41,7 @@ InitSelectGameboyTargetMenu: ; 0x800a
 	call ClearOAMBuffer
 	call Func_b66
 	call Func_588
-	call Func_bbe
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -229,7 +229,7 @@ CGBSelected_TileData: ; 0x8144
 	db $00  ; terminator
 
 EndSelectGameboyTargetMenu: ; 0x414e
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld hl, wCurrentScreen
 	inc [hl] ; set to SCREEN_ERASE_ALL_DATA
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm
index 63c8ce8..057e937 100755
--- a/engine/titlescreen.asm
+++ b/engine/titlescreen.asm
@@ -35,7 +35,7 @@ FadeInTitlescreen: ; 0xc00e
 	ld de, $0004
 	call PlaySong
 	call Func_588
-	call Func_bbe  ; this does the fading
+	call FadeIn
 	ld hl, wScreenState
 	inc [hl]
 	ret
@@ -147,7 +147,7 @@ Func_c10e: ; 0xc10e
 	ld a, [wTitleScreenGameStartCursorSelection]
 	and a
 	jr z, .asm_c177
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld a, [wd7c2]
 	and a
@@ -223,7 +223,7 @@ Func_c1b1: ; 0xc1b1
 	ret
 
 Func_c1cb: ; 0c1cb
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld a, [wTitleScreenCursorSelection]
 	ld c, a
@@ -242,7 +242,7 @@ Data_c1e4: ; 0xc1e4
 	db SCREEN_OPTIONS
 
 GoToHighScoresFromTitlescreen: ; 0xc1e7
-	call Func_cb5
+	call FadeOut
 	call Func_576
 	ld a, SCREEN_HIGH_SCORES
 	ld [wCurrentScreen], a