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 /mobile/mobile_12.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'mobile/mobile_12.asm')
| -rwxr-xr-x | mobile/mobile_12.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index b6e20ef03..14b787645 100755 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -22,11 +22,11 @@ InitMobileProfile: ; 4802f (12:402f) call Function486bf call LoadFontsExtra ld de, MobileUpArrowGFX - ld hl, VTiles2 tile $10 + ld hl, vTiles2 tile $10 lb bc, BANK(MobileUpArrowGFX), 1 call Request1bpp ld de, MobileDownArrowGFX - ld hl, VTiles2 tile $11 + ld hl, vTiles2 tile $11 lb bc, BANK(MobileDownArrowGFX), 1 call Request1bpp call Function4a3a7 @@ -84,7 +84,7 @@ InitMobileProfile: ; 4802f (12:402f) ld a, [wd002] bit 6, a jr nz, .asm_48113 - ld a, [PlayerGender] + ld a, [wPlayerGender] ld hl, Strings_484fb call GetNthString ld d, h @@ -298,7 +298,7 @@ asm_4828d: ; 4828d (12:428d) ld de, String_484ff call PlaceString call WaitBGMap - ld a, [PlayerGender] + ld a, [wPlayerGender] inc a ld [wMenuCursorBuffer], a call StaticMenuJoypad @@ -316,11 +316,11 @@ asm_4828d: ; 4828d (12:428d) cp $50 jr nz, .asm_482e1 ld a, $1 - ld [PlayerGender], a + ld [wPlayerGender], a jr .asm_482f1 .asm_482ed xor a - ld [PlayerGender], a + ld [wPlayerGender], a .asm_482f1 ld d, h ld e, l @@ -804,10 +804,10 @@ Function4873c: ; 4873c (12:473c) ld a, A_BUTTON add B_BUTTON ld [hli], a ; joypad filter - ; ld a, [PlayerGender] + ; ld a, [wPlayerGender] ; xor 1 ; inc a - ld a, [PlayerGender] + ld a, [wPlayerGender] and a jr z, .male ld a, 2 |