Use BANK for hardcoded WRAM banks preceding FarCopyWRAM/GetFarWRAMByte calls.

This commit is contained in:
Adelaide Walter 2018-01-04 14:53:50 -05:00
parent 5fd3bfa832
commit fb422e8d9c
6 changed files with 16 additions and 16 deletions

View File

@ -1,7 +1,7 @@
CheckBattleScene: ; 4ea44 CheckBattleScene: ; 4ea44
; Return carry if battle scene is turned off. ; Return carry if battle scene is turned off.
ld a, 0 ld a, BANK(wLinkMode)
ld hl, wLinkMode ld hl, wLinkMode
call GetFarWRAMByte call GetFarWRAMByte
cp LINK_MOBILE cp LINK_MOBILE
@ -33,7 +33,7 @@ CheckBattleScene: ; 4ea44
ret ret
.from_wram .from_wram
ld a, $5 ld a, BANK(w5_dc00)
ld hl, w5_dc00 ld hl, w5_dc00
call GetFarWRAMByte call GetFarWRAMByte
bit 0, a bit 0, a

View File

@ -144,13 +144,13 @@ Function8b07:
ld hl, .BGPal ld hl, .BGPal
ld de, wBGPals1 ld de, wBGPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, $5 ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
ld hl, .OBPal ld hl, .OBPal
ld de, wOBPals1 ld de, wOBPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, $5 ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyPals call ApplyPals
@ -359,7 +359,7 @@ ApplyHPBarPals:
ld bc, HPBarPals ld bc, HPBarPals
add hl, bc add hl, bc
ld bc, 4 ld bc, 4
ld a, $5 ld a, BANK(wBGPals2)
call FarCopyWRAM call FarCopyWRAM
ld a, $1 ld a, $1
ld [hCGBPalUpdate], a ld [hCGBPalUpdate], a
@ -443,7 +443,7 @@ LoadMailPalettes:
.cgb .cgb
ld de, wBGPals1 ld de, wBGPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, $5 ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyPals call ApplyPals
call WipeAttrMap call WipeAttrMap
@ -460,7 +460,7 @@ Function95f0:
ld hl, .Palette ld hl, .Palette
ld de, wBGPals1 ld de, wBGPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, $5 ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
call ApplyPals call ApplyPals
call WipeAttrMap call WipeAttrMap
@ -611,7 +611,7 @@ ApplyPals:
ld hl, wBGPals1 ld hl, wBGPals1
ld de, wBGPals2 ld de, wBGPals2
ld bc, 16 palettes ld bc, 16 palettes
ld a, $5 ld a, BANK(wPals)
call FarCopyWRAM call FarCopyWRAM
ret ret
@ -688,7 +688,7 @@ InitPartyMenuOBPals:
ld hl, PartyMenuOBPals ld hl, PartyMenuOBPals
ld de, wOBPals1 ld de, wOBPals1
ld bc, 2 palettes ld bc, 2 palettes
ld a, $5 ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
ret ret
@ -761,7 +761,7 @@ Function9779: mobile
ld hl, BattleObjectPals ld hl, BattleObjectPals
ld de, wOBPals1 palette 2 ld de, wOBPals1 palette 2
ld bc, 2 palettes ld bc, 2 palettes
ld a, $5 ld a, BANK(wOBPals1)
call FarCopyWRAM call FarCopyWRAM
ret ret
@ -1318,7 +1318,7 @@ endr
.morn_day .morn_day
ld de, wBGPals1 palette PAL_BG_ROOF + 2 ld de, wBGPals1 palette PAL_BG_ROOF + 2
ld bc, 4 ld bc, 4
ld a, $5 ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
ret ret

View File

@ -241,7 +241,7 @@ Function49742: ; 49742
ld hl, .Palette_49757 ld hl, .Palette_49757
ld de, wBGPals1 ld de, wBGPals1
ld bc, 8 palettes ld bc, 8 palettes
ld a, $5 ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
farcall ApplyPals farcall ApplyPals
ret ret

View File

@ -160,7 +160,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
ld hl, .palettes ld hl, .palettes
ld de, wOBPals2 palette PAL_OW_TREE ld de, wOBPals2 palette PAL_OW_TREE
ld bc, 1 palettes ld bc, 1 palettes
ld a, $5 ld a, BANK(wOBPals2)
call FarCopyWRAM call FarCopyWRAM
ld a, $1 ld a, $1
ld [hCGBPalUpdate], a ld [hCGBPalUpdate], a

View File

@ -90,7 +90,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47)
ld hl, .Palette ld hl, .Palette
ld de, wBGPals1 ld de, wBGPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, $5 ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
farcall ApplyPals farcall ApplyPals
ret ret

View File

@ -335,12 +335,12 @@ PokeAnim_InitPicAttributes: ; d01d6
ld a, d ld a, d
ld [wPokeAnimGraphicStartTile], a ld [wPokeAnimGraphicStartTile], a
ld a, $1 ld a, BANK(CurPartySpecies)
ld hl, CurPartySpecies ld hl, CurPartySpecies
call GetFarWRAMByte call GetFarWRAMByte
ld [wPokeAnimSpecies], a ld [wPokeAnimSpecies], a
ld a, $1 ld a, BANK(UnownLetter)
ld hl, UnownLetter ld hl, UnownLetter
call GetFarWRAMByte call GetFarWRAMByte
ld [wPokeAnimUnownLetter], a ld [wPokeAnimUnownLetter], a