Merge pull request #19 from thornAvery/master

This seems fine?
This commit is contained in:
Llinos Evans 2023-09-26 19:46:38 +01:00 committed by GitHub
commit a1e52924d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions

View file

@ -177,6 +177,18 @@ StartMenu_Pokemon::
.strength
bit BIT_RAINBOWBADGE, a
jp z, .newBadgeRequired
ld a, [wWhichPokemon]
ld hl, wPartySpecies
; bumping hl by a, need to make sure carry happens
ld c, a
ld a, l
add a, c
ld l, a
jr nc, .strengthNoCarry
inc h
.strengthNoCarry
ld a, [hl]
ld [wcf91], a
predef PrintStrengthTxt
call GBPalWhiteOutWithDelay3
jp .goBackToMap

View file

@ -30,6 +30,17 @@ BoulderText::
pop af
ld [wWhichPokemon], a
call GetPartyMonName2
ld a, [wWhichPokemon]
ld hl, wPartySpecies
ld c, a
ld a, l
add a, c
ld l, a
jr nc, .noCarry
inc h
.noCarry
ld a, [hl]
ld [wcf91], a
predef PrintStrengthTxt
.done
jp TextScriptEnd