Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace hardware_constants.asm with the community-standard hardware.inc 5.0 (#1186)

Browse Source
This commit is contained in:
Rangi
2025-06-23 09:11:33 -04:00
committed by GitHub
parent ae7ee67d21
commit 4c540aa43b
149 changed files with 3444 additions and 3103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
engine/battle/battle_transition.asm
View File

@@ -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

28
engine/battle/core.asm
View File

@@ -8057,11 +8057,11 @@ BattleIntro:
ld b, SCGB_BATTLE_GRAYSCALE
call GetSGBLayout
ld hl, rLCDC
res rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap0/vBGMap2
res B_LCDC_WIN_MAP, [hl] ; select vBGMap0/vBGMap2
call InitBattleDisplay
call BattleStartMessage
ld hl, rLCDC
set rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap1/vBGMap3
set B_LCDC_WIN_MAP, [hl] ; select vBGMap1/vBGMap3
xor a
ldh [hBGMapMode], a
call EmptyBattleTextbox
@@ -8097,10 +8097,10 @@ InitEnemy:
jp InitEnemyWildmon ; wild
BackUpBGMap2:
ldh a, [rSVBK]
ldh a, [rWBK]
push af
ld a, BANK(wDecompressScratch)
ldh [rSVBK], a
ldh [rWBK], a
ld hl, wDecompressScratch
ld bc, $40 tiles ; vBGMap3 - vBGMap2
ld a, $2
@@ -8116,7 +8116,7 @@ BackUpBGMap2:
pop af
ldh [rVBK], a
pop af
ldh [rSVBK], a
ldh [rWBK], a
ret
InitEnemyTrainer:
@@ -8457,7 +8457,7 @@ _DisplayLinkRecord:
call CloseSRAM
hlcoord 0, 0, wAttrmap
xor a
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld bc, SCREEN_AREA
call ByteFill
call WaitBGMap2
ld b, SCGB_DIPLOMA
@@ -8951,23 +8951,23 @@ InitBattleDisplay:
ret
.BlankBGMap:
ldh a, [rSVBK]
ldh a, [rWBK]
push af
ld a, BANK(wDecompressScratch)
ldh [rSVBK], a
ldh [rWBK], a
ld hl, wDecompressScratch
ld bc, BG_MAP_WIDTH * BG_MAP_HEIGHT
ld bc, TILEMAP_AREA
ld a, " "
call ByteFill
ld de, wDecompressScratch
hlbgcoord 0, 0
lb bc, BANK(@), (BG_MAP_WIDTH * BG_MAP_HEIGHT) / LEN_2BPP_TILE
lb bc, BANK(@), TILEMAP_AREA / TILE_SIZE
call Request2bpp
pop af
ldh [rSVBK], a
ldh [rWBK], a
ret
.InitBackPic:
@@ -9009,10 +9009,10 @@ GetTrainerBackpic:
ret
CopyBackpic:
ldh a, [rSVBK]
ldh a, [rWBK]
push af
ld a, BANK(wDecompressScratch)
ldh [rSVBK], a
ldh [rWBK], a
ld hl, vTiles0
ld de, vTiles2 tile $31
ldh a, [hROMBank]
@@ -9020,7 +9020,7 @@ CopyBackpic:
ld c, 7 * 7
call Get2bpp
pop af
ldh [rSVBK], a
ldh [rWBK], a
call .LoadTrainerBackpicAsOAM
ld a, $31
ldh [hGraphicStartTile], a

8
engine/battle/sliding_intro.asm
View File

@@ -1,8 +1,8 @@
BattleIntroSlidingPics:
ldh a, [rSVBK]
ldh a, [rWBK]
push af
ld a, BANK(wLYOverrides)
ldh [rSVBK], a
ldh [rWBK], a
call .subfunction1
ld a, LOW(rSCX)
ldh [hLCDCPointer], a
@@ -10,7 +10,7 @@ BattleIntroSlidingPics:
xor a
ldh [hLCDCPointer], a
pop af
ldh [rSVBK], a
ldh [rWBK], a
ret
.subfunction1
@@ -59,7 +59,7 @@ BattleIntroSlidingPics:
.subfunction3
ld hl, wShadowOAMSprite00XCoord
ld c, $12 ; 18
ld de, SPRITEOAMSTRUCT_LENGTH
ld de, OBJ_SIZE
.loop3
dec [hl]
dec [hl]

4
engine/battle/trainer_huds.asm
View File

@@ -41,7 +41,7 @@ ShowOTTrainerMonsRemaining:
ld [hl], 4 * TILE_WIDTH
ld a, -TILE_WIDTH
ld [wPlaceBallsDirection], a
ld hl, wShadowOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
ld hl, wShadowOAMSprite00 + PARTY_LENGTH * OBJ_SIZE
jp LoadTrainerHudOAM
StageBallTilesData:
@@ -197,7 +197,7 @@ LinkBattle_TrainerHuds:
ld a, 10 * TILE_WIDTH
ld [hli], a
ld [hl], 13 * TILE_WIDTH
ld hl, wShadowOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
ld hl, wShadowOAMSprite00 + PARTY_LENGTH * OBJ_SIZE
jp LoadTrainerHudOAM
LoadTrainerHudOAM: