diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-06 23:04:00 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-06 23:04:00 -0400 |
| commit | c8626595b447358e568a8d23738b832f50351f77 (patch) | |
| tree | 6dc195079646a3921eac85c3f653459f09983df2 /engine | |
| parent | Merge pull request #321 from SatoMew/master (diff) | |
| download | pokeyellow-c8626595b447358e568a8d23738b832f50351f77.tar.gz pokeyellow-c8626595b447358e568a8d23738b832f50351f77.tar.xz pokeyellow-c8626595b447358e568a8d23738b832f50351f77.zip | |
Use BANK("Pics #") for Pokémon and trainer pics
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 3 |
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 |