diff options
| -rw-r--r-- | engine/battle/checkbattlescene.asm | 4 | ||||
| -rw-r--r-- | engine/color.asm | 18 | ||||
| -rwxr-xr-x | engine/crystal_colors.asm | 2 | ||||
| -rwxr-xr-x | engine/events/heal_machine_anim.asm | 2 | ||||
| -rwxr-xr-x | engine/init_gender.asm | 2 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 4 |
6 files changed, 16 insertions, 16 deletions
diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/checkbattlescene.asm index b63f00907..5253c3c47 100644 --- a/engine/battle/checkbattlescene.asm +++ b/engine/battle/checkbattlescene.asm @@ -1,7 +1,7 @@ CheckBattleScene: ; 4ea44 ; Return carry if battle scene is turned off. - ld a, 0 + ld a, BANK(wLinkMode) ld hl, wLinkMode call GetFarWRAMByte cp LINK_MOBILE @@ -33,7 +33,7 @@ CheckBattleScene: ; 4ea44 ret .from_wram - ld a, $5 + ld a, BANK(w5_dc00) ld hl, w5_dc00 call GetFarWRAMByte bit 0, a diff --git a/engine/color.asm b/engine/color.asm index 054d74654..b074d2080 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -144,13 +144,13 @@ Function8b07: ld hl, .BGPal ld de, wBGPals1 ld bc, 1 palettes - ld a, $5 + ld a, BANK(wBGPals1) call FarCopyWRAM ld hl, .OBPal ld de, wOBPals1 ld bc, 1 palettes - ld a, $5 + ld a, BANK(wOBPals1) call FarCopyWRAM call ApplyPals @@ -359,7 +359,7 @@ ApplyHPBarPals: ld bc, HPBarPals add hl, bc ld bc, 4 - ld a, $5 + ld a, BANK(wBGPals2) call FarCopyWRAM ld a, $1 ld [hCGBPalUpdate], a @@ -443,7 +443,7 @@ LoadMailPalettes: .cgb ld de, wBGPals1 ld bc, 1 palettes - ld a, $5 + ld a, BANK(wBGPals1) call FarCopyWRAM call ApplyPals call WipeAttrMap @@ -460,7 +460,7 @@ Function95f0: ld hl, .Palette ld de, wBGPals1 ld bc, 1 palettes - ld a, $5 + ld a, BANK(wBGPals1) call FarCopyWRAM call ApplyPals call WipeAttrMap @@ -611,7 +611,7 @@ ApplyPals: ld hl, wBGPals1 ld de, wBGPals2 ld bc, 16 palettes - ld a, $5 + ld a, BANK(wPals) call FarCopyWRAM ret @@ -688,7 +688,7 @@ InitPartyMenuOBPals: ld hl, PartyMenuOBPals ld de, wOBPals1 ld bc, 2 palettes - ld a, $5 + ld a, BANK(wOBPals1) call FarCopyWRAM ret @@ -761,7 +761,7 @@ Function9779: mobile ld hl, BattleObjectPals ld de, wOBPals1 palette 2 ld bc, 2 palettes - ld a, $5 + ld a, BANK(wOBPals1) call FarCopyWRAM ret @@ -1318,7 +1318,7 @@ endr .morn_day ld de, wBGPals1 palette PAL_BG_ROOF + 2 ld bc, 4 - ld a, $5 + ld a, BANK(wBGPals1) call FarCopyWRAM ret diff --git a/engine/crystal_colors.asm b/engine/crystal_colors.asm index 5d2ba236c..20cd4f4a2 100755 --- a/engine/crystal_colors.asm +++ b/engine/crystal_colors.asm @@ -241,7 +241,7 @@ Function49742: ; 49742 ld hl, .Palette_49757 ld de, wBGPals1 ld bc, 8 palettes - ld a, $5 + ld a, BANK(wBGPals1) call FarCopyWRAM farcall ApplyPals ret diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index d60acb5b6..809d11eb5 100755 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -160,7 +160,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp" ld hl, .palettes ld de, wOBPals2 palette PAL_OW_TREE ld bc, 1 palettes - ld a, $5 + ld a, BANK(wOBPals2) call FarCopyWRAM ld a, $1 ld [hCGBPalUpdate], a diff --git a/engine/init_gender.asm b/engine/init_gender.asm index 588709b88..2cb664072 100755 --- a/engine/init_gender.asm +++ b/engine/init_gender.asm @@ -90,7 +90,7 @@ LoadGenderScreenPal: ; 48e47 (12:4e47) ld hl, .Palette ld de, wBGPals1 ld bc, 1 palettes - ld a, $5 + ld a, BANK(wBGPals1) call FarCopyWRAM farcall ApplyPals ret diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index e10dcc360..9a6ae4a75 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -335,12 +335,12 @@ PokeAnim_InitPicAttributes: ; d01d6 ld a, d ld [wPokeAnimGraphicStartTile], a - ld a, $1 + ld a, BANK(CurPartySpecies) ld hl, CurPartySpecies call GetFarWRAMByte ld [wPokeAnimSpecies], a - ld a, $1 + ld a, BANK(UnownLetter) ld hl, UnownLetter call GetFarWRAMByte ld [wPokeAnimUnownLetter], a |