pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: wStatusFlags.STATUSFLAGS_FLASH_F should not persist forever (#34)

Browse Source
This commit is contained in:
xCrystal 2024-03-08 13:29:26 +01:00
parent f796199bab
commit bb0240e279
3 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engine/gfx/cgb_layouts.asm
View File

@ -308,28 +308,6 @@ _CGB_BillsPC:
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
ret 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: BillsPCOrangePalette:
INCLUDE "gfx/pc/orange.pal" INCLUDE "gfx/pc/orange.pal"

11
engine/gfx/player_gfx.asm
View File

@ -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: MovePlayerPicRight:
hlcoord 6, 4 hlcoord 6, 4
ld de, 1 ld de, 1

2
engine/overworld/events.asm
View File

@ -175,6 +175,8 @@ StartMap:
ld [hl], a ; wPrevMapNumber ld [hl], a ; wPrevMapNumber
ld [wPlayerState], a ; PLAYER_NORMAL ld [wPlayerState], a ; PLAYER_NORMAL
ld [wCurOverworldMiscPal], a ; OW_MISC_BOARD_MENU_ITEMS | BOARDMENUITEM_DIE ld [wCurOverworldMiscPal], a ; OW_MISC_BOARD_MENU_ITEMS | BOARDMENUITEM_DIE
ld hl, wStatusFlags
res STATUSFLAGS_FLASH_F, [hl]
ld a, BANK(wDisabledSpacesBackups) ld a, BANK(wDisabledSpacesBackups)
ld [rSVBK], a ld [rSVBK], a