remove address comments

1 files changed, 39 insertions, 39 deletions

diff --git a/data/pikachu_emotions.asm b/data/pikachu_emotions.asm
index cb90a4e6..f72beaa4 100755
--- a/data/pikachu_emotions.asm
+++ b/data/pikachu_emotions.asm
@@ -1,14 +1,14 @@
-PikachuEmotion0: ; fd115 (3f:5115)
+PikachuEmotion0:
 	db $ff
 
-PikachuEmotion2: ; fd116 (3f:5116)
+PikachuEmotion2:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble SMILE_BUBBLE
 	pikaemotion_pcm PikachuCry35
 	pikaemotion_pikapic PikaPicAnimScript2
 	db $ff
 
-PikachuEmotion10: ; fd11e (3f:511e)
+PikachuEmotion10:
 	pikaemotion_dummy2
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
 	pikaemotion_emotebubble HEART_BUBBLE
@@ -16,7 +16,7 @@ PikachuEmotion10: ; fd11e (3f:511e)
 	pikaemotion_pikapic PikaPicAnimScript10
 	db $ff
 
-PikachuEmotion7: ; fd128 (3f:5128)
+PikachuEmotion7:
 	pikaemotion_dummy2
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
 	pikaemotion_movement PikachuMovementData_fd224
@@ -25,7 +25,7 @@ PikachuEmotion7: ; fd128 (3f:5128)
 	pikaemotion_pikapic PikaPicAnimScript7
 	db $ff
 
-PikachuEmotion4: ; fd136 (3f:5136)
+PikachuEmotion4:
 	pikaemotion_dummy2
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
 	pikaemotion_movement PikachuMovementData_fd230
@@ -33,25 +33,25 @@ PikachuEmotion4: ; fd136 (3f:5136)
 	pikaemotion_pikapic PikaPicAnimScript4
 	db $ff
 
-PikachuEmotion1: ; fd141 (3f:5141)
+PikachuEmotion1:
 	pikaemotion_dummy2
 	pikaemotion_pcm
 	pikaemotion_pikapic PikaPicAnimScript1
 	db $ff
 
-PikachuEmotion8: ; fd147 (3f:5147)
+PikachuEmotion8:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry39
 	pikaemotion_pikapic PikaPicAnimScript8
 	db $ff
 
-PikachuEmotion5: ; fd14d (3f:514d)
+PikachuEmotion5:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry31
 	pikaemotion_pikapic PikaPicAnimScript5
 	db $ff
 
-PikachuEmotion6: ; fd153 (3f:5153)
+PikachuEmotion6:
 	pikaemotion_dummy2
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
 	pikaemotion_pcm
@@ -60,13 +60,13 @@ PikachuEmotion6: ; fd153 (3f:5153)
 	pikaemotion_pikapic PikaPicAnimScript6
 	db $ff
 
-PikachuEmotion3: ; fd160 (3f:5160)
+PikachuEmotion3:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry40
 	pikaemotion_pikapic PikaPicAnimScript3
 	db $ff
 
-PikachuEmotion9: ; fd166 (3f:5166)
+PikachuEmotion9:
 	pikaemotion_dummy2
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
 	pikaemotion_pcm PikachuCry6
@@ -75,105 +75,105 @@ PikachuEmotion9: ; fd166 (3f:5166)
 	pikaemotion_pikapic PikaPicAnimScript9
 	db $ff
 
-PikachuEmotion11: ; fd173 (3f:5173)
+PikachuEmotion11:
 	pikaemotion_emotebubble ZZZ_BUBBLE
 	pikaemotion_pcm PikachuCry37
 	pikaemotion_pikapic PikaPicAnimScript11
 	db $ff
 
-PikachuEmotion12: ; fd17a (3f:517a)
+PikachuEmotion12:
 	pikaemotion_dummy2
 	pikaemotion_pcm
 	pikaemotion_pikapic PikaPicAnimScript12
 	db $ff
 
-PikachuEmotion13: ; fd180 (3f:5180)
+PikachuEmotion13:
 	pikaemotion_dummy2
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
 	pikaemotion_movement PikachuMovementData_fd21e
 	pikaemotion_pikapic PikaPicAnimScript13
 	db $ff
 
-PikachuEmotion14: ; fd189 (3f:5189)
+PikachuEmotion14:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble BOLT_BUBBLE
 	pikaemotion_pcm PikachuCry10
 	pikaemotion_pikapic PikaPicAnimScript14
 	db $ff
 
-PikachuEmotion15: ; fd191 (3f:5191)
+PikachuEmotion15:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry34
 	pikaemotion_pikapic PikaPicAnimScript15
 	db $ff
 
-PikachuEmotion16: ; fd197 (3f:5197)
+PikachuEmotion16:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry33
 	pikaemotion_pikapic PikaPicAnimScript16
 	db $ff
 
-PikachuEmotion17: ; fd19d (3f:519d)
+PikachuEmotion17:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry13
 	pikaemotion_pikapic PikaPicAnimScript17
 	db $ff
 
-PikachuEmotion18: ; fd1a3 (3f:51a3)
+PikachuEmotion18:
 	pikaemotion_dummy2
 	pikaemotion_pcm
 	pikaemotion_pikapic PikaPicAnimScript18
 	db $ff
 
-PikachuEmotion19: ; fd1a9 (3f:51a9)
+PikachuEmotion19:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble HEART_BUBBLE
 	pikaemotion_pcm PikachuCry33
 	pikaemotion_pikapic PikaPicAnimScript19
 	db $ff
 
-PikachuEmotion20: ; fd1b1 (3f:51b1)
+PikachuEmotion20:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble HEART_BUBBLE
 	pikaemotion_pcm PikachuCry5
 	pikaemotion_pikapic PikaPicAnimScript20
 	db $ff
 
-PikachuEmotion21: ; fd1b9 (3f:51b9)
+PikachuEmotion21:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble FISH_BUBBLE
 	pikaemotion_pcm
 	pikaemotion_pikapic PikaPicAnimScript21
 	db $ff
 
-PikachuEmotion22: ; fd1c1 (3f:51c1)
+PikachuEmotion22:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry4
 	pikaemotion_pikapic PikaPicAnimScript22
 	db $ff
 
-PikachuEmotion23: ; fd1c7 (3f:51c7)
+PikachuEmotion23:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry19
 	pikaemotion_pikapic PikaPicAnimScript23
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
 	db $ff
 
-PikachuEmotion24: ; fd1cf (3f:51cf)
+PikachuEmotion24:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble EXCLAMATION_BUBBLE
 	pikaemotion_pcm
 	pikaemotion_pikapic PikaPicAnimScript24
 	db $ff
 
-PikachuEmotion25: ; fd1d7 (3f:51d7)
+PikachuEmotion25:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble BOLT_BUBBLE
 	pikaemotion_pcm PikachuCry35
 	pikaemotion_pikapic PikaPicAnimScript25
 	db $ff
 
-PikachuEmotion26: ; fd1df (3f:51df)
+PikachuEmotion26:
 	pikaemotion_dummy2
 	pikaemotion_emotebubble ZZZ_BUBBLE
 	pikaemotion_pcm PikachuCry37
@@ -182,24 +182,24 @@ PikachuEmotion26: ; fd1df (3f:51df)
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKPEWTERCENTER
 	db $ff
 
-PikachuEmotion27: ; fd1eb (3f:51eb)
+PikachuEmotion27:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry9
 	pikaemotion_pikapic PikaPicAnimScript27
 	db $ff
 
-PikachuEmotion28: ; fd1f1 (3f:51f1)
+PikachuEmotion28:
 	pikaemotion_dummy2
 	pikaemotion_pcm PikachuCry15
 	pikaemotion_pikapic PikaPicAnimScript28
 	db $ff
 
-PikachuEmotion29: ; fd1f7 (3f:51f7)
+PikachuEmotion29:
 	pikaemotion_pcm PikachuCry5
 	pikaemotion_pikapic PikaPicAnimScript10
 	db $ff
 
-PikachuEmotion30: ; fd1fc (3f:51fc)
+PikachuEmotion30:
 	pikaemotion_9
 	pikaemotion_emotebubble HEART_BUBBLE
 	pikaemotion_pcm PikachuCry5
@@ -209,47 +209,47 @@ PikachuEmotion30: ; fd1fc (3f:51fc)
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER
 	db $ff
 
-PikachuEmotion31: ; fd20a (3f:520a)
+PikachuEmotion31:
 	pikaemotion_pcm PikachuCry19
 	pikaemotion_pikapic PikaPicAnimScript23
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
 	pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE
 	db $ff
 
-PikachuEmotion32: ; fd213 (3f:5213)
+PikachuEmotion32:
 	pikaemotion_pcm PikachuCry26
 	pikaemotion_pikapic PikaPicAnimScript23
 	db $ff
 
-PikachuMovementData_fd218: ; fd218 (3f:5218)
+PikachuMovementData_fd218:
 	db $00
 	db $39,  2 - 1
 	db $3e, 31 - 1
 	db $3f
 
-PikachuMovementData_fd21e: ; fd21e (3f:521e)
+PikachuMovementData_fd21e:
 	db $00
 	db $39,  1 - 1
 	db $3e, 31 - 1
 	db $3f
 
-PikachuMovementData_fd224: ; fd224 (3f:5224)
+PikachuMovementData_fd224:
 	db $00
 	db $3c, 8 - 1, (2 << 4) | (16 - 1)
 	db $3c, 8 - 1, (2 << 4) | (16 - 1)
 	db $3f
 
-PikachuMovementData_fd22c: ; fd22c (3f:522c)
+PikachuMovementData_fd22c:
 	db $3b, 32 - 1, 4 - 1
 	db $3f
 
-PikachuMovementData_fd230: ; fd230 (3f:5230)
+PikachuMovementData_fd230:
 	db $00
 	db $3c, 16 - 1, (1 << 4) | (16 - 1)
 	db $3c, 16 - 1, (1 << 4) | (16 - 1)
 	db $3f
 
-PikachuMovementData_fd238: ; fd238 (3f:5238)
+PikachuMovementData_fd238:
 	db $00
 	db $05, 8 - 1
 	db $39, 1 - 1