diff options
| author | vulcandth <vulcandth@gmail.com> | 2022-03-12 17:34:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 18:34:04 -0500 |
| commit | 31c3c94d64e1ac1e40c95acfda7de8b99b4f302b (patch) | |
| tree | 274ec3a4fb4cacaa3d0f88c713085cfb5a3c85d1 /engine/battle | |
| parent | 775b5d046c7f42a3bd8034b92da92e25969bdbf7 (diff) | |
Build the Virtual Console patch with `make crystal11_vc` (#882)
Fixes #813
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transition.asm | 6 | ||||
| -rw-r--r-- | engine/battle/core.asm | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 12932ede5..1cbe881ef 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -21,6 +21,7 @@ DoBattleTransition: ld hl, hVBlank ld a, [hl] push af + vc_hook FPA_link_fight_begin ld [hl], $1 .loop @@ -58,6 +59,7 @@ DoBattleTransition: ld a, $1 ; unnecessary bankswitch? ldh [rSVBK], a pop af + vc_hook FPA_link_fight_End4 ldh [hVBlank], a call DelayFrame ret @@ -310,6 +312,7 @@ StartTrainerBattle_Flash: dc 0, 0, 0, 1 StartTrainerBattle_SetUpForWavyOutro: + vc_hook FPA_link_fight_End0 farcall RespawnPlayerAndOpponent ld a, BANK(wLYOverrides) ldh [rSVBK], a @@ -367,6 +370,7 @@ StartTrainerBattle_SineWave: ret StartTrainerBattle_SetUpForSpinOutro: + vc_hook FPA_link_fight_End1 farcall RespawnPlayerAndOpponent ld a, BANK(wLYOverrides) ldh [rSVBK], a @@ -509,6 +513,7 @@ ENDM .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 farcall RespawnPlayerAndOpponent ld a, BANK(wLYOverrides) ldh [rSVBK], a @@ -763,6 +768,7 @@ StartTrainerBattle_DrawSineWave: calc_sine_wave StartTrainerBattle_ZoomToBlack: + vc_hook FPA_link_fight_End3 farcall RespawnPlayerAndOpponent ld de, .boxes diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 5a6f20ce9..a8c54b77f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8940,6 +8940,7 @@ InitBattleDisplay: predef PlaceGraphic xor a ldh [hWY], a + vc_hook fight_begin ldh [rWY], a call WaitBGMap call HideSprites |