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

Use labels instead of constants for HRAM

Browse Source 
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
This commit is contained in:
Rangi
2018-08-25 14:28:22 -04:00
parent 376c64468b
commit eb1e3636bb
243 changed files with 4706 additions and 4661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
engine/gfx/color.asm
View File

@@ -151,7 +151,7 @@ Unreferenced_Function8b07:
call ApplyPals
ld a, $1
ld [hCGBPalUpdate], a
ldh [hCGBPalUpdate], a
ret
.BGPal:
@@ -169,7 +169,7 @@ Unreferenced_Function8b07:
Unreferenced_Function8b3f:
call CheckCGB
ret nz
ld a, [hSGB]
ldh a, [hSGB]
and a
ret z
ld hl, BlkPacket_9a86
@@ -178,7 +178,7 @@ Unreferenced_Function8b3f:
Unreferenced_Function8b4d:
call CheckCGB
jr nz, .cgb
ld a, [hSGB]
ldh a, [hSGB]
and a
ret z
ld hl, PalPacket_BetaIntroVenusaur
@@ -193,7 +193,7 @@ Unreferenced_Function8b4d:
Unreferenced_Function8b67:
call CheckCGB
jr nz, .cgb
ld a, [hSGB]
ldh a, [hSGB]
and a
ret z
ld hl, PalPacket_Pack
@@ -208,7 +208,7 @@ Unreferenced_Function8b67:
Unreferenced_Function8b81:
call CheckCGB
jr nz, .cgb
ld a, [hSGB]
ldh a, [hSGB]
and a
ret z
ld a, c
@@ -274,7 +274,7 @@ got_palette_pointer_8bd7
ret
Unreferenced_Function8bec:
ld a, [hCGB]
ldh a, [hCGB]
and a
jr nz, .cgb
ld hl, wPlayerLightScreenCount
@@ -353,7 +353,7 @@ ApplyHPBarPals:
ld a, BANK(wBGPals2)
call FarCopyWRAM
ld a, $1
ld [hCGBPalUpdate], a
ldh [hCGBPalUpdate], a
ret
.PartyMenu:
@@ -383,10 +383,10 @@ LoadStatsScreenPals:
dec c
add hl, bc
add hl, bc
ld a, [rSVBK]
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
ldh [rSVBK], a
ld a, [hli]
ld [wBGPals1 palette 0], a
ld [wBGPals1 palette 2], a
@@ -394,7 +394,7 @@ LoadStatsScreenPals:
ld [wBGPals1 palette 0 + 1], a
ld [wBGPals1 palette 2 + 1], a
pop af
ld [rSVBK], a
ldh [rSVBK], a
call ApplyPals
ld a, $1
ret
@@ -492,10 +492,10 @@ GetPredefPal:
ret
LoadHLPaletteIntoDE:
ld a, [rSVBK]
ldh a, [rSVBK]
push af
ld a, BANK(wOBPals1)
ld [rSVBK], a
ldh [rSVBK], a
ld c, 1 palettes
.loop
ld a, [hli]
@@ -504,14 +504,14 @@ LoadHLPaletteIntoDE:
dec c
jr nz, .loop
pop af
ld [rSVBK], a
ldh [rSVBK], a
ret
LoadPalette_White_Col1_Col2_Black:
ld a, [rSVBK]
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
ldh [rSVBK], a
ld a, LOW(PALRGB_WHITE)
ld [de], a
@@ -535,7 +535,7 @@ LoadPalette_White_Col1_Col2_Black:
inc de
pop af
ld [rSVBK], a
ldh [rSVBK], a
ret
FillBoxCGB:
@@ -560,10 +560,10 @@ ResetBGPals:
push de
push hl
ld a, [rSVBK]
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
ldh [rSVBK], a
ld hl, wBGPals1
ld c, 1 palettes
@@ -582,7 +582,7 @@ ResetBGPals:
jr nz, .loop
pop af
ld [rSVBK], a
ldh [rSVBK], a
pop hl
pop de
@@ -606,19 +606,19 @@ ApplyPals:
ret
ApplyAttrMap:
ld a, [rLCDC]
ldh a, [rLCDC]
bit rLCDC_ENABLE, a
jr z, .UpdateVBank1
ld a, [hBGMapMode]
ldh a, [hBGMapMode]
push af
ld a, $2
ld [hBGMapMode], a
ldh [hBGMapMode], a
call DelayFrame
call DelayFrame
call DelayFrame
call DelayFrame
pop af
ld [hBGMapMode], a
ldh [hBGMapMode], a
ret
.UpdateVBank1:
@@ -626,7 +626,7 @@ ApplyAttrMap:
debgcoord 0, 0
ld b, SCREEN_HEIGHT
ld a, $1
ld [rVBK], a
ldh [rVBK], a
.row
ld c, SCREEN_WIDTH
.col
@@ -644,7 +644,7 @@ ApplyAttrMap:
dec b
jr nz, .row
ld a, $0
ld [rVBK], a
ldh [rVBK], a
ret
; CGB layout for SCGB_PARTY_MENU_HP_PALS
@@ -742,11 +742,11 @@ Unreferenced_Function9779:
ret z
ld hl, BattleObjectPals
ld a, $90
ld [rOBPI], a
ldh [rOBPI], a
ld c, 6 palettes
.loop
ld a, [hli]
ld [rOBPD], a
ldh [rOBPD], a
dec c
jr nz, .loop
ld hl, BattleObjectPals
@@ -763,7 +763,7 @@ Unreferenced_Function97cc:
call CheckCGB
ret z
ld a, $90
ld [rOBPI], a
ldh [rOBPI], a
ld a, PREDEFPAL_TRADE_TUBE
call GetPredefPal
call .PushPalette
@@ -776,7 +776,7 @@ Unreferenced_Function97cc:
ld c, 1 palettes
.loop
ld a, [hli]
ld [rOBPD], a
ldh [rOBPD], a
dec c
jr nz, .loop
ret
@@ -822,9 +822,9 @@ _PushSGBPals:
.loop
push bc
xor a
ld [rJOYP], a
ldh [rJOYP], a
ld a, $30
ld [rJOYP], a
ldh [rJOYP], a
ld b, $10
.loop2
ld e, $8
@@ -836,18 +836,18 @@ _PushSGBPals:
jr nz, .okay
ld a, $20
.okay
ld [rJOYP], a
ldh [rJOYP], a
ld a, $30
ld [rJOYP], a
ldh [rJOYP], a
rr d
dec e
jr nz, .loop3
dec b
jr nz, .loop2
ld a, $20
ld [rJOYP], a
ldh [rJOYP], a
ld a, $30
ld [rJOYP], a
ldh [rJOYP], a
call SGBDelayCycles
pop bc
dec b
@@ -864,12 +864,12 @@ InitSGBBorder:
set 7, a
ld [wcfbe], a
xor a
ld [rJOYP], a
ld [hSGB], a
ldh [rJOYP], a
ldh [hSGB], a
call PushSGBBorderPalsAndWait
jr nc, .skip
ld a, $1
ld [hSGB], a
ldh [hSGB], a
call _InitSGBBorderPals
call SGBBorder_PushBGPals
call SGBDelayCycles
@@ -891,43 +891,43 @@ InitCGBPals::
ret z
; CGB only
ld a, BANK(vTiles3)
ld [rVBK], a
ldh [rVBK], a
ld hl, vTiles3
ld bc, $200 tiles
xor a
call ByteFill
ld a, BANK(vTiles0)
ld [rVBK], a
ldh [rVBK], a
ld a, 1 << rBGPI_AUTO_INCREMENT
ld [rBGPI], a
ldh [rBGPI], a
ld c, 4 * 8
.bgpals_loop
ld a, LOW(PALRGB_WHITE)
ld [rBGPD], a
ldh [rBGPD], a
ld a, HIGH(PALRGB_WHITE)
ld [rBGPD], a
ldh [rBGPD], a
dec c
jr nz, .bgpals_loop
ld a, 1 << rOBPI_AUTO_INCREMENT
ld [rOBPI], a
ldh [rOBPI], a
ld c, 4 * 8
.obpals_loop
ld a, LOW(PALRGB_WHITE)
ld [rOBPD], a
ldh [rOBPD], a
ld a, HIGH(PALRGB_WHITE)
ld [rOBPD], a
ldh [rOBPD], a
dec c
jr nz, .obpals_loop
ld a, [rSVBK]
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
ldh [rSVBK], a
ld hl, wBGPals1
call .LoadWhitePals
ld hl, wBGPals2
call .LoadWhitePals
pop af
ld [rSVBK], a
ldh [rSVBK], a
ret
.LoadWhitePals:
@@ -972,7 +972,7 @@ _InitSGBBorderPals:
Unreferenced_Function9911:
di
xor a
ld [rJOYP], a
ldh [rJOYP], a
ld hl, MaskEnFreezePacket
call _PushSGBPals
call PushSGBBorder
@@ -1007,35 +1007,35 @@ PushSGBBorderPalsAndWait:
ld hl, MltReq2Packet
call _PushSGBPals
call SGBDelayCycles
ld a, [rJOYP]
ldh a, [rJOYP]
and $3
cp $3
jr nz, .carry
ld a, $20
ld [rJOYP], a
ld a, [rJOYP]
ld a, [rJOYP]
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
call SGBDelayCycles
call SGBDelayCycles
ld a, $30
ld [rJOYP], a
ldh [rJOYP], a
call SGBDelayCycles
call SGBDelayCycles
ld a, $10
ld [rJOYP], a
ldh [rJOYP], a
rept 6
ld a, [rJOYP]
ldh a, [rJOYP]
endr
call SGBDelayCycles
call SGBDelayCycles
ld a, $30
ld [rJOYP], a
ld a, [rJOYP]
ld a, [rJOYP]
ld a, [rJOYP]
ldh [rJOYP], a
ldh a, [rJOYP]
ldh a, [rJOYP]
ldh a, [rJOYP]
call SGBDelayCycles
call SGBDelayCycles
ld a, [rJOYP]
ldh a, [rJOYP]
and $3
cp $3
jr nz, .carry
@@ -1056,24 +1056,24 @@ endr
SGBBorder_PushBGPals:
call DisableLCD
ld a, %11100100
ld [rBGP], a
ldh [rBGP], a
ld hl, PredefPals
ld de, vTiles1
ld bc, $100 tiles
call CopyData
call DrawDefaultTiles
ld a, LCDC_DEFAULT
ld [rLCDC], a
ldh [rLCDC], a
ld hl, PalTrnPacket
call _PushSGBPals
xor a
ld [rBGP], a
ldh [rBGP], a
ret
SGBBorder_MorePalPushing:
call DisableLCD
ld a, $e4
ld [rBGP], a
ldh [rBGP], a
ld de, vTiles1
ld bc, 20 tiles
call CopyData
@@ -1097,17 +1097,17 @@ SGBBorder_MorePalPushing:
call CopyData
call DrawDefaultTiles
ld a, LCDC_DEFAULT
ld [rLCDC], a
ldh [rLCDC], a
ld hl, PctTrnPacket
call _PushSGBPals
xor a
ld [rBGP], a
ldh [rBGP], a
ret
SGBBorder_YetMorePalPushing:
call DisableLCD
ld a, %11100100
ld [rBGP], a
ldh [rBGP], a
ld de, vTiles1
ld b, $80
.loop
@@ -1121,11 +1121,11 @@ SGBBorder_YetMorePalPushing:
jr nz, .loop
call DrawDefaultTiles
ld a, LCDC_DEFAULT
ld [rLCDC], a
ldh [rLCDC], a
ld hl, ChrTrnPacket
call _PushSGBPals
xor a
ld [rBGP], a
ldh [rBGP], a
ret
CopyData:
@@ -1237,10 +1237,10 @@ LoadMapPals:
ld e, l
ld d, h
; Switch to palettes WRAM bank
ld a, [rSVBK]
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ld [rSVBK], a
ldh [rSVBK], a
ld hl, wBGPals1
ld b, 8
.outer_loop
@@ -1269,7 +1269,7 @@ LoadMapPals:
dec b
jr nz, .outer_loop
pop af
ld [rSVBK], a
ldh [rSVBK], a
.got_pals
ld a, [wTimeOfDayPal]