Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better names

This commit is contained in:
Remy Oukaour 2018-01-03 01:27:12 -05:00
parent b0d2409c83
commit 8d095cd5b8
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/sprite_anim_constants.asm
View File

@ -127,7 +127,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
const SPRITE_ANIM_FRAMESET_RED_WALK ; 11 const SPRITE_ANIM_FRAMESET_RED_WALK ; 11
const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12 const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12
const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13 const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13
const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ; 14 const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WIGGLE ; 14
const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15 const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15
const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16 const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16
const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17 const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17

20
data/sprite_anims/framesets.asm
View File

@ -20,7 +20,7 @@ SpriteAnimFrameData: ; 8d6e6
dw .Frameset_RedWalk dw .Frameset_RedWalk
dw .Frameset_StillCursor dw .Frameset_StillCursor
dw .Frameset_TradePokeBall dw .Frameset_TradePokeBall
dw .Frameset_TradePokeBall0 dw .Frameset_TradePokeBallWiggle
dw .Frameset_TradePoof dw .Frameset_TradePoof
dw .Frameset_TradeTubeBulge dw .Frameset_TradeTubeBulge
dw .Frameset_TrademonIcon dw .Frameset_TrademonIcon
@ -38,13 +38,13 @@ SpriteAnimFrameData: ; 8d6e6
dw .Frameset_EggHatch4 dw .Frameset_EggHatch4
dw .Frameset_GSIntroHoOh dw .Frameset_GSIntroHoOh
dw .Frameset_HeadbuttTree dw .Frameset_HeadbuttTree
dw .Frameset_EZChatCursor0
dw .Frameset_EZChatCursor1 dw .Frameset_EZChatCursor1
dw .Frameset_EZChatCursor2 dw .Frameset_EZChatCursor2
dw .Frameset_EZChatCursor3 dw .Frameset_EZChatCursor3
dw .Frameset_EZChatCursor4 dw .Frameset_EZChatCursor4
dw .Frameset_EZChatCursor5 dw .Frameset_EZChatCursor5
dw .Frameset_EZChatCursor6 dw .Frameset_EZChatCursor6
dw .Frameset_EZChatCursor7
dw .Frameset_BlueWalk dw .Frameset_BlueWalk
dw .Frameset_MagnetTrainBlue dw .Frameset_MagnetTrainBlue
dw .Frameset_MobileTradeSentBall dw .Frameset_MobileTradeSentBall
@ -202,7 +202,7 @@ SpriteAnimFrameData: ; 8d6e6
frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 32
endanim endanim
.Frameset_TradePokeBall0: .Frameset_TradePokeBallWiggle:
frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2, 3
frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3 frame SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1, 3
@ -342,31 +342,31 @@ SpriteAnimFrameData: ; 8d6e6
frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2, OAM_X_FLIP frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2, OAM_X_FLIP
dorestart dorestart
.Frameset_EZChatCursor0: .Frameset_EZChatCursor1:
frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1, 2 frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1, 2
endanim endanim
.Frameset_EZChatCursor1: .Frameset_EZChatCursor2:
frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2, 2 frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2, 2
endanim endanim
.Frameset_EZChatCursor2: .Frameset_EZChatCursor3:
frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3, 2 frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3, 2
endanim endanim
.Frameset_EZChatCursor3: .Frameset_EZChatCursor4:
frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4, 2 frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4, 2
endanim endanim
.Frameset_EZChatCursor4: .Frameset_EZChatCursor5:
frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5, 2 frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5, 2
endanim endanim
.Frameset_EZChatCursor5: .Frameset_EZChatCursor6:
frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6, 2 frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6, 2
endanim endanim
.Frameset_EZChatCursor6: .Frameset_EZChatCursor7:
frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7, 2 frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7, 2
endanim endanim

2
engine/sprite_anims.asm
View File

@ -430,7 +430,7 @@ DoAnimFrame: ; 8d24b
; 8d493 ; 8d493
.TradePokeBall_zero ; 8d493 .TradePokeBall_zero ; 8d493
ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ld a, SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WIGGLE
call _ReinitSpriteAnimFrame call _ReinitSpriteAnimFrame
ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX