From c8626595b447358e568a8d23738b832f50351f77 Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 6 May 2021 23:04:00 -0400 Subject: =?UTF-8?q?Use=20BANK("Pics=20#")=20for=20Pok=C3=A9mon=20and=20tra?= =?UTF-8?q?iner=20pics?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/battle/core.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engine') 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 -- cgit v1.2.3