diff options
author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
---|---|---|
committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/color.asm | |
parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/color.asm')
-rw-r--r-- | engine/color.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/color.asm b/engine/color.asm index 3eafbad70..1f563df53 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -718,7 +718,7 @@ GetPlayerOrMonPalettePointer: ld a, [wPlayerSpriteSetupFlags] bit 2, a ; transformed to male jr nz, .male - ld a, [PlayerGender] + ld a, [wPlayerGender] and a jr z, .male ld hl, KrisPalette @@ -902,7 +902,7 @@ InitCGBPals:: ; CGB only ld a, $1 ld [rVBK], a - ld hl, VTiles0 + ld hl, vTiles0 ld bc, $200 tiles xor a call ByteFill @@ -1069,7 +1069,7 @@ SGBBorder_PushBGPals: ld a, %11100100 ld [rBGP], a ld hl, PredefPals - ld de, VTiles1 + ld de, vTiles1 ld bc, $100 tiles call CopyData call DrawDefaultTiles @@ -1085,7 +1085,7 @@ SGBBorder_MorePalPushing: call DisableLCD ld a, $e4 ld [rBGP], a - ld de, VTiles1 + ld de, vTiles1 ld bc, 20 tiles call CopyData ld b, 18 @@ -1119,7 +1119,7 @@ SGBBorder_YetMorePalPushing: call DisableLCD ld a, %11100100 ld [rBGP], a - ld de, VTiles1 + ld de, vTiles1 ld b, $80 .loop push bc |