diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-04 08:46:11 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-04 08:46:11 -0500 |
| commit | 5b94d54a6c81d7ea09497dfc3d1477a7ed3bd954 (patch) | |
| tree | c2b9a32ed9f102f6fe0956760fc59c4490ba38d4 /event | |
| parent | 2f14f3a669afd51ab98d9f2dea5857e5b548a8d7 (diff) | |
More work on animations
Diffstat (limited to 'event')
| -rwxr-xr-x | event/field_moves.asm | 10 | ||||
| -rw-r--r-- | event/move_deleter.asm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/event/field_moves.asm b/event/field_moves.asm index 1322c4eae..398636451 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -325,7 +325,7 @@ FlyFromAnim: ; 8caed push af xor a ld [VramState], a - call Function8cb9b + call FlyFunction_InitGFX depixel 10, 10, 4, 0 ld a, SPRITE_ANIM_INDEX_0A call _InitSpriteAnimStruct @@ -334,7 +334,7 @@ FlyFromAnim: ; 8caed ld [hl], $84 ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID add hl, bc - ld [hl], $16 + ld [hl], SPRITE_ANIM_SEQ_16 ld a, $80 ld [wcf64], a .loop @@ -360,7 +360,7 @@ FlyToAnim: ; 8cb33 push af xor a ld [VramState], a - call Function8cb9b + call FlyFunction_InitGFX depixel 31, 10, 4, 0 ld a, SPRITE_ANIM_INDEX_0A call _InitSpriteAnimStruct @@ -410,7 +410,7 @@ endr call ByteFill ret -Function8cb9b: ; 8cb9b (23:4b9b) +FlyFunction_InitGFX: ; 8cb9b (23:4b9b) callab ClearSpriteAnims ld de, CutGrassGFX ld hl, VTiles1 tile $00 @@ -424,7 +424,7 @@ Function8cb9b: ; 8cb9b (23:4b9b) ld a, [hl] ld [wd265], a ld e, $84 - callba Function8e9bc + callba FlyFunction_GetMonIcon xor a ld [wJumptableIndex], a ret diff --git a/event/move_deleter.asm b/event/move_deleter.asm index 617e3b86d..44226cca8 100644 --- a/event/move_deleter.asm +++ b/event/move_deleter.asm @@ -20,7 +20,7 @@ MoveDeletion: ld hl, UnknownText_0x2c5ea call PrintText call LoadStandardMenuDataHeader - callba Function12f5b + callba ChooseMoveToDelete push af call Function2b74 pop af |