Improved Virtual Console patch identifiers (#85)

10 files changed, 48 insertions, 48 deletions

diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index a46f11df..61ad93dc 100644
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -203,9 +203,9 @@ PlayAnimation:
 	ld h, [hl]
 	ld l, a
 .animationLoop
-	vc_hook FPA_005_End
+	vc_hook Stop_reducing_move_anim_flashing_Bubblebeam
 	ld a, [hli]
-	vc_hook FPA_001_End
+	vc_hook Stop_reducing_move_anim_flashing_Mega_Punch
 	cp -1
 	jr z, .AnimationOver
 	cp FIRST_SE_ID ; is this subanimation or a special effect?
@@ -279,17 +279,17 @@ PlayAnimation:
 	call LoadSubanimation
 	call PlaySubanimation
 	pop af
-	vc_hook FPA_007_End
+	vc_hook Stop_reducing_move_anim_flashing_Thunderbolt
 	ldh [rOBP0], a
-	vc_hook FPA_011_End
+	vc_hook Stop_reducing_move_anim_flashing_Explosion
 	call UpdateGBCPal_OBP0
 .nextAnimationCommand
-	vc_hook FPA_002_End
+	vc_hook Stop_reducing_move_anim_flashing_Guillotine
 	pop hl
-	vc_hook FPA_003_End
+	vc_hook Stop_reducing_move_anim_flashing_Mega_Kick
 	jr .animationLoop
 .AnimationOver
-	vc_hook FPA_004_End
+	vc_hook Stop_reducing_move_anim_flashing_Blizzard
 	ret
 
 LoadSubanimation:
@@ -301,26 +301,26 @@ LoadSubanimation:
 	ld e, a
 	ld a, [hl]
 	ld d, a ; de = address of subanimation
-	vc_hook FPA_005_Begin
+	vc_hook Reduce_move_anim_flashing_Bubblebeam
 	ld a, [de]
-	vc_hook FPA_003_Begin
+	vc_hook Reduce_move_anim_flashing_Mega_Kick
 	ld b, a
-	vc_hook FPA_002_Begin
+	vc_hook Reduce_move_anim_flashing_Guillotine
 	and %00011111
-	vc_hook FPA_001_Begin
+	vc_hook Reduce_move_anim_flashing_Mega_Punch_Explosion_Self_Destruct
 	ld [wSubAnimCounter], a ; number of frame blocks
-	vc_hook FPA_004_Begin
+	vc_hook Reduce_move_anim_flashing_Blizzard
 	ld a, b
-	vc_hook FPA_007_Begin
+	vc_hook Reduce_move_anim_flashing_Thunderbolt
 	and %11100000
 	cp SUBANIMTYPE_ENEMY << 5
-	vc_hook FPA_009_Begin
+	vc_hook Reduce_move_anim_flashing_Reflect
 	jr nz, .isNotType5
 .isType5
 	call GetSubanimationTransform2
 	jr .saveTransformation
 .isNotType5
-	vc_hook FPA_010_Begin
+	vc_hook Reduce_move_anim_flashing_Self_Destruct
 	call GetSubanimationTransform1
 .saveTransformation
 ; place the upper 3 bits of a into bits 0-2 of a before storing
@@ -351,7 +351,7 @@ LoadSubanimation:
 ; sets the transform to SUBANIMTYPE_NORMAL if it's the player's turn
 ; sets the transform to the subanimation type if it's the enemy's turn
 GetSubanimationTransform1:
-	vc_hook FPA_011_Begin
+	vc_hook Reduce_move_anim_flashing_Explosion
 	ld b, a
 	ldh a, [hWhoseTurn]
 	and a
@@ -444,12 +444,12 @@ MoveAnimation:
 	ld c, 30
 	call DelayFrames
 .next4
-	vc_hook FPA_009_End
+	vc_hook Stop_reducing_move_anim_flashing_Reflect
 	call PlayApplyingAttackAnimation ; shake the screen or flash the pic in and out (to show damage)
 .animationFinished
 	call WaitForSoundToFinish
 	xor a
-	vc_hook FPA_008_End
+	vc_hook Stop_reducing_move_anim_flashing_Haze_Hyper_Beam
 	ld [wSubAnimSubEntryAddr], a
 	ld [wUnusedD09B], a
 	ld [wSubAnimTransform], a
@@ -487,7 +487,7 @@ ShareMoveAnimations:
 PlayApplyingAttackAnimation:
 ; Generic animation that shows after the move's individual animation
 ; Different animation depending on whether the move has an additional effect and on whose turn it is
-	vc_hook FPA_010_End
+	vc_hook Stop_reducing_move_anim_flashing_Self_Destruct
 	ld a, [wAnimationType]
 	and a
 	ret z
@@ -577,10 +577,10 @@ SetAnimationPalette:
 	ld b, $f0
 .next
 	ld a, b
-	vc_hook FPA_006_Begin
+	vc_hook Reduce_move_anim_flashing_Hyper_Beam
 	ldh [rOBP0], a
 	ld a, $6c
-	vc_hook FPA_008_Begin
+	vc_hook Reduce_move_anim_flashing_Haze
 	ldh [rOBP1], a
 	call UpdateGBCPal_OBP0
 	call UpdateGBCPal_OBP1
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index e8624289..a4c06f58 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3192,7 +3192,7 @@ LinkBattleExchangeData:
 	ld a, b
 .doExchange
 	ld [wSerialExchangeNybbleSendData], a
-	vc_hook send_byt2
+	vc_hook Wireless_start_exchange
 	callfar PrintWaitingText
 .syncLoop1
 	call Serial_ExchangeNybble
@@ -3200,8 +3200,8 @@ LinkBattleExchangeData:
 	ld a, [wSerialExchangeNybbleReceiveData]
 	inc a
 	jr z, .syncLoop1
-	vc_hook send_byt2_ret
-	vc_patch FIGHT
+	vc_hook Wireless_end_exchange
+	vc_patch Wireless_net_delay_1
 IF DEF(_YELLOW_VC)
 	ld b, 26
 ELSE
@@ -3213,8 +3213,8 @@ ENDC
 	call Serial_ExchangeNybble
 	dec b
 	jr nz, .syncLoop2
-	vc_hook send_dummy
-	vc_patch FIGHT2
+	vc_hook Wireless_start_send_zero_bytes
+	vc_patch Wireless_net_delay_2
 IF DEF(_YELLOW_VC)
 	ld b, 26
 ELSE
@@ -3226,7 +3226,7 @@ ENDC
 	call Serial_SendZeroByte
 	dec b
 	jr nz, .syncLoop3
-	vc_hook send_dummy_end
+	vc_hook Wireless_end_send_zero_bytes
 	ret
 
 ExecutePlayerMove:
@@ -6860,8 +6860,8 @@ BattleRandom:
 	ld a, [hl]
 	pop bc
 	pop hl
-	vc_hook fight_ret_c
-	vc_patch fight_ret
+	vc_hook Unknown_BattleRandom_ret_c
+	vc_patch BattleRandom_ret
 IF DEF(_YELLOW_VC)
 	ret
 ELSE
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index 4d4e6d02..0c175d2d 100644
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -657,7 +657,7 @@ CheckSGB:
 SendMltReq1Packet:
 	ld hl, MltReq1Packet
 	call SendSGBPacket
-	vc_hook Network_RESET
+	vc_hook Unknown_network_reset
 	jp Wait7000
 
 CopyGfxToSuperNintendoVRAM:
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index aa2ff15a..6b646647 100644
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -130,14 +130,14 @@ CableClub_DoBattleOrTradeAgain:
 	ld hl, wSerialPlayerDataBlock
 	ld de, wSerialEnemyDataBlock
 	ld bc, $1a8
-	vc_hook Network424
+	vc_hook Wireless_ExchangeBytes_1
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
 	ld hl, wSerialPartyMonsPatchList
 	ld de, wSerialEnemyMonsPatchList
 	ld bc, $c8
-	vc_hook Network200
+	vc_hook Wireless_ExchangeBytes_2
 	call Serial_ExchangeBytes
 	ld a, (1 << SERIAL) | (1 << TIMER) | (1 << VBLANK)
 	ldh [rIE], a
@@ -868,7 +868,7 @@ TradeCenter_Trade:
 	ld de, TradeCompleted
 	call PlaceString
 	predef SaveSAVtoSRAM2
-	vc_hook save_game_end
+	vc_hook Trade_save_game_end
 	ld c, 50
 	call DelayFrames
 	xor a
diff --git a/engine/link/cable_club_npc.asm b/engine/link/cable_club_npc.asm
index 293a208a..1ba3becb 100644
--- a/engine/link/cable_club_npc.asm
+++ b/engine/link/cable_club_npc.asm
@@ -34,7 +34,7 @@ CableClubNPC::
 ; USING_INTERNAL_CLOCK, which allows the player to proceed past the link
 ; receptionist's "Please wait." It assumes that hSerialConnectionStatus is at
 ; its original address.
-	vc_hook linkCable_fake_begin
+	vc_hook Link_fake_connection_status
 	vc_assert hSerialConnectionStatus == $ffaa, \
 		"hSerialConnectionStatus is no longer located at 00:ffaa"
 	vc_assert USING_INTERNAL_CLOCK == $02, \
@@ -66,7 +66,7 @@ CableClubNPC::
 	ld a, [wCurrentMenuItem]
 	and a
 	jr nz, .choseNo
-	vc_hook linkCable_block_input
+	vc_hook Wireless_TryQuickSave_block_input
 	callfar SaveSAVtoSRAM
 	call WaitForSoundToFinish
 	ld a, SFX_SAVE
@@ -80,9 +80,9 @@ CableClubNPC::
 	ld [hl], a
 	ldh [hSerialReceivedNewData], a
 	ld [wSerialExchangeNybbleSendData], a
-	vc_hook linkCable_fake_end
+	vc_hook Wireless_prompt
 	call Serial_SyncAndExchangeNybble
-	vc_hook Network_RECHECK
+	vc_hook Wireless_net_recheck
 	ld hl, wUnknownSerialCounter
 	ld a, [hli]
 	inc a
diff --git a/engine/menus/link_menu.asm b/engine/menus/link_menu.asm
index 6d9021e4..409316c9 100644
--- a/engine/menus/link_menu.asm
+++ b/engine/menus/link_menu.asm
@@ -794,11 +794,11 @@ LinkMenu:
 	call Delay3
 	callfar CloseLinkConnection
 	ld hl, ColosseumCanceledText
-	vc_hook Network_STOP
+	vc_hook Wireless_net_stop
 	call PrintText
 	ld hl, wd72e
 	res 6, [hl]
-	vc_hook Network_END
+	vc_hook Wireless_net_end
 	ret
 
 .asm_f5963
diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm
index d0e8cf2b..1ab1ff9b 100644
--- a/engine/menus/pokedex.asm
+++ b/engine/menus/pokedex.asm
@@ -111,7 +111,7 @@ HandlePokedexSideMenu:
 	dec a
 	jr z, .choseArea
 	dec a
-	vc_patch disable_print
+	vc_patch Forbid_printing_Pokedex
 IF DEF (_YELLOW_VC)
 	jr z, .handleMenuInput
 ELSE
diff --git a/engine/menus/save.asm b/engine/menus/save.asm
index a623ee1a..359830d9 100644
--- a/engine/menus/save.asm
+++ b/engine/menus/save.asm
@@ -37,7 +37,7 @@ LoadSAV0:
 	ld [MBC1SRamBank], a
 ; This vc_hook does not have to be in any particular location.
 ; It is defined here because it refers to the same labels as the two lines below.
-	vc_hook SaveLimit
+	vc_hook Unknown_save_limit
 	ld hl, sGameData
 	ld bc, sGameDataEnd - sGameData
 	call SAVCheckSum
diff --git a/engine/movie/intro_yellow.asm b/engine/movie/intro_yellow.asm
index f054f576..a67c6de4 100644
--- a/engine/movie/intro_yellow.asm
+++ b/engine/movie/intro_yellow.asm
@@ -30,7 +30,7 @@ PlayIntroScene:
 	jr .loop
 
 .go_to_title_screen
-	vc_hook FPA_031801_End3
+	vc_hook Stop_Reducing_intro_scene_flashing
 	call YellowIntro_BlankPalettes
 	xor a
 	ldh [hLCDCPointer], a
@@ -124,7 +124,7 @@ Jumptable_f9906:
 YellowIntro_NextScene:
 	ld hl, wYellowIntroCurrentScene
 	inc [hl]
-	vc_hook FPA_031801_Begin1
+	vc_hook Reduce_intro_scene_flashing_0E
 	ret
 
 YellowIntroScene0:
@@ -603,7 +603,7 @@ YellowIntroScene14:
 	call YellowIntro_SpawnAnimatedObjectAndSavePointer
 	call YellowIntro_NextScene
 	ld a, $28
-	vc_hook FPA_031801_Begin2
+	vc_hook Reduce_intro_scene_flashing_0F
 	ld [wYellowIntroSceneTimer], a
 	ret
 
@@ -708,14 +708,14 @@ YellowIntro_CheckFrameTimerDecrement:
 	ret
 
 .asm_f9e4b
-	vc_hook FPA_031801_End2
+	vc_hook Stop_reducing_intro_scene_flashing_0F
 	scf
 	ret
 
 YellowIntro_LoadDMGPalAndIncrementCounter:
 	ld hl, wYellowIntroSceneTimer
 	ld a, [hl]
-	vc_hook FPA_031801_End1
+	vc_hook Stop_reducing_intro_scene_flashing_0E
 	inc [hl]
 	ld l, a
 	ld h, $0
diff --git a/engine/pikachu/pikachu_pcm.asm b/engine/pikachu/pikachu_pcm.asm
index d971ea85..844449f9 100644
--- a/engine/pikachu/pikachu_pcm.asm
+++ b/engine/pikachu/pikachu_pcm.asm
@@ -1,5 +1,5 @@
 PlayPikachuSoundClip::
-	vc_hook PLAY_NEW
+	vc_hook Unknown_PlayPikachuSoundClip_start
 	ld a, e
 	ld e, a
 	ld d, $0
@@ -40,7 +40,7 @@ PlayPikachuSoundClip::
 	ld a, l
 	cp $40 ; end of wave data
 	jr nz, .saveWaveDataLoop
-	vc_patch PLAY_MUTE
+	vc_patch Unknown_PlayPikachuSoundClip_end
 IF DEF(_YELLOW_VC)
 	ld a, 0
 ELSE