summaryrefslogtreecommitdiff
path: root/engine/mon_icons.asm
diff options
context:
space:
mode:
authorsurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
committersurskitty <surskitty@gmail.com>2017-12-12 00:50:55 -0500
commit096afdcdaca0714612f3670a3c4a670f312c1c3f (patch)
tree0c0bedcd311ab83262e31cf6d9d4c37257143acc /engine/mon_icons.asm
parent98128cd4d8457948e7136a16e08bacff0bc3529d (diff)
parentf6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff)
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/mon_icons.asm')
-rwxr-xr-xengine/mon_icons.asm25
1 files changed, 24 insertions, 1 deletions
diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm
index 9c6fb1870..0aade6985 100755
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -450,4 +450,27 @@ HoldSwitchmonIcon: ; 8ea8c
jr nz, .loop
ret
-INCLUDE "menu/mon_icons.asm"
+ReadMonMenuIcon: ; 8eab3
+ cp EGG
+ jr z, .egg
+ dec a
+ ld hl, MonMenuIcons
+ ld e, a
+ ld d, 0
+ add hl, de
+ ld a, [hl]
+ ret
+.egg
+ ld a, ICON_EGG
+ ret
+; 8eac4
+
+
+INCLUDE "data/mon_menu_icons.asm"
+
+
+INCLUDE "gfx/icon_pointers.asm"
+
+Icons:
+INCLUDE "gfx/icons.asm"
+