diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 18 |
2 files changed, 12 insertions, 10 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 113e9df37..c0424088e 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -237,12 +237,12 @@ BattleAnim_ClearOAM: bit BATTLEANIM_KEEPSPRITES_F, a jr z, .delete - ; Instead of deleting the sprites, make them all use palette 0 (monochrome) + ; Instead of deleting the sprites, make them all use PAL_BATTLE_OB_ENEMY ld hl, wVirtualOAMSprite00Attributes ld c, NUM_SPRITE_OAM_STRUCTS .loop ld a, [hl] - and $ff ^ (PALETTE_MASK | VRAM_BANK_1) + and $ff ^ (PALETTE_MASK | VRAM_BANK_1) ; PAL_BATTLE_OB_ENEMY (0) ld [hli], a rept SPRITEOAMSTRUCT_LENGTH + -1 inc hl diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index cb066317d..ae7e71cf2 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -4,6 +4,8 @@ const BLUE_PAGE ; 3 NUM_STAT_PAGES EQU const_value + -1 +STAT_PAGE_MASK EQU %00000011 + BattleStatsScreenInit: ld a, [wLinkMode] cp LINK_MOBILE @@ -63,15 +65,15 @@ StatsScreenMain: ; ??? ld [wcf64], a ld a, [wcf64] - and %11111100 - or 1 + and $ff ^ STAT_PAGE_MASK + or PINK_PAGE ; first_page ld [wcf64], a .loop ld a, [wJumptableIndex] and $ff ^ (1 << 7) ld hl, StatsScreenPointerTable rst JumpTable - call StatsScreen_WaitAnim ; check for keys? + call StatsScreen_WaitAnim ld a, [wJumptableIndex] bit 7, a jr z, .loop @@ -83,13 +85,13 @@ StatsScreenMobile: ; ??? ld [wcf64], a ld a, [wcf64] - and %11111100 - or 1 + and $ff ^ STAT_PAGE_MASK + or PINK_PAGE ; first_page ld [wcf64], a .loop farcall Mobile_SetOverworldDelay ld a, [wJumptableIndex] - and $ff ^ (1 << 7) + and $7f ld hl, StatsScreenPointerTable rst JumpTable call StatsScreen_WaitAnim @@ -355,7 +357,7 @@ StatsScreen_JoypadAction: .set_page ld a, [wcf64] - and %11111100 + and $ff ^ STAT_PAGE_MASK or c ld [wcf64], a ld h, 4 @@ -759,7 +761,7 @@ StatsScreen_LoadGFX: jr z, .done cp $7f jr z, .done - and $80 + and CAUGHT_GENDER_MASK ld a, "♂" jr z, .got_gender ld a, "♀" |