diff options
Diffstat (limited to 'engine/menus/party_menu.asm')
| -rwxr-xr-x | engine/menus/party_menu.asm | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm index 6648ab54..32f47f6a 100755 --- a/engine/menus/party_menu.asm +++ b/engine/menus/party_menu.asm @@ -30,9 +30,17 @@ RedrawPartyMenu_:: call GetPartyMonName pop hl call PlaceString ; print the pokemon's name - farcall WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon ldh a, [hPartyMonIndex] ld [wWhichPokemon], a + callfar IsThisPartymonStarterPikachu_Party + jr nc, .regularMon + call CheckPikachuFollowingPlayer + jr z, .regularMon + ld a, $ff + ldh [hPartyMonIndex], a +.regularMon + farcall WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon + ld a, [wWhichPokemon] inc a ldh [hPartyMonIndex], a call LoadMonData @@ -69,14 +77,14 @@ RedrawPartyMenu_:: pop hl push hl ld bc, SCREEN_WIDTH + 1 ; down 1 row and right 1 column - ldh a, [hFlagsFFF6] + ldh a, [hFlagsFFFA] set 0, a - ldh [hFlagsFFF6], a + ldh [hFlagsFFFA], a add hl, bc predef DrawHP2 ; draw HP bar and prints current / max HP - ldh a, [hFlagsFFF6] + ldh a, [hFlagsFFFA] res 0, a - ldh [hFlagsFFF6], a + ldh [hFlagsFFFA], a call SetPartyMenuHPBarColor ; color the HP bar (on SGB) pop hl jr .printLevel @@ -90,8 +98,8 @@ RedrawPartyMenu_:: jr nz, .placeMoveLearnabilityString ld de, .notAbleToLearnMoveText .placeMoveLearnabilityString - ld bc, 20 + 9 ; down 1 row and right 9 columns push hl + ld bc, 20 + 9 ; down 1 row and right 9 columns add hl, bc call PlaceString pop hl @@ -157,9 +165,9 @@ RedrawPartyMenu_:: ; if it does match ld de, .ableToEvolveText .placeEvolutionStoneString - ld bc, 20 + 9 ; down 1 row and right 9 columns pop hl push hl + ld bc, 20 + 9 ; down 1 row and right 9 columns add hl, bc call PlaceString pop hl |