ref: 2dd9ac08a4d6ae7f26515dd99cd579b00a7d2b14
parent: 7ad8ea13c95a6ddbde90de56e7d58bf0eb161dfc
author: Remy Oukaour <[email protected]>
date: Tue Jan 2 09:39:24 EST 2018
More sprite anim documentation
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -137,10 +137,10 @@
const SPRITE_ANIM_FRAMESET_LEAF ; 1d
const SPRITE_ANIM_FRAMESET_CUT_TREE ; 1e
const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 1f
- const SPRITE_ANIM_FRAMESET_EGG_HATCH ; 20
- const SPRITE_ANIM_FRAMESET_UNUSED_21 ; 21
- const SPRITE_ANIM_FRAMESET_UNUSED_22 ; 22
- const SPRITE_ANIM_FRAMESET_UNUSED_23 ; 23
+ const SPRITE_ANIM_FRAMESET_EGG_HATCH_1 ; 20
+ const SPRITE_ANIM_FRAMESET_EGG_HATCH_2 ; 21
+ const SPRITE_ANIM_FRAMESET_EGG_HATCH_3 ; 22
+ const SPRITE_ANIM_FRAMESET_EGG_HATCH_4 ; 23
const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH ; 24
const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25
const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0 ; 26
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -32,10 +32,10 @@
dw .Frameset_Leaf
dw .Frameset_CutTree
dw .Frameset_EggCrack
- dw .Frameset_EggHatch
- dw .Frameset_Unused21
- dw .Frameset_Unused22
- dw .Frameset_Unused23
+ dw .Frameset_EggHatch1
+ dw .Frameset_EggHatch2
+ dw .Frameset_EggHatch3
+ dw .Frameset_EggHatch4
dw .Frameset_GSIntroHoOh
dw .Frameset_HeadbuttTree
dw .Frameset_EZChatCursor0
@@ -310,19 +310,19 @@
frame SPRITE_ANIM_OAMSET_EGG_CRACK, 32
endanim
-.Frameset_EggHatch:
+.Frameset_EggHatch1:
frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32
endanim
-.Frameset_Unused21:
+.Frameset_EggHatch2:
frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP
endanim
-.Frameset_Unused22:
+.Frameset_EggHatch3:
frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_Y_FLIP
endanim
-.Frameset_Unused23:
+.Frameset_EggHatch4:
frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP
endanim
--- a/data/sprite_anims/sequences.asm
+++ b/data/sprite_anims/sequences.asm
@@ -29,7 +29,7 @@
db SPRITE_ANIM_FRAMESET_EGG_CRACK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH
db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_HEADBUTT
- db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
+ db SPRITE_ANIM_FRAMESET_EGG_HATCH_1, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0, SPRITE_ANIM_SEQ_EZCHAT_CURSOR, $00 ; SPRITE_ANIM_INDEX_EZCHAT_CURSOR
db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_BLUE_WALK
db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -39,7 +39,7 @@
dw .FlyFrom
dw .FlyLeaf
dw .FlyTo
- dw .ForUnused1A
+ dw .GSIntroHoOh
dw .EZChatCursor
dw .MobileTradeSentPulse
dw .MobileTradeOTPulse
@@ -202,7 +202,7 @@
ret
; 8d35a
-.ForUnused1A ; 8d35a (23:535a)
+.GSIntroHoOh ; 8d35a (23:535a)
ld hl, SPRITEANIMSTRUCT_0C
add hl, bc
ld a, [hl]