diff options
| author | Adelaide Walter <adelaidekwalter@gmail.com> | 2018-01-03 19:12:45 -0500 |
|---|---|---|
| committer | Adelaide Walter <adelaidekwalter@gmail.com> | 2018-01-03 19:12:45 -0500 |
| commit | 9d0ba6bfd3b2f10fae9969a784aa7b2b573e8411 (patch) | |
| tree | a902a39f67c16fb0468580af87d0ec0236c47406 /engine/battle | |
| parent | 501ec9b283927a54023c85e8098cc56a32623817 (diff) | |
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transition.asm | 10 | ||||
| -rw-r--r-- | engine/battle/core.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/sliding_intro.asm | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 2b9ebe091..73f7eaef4 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -23,7 +23,7 @@ Predef_StartBattle: ; 8c20f .done ld a, [rSVBK] push af - ld a, $5 + ld a, BANK(wBGPals1) ld [rSVBK], a ld hl, wBGPals1 @@ -44,7 +44,7 @@ Predef_StartBattle: ; 8c20f ld [hLYOverrideEnd], a ld [hSCY], a - ld a, $1 + ld a, 1 ; unnecessary bankswitch? ld [rSVBK], a pop af ld [hVBlank], a @@ -116,7 +116,7 @@ LoadTrainerBattlePokeballTiles: ConvertTrainerBattlePokeballTilesTo2bpp: ; 8c2cf ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a push hl ld hl, wDecompressScratch @@ -647,7 +647,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) .daytime ld a, [rSVBK] push af - ld a, $5 ; WRAM5 = palettes + ld a, BANK(wBGPals1) ld [rSVBK], a call .copypals push hl @@ -729,7 +729,7 @@ PokeBallTransition: WipeLYOverrides: ; 8c6d8 ld a, [rSVBK] push af - ld a, $5 + ld a, BANK(LYOverrides) ld [rSVBK], a ld hl, LYOverrides diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 48be08bf0..bac39e76f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -9320,7 +9320,7 @@ InitBattleDisplay: ; 3fb6c .BlankBGMap: ; 3fbd6 ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a ld hl, wDecompressScratch @@ -9381,7 +9381,7 @@ GetTrainerBackpic: ; 3fbff CopyBackpic: ; 3fc30 ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a ld hl, vTiles0 ld de, vTiles2 tile $31 diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm index ed78add8e..2cd242c84 100755 --- a/engine/battle/sliding_intro.asm +++ b/engine/battle/sliding_intro.asm @@ -1,7 +1,7 @@ BattleIntroSlidingPics: ; 4e980 ld a, [rSVBK] push af - ld a, $5 + ld a, BANK(LYOverrides) ld [rSVBK], a call .subfunction1 ld a, rSCX - $ff00 |