Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new palette constants

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-10 20:50:08 -05:00
parent a0bef01a1d
commit b4261d27d8
283 changed files with 947 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/battle_start.asm
View File

@@ -651,11 +651,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ld [rSVBK], a
call .copypals
push hl
ld de, UnknBGPals + 7 palettes
ld de, UnknBGPals palette PAL_BG_TEXT
ld bc, 1 palettes
call CopyBytes
pop hl
ld de, BGPals + 7 palettes
ld de, BGPals palette PAL_BG_TEXT
ld bc, 1 palettes
call CopyBytes
pop af
@@ -670,17 +670,17 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ret
.copypals ; 8c677 (23:4677)
ld de, UnknBGPals + 7 palettes
ld de, UnknBGPals palette PAL_BG_TEXT
call .copy
ld de, BGPals + 7 palettes
ld de, BGPals palette PAL_BG_TEXT
call .copy
ld de, UnknOBPals + 6 palettes
ld de, UnknOBPals palette PAL_OW_TREE
call .copy
ld de, OBPals + 6 palettes
ld de, OBPals palette PAL_OW_TREE
call .copy
ld de, UnknOBPals + 7 palettes
ld de, UnknOBPals palette PAL_OW_ROCK
call .copy
ld de, OBPals + 7 palettes
ld de, OBPals palette PAL_OW_ROCK
.copy ; 8c698 (23:4698)
push hl

2
engine/color.asm
View File

@@ -2267,7 +2267,7 @@ Palettes_b789:
RGB 18, 18, 18
RGB 00, 00, 00
Palettes_b7a9:
SlotMachinePals:
RGB 31, 31, 31
RGB 24, 25, 28
RGB 24, 24, 09

4
engine/player_object.asm
View File

@@ -29,14 +29,14 @@ SpawnPlayer: ; 8029
call GetMapObject
ld hl, MAPOBJECT_COLOR
add hl, bc
ln e, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT
ln e, PAL_NPC_RED, PERSONTYPE_SCRIPT
ld a, [wPlayerSpriteSetupFlags]
bit 2, a
jr nz, .ok
ld a, [PlayerGender]
bit 0, a
jr z, .ok
ln e, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT
ln e, PAL_NPC_BLUE, PERSONTYPE_SCRIPT
.ok
ld [hl], e