Vermilion Fan Club

20 files changed, 332 insertions, 194 deletions

diff --git a/data/mapObjects/fanclub.asm b/data/mapObjects/fanclub.asm
index 6f65b287..cbe0cb31 100755
--- a/data/mapObjects/fanclub.asm
+++ b/data/mapObjects/fanclub.asm
@@ -5,14 +5,12 @@ FanClubObject: ; 0x59c97 (size=62)
 	db $7, $2, $1, $ff
 	db $7, $3, $1, $ff
 
-	db $2 ; signs
-	db $0, $1, $7 ; FanClubText7
-	db $0, $6, $8 ; FanClubText8
+	db $0 ; signs
 
 	db $6 ; objects
 	object SPRITE_FISHER2, $6, $3, STAY, LEFT, $1 ; person
 	object SPRITE_GIRL, $1, $3, STAY, RIGHT, $2 ; person
-	object SPRITE_CLEFAIRY, $6, $4, STAY, LEFT, $3 ; person
+	object SPRITE_CLEFAIRY_2, $6, $4, STAY, LEFT, $3 ; person
 	object SPRITE_SEEL, $1, $4, STAY, RIGHT, $4 ; person
 	object SPRITE_GENTLEMAN, $3, $1, STAY, DOWN, $5 ; person
 	object SPRITE_CABLE_CLUB_WOMAN, $5, $1, STAY, DOWN, $6 ; person
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 410ed3c1..5804cfd5 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -90,7 +90,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(Route12Gate_h)
 	db BANK(BillsHouse_h)
 	db BANK(VermilionPokecenter_h)
-	db $16 ; db BANK(FanClub_h)
+	db BANK(FanClub_h)
 	db $17 ; db BANK(VermilionMart_h)
 	db $17 ; db BANK(VermilionGym_h)
 	db $07 ; db BANK(VermilionHouse1_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index e1ed2a3b..6d52f36f 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -90,7 +90,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Route12Gate_h
 	dw BillsHouse_h
 	dw VermilionPokecenter_h
-	dw $5a00 ; dw FanClub_h ;id=90
+	dw FanClub_h ;id=90
 	dw $48cb ; dw VermilionMart_h
 	dw $4910 ; dw VermilionGym_h
 	dw $53f8 ; dw VermilionHouse1_h
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)
diff --git a/home.asm b/home.asm
index 9f62d820..19a5b6fc 100644
--- a/home.asm
+++ b/home.asm
@@ -477,7 +477,7 @@ HandlePartyMenuInput:: ; 1226 (0:1226)
 	ld [wWhichPokemon], a
 	callab IsThisPartymonStarterPikachu_Party ; 3f:4e18
 	jr nc, .asm_1258
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz, .asm_128f
 .asm_1258
 	pop af
diff --git a/home/overworld.asm b/home/overworld.asm
index bc7ae029..21f5c1c8 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1222,7 +1222,7 @@ CollisionCheckOnLand:: ; 0a1c (0:0a1c)
 ; if no sprite collision
 	cp $f
 	jr nz,.collision
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz,.collision
 	ld a,[hJoyHeld]
 	and $2
diff --git a/home/pikachu.asm b/home/pikachu.asm
index 9e0ab541..bd750773 100755
--- a/home/pikachu.asm
+++ b/home/pikachu.asm
@@ -30,21 +30,21 @@ Func_152d:: ; 152d (0:152d)
 	pop hl
 	ret
 	
-SetPikachuAsleep:: ; 153a (0:153a)
+DisablePikachuFollowingPlayer:: ; 153a (0:153a)
 	push hl
 	ld hl, wPikachuOverworldStateFlags
 	set 1, [hl]
 	pop hl
 	ret
 
-ResetPikachuAsleep:: ; 1542 (0:1542)
+EnablePikachuFollowingPlayer:: ; 1542 (0:1542)
 	push hl
 	ld hl, wPikachuOverworldStateFlags
 	res 1, [hl]
 	pop hl
 	ret
 	
-CheckPikachuAsleep:: ; 154a (0:154a)
+CheckPikachuFollowingPlayer:: ; 154a (0:154a)
 	push hl
 	ld hl, wPikachuOverworldStateFlags
 	bit 1, [hl]
diff --git a/main.asm b/main.asm
index 7865bd4b..1144789a 100755
--- a/main.asm
+++ b/main.asm
@@ -1200,7 +1200,13 @@ INCLUDE "scripts/route12.asm"
 INCLUDE "scripts/route15.asm"
 INCLUDE "scripts/route16.asm"
 INCLUDE "scripts/route18.asm"
-	dr $59a00,$5a53a
+
+INCLUDE "data/mapHeaders/fanclub.asm"
+INCLUDE "scripts/fanclub.asm"
+INCLUDE "data/mapObjects/fanclub.asm"
+FanClubBlocks:
+INCBIN "maps/fanclub.blk"
+	dr $59c80,$5a53a
 	
 INCLUDE "engine/overworld/saffron_guards.asm"
 
diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm
index 014f5051..5d6d668f 100755
--- a/scripts/billshouse.asm
+++ b/scripts/billshouse.asm
@@ -62,7 +62,7 @@ BillsHouseScript2:
 	and a ; cp SPRITE_FACING_DOWN
 	ld de, MovementData_1e79c
 	jr nz, .notDown
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr nz, .asm_1e0f8
 	callab Func_f250b
 .asm_1e0f8
@@ -97,7 +97,7 @@ BillsHouseScript3: ; 1e7a6 (7:67a6)
 	ld a, HS_BILL_POKEMON
 	ld [wMissableObjectIndex], a
 	predef HideObject
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr z, .asm_1e13e
 	ld hl, PikachuMovementData_1e14d
 	ld a, [wSpriteStateData1 + 9]
@@ -161,7 +161,7 @@ BillsHouseScript5:
 	ld hl, wd472
 	bit 7, [hl]
 	jr z, .asm_1e1c6
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr z, .asm_1e1c6
 	ld a, $2
 	ld [H_SPRITEINDEX], a
diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm
index 6f62a79f..87a39969 100755
--- a/scripts/billshouse2.asm
+++ b/scripts/billshouse2.asm
@@ -87,7 +87,7 @@ Func_f24ae: ; f24ae
 	ld a, [wCurMap]
 	cp BILLS_HOUSE
 	jr nz, .asm_f24d2
-	call CheckPikachuAsleep
+	call CheckPikachuFollowingPlayer
 	jr z, .asm_f24d2
 	ld a, [W_BILLSHOUSECURSCRIPT]
 	cp $5
@@ -120,7 +120,7 @@ Func_f24d5:
 	ld a, $1
 	ld [wWhichEmotionBubble], a
 	predef EmotionBubble
-	call SetPikachuAsleep
+	call DisablePikachuFollowingPlayer
 	callab InitializePikachuTextID
 	ret
 
diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm
index cbafc034..a03fd2d7 100755
--- a/scripts/fanclub.asm
+++ b/scripts/fanclub.asm
@@ -1,15 +1,72 @@
 FanClubScript: ; 59b70 (16:5b70)
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ld hl, FanClubScriptPointers
+	ld a, [W_FANCLUBCURSCRIPT]
+	call JumpTable
+	ret
 
-FanClubBikeInBag:
-; check if any bike paraphernalia in bag
-	CheckEvent EVENT_GOT_BIKE_VOUCHER
-	ret nz
-	ld b, BICYCLE
-	call IsItemInBag
-	ret nz
-	ld b, BIKE_VOUCHER
-	jp IsItemInBag
+FanClubScriptPointers:
+	dw FanClubScript1
+	dw FanClubScript2
+
+FanClubScript1:
+	ld hl, wPreventBlackout
+	bit 7, [hl]
+	call z, FanClubScript_59a44
+	ld hl, wPreventBlackout
+	set 7, [hl]
+	ret
+
+FanClubScript2:
+	ld hl, wPreventBlackout
+	bit 7, [hl]
+	call z, FanClubScript_59a39
+	ld hl, wPreventBlackout
+	set 7, [hl]
+	ret
+
+FanClubScript_59a39:
+	call Random
+	ld a, [hRandomAdd]
+	cp 25
+	call c, FanClubScript_59a44
+	ret
+
+FanClubScript_59a44:
+	ld a, [wd472]
+	bit 7, a
+	ret z
+	callab Func_fce73
+	ret c
+	ld a, $1
+	ld [W_FANCLUBCURSCRIPT], a
+	xor a
+	ld [wPlayerMovingDirection], a
+	call UpdateSprites
+	call UpdateSprites
+	ld a, $0
+	ld [wWhichEmotionBubble], a
+	ld a, $f ; Pikachu
+	ld [wEmotionBubbleSpriteIndex], a
+	predef EmotionBubble
+	ld hl, PikachuMovementScript_59a8c
+	call Func_159b
+	ld a, $2
+	ld [wSpriteStateData1 + 3 * $10 + 1], a ; Seel
+	xor a ; SPRITE_FACING_DOWN
+	ld [wSpriteStateData1 + 3 * $10 + 9], a
+	callab InitializePikachuTextID
+	call DisablePikachuFollowingPlayer
+	ret
+
+PikachuMovementScript_59a8c:
+	db $00
+	db $26
+	db $20
+	db $20
+	db $20
+	db $1e
+	db $3f
 
 FanClubTextPointers: ; 59b84 (16:5b84)
 	dw FanClubText1
@@ -18,22 +75,28 @@ FanClubTextPointers: ; 59b84 (16:5b84)
 	dw FanClubText4
 	dw FanClubText5
 	dw FanClubText6
-	dw FanClubText7
-	dw FanClubText8
 
 FanClubText1:
-; pikachu fan
+; clefairy fan
 	TX_ASM
-	CheckEvent EVENT_PIKACHU_FAN_BOAST
+	CheckEventHL EVENT_152
+	jr z, .asm_59aaf
+	ld hl, .yellowtext
+	call PrintText
+	jr .done
+
+.asm_59aaf
+	CheckEventReuseHL EVENT_PIKACHU_FAN_BOAST
 	jr nz, .mineisbetter
+	SetEventReuseHL EVENT_SEEL_FAN_BOAST
 	ld hl, .normaltext
 	call PrintText
-	SetEvent EVENT_SEEL_FAN_BOAST
 	jr .done
+
 .mineisbetter
+	ResetEventReuseHL EVENT_PIKACHU_FAN_BOAST
 	ld hl, .bettertext
 	call PrintText
-	ResetEvent EVENT_PIKACHU_FAN_BOAST
 .done
 	jp TextScriptEnd
 
@@ -45,19 +108,29 @@ FanClubText1:
 	TX_FAR PikachuFanBetterText
 	db "@"
 
+.yellowtext
+	TX_FAR PikachuFanPrintText
+	db "@"
+
 FanClubText2:
 ; seel fan
 	TX_ASM
-	CheckEvent EVENT_SEEL_FAN_BOAST
+	CheckEventHL EVENT_152
+	jr z, .asm_59ae7
+	ld hl, .yellowtext
+	call PrintText
+	jr .done
+.asm_59ae7
+	CheckEventReuseHL EVENT_SEEL_FAN_BOAST
 	jr nz, .mineisbetter
+	SetEventReuseHL EVENT_PIKACHU_FAN_BOAST
 	ld hl, .normaltext
 	call PrintText
-	SetEvent EVENT_PIKACHU_FAN_BOAST
 	jr .done
 .mineisbetter
+	ResetEventReuseHL EVENT_SEEL_FAN_BOAST
 	ld hl, .bettertext
 	call PrintText
-	ResetEvent EVENT_SEEL_FAN_BOAST
 .done
 	jp TextScriptEnd
 
@@ -69,12 +142,16 @@ FanClubText2:
 	TX_FAR SeelFanBetterText
 	db "@"
 
+.yellowtext
+	TX_FAR SeelFanPrintText
+	db "@"
+
 FanClubText3:
 ; pikachu
 	TX_ASM
 	ld hl, .text
 	call PrintText
-	ld a, PIKACHU
+	ld a, CLEFAIRY
 	call PlayCry
 	call WaitForSoundToFinish
 	jp TextScriptEnd
@@ -100,74 +177,131 @@ FanClubText4:
 FanClubText5:
 ; chair
 	TX_ASM
-	call FanClubBikeInBag
-	jr nz, .nothingleft
-
-	ld hl, .meetchairtext
+	CheckEventHL EVENT_152
+	jr z, .check_bike_voucher
+	ld hl, Text_59c1f
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	jr nz, .nothanks
+	jr z, .select_mon_to_print
+	ld hl, Text_59c24
+	jr .gbpals_print_text
 
-	; tell the story
-	ld hl, .storytext
+.check_bike_voucher
+	CheckEvent EVENT_GOT_BIKE_VOUCHER
+	jr nz, .got_bike_voucher_already
+	ld hl, Text_59bfc
+	call PrintText
+	call YesNoChoice
+	ld a, [wCurrentMenuItem]
+	and a
+	jr nz, .declined_story
+	ld hl, Text_59c01
 	call PrintText
 	lb bc, BIKE_VOUCHER, 1
 	call GiveItem
-	jr nc, .BagFull
-	ld hl, .receivedvouchertext
+	jr nc, .no_room_for_voucher
+	ld hl, Text_59c06
 	call PrintText
 	SetEvent EVENT_GOT_BIKE_VOUCHER
-	jr .done
-.BagFull
-	ld hl, .bagfulltext
-	call PrintText
-	jr .done
-.nothanks
-	ld hl, .nostorytext
-	call PrintText
-	jr .done
-.nothingleft
-	ld hl, .finaltext
+	jp TextScriptEnd
+
+.no_room_for_voucher
+	ld hl, Text_59c1a
+	jr .gbpals_print_text
+
+.declined_story
+	ld hl, Text_59c10
+	jr .gbpals_print_text
+
+.got_bike_voucher_already
+	ld hl, Text_59c15
+.gbpals_print_text
+	push hl
+	call LoadGBPal
+	pop hl
 	call PrintText
-.done
 	jp TextScriptEnd
 
-.meetchairtext
+.select_mon_to_print
+	call GBPalWhiteOutWithDelay3
+	call LoadCurrentMapView
+	call SaveScreenTilesToBuffer2
+	ld a, $ff
+	ld [wUpdateSpritesEnabled], a
+	ld a, $00
+	ld [wTempTilesetNumTiles], a
+	call DisplayPartyMenu
+	jp nc, .print
+	call GBPalWhiteOutWithDelay3
+	call RestoreScreenTilesAndReloadTilePatterns
+	ld hl, Text_59c24
+	jr .gbpals_print_text
+
+.print
+	xor a
+	ld [wUpdateSpritesEnabled], a
+	ld hl, wd730
+	set 6, [hl]
+	callab Func_e8e24
+	ld hl, wd730
+	res 6, [hl]
+	call GBPalWhiteOutWithDelay3
+	call ReloadTilesetTilePatterns
+	call RestoreScreenTilesAndReloadTilePatterns
+	call LoadScreenTilesFromBuffer2
+	call Delay3
+	call GBPalNormal
+	ld hl, Text_59c2e
+	ld a, [hOaksAideResult]
+	and a
+	jr nz, .gbpals_print_text
+	ld hl, Text_59c29
+	jr .gbpals_print_text
+
+Text_59bfc:
 	TX_FAR FanClubMeetChairText
 	db "@"
 
-.storytext
+Text_59c01:
 	TX_FAR FanClubChairStoryText
 	db "@"
 
-.receivedvouchertext
+Text_59c06:
 	TX_FAR ReceivedBikeVoucherText
-	db $11
+	TX_SFX_KEY_ITEM
 	TX_FAR ExplainBikeVoucherText
 	db "@"
 
-.nostorytext
+Text_59c10:
 	TX_FAR FanClubNoStoryText
 	db "@"
 
-.finaltext
+Text_59c15:
 	TX_FAR FanClubChairFinalText
 	db "@"
 
-.bagfulltext
+Text_59c1a:
 	TX_FAR FanClubBagFullText
 	db "@"
 
-FanClubText6: ; 59c88 (16:5c88)
-	TX_FAR _FanClubText6
+Text_59c1f:
+	TX_FAR FanClubChairPrintText1
+	db "@"
+
+Text_59c24:
+	TX_FAR FanClubChairPrintText2
+	db "@"
+
+Text_59c29:
+	TX_FAR FanClubChairPrintText3
 	db "@"
 
-FanClubText7: ; 59c8d (16:5c8d)
-	TX_FAR _FanClubText7
+Text_59c2e:
+	TX_FAR FanClubChairPrintText4
 	db "@"
 
-FanClubText8: ; 59c92 (16:5c92)
-	TX_FAR _FanClubText8
+FanClubText6: ; 59c88 (16:5c88)
+	TX_FAR _FanClubText6
 	db "@"
diff --git a/scripts/pewterpokecenter2.asm b/scripts/pewterpokecenter2.asm
index 1aae37d1..c884ad65 100755
--- a/scripts/pewterpokecenter2.asm
+++ b/scripts/pewterpokecenter2.asm
@@ -57,7 +57,7 @@ Func_f1da4:
 	ret z
 	callab Func_fce73
 	ret c
-	call SetPikachuAsleep
+	call DisablePikachuFollowingPlayer
 	ret
 
 PewterPokecenterText_f1e19:
diff --git a/text/maps/fan_club.asm b/text/maps/fan_club.asm
index 8b442011..33d3ca53 100644
--- a/text/maps/fan_club.asm
+++ b/text/maps/fan_club.asm
@@ -100,13 +100,13 @@ FanClubChairStoryText::
 	prompt
 
 ReceivedBikeVoucherText::
-	text $52, " received"
+	text "<PLAYER> received"
 	line "a @"
 	TX_RAM wcf4b
 	text "!@@"
 
 ExplainBikeVoucherText::
-	db $0
+	text ""
 	para "Exchange that for"
 	line "a BICYCLE!"
 
@@ -128,7 +128,7 @@ FanClubNoStoryText::
 	done
 
 FanClubChairFinalText::
-	text "Hello, ", $52, "!"
+	text "Hello, <PLAYER>!"
 
 	para "Did you come see"
 	line "me about my"
@@ -143,7 +143,7 @@ FanClubBagFullText::
 	done
 
 FanClubChairPrintText1::
-	text "Hi there, ",$52,"!"
+	text "Hi there, <PLAYER>!"
 	line "Have you seen my"
 	cont "#MON photos?"
 
diff --git a/wram.asm b/wram.asm
index 593f7c09..70d973c7 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2711,220 +2711,220 @@ wMissableObjectList:: ; d5ce
 ; terminated with $FF
 	ds 17 * 2
 
-wGameProgressFlags:: ; d5f0
+wGameProgressFlags:: ; d5e9
 ; $c8 bytes
-	ds 0
 
-W_OAKSLABCURSCRIPT:: ; d5f0
+W_OAKSLABCURSCRIPT:: ; d5e9
 	ds 1
-W_PALLETTOWNCURSCRIPT:: ; d5f1
+W_PALLETTOWNCURSCRIPT:: ; d5f0
 	ds 1
 	ds 1
-W_BLUESHOUSECURSCRIPT:: ; d5f3
+W_BLUESHOUSECURSCRIPT:: ; d5f2
 	ds 1
-W_VIRIDIANCITYCURSCRIPT:: ; d5f4
+W_VIRIDIANCITYCURSCRIPT:: ; d5f3
 	ds 1
 	ds 2
-W_PEWTERCITYCURSCRIPT:: ; d5f7
+W_PEWTERCITYCURSCRIPT:: ; d5f6
 	ds 1
-W_ROUTE3CURSCRIPT:: ; d5f8
+W_ROUTE3CURSCRIPT:: ; d5f7
 	ds 1
-W_ROUTE4CURSCRIPT:: ; d5f9
+W_ROUTE4CURSCRIPT:: ; d5f8
 	ds 1
+W_FANCLUBCURSCRIPT:: ; d5f9
 	ds 1
-W_VIRIDIANGYMCURSCRIPT:: ; d5fb
+W_VIRIDIANGYMCURSCRIPT:: ; d5fa
 	ds 1
-W_PEWTERGYMCURSCRIPT:: ; d5fc
+W_PEWTERGYMCURSCRIPT:: ; d5fb
 	ds 1
-W_CERULEANGYMCURSCRIPT:: ; d5fd
+W_CERULEANGYMCURSCRIPT:: ; d5fc
 	ds 1
-W_VERMILIONGYMCURSCRIPT:: ; d5fe
+W_VERMILIONGYMCURSCRIPT:: ; d5fd
 	ds 1
-W_CELADONGYMCURSCRIPT:: ; d5ff
+W_CELADONGYMCURSCRIPT:: ; d5fe
 	ds 1
-W_ROUTE6CURSCRIPT:: ; d600
+W_ROUTE6CURSCRIPT:: ; d5ff
 	ds 1
-W_ROUTE8CURSCRIPT:: ; d601
+W_ROUTE8CURSCRIPT:: ; d600
 	ds 1
-W_ROUTE24CURSCRIPT:: ; d602
+W_ROUTE24CURSCRIPT:: ; d601
 	ds 1
-W_ROUTE25CURSCRIPT:: ; d603
+W_ROUTE25CURSCRIPT:: ; d602
 	ds 1
-W_ROUTE9CURSCRIPT:: ; d604
+W_ROUTE9CURSCRIPT:: ; d603
 	ds 1
-W_ROUTE10CURSCRIPT:: ; d605
+W_ROUTE10CURSCRIPT:: ; d604
 	ds 1
-W_MTMOON1CURSCRIPT:: ; d606
+W_MTMOON1CURSCRIPT:: ; d605
 	ds 1
-W_MTMOON3CURSCRIPT:: ; d607
+W_MTMOON3CURSCRIPT:: ; d606
 	ds 1
-W_SSANNE8CURSCRIPT:: ; d608
+W_SSANNE8CURSCRIPT:: ; d607
 	ds 1
-W_SSANNE9CURSCRIPT:: ; d609
+W_SSANNE9CURSCRIPT:: ; d608
 	ds 1
-W_ROUTE22CURSCRIPT:: ; d60a
+W_ROUTE22CURSCRIPT:: ; d609
 	ds 1
 	ds 1
-W_REDSHOUSE2CURSCRIPT:: ; d60c
+W_REDSHOUSE2CURSCRIPT:: ; d60b
 	ds 1
-W_VIRIDIANMARKETCURSCRIPT:: ; d60d
+W_VIRIDIANMARKETCURSCRIPT:: ; d60c
 	ds 1
-W_ROUTE22GATECURSCRIPT:: ; d60e
+W_ROUTE22GATECURSCRIPT:: ; d60d
 	ds 1
-W_CERULEANCITYCURSCRIPT:: ; d60f
+W_CERULEANCITYCURSCRIPT:: ; d60e
 	ds 1
 	ds 7
-W_SSANNE5CURSCRIPT:: ; d617
+W_SSANNE5CURSCRIPT:: ; d616
 	ds 1
-W_VIRIDIANFORESTCURSCRIPT:: ; d618
+W_VIRIDIANFORESTCURSCRIPT:: ; d617
 	ds 1
-W_MUSEUM1FCURSCRIPT:: ; d619
+W_MUSEUM1FCURSCRIPT:: ; d618
 	ds 1
-W_ROUTE13CURSCRIPT:: ; d61a
+W_ROUTE13CURSCRIPT:: ; d619
 	ds 1
-W_ROUTE14CURSCRIPT:: ; d61b
+W_ROUTE14CURSCRIPT:: ; d61a
 	ds 1
-W_ROUTE17CURSCRIPT:: ; d61c
+W_ROUTE17CURSCRIPT:: ; d61b
 	ds 1
-W_ROUTE19CURSCRIPT:: ; d61d
+W_ROUTE19CURSCRIPT:: ; d61c
 	ds 1
-W_ROUTE21CURSCRIPT:: ; d61e
+W_ROUTE21CURSCRIPT:: ; d61d
 	ds 1
-wSafariZoneEntranceCurScript:: ; d61f
+wSafariZoneEntranceCurScript:: ; d61e
 	ds 1
-W_ROCKTUNNEL2CURSCRIPT:: ; d620
+W_ROCKTUNNEL2CURSCRIPT:: ; d61f
 	ds 1
-W_ROCKTUNNEL1CURSCRIPT:: ; d621
+W_ROCKTUNNEL1CURSCRIPT:: ; d620
 	ds 1
 	ds 1
-W_ROUTE11CURSCRIPT:: ; d623
+W_ROUTE11CURSCRIPT:: ; d622
 	ds 1
-W_ROUTE12CURSCRIPT:: ; d624
+W_ROUTE12CURSCRIPT:: ; d623
 	ds 1
-W_ROUTE15CURSCRIPT:: ; d625
+W_ROUTE15CURSCRIPT:: ; d624
 	ds 1
-W_ROUTE16CURSCRIPT:: ; d626
+W_ROUTE16CURSCRIPT:: ; d625
 	ds 1
-W_ROUTE18CURSCRIPT:: ; d627
+W_ROUTE18CURSCRIPT:: ; d626
 	ds 1
-W_ROUTE20CURSCRIPT:: ; d628
+W_ROUTE20CURSCRIPT:: ; d627
 	ds 1
-W_SSANNE10CURSCRIPT:: ; d629
+W_SSANNE10CURSCRIPT:: ; d628
 	ds 1
-W_VERMILIONCITYCURSCRIPT:: ; d62a
+W_VERMILIONCITYCURSCRIPT:: ; d629
 	ds 1
-W_POKEMONTOWER2CURSCRIPT:: ; d62b
+W_POKEMONTOWER2CURSCRIPT:: ; d62a
 	ds 1
-W_POKEMONTOWER3CURSCRIPT:: ; d62c
+W_POKEMONTOWER3CURSCRIPT:: ; d62b
 	ds 1
-W_POKEMONTOWER4CURSCRIPT:: ; d62d
+W_POKEMONTOWER4CURSCRIPT:: ; d62c
 	ds 1
-W_POKEMONTOWER5CURSCRIPT:: ; d62e
+W_POKEMONTOWER5CURSCRIPT:: ; d62d
 	ds 1
-W_POKEMONTOWER6CURSCRIPT:: ; d62f
+W_POKEMONTOWER6CURSCRIPT:: ; d62e
 	ds 1
-W_POKEMONTOWER7CURSCRIPT:: ; d630
+W_POKEMONTOWER7CURSCRIPT:: ; d62f
 	ds 1
-W_ROCKETHIDEOUT1CURSCRIPT:: ; d631
+W_ROCKETHIDEOUT1CURSCRIPT:: ; d630
 	ds 1
-W_ROCKETHIDEOUT2CURSCRIPT:: ; d632
+W_ROCKETHIDEOUT2CURSCRIPT:: ; d631
 	ds 1
-W_ROCKETHIDEOUT3CURSCRIPT:: ; d633
+W_ROCKETHIDEOUT3CURSCRIPT:: ; d632
 	ds 1
-W_ROCKETHIDEOUT4CURSCRIPT:: ; d634
+W_ROCKETHIDEOUT4CURSCRIPT:: ; d633
 	ds 2
-W_ROUTE6GATECURSCRIPT:: ; d636
+W_ROUTE6GATECURSCRIPT:: ; d635
 	ds 1
-W_ROUTE8GATECURSCRIPT:: ; d637
+W_ROUTE8GATECURSCRIPT:: ; d636
 	ds 2
-W_CINNABARISLANDCURSCRIPT:: ; d639
+W_CINNABARISLANDCURSCRIPT:: ; d638
 	ds 1
-W_MANSION1CURSCRIPT:: ; d63a
+W_MANSION1CURSCRIPT:: ; d639
 	ds 2
-W_MANSION2CURSCRIPT:: ; d63c
+W_MANSION2CURSCRIPT:: ; d63b
 	ds 1
-W_MANSION3CURSCRIPT:: ; d63d
+W_MANSION3CURSCRIPT:: ; d63c
 	ds 1
-W_MANSION4CURSCRIPT:: ; d63e
+W_MANSION4CURSCRIPT:: ; d63d
 	ds 1
-W_VICTORYROAD2CURSCRIPT:: ; d63f
+W_VICTORYROAD2CURSCRIPT:: ; d63e
 	ds 1
-W_VICTORYROAD3CURSCRIPT:: ; d640
+W_VICTORYROAD3CURSCRIPT:: ; d63f
 	ds 1
-W_CELADONCITYCURSCRIPT::
+W_CELADONCITYCURSCRIPT:: ; d640
 	ds 1
-W_FIGHTINGDOJOCURSCRIPT:: ; d642
+W_FIGHTINGDOJOCURSCRIPT:: ; d641
 	ds 1
-W_SILPHCO2CURSCRIPT:: ; d643
+W_SILPHCO2CURSCRIPT:: ; d642
 	ds 1
-W_SILPHCO3CURSCRIPT:: ; d644
+W_SILPHCO3CURSCRIPT:: ; d643
 	ds 1
-W_SILPHCO4CURSCRIPT:: ; d645
+W_SILPHCO4CURSCRIPT:: ; d644
 	ds 1
-W_SILPHCO5CURSCRIPT:: ; d646
+W_SILPHCO5CURSCRIPT:: ; d645
 	ds 1
-W_SILPHCO6CURSCRIPT:: ; d647
+W_SILPHCO6CURSCRIPT:: ; d646
 	ds 1
-W_SILPHCO7CURSCRIPT:: ; d648
+W_SILPHCO7CURSCRIPT:: ; d647
 	ds 1
-W_SILPHCO8CURSCRIPT:: ; d649
+W_SILPHCO8CURSCRIPT:: ; d648
 	ds 1
-W_SILPHCO9CURSCRIPT:: ; d64a
+W_SILPHCO9CURSCRIPT:: ; d649
 	ds 1
-W_HALLOFFAMEROOMCURSCRIPT:: ; d64b
+W_HALLOFFAMEROOMCURSCRIPT:: ; d64a
 	ds 1
-W_GARYCURSCRIPT:: ; d64c
+W_GARYCURSCRIPT:: ; d64b
 	ds 1
-W_LORELEICURSCRIPT:: ; d64d
+W_LORELEICURSCRIPT:: ; d64c
 	ds 1
-W_BRUNOCURSCRIPT:: ; d64e
+W_BRUNOCURSCRIPT:: ; d64d
 	ds 1
-W_AGATHACURSCRIPT:: ; d64f
+W_AGATHACURSCRIPT:: ; d64e
 	ds 1
-W_UNKNOWNDUNGEON3CURSCRIPT:: ; d650
+W_UNKNOWNDUNGEON3CURSCRIPT:: ; d64f
 	ds 1
-W_VICTORYROAD1CURSCRIPT:: ; d651
+W_VICTORYROAD1CURSCRIPT:: ; d650
 	ds 1
 	ds 1
-W_LANCECURSCRIPT:: ; d653
+W_LANCECURSCRIPT:: ; d652
 	ds 1
 	ds 4
-W_SILPHCO10CURSCRIPT:: ; d658
+W_SILPHCO10CURSCRIPT:: ; d657
 	ds 1
-W_SILPHCO11CURSCRIPT:: ; d659
+W_SILPHCO11CURSCRIPT:: ; d658
 	ds 1
 	ds 1
-W_FUCHSIAGYMCURSCRIPT:: ; d65b
+W_FUCHSIAGYMCURSCRIPT:: ; d65a
 	ds 1
-W_SAFFRONGYMCURSCRIPT:: ; d65c
+W_SAFFRONGYMCURSCRIPT:: ; d65b
 	ds 1
 	ds 1
-W_CINNABARGYMCURSCRIPT:: ; d65e
+W_CINNABARGYMCURSCRIPT:: ; d65d
 	ds 1
-W_CELADONGAMECORNERCURSCRIPT:: ; d65f
+W_CELADONGAMECORNERCURSCRIPT:: ; d65e
 	ds 1
-W_ROUTE16GATECURSCRIPT:: ; d660
+W_ROUTE16GATECURSCRIPT:: ; d65f
 	ds 1
-W_BILLSHOUSECURSCRIPT:: ; d661
+W_BILLSHOUSECURSCRIPT:: ; d660
 	ds 1
-W_ROUTE5GATECURSCRIPT:: ; d662
+W_ROUTE5GATECURSCRIPT:: ; d661
 	ds 1
-W_POWERPLANTCURSCRIPT:: ; d663
+W_POWERPLANTCURSCRIPT:: ; d662
 ; overload
 	ds 0
-W_ROUTE7GATECURSCRIPT:: ; d663
+W_ROUTE7GATECURSCRIPT:: ; d662
 ; overload
 	ds 1
 	ds 1
-W_SSANNE2CURSCRIPT:: ; d665
+W_SSANNE2CURSCRIPT:: ; d664
 	ds 1
-wSeafoamIslands4CurScript:: ; d666
+wSeafoamIslands4CurScript:: ; d665
 	ds 1
-W_ROUTE23CURSCRIPT:: ; d667
+W_ROUTE23CURSCRIPT:: ; d666
 	ds 1
-wSeafoamIslands5CurScript:: ; d668
+wSeafoamIslands5CurScript:: ; d667
 	ds 1
-W_ROUTE18GATECURSCRIPT:: ; d669
+W_ROUTE18GATECURSCRIPT:: ; d668
 	ds 1
 
 	ds 78