Vermilion Fan Club

7 files changed, 17 insertions, 17 deletions

diff --git a/engine/bank3f.asm b/engine/bank3f.asm
index c31fc986..85674ec4 100644
--- a/engine/bank3f.asm
+++ b/engine/bank3f.asm
@@ -27,7 +27,7 @@ Func_fc4fa:: ; fc4fa (3f:44fa)
 	bit 4, [hl]
 	res 4, [hl]
 	jr nz, .asm_fc515
-	call ResetPikachuAsleep
+	call EnablePikachuFollowingPlayer
 	call Func_fc523
 	ld a, $ff
 	ld [wSpriteStateData1 + $f2], a
@@ -344,7 +344,7 @@ Func_fc6d5:: ; fc6d5 (3f:46d5)
 	ld a, [wFontLoaded]
 	bit 0, a
 	jp nz, asm_fc76a
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jp nz, asm_fc76a
 	ld a, [hl]
 	and $7f
@@ -408,7 +408,7 @@ asm_fc745: ; fc745 (3f:4745)
 	ld hl, wSpriteStateData2 - wSpriteStateData1
 	add hl, bc
 	ld [hl], a
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz, .asm_fc75f
 	ld a, [wSpriteStateData1 + $9]
 	xor $4
@@ -1679,7 +1679,7 @@ Func_fce5a:: ; fce5a (3f:4e5a)
 	ret
 
 Func_fce73:: ; fce73 (3f:4e73)
-; function to test if a pokemon is alive?
+; function to test if Pikachu is alive?
 	xor a
 	ld [wWhichPokemon], a
 	ld hl, wPartyCount
diff --git a/engine/items/items.asm b/engine/items/items.asm
index eca9eaef..f37f9f47 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1765,7 +1765,7 @@ ItemUsePokeflute: ; dfbd (3:5fbd)
 .notRoute16
 	cp a,PEWTER_POKECENTER
 	jr nz,.noSnorlaxOrPikachuToWakeUp
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr z,.noSnorlaxOrPikachuToWakeUp
 	callab Func_fcb01
 	jr nc,.noSnorlaxOrPikachuToWakeUp
diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index 97a65517..a3f6f7fc 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -227,7 +227,7 @@ BillsPCDeposit: ; 2156d (8:556d)
 	jp c, BillsPCMenu
 	callab IsThisPartymonStarterPikachu_Party
 	jr nc, .asm_215ad
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr z, .asm_215ad
 	ld hl, SleepingPikachuText2
 	call PrintText
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index 8683d3cb..16bea473 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -53,7 +53,7 @@ RedrawPartyMenu_: ; 11886 (4:5886)
 	ld [wWhichPokemon],a
 	callab IsThisPartymonStarterPikachu_Party
 	jr nc, .regularMon
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr z, .regularMon
 	ld a, $ff
 	ld [hPartyMonIndex], a
diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm
index 4170a936..f60042de 100755
--- a/engine/overworld/cable_club_npc.asm
+++ b/engine/overworld/cable_club_npc.asm
@@ -1,7 +1,7 @@
 CableClubNPC: ; 7035 (1:7035)
 	ld hl, CableClubNPCWelcomeText
 	call PrintText
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz, .asm_7048
 	CheckEvent EVENT_GOT_POKEDEX
 	jp nz, .receivedPokedex
diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm
index 3024ff7b..b9307517 100755
--- a/engine/overworld/pokecenter.asm
+++ b/engine/overworld/pokecenter.asm
@@ -2,7 +2,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
 	ld a, [wCurMap]
 	cp PEWTER_POKECENTER
 	jr nz, .regularCenter
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr z, .regularCenter
 	ld hl, LooksContentText ; if pikachu is sleeping, don't heal
 	call PrintText
@@ -27,7 +27,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
 	call SetLastBlackoutMap
 	callab IsStarterPikachuInOurParty
 	jr nc, .notHealingPlayerPikachu
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz, .notHealingPlayerPikachu
 	call LoadCurrentMapView
 	call Delay3
@@ -38,7 +38,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
 	call PrintText
 	ld c, 64
 	call DelayFrames
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz, .playerPikachuNotOnScreen
 	call Func_152d
 	callab IsStarterPikachuInOurParty
@@ -58,7 +58,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97)
 	ld [wLastMusicSoundID], a
 	ld [wNewSoundID], a
 	call PlaySound
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz, .doNotReturnPikachu
 	callab IsStarterPikachuInOurParty
 	call c, Func_6eaa
diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm
index a9e0650b..bfac6962 100755
--- a/engine/pikachu_pic_animation.asm
+++ b/engine/pikachu_pic_animation.asm
@@ -247,7 +247,7 @@ Func_fd05e: ; fd05e (3f:505e)
 	bit 7, [hl]
 	ld a, $1d
 	jr z, .asm_fd0c9
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	ld a, $1e
 	jr nz, .asm_fd0c9
 	jr .asm_fd096
@@ -255,7 +255,7 @@ Func_fd05e: ; fd05e (3f:505e)
 	ld a, [wCurMap]
 	cp PEWTER_POKECENTER
 	jr nz, .notPewterPokecenter
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	ld a, $1a
 	jr nz, .asm_fd0c9
 	jr .asm_fd096
@@ -1636,7 +1636,7 @@ PikachuPewterPokecenterCheck: ; fd8d4 (3f:58d4)
 	ld a, [wCurMap]
 	cp PEWTER_POKECENTER
 	ret nz
-	call ResetPikachuAsleep
+	call EnablePikachuFollowingPlayer
 	call Func_fcff2
 	ret
 
@@ -1644,7 +1644,7 @@ PikachuFanClubCheck: ; fd8e1 (3f:58e1)
 	ld a, [wCurMap]
 	cp POKEMON_FAN_CLUB
 	ret nz
-	call ResetPikachuAsleep
+	call EnablePikachuFollowingPlayer
 	call Func_fcff2
 	ret
 
@@ -1652,7 +1652,7 @@ PikachuBillsHouseCheck: ; fd8ee (3f:58ee)
 	ld a, [wCurMap]
 	cp BILLS_HOUSE
 	ret nz
-	call ResetPikachuAsleep
+	call EnablePikachuFollowingPlayer
 	ret
 
 Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3: ; fd8f8 (3f:58f8)