diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-30 17:50:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 17:50:33 -0400 |
| commit | 2641f93ad084b1329b3f3b9f7c8c222445fc4832 (patch) | |
| tree | fb048bbc8bb7257dbd8169e2442117da5d2b30d2 /constants/gfx_constants.asm | |
| parent | 91f914718a263839daef24d44eda857bfc7cca95 (diff) | |
| parent | da5125e1411f9599b883181c5ee6e31252d37ac8 (diff) | |
Merge pull request #534 from Rangi42/master
[RTM] Fix triple newlines left over from removing address comments, and other improvements
Diffstat (limited to 'constants/gfx_constants.asm')
| -rw-r--r-- | constants/gfx_constants.asm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 0da273f89..41a67a648 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -8,7 +8,6 @@ PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff - SCREEN_WIDTH EQU 20 ; tiles SCREEN_HEIGHT EQU 18 ; tiles SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels @@ -23,7 +22,6 @@ SCREEN_META_HEIGHT EQU 5 ; metatiles SURROUNDING_WIDTH EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles - HP_BAR_LENGTH EQU 6 ; tiles EXP_BAR_LENGTH EQU 8 ; tiles HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels @@ -34,7 +32,6 @@ HP_GREEN EQU 0 HP_YELLOW EQU 1 HP_RED EQU 2 - ; sprite_oam_struct members (see macros/wram.asm) const_def const SPRITEOAMSTRUCT_YCOORD ; 0 @@ -44,7 +41,6 @@ HP_RED EQU 2 SPRITEOAMSTRUCT_LENGTH EQU const_value NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM - ; PokeAnims indexes (see engine/gfx/pic_animation.asm) const_def const ANIM_MON_SLOW |