From bb0240e27917de580bcb3bf82a855abe25957eab Mon Sep 17 00:00:00 2001
From: xCrystal <rgr.crystal@gmail.com>
Date: Fri, 8 Mar 2024 13:29:26 +0100
Subject: [PATCH] Fix bug: wStatusFlags.STATUSFLAGS_FLASH_F should not persist
 forever (#34)

---
 engine/gfx/cgb_layouts.asm  | 22 ----------------------
 engine/gfx/player_gfx.asm   | 11 -----------
 engine/overworld/events.asm |  2 ++
 3 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index 207b0d9a3..b269c1dc3 100644
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -308,28 +308,6 @@ _CGB_BillsPC:
 	ldh [hCGBPalUpdate], a
 	ret
 
-_CGB_Unknown: ; unreferenced
-	ld hl, BillsPCOrangePalette
-	call LoadHLPaletteIntoDE
-	jr .GotPalette
-
-.GetMonPalette: ; unreferenced
-	ld bc, wTempMonDVs
-	call GetPlayerOrMonPalettePointer
-	call LoadPalette_White_Col1_Col2_Black
-.GotPalette:
-	call WipeAttrmap
-	hlcoord 1, 1, wAttrmap
-	lb bc, 7, 7
-	ld a, $1 ; mon palette
-	call FillBoxCGB
-	call InitPartyMenuOBPals
-	call ApplyAttrmap
-	call ApplyPals
-	ld a, TRUE
-	ldh [hCGBPalUpdate], a
-	ret
-
 BillsPCOrangePalette:
 INCLUDE "gfx/pc/orange.pal"
 
diff --git a/engine/gfx/player_gfx.asm b/engine/gfx/player_gfx.asm
index be894c3dd..2bf698889 100644
--- a/engine/gfx/player_gfx.asm
+++ b/engine/gfx/player_gfx.asm
@@ -1,14 +1,3 @@
-BetaLoadPlayerTrainerClass: ; unreferenced
-	ld c, CAL
-	ld a, [wPlayerGender]
-	bit PLAYERGENDER_FEMALE_F, a
-	jr z, .got_class
-	ld c, KAREN ; not KRIS?
-.got_class
-	ld a, c
-	ld [wTrainerClass], a
-	ret
-
 MovePlayerPicRight:
 	hlcoord 6, 4
 	ld de, 1
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index 08077436a..d3f7f139a 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -175,6 +175,8 @@ StartMap:
 	ld [hl], a  ; wPrevMapNumber
 	ld [wPlayerState], a ; PLAYER_NORMAL
 	ld [wCurOverworldMiscPal], a ; OW_MISC_BOARD_MENU_ITEMS | BOARDMENUITEM_DIE
+	ld hl, wStatusFlags
+	res STATUSFLAGS_FLASH_F, [hl]
 
 	ld a, BANK(wDisabledSpacesBackups)
 	ld [rSVBK], a