Rename pokemon animation files (fix #439)

This commit is contained in:
Remy Oukaour
2017-12-28 11:05:42 -05:00
parent e2b378f5e3
commit b373984ab9
570 changed files with 863 additions and 863 deletions

View File

@@ -13,7 +13,7 @@
; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm)
; - Pokered_MonIndices (see data/time_capsule/mon_order.asm) ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm)
; - AnimationPointers (see gfx/pokemon/anim_pointers.asm) ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm)
; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm) ; - AnimationIdlePointers (see gfx/pokemon/idle_pointers.asm)
; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm) ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm)
; - FramesPointers (see gfx/pokemon/frame_pointers.asm) ; - FramesPointers (see gfx/pokemon/frame_pointers.asm)
; - Footprints (see gfx/footprints.asm) ; - Footprints (see gfx/footprints.asm)

View File

@@ -77,13 +77,13 @@ PokeAnims: ; d0042
.Slow: pokeanim StereoCry, Setup2, Play .Slow: pokeanim StereoCry, Setup2, Play
.Normal: pokeanim StereoCry, Setup, Play .Normal: pokeanim StereoCry, Setup, Play
.Menu: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play .Menu: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
.Trade: pokeanim Extra, Play2, Extra, Play, SetWait, Wait, Cry, Setup, Play .Trade: pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play
.Evolve: pokeanim Extra, Play, SetWait, Wait, CryNoWait, Setup, Play .Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play
.Hatch: pokeanim Extra, Play, CryNoWait, Setup, Play, SetWait, Wait, Extra, Play .Hatch: pokeanim Idle, Play, CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Extra, Play .Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play
.Egg1: pokeanim Setup, Play .Egg1: pokeanim Setup, Play
.Egg2: pokeanim Extra, Play .Egg2: pokeanim Idle, Play
AnimateFrontpic: ; d008e AnimateFrontpic: ; d008e
@@ -151,7 +151,7 @@ endm
setup_command PokeAnim_Wait setup_command PokeAnim_Wait
setup_command PokeAnim_Setup setup_command PokeAnim_Setup
setup_command PokeAnim_Setup2 setup_command PokeAnim_Setup2
setup_command PokeAnim_Extra setup_command PokeAnim_Idle
setup_command PokeAnim_Play setup_command PokeAnim_Play
setup_command PokeAnim_Play2 setup_command PokeAnim_Play2
setup_command PokeAnim_Cry setup_command PokeAnim_Cry
@@ -198,7 +198,7 @@ PokeAnim_Setup2: ; d011d
ret ret
; d012f ; d012f
PokeAnim_Extra: ; d012f PokeAnim_Idle: ; d012f
ld c, TRUE ld c, TRUE
ld b, 0 ld b, 0
call PokeAnim_InitAnim call PokeAnim_InitAnim
@@ -360,18 +360,18 @@ PokeAnim_InitPicAttributes: ; d01d6
PokeAnim_InitAnim: ; d0228 PokeAnim_InitAnim: ; d0228
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, BANK(wPokeAnimExtraFlag) ld a, BANK(wPokeAnimIdleFlag)
ld [rSVBK], a ld [rSVBK], a
push bc push bc
ld hl, wPokeAnimExtraFlag ld hl, wPokeAnimIdleFlag
ld bc, wPokeAnimStructEnd - wPokeAnimExtraFlag ld bc, wPokeAnimStructEnd - wPokeAnimIdleFlag
xor a xor a
call ByteFill call ByteFill
pop bc pop bc
ld a, b ld a, b
ld [wPokeAnimSpeed], a ld [wPokeAnimSpeed], a
ld a, c ld a, c
ld [wPokeAnimExtraFlag], a ld [wPokeAnimIdleFlag], a
call GetMonAnimPointer call GetMonAnimPointer
call GetMonFramesPointer call GetMonFramesPointer
call GetMonBitmaskPointer call GetMonBitmaskPointer
@@ -949,20 +949,20 @@ GetMonAnimPointer: ; d055c
ld c, BANK(UnownAnimations) ld c, BANK(UnownAnimations)
ld hl, UnownAnimationPointers ld hl, UnownAnimationPointers
ld de, UnownAnimationExtraPointers ld de, UnownAnimationIdlePointers
call PokeAnim_IsUnown call PokeAnim_IsUnown
jr z, .unown jr z, .unown
ld c, BANK(PicAnimations) ld c, BANK(PicAnimations)
ld hl, AnimationPointers ld hl, AnimationPointers
ld de, AnimationExtraPointers ld de, AnimationIdlePointers
.unown .unown
ld a, [wPokeAnimExtraFlag] ld a, [wPokeAnimIdleFlag]
and a and a
jr z, .extras jr z, .idles
ld h, d ld h, d
ld l, e ld l, e
.extras .idles
ld a, [wPokeAnimSpeciesOrUnown] ld a, [wPokeAnimSpeciesOrUnown]
dec a dec a
@@ -982,12 +982,12 @@ GetMonAnimPointer: ; d055c
.egg .egg
ld hl, EggAnimation ld hl, EggAnimation
ld c, BANK(EggAnimation) ld c, BANK(EggAnimation)
ld a, [wPokeAnimExtraFlag] ld a, [wPokeAnimIdleFlag]
and a and a
jr z, .extras_egg jr z, .idles_egg
ld hl, EggAnimationExtra ld hl, EggAnimationIdle
ld c, BANK(EggAnimationExtra) ld c, BANK(EggAnimationIdle)
.extras_egg .idles_egg
ld a, c ld a, c
ld [wPokeAnimPointerBank], a ld [wPokeAnimPointerBank], a

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More