thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #19 from thornAvery/master

Browse source 
This seems fine?
This commit is contained in:
Llinos Evans 2023-09-26 19:46:38 +01:00 committed by GitHub
parent 62ce1723dc 875adc18fd
commit a1e52924d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
engine/menus/start_sub_menus.asm
View file

@ -177,6 +177,18 @@ StartMenu_Pokemon::
.strength .strength
bit BIT_RAINBOWBADGE, a bit BIT_RAINBOWBADGE, a
jp z, .newBadgeRequired 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 predef PrintStrengthTxt
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
jp .goBackToMap jp .goBackToMap

11
home/overworld_text.asm
View file

@ -30,6 +30,17 @@ BoulderText::
pop af pop af
ld [wWhichPokemon], a ld [wWhichPokemon], a
call GetPartyMonName2 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 predef PrintStrengthTxt
.done .done
jp TextScriptEnd jp TextScriptEnd