diff options
| -rw-r--r-- | engine/battle/init_battle.asm | 2 | ||||
| -rw-r--r-- | gfx/pics.asm | 1 | ||||
| -rw-r--r-- | home/pics.asm | 26 |
3 files changed, 14 insertions, 15 deletions
diff --git a/engine/battle/init_battle.asm b/engine/battle/init_battle.asm index 6a6331b7..bd8b2e8f 100644 --- a/engine/battle/init_battle.asm +++ b/engine/battle/init_battle.asm @@ -158,7 +158,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 diff --git a/gfx/pics.asm b/gfx/pics.asm index 6cd8af95..e7a52a17 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -326,7 +326,6 @@ VictreebelPicBack:: INCBIN "gfx/pokemon/back/victreebelb.pic" SECTION "Pics 6", ROMX -TrainerPics:: YoungsterPic:: INCBIN "gfx/trainers/youngster.pic" BugCatcherPic:: INCBIN "gfx/trainers/bugcatcher.pic" LassPic:: INCBIN "gfx/trainers/lass.pic" diff --git a/home/pics.asm b/home/pics.asm index 8fd9a26a..c0559908 100644 --- a/home/pics.asm +++ b/home/pics.asm @@ -9,35 +9,35 @@ UncompressMonSprite:: ld a, [hl] ld [wSpriteInputPtr+1], a ; define (by index number) the bank that a pokemon's image is in -; index = Mew, bank 1 -; index = Kabutops fossil, bank $B -; index < $1F, bank 9 -; $1F ≤ index < $4A, bank $A -; $4A ≤ index < $74, bank $B -; $74 ≤ index < $99, bank $C -; $99 ≤ index, bank $D - ld a, [wcf91] ; XXX name for this ram location +; index = MEW: bank $1 +; index = FOSSIL_KABUTOPS: bank $B +; index < $1F: bank $9 ("Pics 1") +; $1F ≤ index < $4A: bank $A ("Pics 2") +; $4A ≤ index < $74: bank $B ("Pics 3") +; $74 ≤ index < $99: bank $C ("Pics 4") +; $99 ≤ index: bank $D ("Pics 5") + ld a, [wcf91] ld b, a cp FOSSIL_KABUTOPS ld a, BANK(FossilKabutopsPic) jr z, .GotBank ld a, b cp TANGELA + 1 - ld a, BANK(TangelaPicFront) + ld a, BANK("Pics 1") jr c, .GotBank ld a, b cp MOLTRES + 1 - ld a, BANK(MoltresPicFront) + ld a, BANK("Pics 2") jr c, .GotBank ld a, b cp BEEDRILL + 2 - ld a, BANK(BeedrillPicFront) + ld a, BANK("Pics 3") jr c, .GotBank ld a, b cp STARMIE + 1 - ld a, BANK(StarmiePicFront) + ld a, BANK("Pics 4") jr c, .GotBank - ld a, BANK(VictreebelPicFront) + ld a, BANK("Pics 5") .GotBank jp UncompressSpriteData |