pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Improved Virtual Console patch identifiers (#907)

Browse Source
This commit is contained in:
vulcandth 2022-06-06 16:22:48 -05:00 committed by GitHub
parent c3bf7fd0bd
commit a4d346cc8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 110 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/battle/battle_transition.asm
View File

@ -21,7 +21,7 @@ DoBattleTransition:
ld hl, hVBlank ld hl, hVBlank
ld a, [hl] ld a, [hl]
push af push af
vc_hook FPA_link_fight_begin vc_hook Reduce_battle_transition_flashing
ld [hl], $1 ld [hl], $1
.loop .loop
@ -59,7 +59,7 @@ DoBattleTransition:
ld a, $1 ; unnecessary bankswitch? ld a, $1 ; unnecessary bankswitch?
ldh [rSVBK], a ldh [rSVBK], a
pop af pop af
vc_hook FPA_link_fight_End4 vc_hook Stop_reducing_battle_transition_flashing
ldh [hVBlank], a ldh [hVBlank], a
call DelayFrame call DelayFrame
ret ret
@ -312,7 +312,7 @@ StartTrainerBattle_Flash:
dc 0, 0, 0, 1 dc 0, 0, 0, 1
StartTrainerBattle_SetUpForWavyOutro: StartTrainerBattle_SetUpForWavyOutro:
vc_hook FPA_link_fight_End0 vc_hook Stop_reducing_battle_transition_flashing_WavyOutro
farcall RespawnPlayerAndOpponent farcall RespawnPlayerAndOpponent
ld a, BANK(wLYOverrides) ld a, BANK(wLYOverrides)
ldh [rSVBK], a ldh [rSVBK], a
@ -370,7 +370,7 @@ StartTrainerBattle_SineWave:
ret ret
StartTrainerBattle_SetUpForSpinOutro: StartTrainerBattle_SetUpForSpinOutro:
vc_hook FPA_link_fight_End1 vc_hook Stop_reducing_battle_transition_flashing_SpinOutro
farcall RespawnPlayerAndOpponent farcall RespawnPlayerAndOpponent
ld a, BANK(wLYOverrides) ld a, BANK(wLYOverrides)
ldh [rSVBK], a ldh [rSVBK], a
@ -513,7 +513,7 @@ ENDM
.wedge5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1 .wedge5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
StartTrainerBattle_SetUpForRandomScatterOutro: StartTrainerBattle_SetUpForRandomScatterOutro:
vc_hook FPA_link_fight_End2 vc_hook Stop_reducing_battle_transition_flashing_ScatterOutro
farcall RespawnPlayerAndOpponent farcall RespawnPlayerAndOpponent
ld a, BANK(wLYOverrides) ld a, BANK(wLYOverrides)
ldh [rSVBK], a ldh [rSVBK], a
@ -768,7 +768,7 @@ StartTrainerBattle_DrawSineWave:
calc_sine_wave calc_sine_wave
StartTrainerBattle_ZoomToBlack: StartTrainerBattle_ZoomToBlack:
vc_hook FPA_link_fight_End3 vc_hook Stop_reducing_battle_transition_flashing_ZoomToBlack
farcall RespawnPlayerAndOpponent farcall RespawnPlayerAndOpponent
ld de, .boxes ld de, .boxes

2
engine/battle/core.asm
View File

@ -8940,7 +8940,7 @@ InitBattleDisplay:
predef PlaceGraphic predef PlaceGraphic
xor a xor a
ldh [hWY], a ldh [hWY], a
vc_hook fight_begin vc_hook Unknown_InitBattleDisplay
ldh [rWY], a ldh [rWY], a
call WaitBGMap call WaitBGMap
call HideSprites call HideSprites

4
engine/battle_anims/anim_commands.asm
View File

@ -58,6 +58,8 @@ BattleAnimRunScript:
farcall CheckBattleScene farcall CheckBattleScene
jr c, .disabled 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 vc_hook Reduce_move_anim_flashing
call BattleAnimClearHud call BattleAnimClearHud
call RunBattleAnimScript call RunBattleAnimScript
@ -675,7 +677,7 @@ BattleAnimCmd_5GFX:
.loop .loop
ld a, [wBattleAnimGFXTempTileID] ld a, [wBattleAnimGFXTempTileID]
cp (vTiles1 - vTiles0) / LEN_2BPP_TILE - BATTLEANIM_BASE_TILE cp (vTiles1 - vTiles0) / LEN_2BPP_TILE - BATTLEANIM_BASE_TILE
vc_hook FPA_042801_Begin vc_hook Reduce_move_anim_flashing_PRESENT
ret nc ret nc
call GetBattleAnimByte call GetBattleAnimByte
ld [hli], a ld [hli], a

2
engine/events/print_unown.asm
View File

@ -74,7 +74,7 @@ _UnownPrinter:
jr nz, .pressed_b jr nz, .pressed_b
ldh a, [hJoyPressed] ldh a, [hJoyPressed]
vc_patch print_forbid_1 vc_patch Forbid_printing_Unown
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
and 0 and 0
else else

2
engine/gfx/color.asm
View File

@ -1033,7 +1033,7 @@ endr
.FinalPush: .FinalPush:
ld hl, MltReq1Packet ld hl, MltReq1Packet
call _PushSGBPals 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 jp SGBDelayCycles
SGBBorder_PushBGPals: SGBBorder_PushBGPals:

48
engine/link/link.asm
View File

@ -67,7 +67,7 @@ Gen2ToGen1LinkComms:
.player_1 .player_1
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
vc_patch NetworkDelay1 vc_patch Wireless_net_delay_5
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld c, 26 ld c, 26
else else
@ -83,7 +83,7 @@ endc
ld hl, wLinkBattleRNPreamble ld hl, wLinkBattleRNPreamble
ld de, wEnemyMon ld de, wEnemyMon
ld bc, SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH ld bc, SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH
vc_hook Network358 vc_hook Wireless_ExchangeBytes_1
call Serial_ExchangeBytes call Serial_ExchangeBytes
ld a, SERIAL_NO_DATA_BYTE ld a, SERIAL_NO_DATA_BYTE
ld [de], a ld [de], a
@ -91,7 +91,7 @@ endc
ld hl, wLinkData ld hl, wLinkData
ld de, wOTPartyData ld de, wOTPartyData
ld bc, SERIAL_PREAMBLE_LENGTH + NAME_LENGTH + 1 + PARTY_LENGTH + 1 + (REDMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH + 3 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 call Serial_ExchangeBytes
ld a, SERIAL_NO_DATA_BYTE ld a, SERIAL_NO_DATA_BYTE
ld [de], a ld [de], a
@ -99,7 +99,7 @@ endc
ld hl, wPlayerPatchLists ld hl, wPlayerPatchLists
ld de, wOTPatchLists ld de, wOTPatchLists
ld bc, 200 ld bc, 200
vc_hook Network364 vc_hook Wireless_ExchangeBytes_3_Gen2toGen1Fix
call Serial_ExchangeBytes call Serial_ExchangeBytes
xor a xor a
@ -233,7 +233,7 @@ Gen2ToGen2LinkComms:
.player_1 .player_1
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
vc_patch NetworkDelay4 vc_patch Wireless_net_delay_8
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld c, 26 ld c, 26
else else
@ -249,7 +249,7 @@ endc
ld hl, wLinkBattleRNPreamble ld hl, wLinkBattleRNPreamble
ld de, wEnemyMon ld de, wEnemyMon
ld bc, SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH ld bc, SERIAL_RN_PREAMBLE_LENGTH + SERIAL_RNS_LENGTH
vc_hook Network360 vc_hook Wireless_ExchangeBytes_4
call Serial_ExchangeBytes call Serial_ExchangeBytes
ld a, SERIAL_NO_DATA_BYTE ld a, SERIAL_NO_DATA_BYTE
ld [de], a ld [de], a
@ -257,7 +257,7 @@ endc
ld hl, wLinkData ld hl, wLinkData
ld de, wOTPartyData ld de, wOTPartyData
ld bc, SERIAL_PREAMBLE_LENGTH + NAME_LENGTH + 1 + PARTY_LENGTH + 1 + 2 + (PARTYMON_STRUCT_LENGTH + NAME_LENGTH * 2) * PARTY_LENGTH + 3 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 call Serial_ExchangeBytes
ld a, SERIAL_NO_DATA_BYTE ld a, SERIAL_NO_DATA_BYTE
ld [de], a ld [de], a
@ -265,7 +265,7 @@ endc
ld hl, wPlayerPatchLists ld hl, wPlayerPatchLists
ld de, wOTPatchLists ld de, wOTPatchLists
ld bc, 200 ld bc, 200
vc_hook Network362 vc_hook Wireless_ExchangeBytes_6
call Serial_ExchangeBytes call Serial_ExchangeBytes
ld a, [wLinkMode] ld a, [wLinkMode]
@ -274,7 +274,7 @@ endc
ld hl, wLinkPlayerMail ld hl, wLinkPlayerMail
ld de, wLinkOTMail ld de, wLinkOTMail
ld bc, wLinkPlayerMailEnd - wLinkPlayerMail ld bc, wLinkPlayerMailEnd - wLinkPlayerMail
vc_hook Network363 vc_hook Wireless_ExchangeBytes_7
call ExchangeBytes call ExchangeBytes
.not_trading .not_trading
@ -1627,7 +1627,7 @@ ExitLinkCommunications:
ldh [rSC], a ldh [rSC], a
ld a, (1 << rSC_ON) | (1 << rSC_CLOCK) ld a, (1 << rSC_ON) | (1 << rSC_CLOCK)
ldh [rSC], a ldh [rSC], a
vc_hook ret_heya vc_hook ExitLinkCommunications_ret
ret ret
GSPlaceTradeScreenFooter: ; unreferenced GSPlaceTradeScreenFooter: ; unreferenced
@ -2029,7 +2029,7 @@ LinkTrade:
ld de, String_TradeCompleted ld de, String_TradeCompleted
call PlaceString call PlaceString
farcall Link_WaitBGMap farcall Link_WaitBGMap
vc_hook save_game_end vc_hook Trade_save_game_end
ld c, 50 ld c, 50
call DelayFrames call DelayFrames
ld a, [wLinkMode] ld a, [wLinkMode]
@ -2182,7 +2182,7 @@ GetIncompatibleMonName:
ret ret
EnterTimeCapsule: EnterTimeCapsule:
vc_patch NetworkDelay2 vc_patch Wireless_net_delay_6
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld c, 26 ld c, 26
else else
@ -2245,7 +2245,7 @@ WaitForOtherPlayerToExit:
ld [hl], a ld [hl], a
ldh [hVBlank], a ldh [hVBlank], a
ld [wLinkMode], a ld [wLinkMode], a
vc_hook term_exit vc_hook Wireless_term_exit
ret ret
SetBitsForLinkTradeRequest: SetBitsForLinkTradeRequest:
@ -2314,7 +2314,7 @@ WaitForLinkedFriend:
; USING_INTERNAL_CLOCK, which allows the player to proceed past the link ; USING_INTERNAL_CLOCK, which allows the player to proceed past the link
; receptionist's "Please wait." It assumes that hSerialConnectionStatus is at ; receptionist's "Please wait." It assumes that hSerialConnectionStatus is at
; its original address. ; its original address.
vc_hook linkCable_fake_begin vc_hook Link_fake_connection_status
vc_assert hSerialConnectionStatus == $ffcb, \ vc_assert hSerialConnectionStatus == $ffcb, \
"hSerialConnectionStatus is no longer located at 00:ffcb." "hSerialConnectionStatus is no longer located at 00:ffcb."
vc_assert USING_INTERNAL_CLOCK == $02, \ vc_assert USING_INTERNAL_CLOCK == $02, \
@ -2411,7 +2411,7 @@ CheckLinkTimeout_Gen2:
ld a, $6 ld a, $6
ld [wPlayerLinkAction], a ld [wPlayerLinkAction], a
ld hl, wLinkTimeoutFrames ld hl, wLinkTimeoutFrames
vc_patch NetworkDelay6 vc_patch Wireless_net_delay_9
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld a, $3 ld a, $3
else else
@ -2438,7 +2438,7 @@ endc
Link_CheckCommunicationError: Link_CheckCommunicationError:
xor a xor a
ldh [hSerialReceivedNewData], a ldh [hSerialReceivedNewData], a
vc_hook linkCable_fake_end vc_hook Wireless_prompt
ld a, [wLinkTimeoutFrames] ld a, [wLinkTimeoutFrames]
ld h, a ld h, a
ld a, [wLinkTimeoutFrames + 1] ld a, [wLinkTimeoutFrames + 1]
@ -2469,7 +2469,7 @@ Link_CheckCommunicationError:
.CheckConnected: .CheckConnected:
call WaitLinkTransfer call WaitLinkTransfer
ld hl, wLinkTimeoutFrames ld hl, wLinkTimeoutFrames
vc_hook Network_RECHECK vc_hook Wireless_net_recheck
ld a, [hli] ld a, [hli]
inc a inc a
ret nz ret nz
@ -2478,7 +2478,7 @@ Link_CheckCommunicationError:
ret ret
.AcknowledgeSerial: .AcknowledgeSerial:
vc_patch NetworkDelay3 vc_patch Wireless_net_delay_7
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld b, 26 ld b, 26
else else
@ -2511,10 +2511,10 @@ TryQuickSave:
ld a, [wChosenCableClubRoom] ld a, [wChosenCableClubRoom]
push af push af
farcall Link_SaveGame farcall Link_SaveGame
vc_hook linkCable_block_input vc_hook Wireless_TryQuickSave_block_input_1
ld a, TRUE ld a, TRUE
jr nc, .return_result jr nc, .return_result
vc_hook linkCable_block_input2 vc_hook Wireless_TryQuickSave_block_input_2
xor a ; FALSE xor a ; FALSE
.return_result .return_result
ld [wScriptVar], a ld [wScriptVar], a
@ -2551,7 +2551,7 @@ CheckBothSelectedSameRoom:
ret ret
TimeCapsule: TimeCapsule:
vc_hook to_play2_mons1 vc_hook Wireless_TimeCapsule
ld a, LINK_TIMECAPSULE ld a, LINK_TIMECAPSULE
ld [wLinkMode], a ld [wLinkMode], a
call DisableSpriteUpdates call DisableSpriteUpdates
@ -2562,7 +2562,7 @@ TimeCapsule:
ret ret
TradeCenter: TradeCenter:
vc_hook to_play2_trade vc_hook Wireless_TradeCenter
ld a, LINK_TRADECENTER ld a, LINK_TRADECENTER
ld [wLinkMode], a ld [wLinkMode], a
call DisableSpriteUpdates call DisableSpriteUpdates
@ -2573,7 +2573,7 @@ TradeCenter:
ret ret
Colosseum: Colosseum:
vc_hook to_play2_battle vc_hook Wireless_Colosseum
ld a, LINK_COLOSSEUM ld a, LINK_COLOSSEUM
ld [wLinkMode], a ld [wLinkMode], a
call DisableSpriteUpdates call DisableSpriteUpdates
@ -2588,7 +2588,7 @@ CloseLink:
ld [wLinkMode], a ld [wLinkMode], a
ld c, 3 ld c, 3
call DelayFrames call DelayFrames
vc_hook room_check vc_hook Wireless_room_check
jp Link_ResetSerialRegistersAfterLinkClosure jp Link_ResetSerialRegistersAfterLinkClosure
FailedLinkToPast: FailedLinkToPast:

10
engine/link/mystery_gift.asm
View File

@ -37,7 +37,7 @@ DoMysteryGift:
; Prepare the first of two messages for wMysteryGiftPartnerData ; Prepare the first of two messages for wMysteryGiftPartnerData
farcall StageDataForMysteryGift farcall StageDataForMysteryGift
call ClearMysteryGiftTrainer call ClearMysteryGiftTrainer
vc_patch infrared_fake_0 vc_patch Infrared_stage_party_data
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
farcall StagePartyDataForMysteryGift farcall StagePartyDataForMysteryGift
call ClearMysteryGiftTrainer call ClearMysteryGiftTrainer
@ -53,7 +53,7 @@ endc
ldh a, [rIE] ldh a, [rIE]
push af push af
call ExchangeMysteryGiftData call ExchangeMysteryGiftData
vc_hook infrared_fake_4 vc_hook Infrared_ExchangeMysteryGiftData_end
ld d, a ld d, a
xor a xor a
ldh [rIF], a ldh [rIF], a
@ -269,8 +269,8 @@ endc
jp CloseSRAM jp CloseSRAM
ExchangeMysteryGiftData: ExchangeMysteryGiftData:
vc_hook infrared_fake_2 vc_hook Infrared_ExchangeMysteryGiftData_start
vc_patch infrared_fake_1 vc_patch Infrared_ExchangeMysteryGiftData_function
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld d, $ef ld d, $ef
.loop .loop
@ -278,7 +278,7 @@ if DEF(_CRYSTAL11_VC)
ld a, d ld a, d
or a or a
jr nz, .loop jr nz, .loop
vc_hook infrared_fake_3 vc_hook Infrared_ExchangeMysteryGiftData_loop_done
nop nop
cp MG_CANCELED cp MG_CANCELED
.restart ; same location as unpatched .restart .restart ; same location as unpatched .restart

4
engine/menus/menu.asm
View File

@ -362,9 +362,9 @@ Menu_WasButtonPressed:
call GetMenuJoypad call GetMenuJoypad
and a and a
ret z ret z
vc_hook print_forbid_3 vc_hook Forbid_printing_photo_studio
scf scf
vc_hook print_forbid_2 vc_hook Forbid_printing_PC_Box
ret ret
_2DMenuInterpretJoypad: _2DMenuInterpretJoypad:

2
engine/overworld/scripting.asm
View File

@ -389,7 +389,7 @@ Script_yesorno:
ld a, TRUE ld a, TRUE
.no .no
ld [wScriptVar], a ld [wScriptVar], a
vc_hook E_YESNO vc_hook Unknown_yesorno_ret
ret ret
Script_loadmenu: Script_loadmenu:

2
engine/pokedex/pokedex.asm
View File

@ -356,7 +356,7 @@ Pokedex_UpdateDexEntryScreen:
ld a, [hl] ld a, [hl]
and B_BUTTON and B_BUTTON
jr nz, .return_to_prev_screen jr nz, .return_to_prev_screen
vc_hook print_forbid_5 vc_hook Forbid_printing_Pokedex
ld a, [hl] ld a, [hl]
and A_BUTTON and A_BUTTON
jr nz, .do_menu_action jr nz, .do_menu_action

2
engine/pokemon/mail_2.asm
View File

@ -67,7 +67,7 @@ ReadAnyMail:
ldh a, [hJoyPressed] ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON | START and A_BUTTON | B_BUTTON | START
jr z, .loop jr z, .loop
vc_patch print_forbid_4 vc_patch Forbid_printing_mail
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
and 0 and 0
else else

8
home/serial.asm
View File

@ -290,7 +290,7 @@ Serial_SyncAndExchangeNybble:: ; unreferenced
jp WaitLinkTransfer ; pointless jp WaitLinkTransfer ; pointless
WaitLinkTransfer:: WaitLinkTransfer::
vc_hook send_send_buf2 vc_hook Wireless_WaitLinkTransfer
ld a, $ff ld a, $ff
ld [wOtherPlayerLinkAction], a ld [wOtherPlayerLinkAction], a
.loop .loop
@ -318,7 +318,7 @@ WaitLinkTransfer::
inc a inc a
jr z, .loop jr z, .loop
vc_patch Network10 vc_patch Wireless_net_delay_1
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld b, 26 ld b, 26
else else
@ -331,7 +331,7 @@ endc
dec b dec b
jr nz, .receive jr nz, .receive
vc_patch Network11 vc_patch Wireless_net_delay_2
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld b, 26 ld b, 26
else else
@ -346,7 +346,7 @@ endc
ld a, [wOtherPlayerLinkAction] ld a, [wOtherPlayerLinkAction]
ld [wOtherPlayerLinkMode], a ld [wOtherPlayerLinkMode], a
vc_hook send_send_buf2_ret vc_hook Wireless_WaitLinkTransfer_ret
ret ret
LinkTransfer:: LinkTransfer::

12
mobile/mobile_40.asm
View File

@ -1530,7 +1530,7 @@ Function1009f3:
_LinkBattleSendReceiveAction: _LinkBattleSendReceiveAction:
call .StageForSend call .StageForSend
ld [wLinkBattleSentAction], a ld [wLinkBattleSentAction], a
vc_hook send_byt2 vc_hook Wireless_start_exchange
farcall PlaceWaitingText farcall PlaceWaitingText
ld a, [wLinkMode] ld a, [wLinkMode]
cp LINK_MOBILE cp LINK_MOBILE
@ -1585,8 +1585,8 @@ _LinkBattleSendReceiveAction:
inc a inc a
jr z, .waiting jr z, .waiting
vc_hook send_byt2_ret vc_hook Wireless_end_exchange
vc_patch send_byt2_wait vc_patch Wireless_net_delay_3
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld b, 26 ld b, 26
else else
@ -1599,8 +1599,8 @@ endc
dec b dec b
jr nz, .receive jr nz, .receive
vc_hook send_dummy vc_hook Wireless_start_send_zero_bytes
vc_patch send_dummy_wait vc_patch Wireless_net_delay_4
if DEF(_CRYSTAL11_VC) if DEF(_CRYSTAL11_VC)
ld b, 26 ld b, 26
else else
@ -1613,7 +1613,7 @@ endc
dec b dec b
jr nz, .acknowledge jr nz, .acknowledge
vc_hook send_dummy_end vc_hook Wireless_end_send_zero_bytes
ld a, [wOtherPlayerLinkAction] ld a, [wOtherPlayerLinkAction]
ld [wBattleAction], a ld [wBattleAction], a
ret ret

108
vc/pokecrystal11.patch.template
View File

@ -26,118 +26,118 @@
;MotionBlur1 = 31 ;0~31 (for Green Mode) ;MotionBlur1 = 31 ;0~31 (for Green Mode)
;PaletteX = c31,31,31 ;X:0~15, cR,G,B (0~31) ;PaletteX = c31,31,31 ;X:0~15, cR,G,B (0~31)
[Network10] [Network10@Wireless_net_delay_1]
Mode = 1 Mode = 1
Address = {HEX @+1 4} Address = {HEX @+1 4}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[Network11] [Network11@Wireless_net_delay_2]
Mode = 1 Mode = 1
Address = {HEX @+1 4} Address = {HEX @+1 4}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[send_send_buf2] [send_send_buf2@Wireless_WaitLinkTransfer]
Mode = 2 Mode = 2
Address = {HEX @ 4} Address = {HEX @ 4}
Type = 29 Type = 29
[send_send_buf2_ret] [send_send_buf2_ret@Wireless_WaitLinkTransfer_ret]
Mode = 2 Mode = 2
Address = {HEX @ 4} Address = {HEX @ 4}
Type = 30 Type = 30
[Network358] [Network358@Wireless_ExchangeBytes_1]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 4 Type = 4
[Network359] [Network359@Wireless_ExchangeBytes_2]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 4 Type = 4
[Network364] [Network364@Wireless_ExchangeBytes_3_Gen2toGen1Fix]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
;fix pokemon ?? in name ;fix pokemon ?? in name
Type = 26 Type = 26
[Network360] [Network360@Wireless_ExchangeBytes_4]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 4 Type = 4
[Network361] [Network361@Wireless_ExchangeBytes_5]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 4 Type = 4
[Network362] [Network362@Wireless_ExchangeBytes_6]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 4 Type = 4
[Network363] [Network363@Wireless_ExchangeBytes_7]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 4 Type = 4
[Network_RECHECK] [Network_RECHECK@Wireless_net_recheck]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 7 Type = 7
[send_byt2] [send_byt2@Wireless_start_exchange]
Mode = 2 Mode = 2
Address = {HEX @+5} Address = {HEX @+5}
Type = 31 Type = 31
[send_byt2_ret] [send_byt2_ret@Wireless_end_exchange]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 32 Type = 32
[send_byt2_wait] [send_byt2_wait@Wireless_net_delay_3]
Mode = 1 Mode = 1
Address = {HEX @+1} Address = {HEX @+1}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[send_dummy] [send_dummy@Wireless_start_send_zero_bytes]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 33 Type = 33
[send_dummy_wait] [send_dummy_wait@Wireless_net_delay_4]
Mode = 1 Mode = 1
Address = {HEX @+1} Address = {HEX @+1}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[send_dummy_end] [send_dummy_end@Wireless_end_send_zero_bytes]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 34 Type = 34
[NetworkDelay1] [NetworkDelay1@Wireless_net_delay_5]
Mode = 1 Mode = 1
Address = {HEX @+1} Address = {HEX @+1}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[NetworkDelay2] [NetworkDelay2@Wireless_net_delay_6]
Mode = 1 Mode = 1
Address = {HEX @+1} Address = {HEX @+1}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[NetworkDelay3] [NetworkDelay3@Wireless_net_delay_7]
Mode = 1 Mode = 1
Address = {HEX @+1} Address = {HEX @+1}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[NetworkDelay4] [NetworkDelay4@Wireless_net_delay_8]
Mode = 1 Mode = 1
Address = {HEX @+1} Address = {HEX @+1}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
[NetworkDelay6] [NetworkDelay6@Wireless_net_delay_9]
Mode = 1 Mode = 1
Address = {HEX @+1} Address = {HEX @+1}
Fixcode = {PATCH +1} Fixcode = {PATCH +1}
@ -152,60 +152,60 @@ Fixcode = {PATCH +1}
;Address = 0xF4D3C ;Address = 0xF4D3C
;Type = 9 ;Type = 9
[Network_RESET] [Network_RESET@Unknown_network_reset]
Mode = 2 Mode = 2
Address = {HEX @ 5} Address = {HEX @ 5}
Type = 10 Type = 10
[E_YESNO] [E_YESNO@Unknown_yesorno_ret]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 15 Type = 15
[linkCable fake begin] [linkCable fake begin@Link_fake_connection_status]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 16 Type = 16
[linkCable fake end] [linkCable fake end@Wireless_prompt]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 17 Type = 17
;MURIYARI ;MURIYARI
[linkCable block input] [linkCable block input@Wireless_TryQuickSave_block_input_1]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 18 Type = 18
[linkCable block input2] [linkCable block input2@Wireless_TryQuickSave_block_input_2]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 24 Type = 24
[save game end] [save game end@Trade_save_game_end]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 20 Type = 20
[term_exit] [term_exit@Wireless_term_exit]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 25 Type = 25
[room_check] [room_check@Wireless_room_check]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 27 Type = 27
[to_play2_mons1] [to_play2_mons1@Wireless_TimeCapsule]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 11 Type = 11
[to_play2_trade] [to_play2_trade@Wireless_TradeCenter]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 12 Type = 12
[to_play2_battle] [to_play2_battle@Wireless_Colosseum]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 13 Type = 13
[ret_heya] [ret_heya@ExitLinkCommunications_ret]
Mode = 2 Mode = 2
Address = {HEX @} Address = {HEX @}
Type = 14 Type = 14
@ -227,7 +227,7 @@ Type = 14
;0003fbb5h: 06 3E 13 CD ; .>.? ;0003fbb5h: 06 3E 13 CD ; .>.?
[fight begin] [fight begin@Unknown_InitBattleDisplay]
Mode = 11 Mode = 11
Type = 0 Type = 0
Index = 1 Index = 1
@ -252,14 +252,14 @@ Type = 60
; change "and 1" to "and 0" ; 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熙 ;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硝 ;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 Mode = 1
Address = {hex @} Address = {hex @}
Fixcode={patch} Fixcode={patch}
[print forbid 2] [print forbid 2@Forbid_printing_PC_Box]
Mode = 6 Mode = 6
Type = 0 Type = 0
Address = {hex @} Address = {hex @}
@ -274,7 +274,7 @@ ConditionValueC = {dws_ 0xdd 0xd3 A_BUTTON 0x
; 0xd9c7 is the room number. ; 0xd9c7 is the room number.
[print forbid 3] [print forbid 3@Forbid_printing_photo_studio]
Mode = 6 Mode = 6
Type = 0 Type = 0
Address = {hex @} Address = {hex @}
@ -296,7 +296,7 @@ ConditionValueC = {dws_ 0xaf 0xdf NO_INPUT 0x
; 000bb2a5h: E6 08 20 01 ; 000bb2a5h: E6 08 20 01
; 000b92a3h: E6 08 20 01 ; ? . ; 000b92a3h: E6 08 20 01 ; ? .
; change "and 8" to "and 0" ; change "and 8" to "and 0"
[print forbid 4] [print forbid 4@Forbid_printing_mail]
Mode = 1 Mode = 1
Address = {hex @} Address = {hex @}
Fixcode={patch} Fixcode={patch}
@ -317,7 +317,7 @@ Fixcode={patch}
; -----6666666666ddddddddd88888----0xc6d8 no ..............Mem Write: pc32 = 0x4109b addr = 0xc6d8 value = 0x0 ; -----6666666666ddddddddd88888----0xc6d8 no ..............Mem Write: pc32 = 0x4109b addr = 0xc6d8 value = 0x0
;00040266h: 7E E6 01 20 08 ; ~? . ;00040266h: 7E E6 01 20 08 ; ~? .
[print forbid 5] [print forbid 5@Forbid_printing_Pokedex]
Mode = 6 Mode = 6
Type = 0 Type = 0
Address = {hex @} Address = {hex @}
@ -356,7 +356,7 @@ ConditionValueC = {dws_ 0xa1 0xdb A_BUTTON 0x
;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 94 4A
;001048dbh: 3E 02 EA 01 CA 3E 14 EA 02 CA F0 FF F5 CD 9D 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 Mode = 1
Address = {hex @} Address = {hex @}
Fixcode={PATCH} Fixcode={PATCH}
@ -366,22 +366,22 @@ Fixcode={PATCH}
;00104a95h: F3 3E 3A 21 E9 4F CF CD 5E 4D CD 96 4D CD DD 4D ; ?:!镺贤^M蜄M洼M ;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鸺? ;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 Mode = 1
Address = {hex @} Address = {hex @}
Fixcode={patch} Fixcode={patch}
[infrared fake 2] [infrared fake 2@Infrared_ExchangeMysteryGiftData_start]
Mode = 2 Mode = 2
Address = {hex @} Address = {hex @}
Type = 101 Type = 101
[infrared fake 3] [infrared fake 3@Infrared_ExchangeMysteryGiftData_loop_done]
Mode = 2 Mode = 2
Address = {hex @} Address = {hex @}
Type = 102 Type = 102
[infrared fake 4] [infrared fake 4@Infrared_ExchangeMysteryGiftData_end]
Mode = 2 Mode = 2
Address = {hex @} Address = {hex @}
Type = 103 Type = 103
@ -584,7 +584,7 @@ ConditionValueC = {dws_ HYPER_BEAM}
;000cc497h: FE 4F D0 CD ; 﨩型 ;000cc497h: FE 4F D0 CD ; 﨩型
; -------------0xd4170xd4170xd4170xd417--------------- Mem Write: pc32 = 0x3a89 addr = 0xd417 value = 0xd1 ; -------------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&. ;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 Mode = 3
Type = 0 Type = 0
Address = {HEX @} Address = {HEX @}
@ -628,7 +628,7 @@ Address = {hex @}
;-----ddddff0xff690xff69fffff----0xce57 no ....----5555555577777---------..........Mem Write: pc32 = 0x8c483 addr = 0xce57 value = 0x1a ;-----ddddff0xff690xff69fffff----0xce57 no ....----5555555577777---------..........Mem Write: pc32 = 0x8c483 addr = 0xce57 value = 0x1a
;0008c352h: 36 01 FA 57 CE CB 7F 20 08 ; 6.鶺嗡 . ;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蚙.. ;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 Mode = 3
Type = 0 Type = 0
Address = {hex @} Address = {hex @}
@ -645,28 +645,28 @@ MotionBlur0 = 11
;40 90 e4 01 3E at 3E ;40 90 e4 01 3E at 3E
;0008c3e4h: 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 Mode = 3
Type = 1 Type = 1
Address = {HEx @} Address = {HEx @}
;3D 20 EF C9 3E 01 at 3E ;3D 20 EF C9 3E 01 at 3E
; 0008c439h: 3D 20 EF C9 3E 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 Mode = 3
Type = 1 Type = 1
Address = {HEx @} Address = {HEx @}
;01 FF 3E 01 at 3E ;01 FF 3E 01 at 3E
;0008c576h: 01 FF 3E 01 ; .>. ;0008c576h: 01 FF 3E 01 ; .>.
[FPA link fight End2] [FPA link fight End2@Stop_reducing_battle_transition_flashing_ScatterOutro]
Mode = 3 Mode = 3
Type = 1 Type = 1
Address = {HEx @} Address = {HEx @}
;32 00 19 00 3e 01 at 3e ;32 00 19 00 3e 01 at 3e
;0008c764h: 32 00 19 00 3E 01 ; 2...>. ;0008c764h: 32 00 19 00 3E 01 ; 2...>.
[FPA link fight End3] [FPA link fight End3@Stop_reducing_battle_transition_flashing_ZoomToBlack]
Mode = 3 Mode = 3
Type = 1 Type = 1
Address = {HEx @} Address = {HEx @}
@ -692,7 +692,7 @@ Address = {HEx @}
;0008c298h: AF 22 22 77 CD ; ?"w? ;0008c298h: AF 22 22 77 CD ; ?"w?
[FPA link fight End4] [FPA link fight End4@Stop_reducing_battle_transition_flashing]
Mode = 3 Mode = 3
Type = 1 Type = 1
Address = {hex @} Address = {hex @}