diff options
| author | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
| commit | a02a98ee7ada1a658e28698484058be2796dc0df (patch) | |
| tree | 945986054565bd8b5212fc755415096050d1d3a8 /engine/gfx/palettes.asm | |
| parent | Use long option flags for rgbgfx, same as tools/gfx (diff) | |
| parent | Use `const_skip` (diff) | |
| download | pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/gfx/palettes.asm')
| -rw-r--r-- | engine/gfx/palettes.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 26bffb4f..d9ae4369 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -75,7 +75,7 @@ SetPal_StatusScreen: ld de, wPalPacket ld bc, $10 call CopyData - ld a, [wcf91] + ld a, [wCurPartySpecies] cp NUM_POKEMON_INDEXES + 1 jr c, .pokemon ld a, $1 ; not pokemon @@ -103,7 +103,7 @@ SetPal_Pokedex: ld de, wPalPacket ld bc, $10 call CopyData - ld a, [wcf91] + ld a, [wCurPartySpecies] call DeterminePaletteIDOutOfBattle ld hl, wPalPacket + 3 ld [hl], a @@ -297,13 +297,13 @@ BadgeBlkDataLengths: DeterminePaletteID: ld a, [hl] DeterminePaletteIDOutOfBattle: - ld [wd11e], a + ld [wPokedexNum], a and a ; is the mon index 0? jr z, .skipDexNumConversion push bc predef IndexToPokedex pop bc - ld a, [wd11e] + ld a, [wPokedexNum] .skipDexNumConversion ld e, a ld d, 0 @@ -723,7 +723,7 @@ SendSGBPackets: pop hl call InitGBCPalettes ldh a, [rLCDC] - and rLCDC_ENABLE_MASK + and 1 << rLCDC_ENABLE ret z call Delay3 ret @@ -853,7 +853,7 @@ TransferCurBGPData:: ld hl, wGBCPal ld b, %10 ; mask for non-V-blank/non-H-blank STAT mode ldh a, [rLCDC] - and rLCDC_ENABLE_MASK + and 1 << rLCDC_ENABLE jr nz, .lcdEnabled REPT NUM_PAL_COLORS call TransferPalColorLCDDisabled @@ -892,7 +892,7 @@ BufferBGPPal:: TransferBGPPals:: ; Transfer the buffered BG palettes. ldh a, [rLCDC] - and rLCDC_ENABLE_MASK + and 1 << rLCDC_ENABLE jr z, .lcdDisabled di .waitLoop @@ -929,7 +929,7 @@ TransferCurOBPData: ld hl, wGBCPal ld b, %10 ; mask for non-V-blank/non-H-blank STAT mode ldh a, [rLCDC] - and rLCDC_ENABLE_MASK + and 1 << rLCDC_ENABLE jr nz, .lcdEnabled REPT NUM_PAL_COLORS call TransferPalColorLCDDisabled |