summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-05-06 23:04:00 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-05-06 23:04:00 -0400
commitc8626595b447358e568a8d23738b832f50351f77 (patch)
tree6dc195079646a3921eac85c3f653459f09983df2 /engine
parentbb8fdd7f42dc633e4c72f8199bbcb5c6b750cba3 (diff)
Use BANK("Pics #") for Pokémon and trainer pics
Diffstat (limited to 'engine')
-rw-r--r--engine/battle/core.asm3
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index d9bcdddb..5cb4fa13 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6308,6 +6308,7 @@ LoadPlayerBackPic:
ld de, OldManPicBack
.next
ld a, BANK(RedPicBack)
+ assert BANK(RedPicBack) == BANK(OldManPicBack)
call UncompressSpriteFromDE
predef ScaleSpriteByTwo
ld hl, wOAMBuffer
@@ -6880,7 +6881,7 @@ _LoadTrainerPic:
ld d, a ; de contains pointer to trainer pic
ld a, [wLinkState]
and a
- ld a, BANK(TrainerPics) ; this is where all the trainer pics are (not counting Red's)
+ ld a, BANK("Pics 6") ; this is where all the trainer pics are (not counting Red's)
jr z, .loadSprite
ld a, BANK(RedPicFront)
.loadSprite