summaryrefslogtreecommitdiff
path: root/data/pikachu_emotions.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/pikachu_emotions.asm')
-rwxr-xr-xdata/pikachu_emotions.asm154
1 files changed, 77 insertions, 77 deletions
diff --git a/data/pikachu_emotions.asm b/data/pikachu_emotions.asm
index a1d902c3..0fe51be8 100755
--- a/data/pikachu_emotions.asm
+++ b/data/pikachu_emotions.asm
@@ -1,255 +1,255 @@
-PikachuEmotion0_fd115: ; fd115 (3f:5115)
+PikachuEmotion0: ; fd115 (3f:5115)
db $ff
-PikachuEmotion2_fd116: ; fd116 (3f:5116)
+PikachuEmotion2: ; fd116 (3f:5116)
pikaemotion_dummy2
pikaemotion_emotebubble SMILE_BUBBLE
pikaemotion_pcm PikachuCry35
- pikaemotion_pikapic $2
+ pikaemotion_pikapic PikaPicAnimScript2
db $ff
-PikachuEmotion10_fd11e: ; fd11e (3f:511e)
+PikachuEmotion10: ; fd11e (3f:511e)
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $a
+ pikaemotion_pikapic PikaPicAnimScript10
db $ff
-PikachuEmotion7_fd128: ; fd128 (3f:5128)
+PikachuEmotion7: ; fd128 (3f:5128)
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
- pikaemotion_movement Pointer_fd224
+ pikaemotion_movement PikachuMovementData_fd224
pikaemotion_pcm PikachuCry1
- pikaemotion_movement Pointer_fd224
- pikaemotion_pikapic $7
+ pikaemotion_movement PikachuMovementData_fd224
+ pikaemotion_pikapic PikaPicAnimScript7
db $ff
-PikachuEmotion4_fd136: ; fd136 (3f:5136)
+PikachuEmotion4: ; fd136 (3f:5136)
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
- pikaemotion_movement Pointer_fd230
+ pikaemotion_movement PikachuMovementData_fd230
pikaemotion_pcm PikachuCry29
- pikaemotion_pikapic $4
+ pikaemotion_pikapic PikaPicAnimScript4
db $ff
-PikachuEmotion1_fd141: ; fd141 (3f:5141)
+PikachuEmotion1: ; fd141 (3f:5141)
pikaemotion_dummy2
pikaemotion_pcm
- pikaemotion_pikapic $1
+ pikaemotion_pikapic PikaPicAnimScript1
db $ff
-PikachuEmotion8_fd147: ; fd147 (3f:5147)
+PikachuEmotion8: ; fd147 (3f:5147)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry39
- pikaemotion_pikapic $8
+ pikaemotion_pikapic PikaPicAnimScript8
db $ff
-PikachuEmotion5_fd14d: ; fd14d (3f:514d)
+PikachuEmotion5: ; fd14d (3f:514d)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry31
- pikaemotion_pikapic $5
+ pikaemotion_pikapic PikaPicAnimScript5
db $ff
-PikachuEmotion6_fd153: ; fd153 (3f:5153)
+PikachuEmotion6: ; fd153 (3f:5153)
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
pikaemotion_pcm
- pikaemotion_movement Pointer_fd21e
+ pikaemotion_movement PikachuMovementData_fd21e
pikaemotion_emotebubble SKULL_BUBBLE
- pikaemotion_pikapic $6
+ pikaemotion_pikapic PikaPicAnimScript6
db $ff
-PikachuEmotion3_fd160: ; fd160 (3f:5160)
+PikachuEmotion3: ; fd160 (3f:5160)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry40
- pikaemotion_pikapic $3
+ pikaemotion_pikapic PikaPicAnimScript3
db $ff
-PikachuEmotion9_fd166: ; fd166 (3f:5166)
+PikachuEmotion9: ; fd166 (3f:5166)
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
pikaemotion_pcm PikachuCry6
- pikaemotion_movement Pointer_fd218
+ pikaemotion_movement PikachuMovementData_fd218
pikaemotion_emotebubble SKULL_BUBBLE
- pikaemotion_pikapic $9
+ pikaemotion_pikapic PikaPicAnimScript9
db $ff
-PikachuEmotion11_fd173: ; fd173 (3f:5173)
+PikachuEmotion11: ; fd173 (3f:5173)
pikaemotion_emotebubble ZZZ_BUBBLE
pikaemotion_pcm PikachuCry37
- pikaemotion_pikapic $b
+ pikaemotion_pikapic PikaPicAnimScript11
db $ff
-PikachuEmotion12_fd17a: ; fd17a (3f:517a)
+PikachuEmotion12: ; fd17a (3f:517a)
pikaemotion_dummy2
pikaemotion_pcm
- pikaemotion_pikapic $c
+ pikaemotion_pikapic PikaPicAnimScript12
db $ff
-PikachuEmotion13_fd180: ; fd180 (3f:5180)
+PikachuEmotion13: ; fd180 (3f:5180)
pikaemotion_dummy2
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
- pikaemotion_movement Pointer_fd21e
- pikaemotion_pikapic $d
+ pikaemotion_movement PikachuMovementData_fd21e
+ pikaemotion_pikapic PikaPicAnimScript13
db $ff
-PikachuEmotion14_fd189: ; fd189 (3f:5189)
+PikachuEmotion14: ; fd189 (3f:5189)
pikaemotion_dummy2
pikaemotion_emotebubble BOLT_BUBBLE
pikaemotion_pcm PikachuCry10
- pikaemotion_pikapic $e
+ pikaemotion_pikapic PikaPicAnimScript14
db $ff
-PikachuEmotion15_fd191: ; fd191 (3f:5191)
+PikachuEmotion15: ; fd191 (3f:5191)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry34
- pikaemotion_pikapic $f
+ pikaemotion_pikapic PikaPicAnimScript15
db $ff
-PikachuEmotion16_fd197: ; fd197 (3f:5197)
+PikachuEmotion16: ; fd197 (3f:5197)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry33
- pikaemotion_pikapic $10
+ pikaemotion_pikapic PikaPicAnimScript16
db $ff
-PikachuEmotion17_fd19d: ; fd19d (3f:519d)
+PikachuEmotion17: ; fd19d (3f:519d)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry13
- pikaemotion_pikapic $11
+ pikaemotion_pikapic PikaPicAnimScript17
db $ff
-PikachuEmotion18_fd1a3: ; fd1a3 (3f:51a3)
+PikachuEmotion18: ; fd1a3 (3f:51a3)
pikaemotion_dummy2
pikaemotion_pcm
- pikaemotion_pikapic $12
+ pikaemotion_pikapic PikaPicAnimScript18
db $ff
-PikachuEmotion19_fd1a9: ; fd1a9 (3f:51a9)
+PikachuEmotion19: ; fd1a9 (3f:51a9)
pikaemotion_dummy2
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry33
- pikaemotion_pikapic $13
+ pikaemotion_pikapic PikaPicAnimScript19
db $ff
-PikachuEmotion20_fd1b1: ; fd1b1 (3f:51b1)
+PikachuEmotion20: ; fd1b1 (3f:51b1)
pikaemotion_dummy2
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $14
+ pikaemotion_pikapic PikaPicAnimScript20
db $ff
-PikachuEmotion21_fd1b9: ; fd1b9 (3f:51b9)
+PikachuEmotion21: ; fd1b9 (3f:51b9)
pikaemotion_dummy2
pikaemotion_emotebubble FISH_BUBBLE
pikaemotion_pcm
- pikaemotion_pikapic $15
+ pikaemotion_pikapic PikaPicAnimScript21
db $ff
-PikachuEmotion22_fd1c1: ; fd1c1 (3f:51c1)
+PikachuEmotion22: ; fd1c1 (3f:51c1)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry4
- pikaemotion_pikapic $16
+ pikaemotion_pikapic PikaPicAnimScript22
db $ff
-PikachuEmotion23_fd1c7: ; fd1c7 (3f:51c7)
+PikachuEmotion23: ; fd1c7 (3f:51c7)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry19
- pikaemotion_pikapic $17
+ pikaemotion_pikapic PikaPicAnimScript23
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
db $ff
-PikachuEmotion24_fd1cf: ; fd1cf (3f:51cf)
+PikachuEmotion24: ; fd1cf (3f:51cf)
pikaemotion_dummy2
pikaemotion_emotebubble EXCLAMATION_BUBBLE
pikaemotion_pcm
- pikaemotion_pikapic $18
+ pikaemotion_pikapic PikaPicAnimScript24
db $ff
-PikachuEmotion25_fd1d7: ; fd1d7 (3f:51d7)
+PikachuEmotion25: ; fd1d7 (3f:51d7)
pikaemotion_dummy2
pikaemotion_emotebubble BOLT_BUBBLE
pikaemotion_pcm PikachuCry35
- pikaemotion_pikapic $19
+ pikaemotion_pikapic PikaPicAnimScript25
db $ff
-PikachuEmotion26_fd1df: ; fd1df (3f:51df)
+PikachuEmotion26: ; fd1df (3f:51df)
pikaemotion_dummy2
pikaemotion_emotebubble ZZZ_BUBBLE
pikaemotion_pcm PikachuCry37
- pikaemotion_pikapic $1a
+ pikaemotion_pikapic PikaPicAnimScript26
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKPEWTERCENTER
db $ff
-PikachuEmotion27_fd1eb: ; fd1eb (3f:51eb)
+PikachuEmotion27: ; fd1eb (3f:51eb)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry9
- pikaemotion_pikapic $1b
+ pikaemotion_pikapic PikaPicAnimScript27
db $ff
-PikachuEmotion28_fd1f1: ; fd1f1 (3f:51f1)
+PikachuEmotion28: ; fd1f1 (3f:51f1)
pikaemotion_dummy2
pikaemotion_pcm PikachuCry15
- pikaemotion_pikapic $1c
+ pikaemotion_pikapic PikaPicAnimScript28
db $ff
-PikachuEmotion29_fd1f7: ; fd1f7 (3f:51f7)
+PikachuEmotion29: ; fd1f7 (3f:51f7)
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $a
+ pikaemotion_pikapic PikaPicAnimScript10
db $ff
-PikachuEmotion30_fd1fc: ; fd1fc (3f:51fc)
+PikachuEmotion30: ; fd1fc (3f:51fc)
pikaemotion_9
pikaemotion_emotebubble HEART_BUBBLE
pikaemotion_pcm PikachuCry5
- pikaemotion_pikapic $14
+ pikaemotion_pikapic PikaPicAnimScript20
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADFONT
pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER
db $ff
-PikachuEmotion31_fd20a: ; fd20a (3f:520a)
+PikachuEmotion31: ; fd20a (3f:520a)
pikaemotion_pcm PikachuCry19
- pikaemotion_pikapic $17
+ pikaemotion_pikapic PikaPicAnimScript23
pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE
db $ff
-PikachuEmotion32_fd213: ; fd213 (3f:5213)
+PikachuEmotion32: ; fd213 (3f:5213)
pikaemotion_pcm PikachuCry26
- pikaemotion_pikapic $17
+ pikaemotion_pikapic PikaPicAnimScript23
db $ff
-Pointer_fd218: ; fd218 (3f:5218)
+PikachuMovementData_fd218: ; fd218 (3f:5218)
db $00
db $39, $01
db $3e, $1e
db $3f
-Pointer_fd21e: ; fd21e (3f:521e)
+PikachuMovementData_fd21e: ; fd21e (3f:521e)
db $00
db $39, $00
db $3e, $1e
db $3f
-Pointer_fd224: ; fd224 (3f:5224)
+PikachuMovementData_fd224: ; fd224 (3f:5224)
db $00
db $3c, $07, $2f
db $3c, $07, $2f
db $3f
-Pointer_fd22c: ; fd22c (3f:522c)
+PikachuMovementData_fd22c: ; fd22c (3f:522c)
db $3b, $1f, $03
db $3f
-Pointer_fd230: ; fd230 (3f:5230)
+PikachuMovementData_fd230: ; fd230 (3f:5230)
db $00
db $3c, $0f, $1f
db $3c, $0f, $1f
db $3f
-Pointer_fd238: ; fd238 (3f:5238)
+PikachuMovementData_fd238: ; fd238 (3f:5238)
db $00
db $05, $07
db $39, $00