diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
| commit | 9457679af8d36a140db7b8832df595e8310e6bb4 (patch) | |
| tree | d3bf8b1b424582f66add4f2b8d95f409cfafecb2 /engine/cgb_layouts.asm | |
| parent | e2b378f5e32ea1416fbc9ac5e96d23be244e4a6b (diff) | |
Prefix engine_flags wram addresses with w
Diffstat (limited to 'engine/cgb_layouts.asm')
| -rw-r--r-- | engine/cgb_layouts.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 93e2c4434..715e41847 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -183,7 +183,7 @@ InitPartyMenuBGPal0: ; 8e9f ; 8eb9 _CGB_PokegearPals: ; 8eb9 - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a jr z, .male ld hl, FemalePokegearPals @@ -719,7 +719,7 @@ _CGB_TrainerCard: ; 9289 ; fill screen with opposite-gender palette for the card border hlcoord 0, 0, AttrMap ld bc, SCREEN_WIDTH * SCREEN_HEIGHT - ld a, [PlayerGender] + ld a, [wPlayerGender] and a ld a, $1 ; kris jr z, .got_gender @@ -729,7 +729,7 @@ _CGB_TrainerCard: ; 9289 ; fill trainer sprite area with same-gender palette hlcoord 14, 1, AttrMap lb bc, 7, 5 - ld a, [PlayerGender] + ld a, [wPlayerGender] and a ld a, $0 ; chris jr z, .got_gender2 @@ -768,7 +768,7 @@ _CGB_TrainerCard: ; 9289 ld a, $7 ; pryce call FillBoxCGB ; clair uses kris's palette - ld a, [PlayerGender] + ld a, [wPlayerGender] and a push af jr z, .got_gender3 @@ -847,7 +847,7 @@ _CGB_PackPals: ; 93d3 cp BATTLETYPE_TUTORIAL jr z, .tutorial_male - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a jr z, .tutorial_male |