EZChat cursor object

6 files changed, 41 insertions, 41 deletions

diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index 9259ede91..367fa1562 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -847,7 +847,7 @@ Hatch_InitShellFragments: ; 173b3 (5:73b3)
 	add [hl]
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], d
 
diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm
index 8dde2fa0a..781a1fd15 100755
--- a/engine/crystal_intro.asm
+++ b/engine/crystal_intro.asm
@@ -212,7 +212,7 @@ PlaceGameFreakPresents_3: ; e46dd
 
 
 GameFreakLogoJumper: ; e46ed (39:46ed)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
 	ld d, 0
@@ -232,7 +232,7 @@ GameFreakLogoScenes: ; e46fd (39:46fd)
 	dw GameFreakLogoScene5
 
 GameFreakLogoScene1: ; e4707 (39:4707)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
@@ -273,7 +273,7 @@ GameFreakLogoScene2: ; e470d (39:470d)
 	ret
 
 .asm_e4747
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ld hl, SPRITEANIMSTRUCT_0D
@@ -293,7 +293,7 @@ GameFreakLogoScene3: ; e4759 (39:4759)
 	ret
 
 .asm_e4764
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ld hl, SPRITEANIMSTRUCT_0D
@@ -332,7 +332,7 @@ GameFreakLogoScene4: ; e4776 (39:4776)
 	ret
 
 .asm_e47a3
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	call PlaceGameFreakPresents_AdvanceIndex
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index bc0c0924a..cce0cbd9b 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -319,7 +319,7 @@ EvolutionAnimation: ; 4e5e1
 	depixel 9, 11
 	ld a, SPRITE_ANIM_INDEX_13
 	call _InitSpriteAnimStruct
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [wJumptableIndex]
 	and %1110
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index 626989999..00ab1d828 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -1948,7 +1948,7 @@ endr
 ; 9321d
 
 SlotMachine_AnimateGolem: ; 9321d (24:721d)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
 	ld d, 0
@@ -1982,7 +1982,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
 
 .retain
 	dec [hl]
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ld hl, SPRITEANIMSTRUCT_0C
@@ -2009,7 +2009,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
 	ret
 
 .play_sound
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ld hl, SPRITEANIMSTRUCT_0D
@@ -2041,7 +2041,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
 	ret
 
 .restart
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	xor a
 	ld [hl], a
@@ -2049,7 +2049,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
 	ret
 
 Slots_AnimateChansey: ; 932ac (24:72ac)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
 	ld d, 0
@@ -2082,7 +2082,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	ret
 
 .limit
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ld a, $1
@@ -2100,7 +2100,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	ret
 
 .retain
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ld hl, SPRITEANIMSTRUCT_0C
@@ -2116,7 +2116,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
 	ret
 
 .spawn_egg
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	dec [hl]
 	push bc
diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm
index 93f8a234e..0e25cafdf 100755
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -133,17 +133,17 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .four ; 8d302 (23:5302)
-	call .anonymous_dw
+	call .AnonymousJumptable
 	jp [hl]
 ; 8d306 (23:5306)
 
-; Anonymous dw (see .anonymous_dw)
+; Anonymous dw (see .AnonymousJumptable)
 	dw .four_zero
 	dw .four_one
 ; 8d30a
 
 .four_zero ; 8d30a
-	call .IncrementSpriteAnimStruct0B
+	call .IncrementJumptableIndex
 
 	ld hl, SPRITEANIMSTRUCT_INDEX
 	add hl, bc
@@ -245,7 +245,7 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	dec [hl]
 .asm_8d395
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
 	push af
@@ -267,7 +267,7 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	ld a, [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	add [hl]
 	ld [hl], a
@@ -290,7 +290,7 @@ DoAnimFrame: ; 8d24b
 	add hl, bc
 	ld d, [hl]
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
 	push af
@@ -345,7 +345,7 @@ DoAnimFrame: ; 8d24b
 	inc hl
 	ld [hl], d
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
 	xor $20
@@ -372,7 +372,7 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .SlotsChanseyEgg: ; 8d43e (23:543e)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
 	dec [hl]
@@ -417,11 +417,11 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .sixteen ; 8d483 (23:5483)
-	call .anonymous_dw
+	call .AnonymousJumptable
 	jp [hl]
 ; 8d487 (23:5487)
 
-; Anonymous dw (see .anonymous_dw)
+; Anonymous dw (see .AnonymousJumptable)
 	dw .sixteen_zero
 	dw .sixteen_one
 	dw .sixteen_two
@@ -434,7 +434,7 @@ DoAnimFrame: ; 8d24b
 	ld a, $14
 	call _ReinitSpriteAnimFrame
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $2
 
@@ -454,7 +454,7 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .asm_8d4af
-	call .IncrementSpriteAnimStruct0B
+	call .IncrementJumptableIndex
 
 	ld hl, SPRITEANIMSTRUCT_0C
 	add hl, bc
@@ -482,7 +482,7 @@ DoAnimFrame: ; 8d24b
 ; 8d4d5
 
 .sixteen_one ; 8d4d5
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $4
 
@@ -539,7 +539,7 @@ DoAnimFrame: ; 8d24b
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
 	add hl, bc
 	ld [hl], a
-	call .IncrementSpriteAnimStruct0B
+	call .IncrementJumptableIndex
 	ret
 
 .sixteen_five ; 8d526
@@ -579,7 +579,7 @@ DoAnimFrame: ; 8d24b
 	add $8
 	ld [hl], a
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld a, [hl]
 	xor $20
@@ -804,7 +804,7 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .thirtytwo ; 8d680 (23:5680)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld d, [hl]
 	inc [hl]
@@ -847,21 +847,21 @@ DoAnimFrame: ; 8d24b
 	ret
 
 .twentysix ; 8d6b7 (23:56b7)
-	callba Function11d0b6
+	callba AnimateEZChatCursor
 	ret
 
 .thirtyone ; 8d6be (23:56be)
 	callba UpdateCelebiPosition
 	ret
 
-.anonymous_dw ; 8d6c5 (23:56c5)
+.AnonymousJumptable: ; 8d6c5 (23:56c5)
 	ld hl, [sp+$0]
 	ld e, [hl]
 	inc hl
 	ld d, [hl]
 	inc de
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld l, [hl]
 	ld h, $0
@@ -873,8 +873,8 @@ DoAnimFrame: ; 8d24b
 	ret
 ; 8d6d8 (23:56d8)
 
-.IncrementSpriteAnimStruct0B: ; 8d6d8
-	ld hl, SPRITEANIMSTRUCT_0B
+.IncrementJumptableIndex: ; 8d6d8
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret
diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm
index 27b4df245..d90f45a82 100755
--- a/engine/trade/animation.asm
+++ b/engine/trade/animation.asm
@@ -363,7 +363,7 @@ TradeAnim_InitTubeAnim: ; 2914e
 	ld a, SPRITE_ANIM_INDEX_TRADEMON_ICON
 	call _InitSpriteAnimStruct
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	pop bc
 	ld [hl], b
@@ -372,7 +372,7 @@ TradeAnim_InitTubeAnim: ; 2914e
 	ld a, SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
 	call _InitSpriteAnimStruct
 
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	pop bc
 	ld [hl], b
@@ -1123,7 +1123,7 @@ TradeAnim_DropBall: ; 2962c
 	depixel 10, 11, 4, 0
 	ld a, SPRITE_ANIM_INDEX_0E
 	call _InitSpriteAnimStruct
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld [hl], $1
 	ld hl, SPRITEANIMSTRUCT_YOFFSET
@@ -1163,7 +1163,7 @@ TradeAnim_BulgeThroughTube: ; 29660
 ; 29676
 
 TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	ld e, [hl]
 	ld d, 0
@@ -1187,7 +1187,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676)
 ; 2969a
 
 .JumptableNext: ; 29694 (a:5694)
-	ld hl, SPRITEANIMSTRUCT_0B
+	ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX
 	add hl, bc
 	inc [hl]
 	ret