diff options
Diffstat (limited to 'engine/mon_icons.asm')
-rwxr-xr-x | engine/mon_icons.asm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index d66ea6fac..9c6fb1870 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -178,7 +178,7 @@ InitPartyMenuIcon: ; 8e908 (23:6908) ; x coord ld e, $10 ; type is partymon icon - ld a, SPRITE_ANIM_INDEX_00 + ld a, SPRITE_ANIM_INDEX_PARTY_MON call InitSpriteAnimStruct pop af ld hl, SPRITEANIMSTRUCT_TILE_ID @@ -215,7 +215,9 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936) ; 8e95e (23:695e) .speeds ; 8e95e - db $00, $40, $80 + db $00 ; HP_GREEN + db $40 ; HP_YELLOW + db $80 ; HP_RED ; 8e961 NamingScreen_InitAnimatedMonIcon: ; 8e961 (23:6961) @@ -225,7 +227,7 @@ NamingScreen_InitAnimatedMonIcon: ; 8e961 (23:6961) xor a call GetIconGFX depixel 4, 4, 4, 0 - ld a, SPRITE_ANIM_INDEX_00 + ld a, SPRITE_ANIM_INDEX_PARTY_MON call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc @@ -238,9 +240,9 @@ MoveList_InitAnimatedMonIcon: ; 8e97d (23:697d) ld [CurIcon], a xor a call GetIconGFX - ld d, 3 * 8 + 2 + ld d, 3 * 8 + 2 ; depixel 3, 4, 2, 4 ld e, 4 * 8 + 4 - ld a, SPRITE_ANIM_INDEX_00 + ld a, SPRITE_ANIM_INDEX_PARTY_MON call InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc @@ -376,7 +378,7 @@ FreezeMonIcons: ; 8ea4a jr .ok .loadwithtwo - ld a, SPRITE_ANIM_SEQ_02 + ld a, SPRITE_ANIM_SEQ_PARTY_MON_SWITCH .ok push hl @@ -407,7 +409,7 @@ UnfreezeMonIcons: ; 8ea71 ld b, h ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc - ld [hl], SPRITE_ANIM_SEQ_01 + ld [hl], SPRITE_ANIM_SEQ_PARTY_MON pop hl .next ld bc, $10 @@ -428,11 +430,11 @@ HoldSwitchmonIcon: ; 8ea8c jr z, .next cp d jr z, .is_switchmon - ld a, SPRITE_ANIM_SEQ_03 + ld a, SPRITE_ANIM_SEQ_PARTY_MON_SELECTED jr .join_back .is_switchmon - ld a, SPRITE_ANIM_SEQ_02 + ld a, SPRITE_ANIM_SEQ_PARTY_MON_SWITCH .join_back push hl ld c, l |