diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /engine/mon_icons.asm | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/mon_icons.asm')
| -rwxr-xr-x | engine/mon_icons.asm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 0aade6985..70c439863 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -144,11 +144,11 @@ PartyMenu_InitAnimatedMonIcon: ; 8e8d5 (23:68d5) pop bc pop hl jr c, .mail - ld a, SPRITE_ANIM_FRAMESET_03 + ld a, SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM jr .okay .mail - ld a, SPRITE_ANIM_FRAMESET_02 + ld a, SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL .okay ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc @@ -297,7 +297,7 @@ GetMemIconGFX: ; 8e9db (23:69db) ld a, [wCurIconTile] GetIconGFX: ; 8e9de call GetIcon_a - ld de, $80 ; 8 tiles + ld de, 8 tiles add hl, de ld de, HeldItemIcons lb bc, BANK(HeldItemIcons), 2 @@ -468,9 +468,6 @@ ReadMonMenuIcon: ; 8eab3 INCLUDE "data/mon_menu_icons.asm" - INCLUDE "gfx/icon_pointers.asm" -Icons: INCLUDE "gfx/icons.asm" - |