Fix static banks for monster icons.

This commit is contained in:
yenatch 2014-04-17 22:06:02 -04:00
parent 992a9e506c
commit 12412713fd
2 changed files with 14 additions and 12 deletions

View File

@ -74964,15 +74964,15 @@ Function8e82b: ; 8e82b
ld a, e ld a, e
call ReadMonMenuIcon call ReadMonMenuIcon
ld l, a ld l, a
ld h, $0 ld h, 0
add hl, hl add hl, hl
ld de, IconPointers ld de, IconPointers
add hl, de add hl, de
ld a, [hli] ld a, [hli]
ld e, a ld e, a
ld d, [hl] ld d, [hl]
ld b, $23 ld b, BANK(Icons)
ld c, $8 ld c, 8
ret ret
; 8e83f ; 8e83f
@ -75261,7 +75261,7 @@ GetIconGFX: ; 8e9de
ld de, $80 ; 8 tiles ld de, $80 ; 8 tiles
add hl, de add hl, de
ld de, HeldItemIcons ld de, HeldItemIcons
ld bc, $2302 lb bc, BANK(HeldItemIcons), 2
call GetGFXUnlessMobile call GetGFXUnlessMobile
ld a, [$c3b7] ld a, [$c3b7]
add 10 add 10
@ -75274,20 +75274,20 @@ INCBIN "gfx/icon/item.2bpp"
; 8ea17 ; 8ea17
GetIcon_de: ; 8ea17 GetIcon_de: ; 8ea17
; Load icon graphics into VRAM starting from tile de ; Load icon graphics into VRAM starting from tile de.
ld l, e ld l, e
ld h, d ld h, d
jr GetIcon jr GetIcon
GetIcon_a: ; 8ea1b GetIcon_a: ; 8ea1b
; Load icon graphics into VRAM starting from tile a ; Load icon graphics into VRAM starting from tile a.
ld l, a ld l, a
ld h, 0 ld h, 0
GetIcon: ; 8ea1e GetIcon: ; 8ea1e
; Load icon graphics into VRAM starting from tile hl ; Load icon graphics into VRAM starting from tile hl.
; One tile is 16 bytes long ; One tile is 16 bytes long.
add hl, hl add hl, hl
add hl, hl add hl, hl
add hl, hl add hl, hl
@ -75297,8 +75297,8 @@ GetIcon: ; 8ea1e
add hl, de add hl, de
push hl push hl
; Reading the icon pointer table would only make sense if they were ; The icons are contiguous, in order and of the same
; scattered. However, the icons are contiguous and in-order. ; size, so the pointer table is somewhat redundant.
ld a, [CurIcon] ld a, [CurIcon]
push hl push hl
ld l, a ld l, a
@ -75311,8 +75311,9 @@ GetIcon: ; 8ea1e
ld d, [hl] ld d, [hl]
pop hl pop hl
ld bc, $2308 lb bc, BANK(Icons), 8
call GetGFXUnlessMobile call GetGFXUnlessMobile
pop hl pop hl
ret ret
; 8ea3f ; 8ea3f

View File

@ -307,6 +307,7 @@ IconPointers:
dw SudowoodoIcon dw SudowoodoIcon
dw BigmonIcon dw BigmonIcon
Icons:
NullIcon: NullIcon:
PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d PoliwagIcon: INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d
JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d JigglypuffIcon: INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d