summaryrefslogtreecommitdiff
path: root/home.asm
diff options
context:
space:
mode:
Diffstat (limited to 'home.asm')
-rw-r--r--home.asm41
1 files changed, 9 insertions, 32 deletions
diff --git a/home.asm b/home.asm
index def6200a..dbe7899f 100644
--- a/home.asm
+++ b/home.asm
@@ -285,7 +285,7 @@ LoadFrontSpriteByMonIndex::
cp NUM_POKEMON + 1
jr c, .validDexNumber ; dex >#151 invalid
.invalidDexNumber
- ld a, RHYDON ; $1
+ ld a, RHYDON
ld [wcf91], a
ret
.validDexNumber
@@ -722,40 +722,17 @@ UncompressMonSprite::
ld [wSpriteInputPtr],a ; fetch sprite input pointer
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
- ld b,a
- cp MEW
- ld a,BANK(MewPicFront)
- jr z,.GotBank
- ld a,b
cp FOSSIL_KABUTOPS
+ jr z,.GhostOrFossil
+ cp FOSSIL_AERODACTYL
+ jr z,.GhostOrFossil
+ cp MON_GHOST
+ jr z,.GhostOrFossil
+ ld a,[wMonHPicBank]
+ jr .GotBank
+.GhostOrFossil
ld a,BANK(FossilKabutopsPic)
- jr z,.GotBank
- ld a,b
- cp TANGELA + 1
- ld a,BANK(TangelaPicFront)
- jr c,.GotBank
- ld a,b
- cp MOLTRES + 1
- ld a,BANK(MoltresPicFront)
- jr c,.GotBank
- ld a,b
- cp BEEDRILL + 2
- ld a,BANK(BeedrillPicFront)
- jr c,.GotBank
- ld a,b
- cp STARMIE + 1
- ld a,BANK(StarmiePicFront)
- jr c,.GotBank
- ld a,BANK(VictreebelPicFront)
.GotBank
jp UncompressSpriteData