pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Level selection menu: don't make unique palette numbers and sprite anims for male and female; instead, load either red or blue into pal0 (#12)

Browse Source
This commit is contained in:
xCrystal
2024-02-03 15:09:45 +01:00
parent 435d441d58
commit d3b397fd37
10 changed files with 121 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
engine/gfx/cgb_layouts.asm
View File

@@ -572,17 +572,20 @@ _CGB_GSTitleScreen:
ret
_CGB_LevelSelectionMenu:
; load daytime-based player sprite pals (male and female)
; load daytime-based player sprite pal (male or female)
ld a, [wTimeOfDay]
maskbits NUM_DAYTIMES
ld bc, 8 palettes
ld hl, MapObjectPals
call AddNTimes
gender_to_pal
ld bc, 1 palettes
call AddNTimes
ld de, wOBPals1
ld bc, 2 palettes
ld bc, 1 palettes
ld a, BANK(wOBPals1)
call FarCopyWRAM
; load daytime-based ToD symbol pals (pal2)
; load daytime-based ToD symbol pals (pal1)
ld a, [wTimeOfDay]
maskbits NUM_DAYTIMES
ld bc, 1 palettes
@@ -591,7 +594,7 @@ _CGB_LevelSelectionMenu:
ld bc, 1 palettes
ld a, BANK(wOBPals1)
call FarCopyWRAM
; load stage trophy pals (pal3 to pal6)
; load stage trophy pals (pal2 to pal5)
ld hl, LevelSelectionMenuStageTrophiesPals
ld bc, 4 palettes
ld a, BANK(wOBPals1)

20
engine/gfx/rgb_fade.asm
View File

@@ -277,10 +277,10 @@ RGBFadeEffectJumptable:
table_width 2, RGBFadeEffectJumptable
dw _RGBFadeToBlack_6BGP ; RGBFADE_TO_BLACK_6BGP
dw _RGBFadeToLighter_6BGP ; RGBFADE_TO_LIGHTER_6BGP
dw _RGBFadeToWhite_6BGP_7OBP ; RGBFADE_TO_WHITE_6BGP_7OBP
dw _RGBFadeToWhite_6BGP_6OBP ; RGBFADE_TO_WHITE_6BGP_6OBP
dw _RGBFadeToWhite_8BGP_8OBP ; RGBFADE_TO_WHITE_8BGP_8OBP
dw _RGBFadeToBlack_6BGP_1OBP2 ; RGBFADE_TO_BLACK_6BGP_1OBP2
dw _RGBFadeToLighter_6BGP_1OBP2 ; RGBFADE_TO_LIGHTER_6BGP_1OBP2
dw _RGBFadeToBlack_6BGP_1OBP1 ; RGBFADE_TO_BLACK_6BGP_1OBP1
dw _RGBFadeToLighter_6BGP_1OBP1 ; RGBFADE_TO_LIGHTER_6BGP_1OBP1
assert_table_length NUM_RGB_FADE_EFFECTS
; in RGBFadeEffectJumptable functions, use DelayFrame calls appropriately
@@ -307,7 +307,7 @@ _RGBFadeToBlack_6BGP:
jr nz, .loop
ret
_RGBFadeToBlack_6BGP_1OBP2:
_RGBFadeToBlack_6BGP_1OBP1:
ld c, 32 / 2
.loop
push bc
@@ -318,7 +318,7 @@ _RGBFadeToBlack_6BGP_1OBP2:
call FadeStepColorsToBlack
; fade OBP to black
ld de, wOBPals2 + 2 palettes
ld de, wOBPals2 + 1 palettes
ld c, NUM_PAL_COLORS
call FadeStepColorsToBlack
@@ -353,7 +353,7 @@ _RGBFadeToLighter_6BGP:
jr nz, .loop
ret
_RGBFadeToLighter_6BGP_1OBP2:
_RGBFadeToLighter_6BGP_1OBP1:
ld c, 32 / 2
.loop
push bc
@@ -365,8 +365,8 @@ _RGBFadeToLighter_6BGP_1OBP2:
call FadeStepColorsToLighter
; fade OBP to lighter (towards wOBPals1)
ld de, wOBPals2 + 2 palettes
ld hl, wOBPals1 + 2 palettes
ld de, wOBPals2 + 1 palettes
ld hl, wOBPals1 + 1 palettes
ld c, NUM_PAL_COLORS
call FadeStepColorsToLighter
@@ -380,7 +380,7 @@ _RGBFadeToLighter_6BGP_1OBP2:
jr nz, .loop
ret
_RGBFadeToWhite_6BGP_7OBP:
_RGBFadeToWhite_6BGP_6OBP:
ld c, 32 / 2
.loop
push bc
@@ -392,7 +392,7 @@ _RGBFadeToWhite_6BGP_7OBP:
; fade OBP to white
ld de, wOBPals2
ld c, 7 * NUM_PAL_COLORS
ld c, 6 * NUM_PAL_COLORS
call FadeStepColorsToWhite
; commit pals