Replace pcm arguments with pcm file labels

1 files changed, 0 insertions, 416 deletions

diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm
index 68bddad6..954ac77e 100755
--- a/engine/pikachu_pic_animation.asm
+++ b/engine/pikachu_pic_animation.asm
@@ -1,419 +1,3 @@
-Func_fd004:: ; fd004 (3f:5004)
-	call Func_fd05e
-	jr c, asm_fd00f
-	call GetPikaPicAnimationScriptIndex
-	call Func_fcffb
-asm_fd00f: ; fd00f (3f:500f)
-	ld [wExpressionNumber], a
-	ld hl, PikachuEmotionTable
-	call DoStarterPikachuEmotions
-	ret
-	
-PikachuEmotionTable: ; fd019 (3f:4019)
-	dw PikachuEmotion0_fd115
-	dw PikachuEmotion1_fd141
-	dw PikachuEmotion2_fd116
-	dw PikachuEmotion3_fd160
-	dw PikachuEmotion4_fd136
-	dw PikachuEmotion5_fd14d
-	dw PikachuEmotion6_fd153
-	dw PikachuEmotion7_fd128
-	dw PikachuEmotion8_fd147
-	dw PikachuEmotion9_fd166
-	dw PikachuEmotion10_fd11e
-	dw PikachuEmotion11_fd173
-	dw PikachuEmotion12_fd17a
-	dw PikachuEmotion13_fd180
-	dw PikachuEmotion14_fd189
-	dw PikachuEmotion15_fd191
-	dw PikachuEmotion16_fd197
-	dw PikachuEmotion17_fd19d
-	dw PikachuEmotion18_fd1a3
-	dw PikachuEmotion19_fd1a9
-	dw PikachuEmotion20_fd1b1
-	dw PikachuEmotion21_fd1b9
-	dw PikachuEmotion22_fd1c1
-	dw PikachuEmotion23_fd1c7
-	dw PikachuEmotion24_fd1cf
-	dw PikachuEmotion25_fd1d7
-	dw PikachuEmotion26_fd1df
-	dw PikachuEmotion27_fd1eb
-	dw PikachuEmotion28_fd1f1
-	dw PikachuEmotion29_fd1f7
-	dw PikachuEmotion30_fd1fc
-	dw PikachuEmotion31_fd20a
-	dw PikachuEmotion32_fd213
-	dw PikachuEmotion33_fd05d
-	
-PikachuEmotion33_fd05d: ; fd05d (3f:505d)
-	db $ff
-	
-Func_fd05e: ; fd05e (3f:505e)
-	ld a, [wCurMap]
-	cp POKEMON_FAN_CLUB
-	jr nz, .notFanClub
-	ld hl, wPreventBlackout
-	bit 7, [hl]
-	ld a, $1d
-	jr z, .asm_fd0c9
-	call Func_154a
-	ld a, $1e
-	jr nz, .asm_fd0c9
-	jr .asm_fd096
-.notFanClub
-	ld a, [wCurMap]
-	cp PEWTER_POKECENTER
-	jr nz, .notPewterPokecenter
-	call Func_154a
-	ld a, $1a
-	jr nz, .asm_fd0c9
-	jr .asm_fd096
-.notPewterPokecenter
-	callab Func_f24ae
-	ld a, e
-	cp $ff
-	jr nz, .asm_fd0c9
-	jr .asm_fd096
-.asm_fd096
-	call IsPlayerPikachuAsleepInParty
-	ld a, $b
-	jr c, .asm_fd0c9
-	callab Func_fce73 ; same bank
-	ld a, $1c
-	jr c, .asm_fd0c9
-	ld a, [wCurMap]
-	cp POKEMONTOWER_1
-	jr c, .notInLavenderTower
-	cp POKEMONTOWER_7 + 1
-	ld a, $16
-	jr c, .asm_fd0c9
-.notInLavenderTower
-	ld a, [wd49c]
-	and a
-	jr z, .asm_fd0c7
-	dec a
-	ld c, a
-	ld b, $0
-	ld hl, Pointer_fd0cb
-	add hl, bc
-	ld a, [hl]
-	jr .asm_fd0c9
-.asm_fd0c7
-	and a
-	ret
-.asm_fd0c9
-	scf
-	ret
-	
-Pointer_fd0cb:
-	db $12, $15, $17, $18, $19
-	
-IsPlayerPikachuAsleepInParty:: ; fd0d0 (3f:50d0)
-	xor a
-	ld [wWhichPokemon], a
-.loop
-	ld a, [wWhichPokemon]
-	ld c, a
-	ld b, $0
-	ld hl, wPartySpecies
-	add hl, bc
-	ld a, [hl]
-	cp $ff
-	jr z, .done
-	cp PIKACHU
-	jr nz, .curMonNotStarterPikachu
-	callab IsThisPartymonStarterPikachu
-	jr nc, .curMonNotStarterPikachu
-	ld a, [wWhichPokemon]
-	ld hl, wPartyMon1Status
-	ld bc, wPartyMon2 - wPartyMon1
-	call AddNTimes
-	ld a, [hl]
-	and SLP
-	jr z, .done
-	jr .curMonSleepingPikachu
-.curMonNotStarterPikachu
-	ld a, [wWhichPokemon]
-	cp PARTY_LENGTH - 1
-	jr z, .done
-	inc a
-	ld [wWhichPokemon], a
-	jr .loop
-.curMonSleepingPikachu
-	scf
-	ret
-.done
-	and a
-	ret
-	
-PikachuEmotion0_fd115: ; fd115 (3f:5115)
-	db $ff
-
-PikachuEmotion2_fd116: ; fd116 (3f:5116)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble SMILE_BUBBLE
-	pikaemotion_pcm $22
-	pikaemotion_5 $2
-	db $ff
-
-PikachuEmotion10_fd11e: ; fd11e (3f:511e)
-	pikaemotion_dummy2
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
-	pikaemotion_emotebubble HEART_BUBBLE
-	pikaemotion_pcm $4
-	pikaemotion_5 $a
-	db $ff
-
-PikachuEmotion7_fd128: ; fd128 (3f:5128)
-	pikaemotion_dummy2
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
-	pikaemotion_4 Pointer_fd224
-	pikaemotion_pcm $0
-	pikaemotion_4 Pointer_fd224
-	pikaemotion_5 $7
-	db $ff
-
-PikachuEmotion4_fd136: ; fd136 (3f:5136)
-	pikaemotion_dummy2
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
-	pikaemotion_4 Pointer_fd230
-	pikaemotion_pcm $1c
-	pikaemotion_5 $4
-	db $ff
-
-PikachuEmotion1_fd141: ; fd141 (3f:5141)
-	pikaemotion_dummy2
-	pikaemotion_pcm $ff
-	pikaemotion_5 $1
-	db $ff
-
-PikachuEmotion8_fd147: ; fd147 (3f:5147)
-	pikaemotion_dummy2
-	pikaemotion_pcm $26
-	pikaemotion_5 $8
-	db $ff
-
-PikachuEmotion5_fd14d: ; fd14d (3f:514d)
-	pikaemotion_dummy2
-	pikaemotion_pcm $1e
-	pikaemotion_5 $5
-	db $ff
-
-PikachuEmotion6_fd153: ; fd153 (3f:5153)
-	pikaemotion_dummy2
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
-	pikaemotion_pcm $ff
-	pikaemotion_4 Pointer_fd21e
-	pikaemotion_emotebubble SKULL_BUBBLE
-	pikaemotion_5 $6
-	db $ff
-
-PikachuEmotion3_fd160: ; fd160 (3f:5160)
-	pikaemotion_dummy2
-	pikaemotion_pcm $27
-	pikaemotion_5 $3
-	db $ff
-
-PikachuEmotion9_fd166: ; fd166 (3f:5166)
-	pikaemotion_dummy2
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
-	pikaemotion_pcm $5
-	pikaemotion_4 Pointer_fd218
-	pikaemotion_emotebubble SKULL_BUBBLE
-	pikaemotion_5 $9
-	db $ff
-
-PikachuEmotion11_fd173: ; fd173 (3f:5173)
-	pikaemotion_emotebubble ZZZ_BUBBLE
-	pikaemotion_pcm $24
-	pikaemotion_5 $b
-	db $ff
-
-PikachuEmotion12_fd17a: ; fd17a (3f:517a)
-	pikaemotion_dummy2
-	pikaemotion_pcm $ff
-	pikaemotion_5 $c
-	db $ff
-
-PikachuEmotion13_fd180: ; fd180 (3f:5180)
-	pikaemotion_dummy2
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADEXTRAPIKASPRITES
-	pikaemotion_4 Pointer_fd21e
-	pikaemotion_5 $d
-	db $ff
-
-PikachuEmotion14_fd189: ; fd189 (3f:5189)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble BOLT_BUBBLE
-	pikaemotion_pcm $9
-	pikaemotion_5 $e
-	db $ff
-
-PikachuEmotion15_fd191: ; fd191 (3f:5191)
-	pikaemotion_dummy2
-	pikaemotion_pcm $21
-	pikaemotion_5 $f
-	db $ff
-
-PikachuEmotion16_fd197: ; fd197 (3f:5197)
-	pikaemotion_dummy2
-	pikaemotion_pcm $20
-	pikaemotion_5 $10
-	db $ff
-
-PikachuEmotion17_fd19d: ; fd19d (3f:519d)
-	pikaemotion_dummy2
-	pikaemotion_pcm $c
-	pikaemotion_5 $11
-	db $ff
-
-PikachuEmotion18_fd1a3: ; fd1a3 (3f:51a3)
-	pikaemotion_dummy2
-	pikaemotion_pcm $ff
-	pikaemotion_5 $12
-	db $ff
-
-PikachuEmotion19_fd1a9: ; fd1a9 (3f:51a9)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble HEART_BUBBLE
-	pikaemotion_pcm $20
-	pikaemotion_5 $13
-	db $ff
-
-PikachuEmotion20_fd1b1: ; fd1b1 (3f:51b1)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble HEART_BUBBLE
-	pikaemotion_pcm $4
-	pikaemotion_5 $14
-	db $ff
-
-PikachuEmotion21_fd1b9: ; fd1b9 (3f:51b9)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble FISH_BUBBLE
-	pikaemotion_pcm $ff
-	pikaemotion_5 $15
-	db $ff
-
-PikachuEmotion22_fd1c1: ; fd1c1 (3f:51c1)
-	pikaemotion_dummy2
-	pikaemotion_pcm $3
-	pikaemotion_5 $16
-	db $ff
-
-PikachuEmotion23_fd1c7: ; fd1c7 (3f:51c7)
-	pikaemotion_dummy2
-	pikaemotion_pcm $12
-	pikaemotion_5 $17
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
-	db $ff
-
-PikachuEmotion24_fd1cf: ; fd1cf (3f:51cf)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble EXCLAMATION_BUBBLE
-	pikaemotion_pcm $ff
-	pikaemotion_5 $18
-	db $ff
-
-PikachuEmotion25_fd1d7: ; fd1d7 (3f:51d7)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble BOLT_BUBBLE
-	pikaemotion_pcm $22
-	pikaemotion_5 $19
-	db $ff
-
-PikachuEmotion26_fd1df: ; fd1df (3f:51df)
-	pikaemotion_dummy2
-	pikaemotion_emotebubble ZZZ_BUBBLE
-	pikaemotion_pcm $24
-	pikaemotion_5 $1a
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKPEWTERCENTER
-	db $ff
-
-PikachuEmotion27_fd1eb: ; fd1eb (3f:51eb)
-	pikaemotion_dummy2
-	pikaemotion_pcm $8
-	pikaemotion_5 $1b
-	db $ff
-
-PikachuEmotion28_fd1f1: ; fd1f1 (3f:51f1)
-	pikaemotion_dummy2
-	pikaemotion_pcm $e
-	pikaemotion_5 $1c
-	db $ff
-
-PikachuEmotion29_fd1f7: ; fd1f7 (3f:51f7)
-	pikaemotion_pcm $4
-	pikaemotion_5 $a
-	db $ff
-
-PikachuEmotion30_fd1fc: ; fd1fc (3f:51fc)
-	pikaemotion_9
-	pikaemotion_emotebubble HEART_BUBBLE
-	pikaemotion_pcm $4
-	pikaemotion_5 $14
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_LOADFONT
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKLAVENDERTOWER
-	db $ff
-
-PikachuEmotion31_fd20a: ; fd20a (3f:520a)
-	pikaemotion_pcm $12
-	pikaemotion_5 $17
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_SHOWMAPVIEW
-	pikaemotion_subcmd PIKAEMOTION_SUBCMD_CHECKBILLSHOUSE
-	db $ff
-
-PikachuEmotion32_fd213: ; fd213 (3f:5213)
-	pikaemotion_pcm $19
-	pikaemotion_5 $17
-	db $ff
-
-Pointer_fd218: ; fd218 (3f:5218)
-
-	db $00
-	db $39, $01
-	db $3e, $1e
-	db $3f
-
-Pointer_fd21e: ; fd21e (3f:521e)
-	db $00
-	db $39, $00
-	db $3e, $1e
-	db $3f
-
-Pointer_fd224: ; fd224 (3f:5224)
-	db $00
-	db $3c, $07, $2f
-	db $3c, $07, $2f
-	db $3f
-
-Pointer_fd22c: ; fd22c (3f:522c)
-	db $3b, $1f, $03
-	db $3f
-
-Pointer_fd230: ; fd230 (3f:5230)
-	db $00
-	db $3c, $0f, $1f
-	db $3c, $0f, $1f
-	db $3f
-
-Pointer_fd238: ; fd238 (3f:5238)
-	db $00
-	db $05, $07
-	db $39, $00
-	db $05, $07
-	db $06, $07
-	db $39, $00
-	db $06, $07
-	db $08, $07
-	db $39, $00
-	db $08, $07
-	db $07, $07
-	db $39, $00
-	db $07, $07
-	db $3f
-
 Func_fd252: ; fd252 (3f:5252)
 	ld a, $40
 	ld [h_0xFFFC], a