diff options
Diffstat (limited to 'engine/menu')
| -rwxr-xr-x | engine/menu/naming_screen.asm | 6 | ||||
| -rwxr-xr-x | engine/menu/party_menu.asm | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 7506c849..583bb5aa 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -92,7 +92,7 @@ DisplayNamingScreen: ; 6596 (1:6596) call GoPAL_SET call LoadHpBarAndStatusTilePatterns call LoadEDTile - callba Func_7176c + callba LoadMonPartySpriteGfx hlCoord 0, 4 ld b, $9 ld c, $12 @@ -114,7 +114,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld hl, wHPBarMaxHP + 1 ld [hli], a ld [hli], a - ld [W_SUBANIMTRANSFORM], a + ld [wPartyMonAnimCounter], a .asm_65ed call PrintAlphabet call GBPalNormal @@ -472,7 +472,7 @@ PrintNamingText: ; 68f8 (1:68f8) ld a, [wcf91] ld [wcd5d], a push af - callba Func_71882 + callba WriteMonPartySpriteOAMByMonID pop af ld [wd11e], a call GetMonName diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 97e520c2..242edd40 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -22,7 +22,7 @@ DrawPartyMenu_: ; 12cd2 (4:6cd2) ld [H_AUTOBGTRANSFERENABLED],a call ClearScreen call UpdateSprites ; move sprites - callba Func_71791 ; load pokemon icon graphics + callba LoadMonPartySpriteGfxWithLCDDisabled ; load pokemon icon graphics RedrawPartyMenu_: ; 12ce3 (4:6ce3) ld a,[wd07d] @@ -34,7 +34,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) ld de,wPartySpecies xor a ld c,a - ld [$FF8C],a ; loop counter + ld [hPartyMonIndex],a ld [wcf2d],a .loop ld a,[de] @@ -49,11 +49,11 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) call GetPartyMonName pop hl call PlaceString ; print the pokemon's name - callba Func_71868 ; place the appropriate pokemon icon - ld a,[$FF8C] ; loop counter + callba WriteMonPartySpriteOAMByPartyIndex ; place the appropriate pokemon icon + ld a,[hPartyMonIndex] ld [wWhichPokemon],a inc a - ld [$FF8C],a + ld [hPartyMonIndex],a call LoadMonData pop hl push hl |