summaryrefslogtreecommitdiff
path: root/engine/mon_icons.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-12 19:13:53 -0500
committerGitHub <noreply@github.com>2017-12-12 19:13:53 -0500
commit6cf7c0790f3424a4cb472b274a88d04d449d5231 (patch)
tree7d3c49aaaa6d50f6ea698e95e7204e6d0b76bcca /engine/mon_icons.asm
parentf6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)
parentf0ab09125493f91d66af836e0abb977459a0d801 (diff)
Merge pull request #414 from roukaour/master
Improve sprite constants and documentation
Diffstat (limited to 'engine/mon_icons.asm')
-rwxr-xr-xengine/mon_icons.asm9
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"
-