diff options
Diffstat (limited to 'engine/party_menu.asm')
| -rw-r--r-- | engine/party_menu.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 06b774064..4aa71ecf7 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -13,7 +13,7 @@ SelectMonFromParty: ; 50000 ; 5001d -Function5001d: ; 5001d +SelectTradeOrDaycareMon: ; 5001d ld a, b ld [PartyMenuActionText], a call DisableSpriteUpdates @@ -41,7 +41,7 @@ Function5003f: ; 5003f LoadPartyMenuGFX: ; 5004f call LoadFontsBattleExtra callab Function8ad1 ; engine/color.asm - callab ClearSpriteAnims + callab ClearSpriteAnims2 ret ; 5005f @@ -190,7 +190,7 @@ PlacePartymonHPBar: ; 50117 ld d, a ld a, [hli] ld e, a - predef DrawPartyMenuHPBar + predef ComputeHPBarPixels ret ; 50138 @@ -670,7 +670,7 @@ InitPartyMenuGFX: ; 503e0 pop bc dec c jr nz, .loop - callab Function8cf69 + callab PlaySpriteAnimations ret ; 50405 @@ -696,7 +696,7 @@ InitPartyMenuWithCancel: ; 50405 ld a, $1 .done - ld [MenuSelection2], a + ld [wMenuCursorY], a ld a, A_BUTTON | B_BUTTON ld [wcfa8], a ret @@ -718,7 +718,7 @@ InitPartyMenuNoCancel: ; 0x5042d .skip ld a, $1 .done - ld [MenuSelection2], a + ld [wMenuCursorY], a ld a, A_BUTTON | B_BUTTON ld [wcfa8], a ret @@ -738,12 +738,12 @@ PartyMenuAttributes: ; 5044f PartyMenuSelect: ; 0x50457 ; sets carry if exitted menu. - call Function1bc9 + call StaticMenuJoypad call Function1bee ld a, [PartyCount] inc a ld b, a - ld a, [MenuSelection2] ; menu selection? + ld a, [wMenuCursorY] ; menu selection? cp b jr z, .exitmenu ; CANCEL ld [wPartyMenuCursor], a @@ -751,7 +751,7 @@ PartyMenuSelect: ; 0x50457 ld b, a bit 1, b jr nz, .exitmenu ; B button? - ld a, [MenuSelection2] + ld a, [wMenuCursorY] dec a ld [CurPartyMon], a ld c, a |