shithub: pokecrystal

Download patch

ref: a4d346cc8cf34993640c7d2ea2968a2d88e6e5b2
parent: c3bf7fd0bd4c6557123f0acd4b9f3dd385fa3472
author: vulcandth <vulcandth@gmail.com>
date: Mon Jun 6 12:22:48 EDT 2022

Improved Virtual Console patch identifiers (#907)


--- a/engine/battle/battle_transition.asm
+++ b/engine/battle/battle_transition.asm
@@ -21,7 +21,7 @@
 	ld hl, hVBlank
 	ld a, [hl]
 	push af
-	vc_hook FPA_link_fight_begin
+	vc_hook Reduce_battle_transition_flashing
 	ld [hl], $1
 
 .loop
@@ -59,7 +59,7 @@
 	ld a, $1 ; unnecessary bankswitch?
 	ldh [rSVBK], a
 	pop af
-	vc_hook FPA_link_fight_End4
+	vc_hook Stop_reducing_battle_transition_flashing
 	ldh [hVBlank], a
 	call DelayFrame
 	ret
@@ -312,7 +312,7 @@
 	dc 0, 0, 0, 1
 
 StartTrainerBattle_SetUpForWavyOutro:
-	vc_hook FPA_link_fight_End0
+	vc_hook Stop_reducing_battle_transition_flashing_WavyOutro
 	farcall RespawnPlayerAndOpponent
 	ld a, BANK(wLYOverrides)
 	ldh [rSVBK], a
@@ -370,7 +370,7 @@
 	ret
 
 StartTrainerBattle_SetUpForSpinOutro:
-	vc_hook FPA_link_fight_End1
+	vc_hook Stop_reducing_battle_transition_flashing_SpinOutro
 	farcall RespawnPlayerAndOpponent
 	ld a, BANK(wLYOverrides)
 	ldh [rSVBK], a
@@ -513,7 +513,7 @@
 .wedge5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
 
 StartTrainerBattle_SetUpForRandomScatterOutro:
-	vc_hook FPA_link_fight_End2
+	vc_hook Stop_reducing_battle_transition_flashing_ScatterOutro
 	farcall RespawnPlayerAndOpponent
 	ld a, BANK(wLYOverrides)
 	ldh [rSVBK], a
@@ -768,7 +768,7 @@
 	calc_sine_wave
 
 StartTrainerBattle_ZoomToBlack:
-	vc_hook	FPA_link_fight_End3
+	vc_hook	Stop_reducing_battle_transition_flashing_ZoomToBlack
 	farcall RespawnPlayerAndOpponent
 	ld de, .boxes
 
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -8940,7 +8940,7 @@
 	predef PlaceGraphic
 	xor a
 	ldh [hWY], a
-	vc_hook fight_begin
+	vc_hook Unknown_InitBattleDisplay
 	ldh [rWY], a
 	call WaitBGMap
 	call HideSprites
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -58,6 +58,8 @@
 	farcall CheckBattleScene
 	jr c, .disabled
 
+; This vc_hook reduces the move animation flashing in the Virtual Console for
+; Fissure, Self-Destruct, Thunder, Flash, Explosion, Horn Drill, and Hyper Beam.
 	vc_hook Reduce_move_anim_flashing
 	call BattleAnimClearHud
 	call RunBattleAnimScript
@@ -675,7 +677,7 @@
 .loop
 	ld a, [wBattleAnimGFXTempTileID]
 	cp (vTiles1 - vTiles0) / LEN_2BPP_TILE - BATTLEANIM_BASE_TILE
-	vc_hook FPA_042801_Begin
+	vc_hook Reduce_move_anim_flashing_PRESENT
 	ret nc
 	call GetBattleAnimByte
 	ld [hli], a
--- a/engine/events/print_unown.asm
+++ b/engine/events/print_unown.asm
@@ -74,7 +74,7 @@
 	jr nz, .pressed_b
 
 	ldh a, [hJoyPressed]
-	vc_patch print_forbid_1
+	vc_patch Forbid_printing_Unown
 if DEF(_CRYSTAL11_VC)
 	and 0
 else
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -1033,7 +1033,7 @@
 .FinalPush:
 	ld hl, MltReq1Packet
 	call _PushSGBPals
-	vc_hook Network_RESET
+	vc_hook Unknown_network_reset ; Unknown why this hook is here, doesn't seem to be needed
 	jp SGBDelayCycles
 
 SGBBorder_PushBGPals:
--- a/engine/link/link.asm
+++ b/engine/link/link.asm
@@ -67,7 +67,7 @@
 .player_1
 	ld de, MUSIC_NONE
 	call PlayMusic
-	vc_patch NetworkDelay1
+	vc_patch Wireless_net_delay_5
 if DEF(_CRYSTAL11_VC)
 	ld c, 26
 else
@@ -83,7 +83,7 @@
 	ld hl, wLinkBattleRNPreamble
 	ld de, wEnemyMon
 	ld bc, SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH
-	vc_hook Network358
+	vc_hook Wireless_ExchangeBytes_1
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
@@ -91,7 +91,7 @@
 	ld hl, wLinkData
 	ld de, wOTPartyData
 	ld bc, SERIAL_PREAMBLE_LENGTH + NAME_LENGTH + 1 + PARTY_LENGTH + 1 + (REDMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH + 3
-	vc_hook Network359
+	vc_hook Wireless_ExchangeBytes_2
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
@@ -99,7 +99,7 @@
 	ld hl, wPlayerPatchLists
 	ld de, wOTPatchLists
 	ld bc, 200
-	vc_hook Network364
+	vc_hook Wireless_ExchangeBytes_3_Gen2toGen1Fix
 	call Serial_ExchangeBytes
 
 	xor a
@@ -233,7 +233,7 @@
 .player_1
 	ld de, MUSIC_NONE
 	call PlayMusic
-	vc_patch NetworkDelay4
+	vc_patch Wireless_net_delay_8
 if DEF(_CRYSTAL11_VC)
 	ld c, 26
 else
@@ -249,7 +249,7 @@
 	ld hl, wLinkBattleRNPreamble
 	ld de, wEnemyMon
 	ld bc, SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH
-	vc_hook Network360
+	vc_hook Wireless_ExchangeBytes_4
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
@@ -257,7 +257,7 @@
 	ld hl, wLinkData
 	ld de, wOTPartyData
 	ld bc, SERIAL_PREAMBLE_LENGTH + NAME_LENGTH + 1 + PARTY_LENGTH + 1 + 2 + (PARTYMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH + 3
-	vc_hook Network361
+	vc_hook Wireless_ExchangeBytes_5
 	call Serial_ExchangeBytes
 	ld a, SERIAL_NO_DATA_BYTE
 	ld [de], a
@@ -265,7 +265,7 @@
 	ld hl, wPlayerPatchLists
 	ld de, wOTPatchLists
 	ld bc, 200
-	vc_hook Network362
+	vc_hook Wireless_ExchangeBytes_6
 	call Serial_ExchangeBytes
 
 	ld a, [wLinkMode]
@@ -274,7 +274,7 @@
 	ld hl, wLinkPlayerMail
 	ld de, wLinkOTMail
 	ld bc, wLinkPlayerMailEnd - wLinkPlayerMail
-	vc_hook Network363
+	vc_hook Wireless_ExchangeBytes_7
 	call ExchangeBytes
 
 .not_trading
@@ -1627,7 +1627,7 @@
 	ldh [rSC], a
 	ld a, (1 << rSC_ON) | (1 << rSC_CLOCK)
 	ldh [rSC], a
-	vc_hook ret_heya
+	vc_hook ExitLinkCommunications_ret
 	ret
 
 GSPlaceTradeScreenFooter: ; unreferenced
@@ -2029,7 +2029,7 @@
 	ld de, String_TradeCompleted
 	call PlaceString
 	farcall Link_WaitBGMap
-	vc_hook save_game_end
+	vc_hook Trade_save_game_end
 	ld c, 50
 	call DelayFrames
 	ld a, [wLinkMode]
@@ -2182,7 +2182,7 @@
 	ret
 
 EnterTimeCapsule:
-	vc_patch NetworkDelay2
+	vc_patch Wireless_net_delay_6
 if DEF(_CRYSTAL11_VC)
 	ld c, 26
 else
@@ -2245,7 +2245,7 @@
 	ld [hl], a
 	ldh [hVBlank], a
 	ld [wLinkMode], a
-	vc_hook term_exit
+	vc_hook Wireless_term_exit
 	ret
 
 SetBitsForLinkTradeRequest:
@@ -2314,7 +2314,7 @@
 ; 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 == $ffcb, \
 		"hSerialConnectionStatus is no longer located at 00:ffcb."
 	vc_assert USING_INTERNAL_CLOCK == $02, \
@@ -2411,7 +2411,7 @@
 	ld a, $6
 	ld [wPlayerLinkAction], a
 	ld hl, wLinkTimeoutFrames
-	vc_patch NetworkDelay6
+	vc_patch Wireless_net_delay_9
 if DEF(_CRYSTAL11_VC)
 	ld a, $3
 else
@@ -2438,7 +2438,7 @@
 Link_CheckCommunicationError:
 	xor a
 	ldh [hSerialReceivedNewData], a
-	vc_hook linkCable_fake_end
+	vc_hook Wireless_prompt
 	ld a, [wLinkTimeoutFrames]
 	ld h, a
 	ld a, [wLinkTimeoutFrames + 1]
@@ -2469,7 +2469,7 @@
 .CheckConnected:
 	call WaitLinkTransfer
 	ld hl, wLinkTimeoutFrames
-	vc_hook Network_RECHECK
+	vc_hook Wireless_net_recheck
 	ld a, [hli]
 	inc a
 	ret nz
@@ -2478,7 +2478,7 @@
 	ret
 
 .AcknowledgeSerial:
-	vc_patch NetworkDelay3
+	vc_patch Wireless_net_delay_7
 if DEF(_CRYSTAL11_VC)
 	ld b, 26
 else
@@ -2511,10 +2511,10 @@
 	ld a, [wChosenCableClubRoom]
 	push af
 	farcall Link_SaveGame
-	vc_hook linkCable_block_input
+	vc_hook Wireless_TryQuickSave_block_input_1
 	ld a, TRUE
 	jr nc, .return_result
-	vc_hook linkCable_block_input2
+	vc_hook Wireless_TryQuickSave_block_input_2
 	xor a ; FALSE
 .return_result
 	ld [wScriptVar], a
@@ -2551,7 +2551,7 @@
 	ret
 
 TimeCapsule:
-	vc_hook to_play2_mons1
+	vc_hook Wireless_TimeCapsule
 	ld a, LINK_TIMECAPSULE
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2562,7 +2562,7 @@
 	ret
 
 TradeCenter:
-	vc_hook to_play2_trade
+	vc_hook Wireless_TradeCenter
 	ld a, LINK_TRADECENTER
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2573,7 +2573,7 @@
 	ret
 
 Colosseum:
-	vc_hook to_play2_battle
+	vc_hook Wireless_Colosseum
 	ld a, LINK_COLOSSEUM
 	ld [wLinkMode], a
 	call DisableSpriteUpdates
@@ -2588,7 +2588,7 @@
 	ld [wLinkMode], a
 	ld c, 3
 	call DelayFrames
-	vc_hook room_check
+	vc_hook Wireless_room_check
 	jp Link_ResetSerialRegistersAfterLinkClosure
 
 FailedLinkToPast:
--- a/engine/link/mystery_gift.asm
+++ b/engine/link/mystery_gift.asm
@@ -37,7 +37,7 @@
 	; Prepare the first of two messages for wMysteryGiftPartnerData
 	farcall StageDataForMysteryGift
 	call ClearMysteryGiftTrainer
-	vc_patch infrared_fake_0
+	vc_patch Infrared_stage_party_data
 if DEF(_CRYSTAL11_VC)
 	farcall StagePartyDataForMysteryGift
 	call ClearMysteryGiftTrainer
@@ -53,7 +53,7 @@
 	ldh a, [rIE]
 	push af
 	call ExchangeMysteryGiftData
-	vc_hook infrared_fake_4
+	vc_hook Infrared_ExchangeMysteryGiftData_end
 	ld d, a
 	xor a
 	ldh [rIF], a
@@ -269,8 +269,8 @@
 	jp CloseSRAM
 
 ExchangeMysteryGiftData:
-	vc_hook infrared_fake_2
-	vc_patch infrared_fake_1
+	vc_hook Infrared_ExchangeMysteryGiftData_start
+	vc_patch Infrared_ExchangeMysteryGiftData_function
 if DEF(_CRYSTAL11_VC)
 	ld d, $ef
 .loop
@@ -278,7 +278,7 @@
 	ld a, d
 	or a
 	jr nz, .loop
-	vc_hook infrared_fake_3
+	vc_hook Infrared_ExchangeMysteryGiftData_loop_done
 	nop
 	cp MG_CANCELED
 .restart ; same location as unpatched .restart
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -362,9 +362,9 @@
 	call GetMenuJoypad
 	and a
 	ret z
-	vc_hook print_forbid_3
+	vc_hook Forbid_printing_photo_studio
 	scf
-	vc_hook print_forbid_2
+	vc_hook Forbid_printing_PC_Box
 	ret
 
 _2DMenuInterpretJoypad:
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -389,7 +389,7 @@
 	ld a, TRUE
 .no
 	ld [wScriptVar], a
-	vc_hook E_YESNO
+	vc_hook Unknown_yesorno_ret
 	ret
 
 Script_loadmenu:
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -356,7 +356,7 @@
 	ld a, [hl]
 	and B_BUTTON
 	jr nz, .return_to_prev_screen
-	vc_hook print_forbid_5
+	vc_hook Forbid_printing_Pokedex
 	ld a, [hl]
 	and A_BUTTON
 	jr nz, .do_menu_action
--- a/engine/pokemon/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
@@ -67,7 +67,7 @@
 	ldh a, [hJoyPressed]
 	and A_BUTTON | B_BUTTON | START
 	jr z, .loop
-	vc_patch print_forbid_4
+	vc_patch Forbid_printing_mail
 if DEF(_CRYSTAL11_VC)
 	and 0
 else
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -290,7 +290,7 @@
 	jp WaitLinkTransfer ; pointless
 
 WaitLinkTransfer::
-	vc_hook send_send_buf2
+	vc_hook Wireless_WaitLinkTransfer
 	ld a, $ff
 	ld [wOtherPlayerLinkAction], a
 .loop
@@ -318,7 +318,7 @@
 	inc a
 	jr z, .loop
 
-	vc_patch Network10
+	vc_patch Wireless_net_delay_1
 if DEF(_CRYSTAL11_VC)
 	ld b, 26
 else
@@ -331,7 +331,7 @@
 	dec b
 	jr nz, .receive
 
-	vc_patch Network11
+	vc_patch Wireless_net_delay_2
 if DEF(_CRYSTAL11_VC)
 	ld b, 26
 else
@@ -346,7 +346,7 @@
 
 	ld a, [wOtherPlayerLinkAction]
 	ld [wOtherPlayerLinkMode], a
-	vc_hook send_send_buf2_ret
+	vc_hook Wireless_WaitLinkTransfer_ret
 	ret
 
 LinkTransfer::
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -1530,7 +1530,7 @@
 _LinkBattleSendReceiveAction:
 	call .StageForSend
 	ld [wLinkBattleSentAction], a
-	vc_hook send_byt2
+	vc_hook Wireless_start_exchange
 	farcall PlaceWaitingText
 	ld a, [wLinkMode]
 	cp LINK_MOBILE
@@ -1585,8 +1585,8 @@
 	inc a
 	jr z, .waiting
 
-	vc_hook send_byt2_ret
-	vc_patch send_byt2_wait
+	vc_hook Wireless_end_exchange
+	vc_patch Wireless_net_delay_3
 if DEF(_CRYSTAL11_VC)
 	ld b, 26
 else
@@ -1599,8 +1599,8 @@
 	dec b
 	jr nz, .receive
 
-	vc_hook send_dummy
-	vc_patch send_dummy_wait
+	vc_hook Wireless_start_send_zero_bytes
+	vc_patch Wireless_net_delay_4
 if DEF(_CRYSTAL11_VC)
 	ld b, 26
 else
@@ -1613,7 +1613,7 @@
 	dec b
 	jr nz, .acknowledge
 
-	vc_hook send_dummy_end
+	vc_hook Wireless_end_send_zero_bytes
 	ld a, [wOtherPlayerLinkAction]
 	ld [wBattleAction], a
 	ret
--- a/vc/pokecrystal11.patch.template
+++ b/vc/pokecrystal11.patch.template
@@ -26,118 +26,118 @@
 ;MotionBlur1 = 31	;0~31 (for Green Mode)
 ;PaletteX = c31,31,31	;X:0~15, cR,G,B (0~31)
 
-[Network10]
+[Network10@Wireless_net_delay_1]
 Mode = 1
 Address = {HEX @+1 4}
 Fixcode = {PATCH +1}
 
-[Network11]
+[Network11@Wireless_net_delay_2]
 Mode = 1
 Address = {HEX @+1 4}
 Fixcode = {PATCH +1}
 
-[send_send_buf2]
+[send_send_buf2@Wireless_WaitLinkTransfer]
 Mode = 2
 Address = {HEX @ 4}
 Type = 29
 
-[send_send_buf2_ret]
+[send_send_buf2_ret@Wireless_WaitLinkTransfer_ret]
 Mode = 2
 Address = {HEX @ 4}
 Type = 30
 
-[Network358]
+[Network358@Wireless_ExchangeBytes_1]
 Mode = 2
 Address = {HEX @}
 Type = 4
 
-[Network359]
+[Network359@Wireless_ExchangeBytes_2]
 Mode = 2
 Address = {HEX @}
 Type = 4
 
-[Network364]
+[Network364@Wireless_ExchangeBytes_3_Gen2toGen1Fix]
 Mode = 2
 Address = {HEX @}
 ;fix pokemon ?? in name
 Type = 26
 
-[Network360]
+[Network360@Wireless_ExchangeBytes_4]
 Mode = 2
 Address = {HEX @}
 Type = 4
 
-[Network361]
+[Network361@Wireless_ExchangeBytes_5]
 Mode = 2
 Address = {HEX @}
 Type = 4
 
-[Network362]
+[Network362@Wireless_ExchangeBytes_6]
 Mode = 2
 Address = {HEX @}
 Type = 4
 
-[Network363]
+[Network363@Wireless_ExchangeBytes_7]
 Mode = 2
 Address = {HEX @}
 Type = 4
 
-[Network_RECHECK]
+[Network_RECHECK@Wireless_net_recheck]
 Mode = 2
 Address = {HEX @}
 Type = 7
 
-[send_byt2]
+[send_byt2@Wireless_start_exchange]
 Mode = 2
 Address = {HEX @+5}
 Type = 31
 
-[send_byt2_ret]
+[send_byt2_ret@Wireless_end_exchange]
 Mode = 2
 Address = {HEX @}
 Type = 32
 
-[send_byt2_wait]
+[send_byt2_wait@Wireless_net_delay_3]
 Mode = 1
 Address = {HEX @+1}
 Fixcode = {PATCH +1}
 
-[send_dummy]
+[send_dummy@Wireless_start_send_zero_bytes]
 Mode = 2
 Address = {HEX @}
 Type = 33
 
-[send_dummy_wait]
+[send_dummy_wait@Wireless_net_delay_4]
 Mode = 1
 Address = {HEX @+1}
 Fixcode = {PATCH +1} 
 
-[send_dummy_end]
+[send_dummy_end@Wireless_end_send_zero_bytes]
 Mode = 2
 Address = {HEX @}
 Type = 34
 
-[NetworkDelay1]
+[NetworkDelay1@Wireless_net_delay_5]
 Mode = 1
 Address = {HEX @+1}
 Fixcode = {PATCH +1}
 
-[NetworkDelay2]
+[NetworkDelay2@Wireless_net_delay_6]
 Mode = 1
 Address = {HEX @+1}
 Fixcode = {PATCH +1}
 
-[NetworkDelay3]
+[NetworkDelay3@Wireless_net_delay_7]
 Mode = 1
 Address = {HEX @+1}
 Fixcode = {PATCH +1}
 
-[NetworkDelay4]
+[NetworkDelay4@Wireless_net_delay_8]
 Mode = 1
 Address = {HEX @+1}
 Fixcode = {PATCH +1}
 
-[NetworkDelay6]
+[NetworkDelay6@Wireless_net_delay_9]
 Mode = 1
 Address = {HEX @+1}
 Fixcode = {PATCH +1}
@@ -152,60 +152,60 @@
 ;Address = 0xF4D3C
 ;Type = 9
 
-[Network_RESET]
+[Network_RESET@Unknown_network_reset]
 Mode = 2
 Address = {HEX @ 5}
 Type = 10
 
-[E_YESNO]
+[E_YESNO@Unknown_yesorno_ret]
 Mode = 2
 Address = {HEX @}
 Type = 15
 
-[linkCable fake begin]
+[linkCable fake begin@Link_fake_connection_status]
 Mode = 2
 Address = {HEX @}
 Type = 16
 
-[linkCable fake end]
+[linkCable fake end@Wireless_prompt]
 Mode = 2
 Address = {HEX @}
 Type = 17  
 
 ;MURIYARI
-[linkCable block input]
+[linkCable block input@Wireless_TryQuickSave_block_input_1]
 Mode = 2
 Address = {HEX @}
 Type = 18
-[linkCable block input2]
+[linkCable block input2@Wireless_TryQuickSave_block_input_2]
 Mode = 2
 Address = {HEX @}
 Type = 24
-[save game end]
+[save game end@Trade_save_game_end]
 Mode = 2
 Address = {HEX @}
 Type = 20
-[term_exit]
+[term_exit@Wireless_term_exit]
 Mode = 2
 Address = {HEX @}
 Type = 25
-[room_check]
+[room_check@Wireless_room_check]
 Mode = 2
 Address = {HEX @}
 Type = 27
-[to_play2_mons1]
+[to_play2_mons1@Wireless_TimeCapsule]
 Mode = 2
 Address = {HEX @}
 Type = 11
-[to_play2_trade]
+[to_play2_trade@Wireless_TradeCenter]
 Mode = 2
 Address = {HEX @}
 Type = 12
-[to_play2_battle]
+[to_play2_battle@Wireless_Colosseum]
 Mode = 2
 Address = {HEX @}
 Type = 13
-[ret_heya]
+[ret_heya@ExitLinkCommunications_ret]
 Mode = 2
 Address = {HEX @}
 Type = 14
@@ -227,7 +227,7 @@
 
 ;0003fbb5h: 06 3E 13 CD                                     ; .>.?
 
-[fight begin]                        
+[fight begin@Unknown_InitBattleDisplay]                        
 Mode = 11                       
 Type = 0                        
 Index = 1                       
@@ -252,7 +252,7 @@
 ; change "and 1" to "and 0"
 ;00017595h: E6 01 20 08 CD BF 75 CD 2E 03 18 E9 FA 57 CE F5 ; ? .涂u?..辁W熙
 ;00016c76h: E6 01 20 08 CD A0 6C CD 5A 04 18 E9 FA 63 CF F5 ; ? .蜖l蚙..辁c硝
-[print forbid 1]                                                   
+[print forbid 1@Forbid_printing_Unown]                                                   
 Mode = 1                                                                                                                  
 Address = {hex @}
 Fixcode={patch}      
@@ -259,7 +259,7 @@
 
 
                             
-[print forbid 2]                                                                           
+[print forbid 2@Forbid_printing_PC_Box]                                                                           
 Mode = 6                                                                                       
 Type = 0                                                                                       
 Address = {hex @}                                                                        
@@ -274,7 +274,7 @@
 ; 0xd9c7 is the room number.
 
 
-[print forbid 3]                                                          
+[print forbid 3@Forbid_printing_photo_studio]                                                          
 Mode = 6                                                                      
 Type = 0                                                                      
 Address = {hex @}                                                           
@@ -296,7 +296,7 @@
 ; 000bb2a5h: E6 08 20 01       
 ; 000b92a3h: E6 08 20 01                                     ; ? .                           
 ; change "and 8" to "and 0"                                                      
-[print forbid 4]                                                  
+[print forbid 4@Forbid_printing_mail]                                                  
 Mode = 1                                                          
 Address = {hex @}                                          
 Fixcode={patch}            
@@ -317,7 +317,7 @@
 ; -----6666666666ddddddddd88888----0xc6d8 no ..............Mem Write: pc32 = 0x4109b addr = 0xc6d8 value = 0x0
 
 ;00040266h: 7E E6 01 20 08                                  ; ~? .                                 
-[print forbid 5]                                                                                           
+[print forbid 5@Forbid_printing_Pokedex]                                                                                           
 Mode = 6                                                                                          
 Type = 0                                                                                          
 Address = {hex @}                                                                            
@@ -356,7 +356,7 @@
                                                                                                                                                                           
 ;001048dbh: 3E 02 EA 01 CA 3E 14 EA 02 CA F0 FF F5 CD 94 4A        
 ;001048dbh: 3E 02 EA 01 CA 3E 14 EA 02 CA F0 FF F5 CD 9D 4A                           
-[infrared fake 0]                                                                                                           
+[infrared fake 0@Infrared_stage_party_data]                                                                                                           
 Mode = 1                                                                                                                    
 Address = {hex @}                                                                                  
 Fixcode={PATCH}                                                                                   
@@ -366,22 +366,22 @@
 ;00104a95h: F3 3E 3A 21 E9 4F CF CD 5E 4D CD 96 4D CD DD 4D ; ?:!镺贤^M蜄M洼M
 ;00104a9ch: CD 5E 4D CD 96 4D CD DD 4D F0 BC FE 10          ; 蚟M蜄M洼M鸺?                                                                
                                                                                                                      
-[infrared fake 1]                                                                                                    
+[infrared fake 1@Infrared_ExchangeMysteryGiftData_function]                                                                                                    
 Mode = 1                                                                                                             
 Address = {hex @}                                                                                              
 Fixcode={patch}                                           
                                                                                                                      
-[infrared fake 2]                                                                                                    
+[infrared fake 2@Infrared_ExchangeMysteryGiftData_start]                                                                                                    
 Mode = 2                                                                                                             
 Address = {hex @}                                                                            
 Type = 101                                                                                                           
                                                                                                                                                                                           
-[infrared fake 3]                    
+[infrared fake 3@Infrared_ExchangeMysteryGiftData_loop_done]                    
 Mode = 2                             
 Address = {hex @}                 
 Type = 102                           
                                      
-[infrared fake 4]                    
+[infrared fake 4@Infrared_ExchangeMysteryGiftData_end]                    
 Mode = 2                             
 Address = {hex @}           
 Type = 103                           
@@ -584,7 +584,7 @@
 ;000cc497h: FE 4F D0 CD                                     ; 﨩型
 ; -------------0xd4170xd4170xd4170xd417---------------   Mem Write: pc32 = 0x3a89 addr = 0xd417 value = 0xd1
 ;000cc486h: FE 4F D0 CD 7D 3A 22 FA 19 D4 22 C5 E5 6F 26 00 ; 﨩型}:"??佩o&.                                                                                                                                                    
-[FPA 042801 Begin]                                                                                                                               
+[FPA 042801 Begin@Reduce_move_anim_flashing_PRESENT]                                                                                                                               
 Mode = 3                                                                                                                                         
 Type = 0                                                                                                                                         
 Address = {HEX @}                                                                                                                       
@@ -628,7 +628,7 @@
 ;-----ddddff0xff690xff69fffff----0xce57 no ....----5555555577777---------..........Mem Write: pc32 = 0x8c483 addr = 0xce57 value = 0x1a
 ;0008c352h: 36 01 FA 57 CE CB 7F 20 08                      ; 6.鶺嗡 .
 ;0008c229h: 36 01 FA 57 CF CB 7F 20 08 CD 14 43 CD 5A 04 18 ; 6.鶺纤 .?C蚙..   
-[FPA link fight begin]
+[FPA link fight begin@Reduce_battle_transition_flashing]
 Mode = 3                                                          
 Type = 0                                                          
 Address = {hex @} 
@@ -645,7 +645,7 @@
 
 ;40 90 e4 01 3E at 3E     
 ;0008c3e4h: 40 90 E4 01 3E     at 3E                                ; @愪.>
-[FPA link fight End0]                                                     
+[FPA link fight End0@Stop_reducing_battle_transition_flashing_WavyOutro]                                                     
 Mode = 3                                                          
 Type = 1                                                          
 Address = {HEx @}
@@ -652,7 +652,7 @@
 
 ;3D 20 EF C9 3E 01 at 3E      
 ; 0008c439h: 3D 20 EF C9 3E       at 3e                           ; = 锷>
-[FPA link fight End1]                                                     
+[FPA link fight End1@Stop_reducing_battle_transition_flashing_SpinOutro]                                                     
 Mode = 3                                                          
 Type = 1                                                          
 Address = {HEx @}
@@ -659,7 +659,7 @@
 
 ;01 FF 3E 01 at 3E
 ;0008c576h: 01 FF 3E 01                                     ; .>.
-[FPA link fight End2]                                                     
+[FPA link fight End2@Stop_reducing_battle_transition_flashing_ScatterOutro]                                                     
 Mode = 3                                                          
 Type = 1                                                          
 Address = {HEx @}
@@ -666,7 +666,7 @@
 
 ;32 00 19 00 3e 01 at 3e
 ;0008c764h: 32 00 19 00 3E 01                               ; 2...>.
-[FPA link fight End3]                                                     
+[FPA link fight End3@Stop_reducing_battle_transition_flashing_ZoomToBlack]                                                     
 Mode = 3                                                          
 Type = 1                                                          
 Address = {HEx @}
@@ -692,7 +692,7 @@
 ;0008c298h: AF 22 22 77 CD                                  ; ?"w? 
 
 
-[FPA link fight End4]                                                     
+[FPA link fight End4@Stop_reducing_battle_transition_flashing]                                                     
 Mode = 3                                                          
 Type = 1                                                          
 Address = {hex @}                       
\ No newline at end of file