Replace hardware_constants.asm with the community-standard hardware.inc 5.0 (#1186)
This commit is contained in:
@@ -32,10 +32,10 @@ DoBattleTransition:
|
||||
jr .loop
|
||||
|
||||
.done
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wBGPals1)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ld hl, wBGPals1
|
||||
ld bc, 8 palettes
|
||||
@@ -43,7 +43,7 @@ DoBattleTransition:
|
||||
call ByteFill
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ld a, %11111111
|
||||
ld [wBGP], a
|
||||
@@ -56,7 +56,7 @@ DoBattleTransition:
|
||||
ldh [hSCY], a
|
||||
|
||||
ld a, $1 ; unnecessary bankswitch?
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
pop af
|
||||
vc_hook Stop_reducing_battle_transition_flashing
|
||||
ldh [hVBlank], a
|
||||
@@ -122,10 +122,10 @@ LoadTrainerBattlePokeballTiles:
|
||||
ret
|
||||
|
||||
ConvertTrainerBattlePokeballTilesTo2bpp:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wDecompressScratch)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
push hl
|
||||
ld hl, wDecompressScratch
|
||||
ld bc, $28 tiles
|
||||
@@ -144,7 +144,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp:
|
||||
ld c, $28
|
||||
call Request2bpp
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
TrainerBattlePokeballTiles:
|
||||
@@ -313,7 +313,7 @@ StartTrainerBattle_SetUpForWavyOutro:
|
||||
vc_hook Stop_reducing_battle_transition_flashing_WavyOutro
|
||||
farcall RespawnPlayerAndOpponent
|
||||
ld a, BANK(wLYOverrides)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
call StartTrainerBattle_NextScene
|
||||
|
||||
ld a, LOW(rSCX)
|
||||
@@ -371,7 +371,7 @@ StartTrainerBattle_SetUpForSpinOutro:
|
||||
vc_hook Stop_reducing_battle_transition_flashing_SpinOutro
|
||||
farcall RespawnPlayerAndOpponent
|
||||
ld a, BANK(wLYOverrides)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
call StartTrainerBattle_NextScene
|
||||
xor a
|
||||
ld [wBattleTransitionCounter], a
|
||||
@@ -514,7 +514,7 @@ StartTrainerBattle_SetUpForRandomScatterOutro:
|
||||
vc_hook Stop_reducing_battle_transition_flashing_ScatterOutro
|
||||
farcall RespawnPlayerAndOpponent
|
||||
ld a, BANK(wLYOverrides)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
call StartTrainerBattle_NextScene
|
||||
ld a, $10
|
||||
ld [wBattleTransitionCounter], a
|
||||
@@ -589,7 +589,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
|
||||
ldh [hBGMapMode], a
|
||||
|
||||
hlcoord 0, 0, wAttrmap
|
||||
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
|
||||
ld bc, SCREEN_AREA
|
||||
inc b
|
||||
inc c
|
||||
jr .enter_loop_midway
|
||||
@@ -661,10 +661,10 @@ StartTrainerBattle_LoadPokeBallGraphics:
|
||||
jr nz, .not_dark
|
||||
ld hl, .darkpals
|
||||
.not_dark
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wBGPals1)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
call .copypals
|
||||
push hl
|
||||
ld de, wBGPals1 palette PAL_BG_TEXT
|
||||
@@ -675,7 +675,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
|
||||
ld bc, 1 palettes
|
||||
call CopyBytes
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ld a, TRUE
|
||||
ldh [hCGBPalUpdate], a
|
||||
call DelayFrame
|
||||
@@ -738,10 +738,10 @@ pusho b.X ; . = 0, X = 1
|
||||
popo
|
||||
|
||||
WipeLYOverrides:
|
||||
ldh a, [rSVBK]
|
||||
ldh a, [rWBK]
|
||||
push af
|
||||
ld a, BANK(wLYOverrides)
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
|
||||
ld hl, wLYOverrides
|
||||
call .wipe
|
||||
@@ -749,7 +749,7 @@ WipeLYOverrides:
|
||||
call .wipe
|
||||
|
||||
pop af
|
||||
ldh [rSVBK], a
|
||||
ldh [rWBK], a
|
||||
ret
|
||||
|
||||
.wipe
|
||||
|
Reference in New Issue
Block a user