diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-07 19:48:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 19:48:22 -0400 |
| commit | 9571c550b6a0dcb3a4f54513c881661a87271024 (patch) | |
| tree | d73507228a57e4f3cece2fb93fe7df3a9439553f /engine/gfx/mon_icons.asm | |
| parent | Merge pull request #262 from Rangi42/master (diff) | |
| parent | Move all code out of home.asm into home/ (diff) | |
| download | pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.gz pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.tar.xz pokeyellow-9571c550b6a0dcb3a4f54513c881661a87271024.zip | |
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'engine/gfx/mon_icons.asm')
| -rwxr-xr-x | engine/gfx/mon_icons.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 7a96b36c..8dd6fe75 100755 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -169,7 +169,7 @@ WriteMonPartySpriteOAMByPartyIndex: push hl push de push bc - ld a, [hPartyMonIndex] + ldh a, [hPartyMonIndex] ld hl, wPartySpecies ld e, a ld d, 0 @@ -187,7 +187,7 @@ WriteMonPartySpriteOAMBySpecies: ; Write OAM blocks for the party sprite of the species in ; [wMonPartySpriteSpecies]. xor a - ld [hPartyMonIndex], a + ldh [hPartyMonIndex], a ld a, [wMonPartySpriteSpecies] call GetPartyMonSpriteID ld [wOAMBaseTile], a @@ -201,11 +201,11 @@ UnusedPartyMonSpriteFunction: ld a, [wcf91] call GetPartyMonSpriteID push af - ld hl, vSprites + ld hl, vSprites tile $00 call .LoadTilePatterns pop af add $54 - ld hl, vSprites + $40 + ld hl, vSprites tile $04 call .LoadTilePatterns xor a ld [wMonPartySpriteSpecies], a @@ -236,8 +236,8 @@ WriteMonPartySpriteOAM: ; make a copy at wMonPartySpritesSavedOAM. push af ld c, $10 - ld h, wOAMBuffer / $100 - ld a, [hPartyMonIndex] + ld h, HIGH(wOAMBuffer) + ldh a, [hPartyMonIndex] swap a ld l, a add $10 |