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/pack.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/pack.asm')
| -rw-r--r-- | engine/pack.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/pack.asm b/engine/pack.asm index 2b0d04aba..b4f6d4ef1 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1294,7 +1294,7 @@ DrawPackGFX: ; 1089d ld a, [BattleType] cp BATTLETYPE_TUTORIAL jr z, .male_dude - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a jr nz, .female .male_dude @@ -1304,7 +1304,7 @@ DrawPackGFX: ; 1089d ld a, [hli] ld e, a ld d, [hl] - ld hl, VTiles2 tile $50 + ld hl, vTiles2 tile $50 lb bc, BANK(PackGFX), 15 call Request2bpp ret @@ -1411,7 +1411,7 @@ Pack_InitGFX: ; 10955 call ClearSprites call DisableLCD ld hl, PackMenuGFX - ld de, VTiles2 + ld de, vTiles2 ld bc, $60 tiles ld a, BANK(PackMenuGFX) call FarCopyBytes |