diff options
Diffstat (limited to 'engine/pokemon/status_screen.asm')
| -rw-r--r-- | engine/pokemon/status_screen.asm | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index d4a4e59a..a2cfb595 100644 --- a/engine/pokemon/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -40,7 +40,7 @@ DrawHP_: push hl call DrawHPBar pop hl - ldh a, [hFlagsFFF6] + ldh a, [hFlagsFFFA] bit 0, a jr z, .printFractionBelowBar ld bc, $9 ; right of bar @@ -170,8 +170,25 @@ StatusScreen: call GBPalNormal hlcoord 1, 0 call LoadFlippedFrontSpriteByMonIndex ; draw Pokémon picture + ld a, [wMonDataLocation] + cp ENEMY_PARTY_DATA + jr z, .playRegularCry + cp BOX_DATA + jr z, .checkBoxData + callfar IsThisPartymonStarterPikachu_Party + jr nc, .playRegularCry + jr .playPikachuSoundClip +.checkBoxData + callfar IsThisPartymonStarterPikachu_Box + jr nc, .playRegularCry +.playPikachuSoundClip + ld e, 16 + callfar PlayPikachuSoundClip + jr .continue +.playRegularCry ld a, [wcf91] call PlayCry ; play Pokémon cry +.continue call WaitForTextScrollButtonPress ; wait for button pop af ldh [hTilesetType], a @@ -251,16 +268,14 @@ PrintStatsBox: and a ; a is 0 from the status screen jr nz, .DifferentBox hlcoord 0, 8 - ld b, 8 - ld c, 8 + lb bc, 8, 8 call TextBoxBorder ; Draws the box hlcoord 1, 9 ; Start printing stats from here ld bc, $19 ; Number offset jr .PrintStats .DifferentBox hlcoord 9, 2 - ld b, 8 - ld c, 9 + lb bc, 8, 9 call TextBoxBorder hlcoord 11, 3 ld bc, $18 @@ -315,8 +330,7 @@ StatusScreen2: hlcoord 19, 3 ld [hl], $78 hlcoord 0, 8 - ld b, 8 - ld c, 18 + lb bc, 8, 18 call TextBoxBorder ; Draw move container hlcoord 2, 9 ld de, wMovesString |