diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-20 13:22:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-20 13:22:32 -0400 |
| commit | 3e554e1d5206f0ede60f7e99e68637b7f13bc683 (patch) | |
| tree | c5a21b6e4d24ad3e98c3c98982afc65a866e650d /engine/gfx | |
| parent | Merge pull request #279 from Rangi42/master (diff) | |
| parent | Add comments associating constants with data, and identify some more data (diff) | |
| download | pokeyellow-3e554e1d5206f0ede60f7e99e68637b7f13bc683.tar.gz pokeyellow-3e554e1d5206f0ede60f7e99e68637b7f13bc683.tar.xz pokeyellow-3e554e1d5206f0ede60f7e99e68637b7f13bc683.zip | |
Merge pull request #281 from Rangi42/master
Add comments associating constants with data, and identify some more data
Diffstat (limited to 'engine/gfx')
| -rwxr-xr-x | engine/gfx/mon_icons.asm | 8 | ||||
| -rwxr-xr-x | engine/gfx/palettes.asm | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 8dd6fe75..16409640 100755 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -55,11 +55,11 @@ GetAnimationSpeed: ld bc, $10 ld a, [wCurrentMenuItem] call AddNTimes - ld c, $40 ; amount to increase the tile id by + ld c, ICONOFFSET ld a, [hl] - cp $4 ; tile ID for ICON_BALL + cp ICON_BALL << 2 jr z, .editCoords - cp $8 ; tile ID for ICON_HELIX + cp ICON_HELIX << 2 jr nz, .editTileIDS ; ICON_BALL and ICON_HELIX only shake up and down .editCoords @@ -274,7 +274,7 @@ GetPartyMonSpriteID: swap a ; use lower nybble if pokedex num is even .skipSwap and $f0 - srl a + srl a ; value == ICON constant << 2 srl a ret diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 618e48b3..f2019e85 100755 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -241,6 +241,7 @@ SetPal_TrainerCard: ret SetPalFunctions: +; entries correspond to SET_PAL_* constants dw SetPal_BattleBlack dw SetPal_Battle dw SetPal_TownMap |