Skip to content

Commit

Permalink
Remove obsolete Daycare Mons OW colors code
Browse files Browse the repository at this point in the history
Fixes an issue where the daycare mons were causing the old man to change colors (and sometimes other NPCs)
  • Loading branch information
vulcandth committed Dec 20, 2024
1 parent daac4d8 commit b6d114c
Showing 1 changed file with 0 additions and 66 deletions.
66 changes: 0 additions & 66 deletions engine/gfx/color.asm
Original file line number Diff line number Diff line change
Expand Up @@ -1365,72 +1365,6 @@ LoadMapPals:
ld bc, 4
ld a, BANK(wBGPals1)
call FarCopyWRAM

; Day Care outdoor palettes
ld a, [wMapGroup]
cp GROUP_ROUTE_34
ret nz

ld a, [wMapNumber]
cp MAP_ROUTE_34
ret nz

ld a, BANK(wBreedMon1Species)
ld hl, wBreedMon1Species
call GetFarWRAMByte
and a
jr z, .day_care_mon_2
ld [wCurPartySpecies], a

ld hl, wBreedMon1DVs ; HL now points to the params of the wBreedMon1, which is needed by GetMenuMonIconPalette to determine if it's shiny.
ld de, GetMenuMonIconPalette
ld a, BANK(GetMenuMonIconPalette)
call FarCall_de
ld a, e
add a
add a
add a
ld e, a
ld d, 0
ld hl, PartyMenuOBPals
add hl, de

inc hl
inc hl

ld de, wOBPals1 palette PAL_OW_PINK + 2
ld bc, 1 palettes - 2
ld a, BANK(wOBPals1)
call FarCopyWRAM

.day_care_mon_2
ld a, BANK(wBreedMon2Species)
ld hl, wBreedMon2Species
call GetFarWRAMByte
and a
ret z
ld [wCurPartySpecies], a

ld hl, wBreedMon2DVs ; HL now points to the params of the wBreedMon2, which is needed by GetMenuMonIconPalette to determine if it's shiny.
ld de, GetMenuMonIconPalette
ld a, BANK(GetMenuMonIconPalette)
call FarCall_de
ld a, e
add a
add a
add a
ld e, a
ld d, 0
ld hl, PartyMenuOBPals
add hl, de

inc hl
inc hl

ld de, wOBPals1 palette PAL_OW_ROCK + 2
ld bc, 1 palettes - 2
ld a, BANK(wOBPals1)
call FarCopyWRAM
ret

INCLUDE "data/maps/environment_colors.asm"
Expand Down

0 comments on commit b6d114c

Please sign in to comment.