diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_start.asm | 16 | ||||
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rwxr-xr-x | engine/player_object.asm | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 9097e74ed..962948386 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -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 diff --git a/engine/color.asm b/engine/color.asm index 3bc431d22..6e99e9cb7 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -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 diff --git a/engine/player_object.asm b/engine/player_object.asm index 6b38a6328..a4796043b 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -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 |