diff options
Diffstat (limited to 'engine/menu/party_menu.asm')
| -rwxr-xr-x | engine/menu/party_menu.asm | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 7ef14232..669d49db 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -49,9 +49,17 @@ RedrawPartyMenu_: call GetPartyMonName pop hl call PlaceString ; print the pokemon's name - callba WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon ld a,[hPartyMonIndex] ld [wWhichPokemon],a + callab IsThisPartymonStarterPikachu_Party + jr nc, .regularMon + call CheckPikachuFollowingPlayer + jr z, .regularMon + ld a, $ff + ld [hPartyMonIndex], a +.regularMon + callba WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon + ld a, [wWhichPokemon] inc a ld [hPartyMonIndex],a call LoadMonData @@ -88,14 +96,14 @@ RedrawPartyMenu_: pop hl push hl ld bc,20 + 1 ; down 1 row and right 1 column - ld a,[hFlags_0xFFF6] + ld a,[hFlags_0xFFFA] set 0,a - ld [hFlags_0xFFF6],a + ld [hFlags_0xFFFA],a add hl,bc predef DrawHP2 ; draw HP bar and prints current / max HP - ld a,[hFlags_0xFFF6] + ld a,[hFlags_0xFFFA] res 0,a - ld [hFlags_0xFFF6],a + ld [hFlags_0xFFFA],a call SetPartyMenuHPBarColor ; color the HP bar (on SGB) pop hl jr .printLevel @@ -109,8 +117,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 @@ -150,7 +158,7 @@ RedrawPartyMenu_: ld l,a ld de,wcd6d ld a,BANK(EvosMovesPointerTable) - ld bc,Mon133_EvosEnd - Mon133_EvosMoves + ld bc, $0d ; Mon133_EvosEnd - Mon133_EvosMoves call FarCopyData ld hl,wcd6d ld de,.notAbleToEvolveText @@ -176,9 +184,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 |