From fbc353f206ad457f32493b061b83e9067109e504 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 18:08:40 -0500 Subject: Replace some hex constants --- constants/gfx_constants.asm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'constants/gfx_constants.asm') diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index ca468f477..cba08a219 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,13 +1,12 @@ -LEN_1BPP_TILE EQU 8 ; bytes -LEN_2BPP_TILE EQU 16 ; bytes - TILE_WIDTH EQU 8 ; pixels +LEN_1BPP_TILE EQU TILE_WIDTH ; bytes +LEN_2BPP_TILE EQU TILE_WIDTH * 2 ; bytes NUM_PAL_COLORS EQU 4 -SCREEN_WIDTH EQU 20 ; tiles +SCREEN_WIDTH EQU 20 ; tiles SCREEN_HEIGHT EQU 18 ; tiles -SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels +SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * TILE_WIDTH ; pixels BG_MAP_WIDTH EQU 32 ; tiles @@ -15,9 +14,9 @@ BG_MAP_HEIGHT EQU 32 ; tiles WMISC_WIDTH EQU 6 * 4 WMISC_HEIGHT EQU 5 * 4 -HP_BAR_LENGTH EQU 6 ; tiles -HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels +HP_BAR_LENGTH EQU 6 ; tiles EXP_BAR_LENGTH EQU 8 ; tiles +HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels PALPACKET_LENGTH EQU $10 -- cgit v1.2.3 From 417937cffc2a7c3cfac49f3b00caf1a856d0a925 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 13:47:57 -0500 Subject: Resolve #461 --- constants/gfx_constants.asm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'constants/gfx_constants.asm') diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index cba08a219..275fe6b9f 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -20,3 +20,12 @@ HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels PALPACKET_LENGTH EQU $10 + +; sprite_oam_struct members (see macros/wram.asm) + const_def + const SPRITEOAMSTRUCT_YCOORD ; 0 + const SPRITEOAMSTRUCT_XCOORD ; 1 + const SPRITEOAMSTRUCT_TILE_ID ; 2 + const SPRITEOAMSTRUCT_ATTRIBUTES ; 3 +SPRITEOAMSTRUCT_LENGTH EQU const_value +NUM_SPRITE_OAM_STRUCTS EQU 40 ; see Sprites -- cgit v1.2.3 From 163f3e0c3f56831b5255b31045798ac950098faa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 22:16:17 -0500 Subject: Local UI tiles don't belong in charmap Separate 1bpp font tiles from gfx/mobile/phone_tiles.png --- constants/gfx_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants/gfx_constants.asm') diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 275fe6b9f..21b379a3d 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,6 +1,6 @@ TILE_WIDTH EQU 8 ; pixels -LEN_1BPP_TILE EQU TILE_WIDTH ; bytes -LEN_2BPP_TILE EQU TILE_WIDTH * 2 ; bytes +LEN_1BPP_TILE EQU 1 * TILE_WIDTH ; bytes +LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes NUM_PAL_COLORS EQU 4 -- cgit v1.2.3 From 0306e94cc3365fb7b28e3bb6e1ccccb1e6b8b449 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 00:16:03 -0500 Subject: More SGB documentation --- constants/gfx_constants.asm | 2 -- 1 file changed, 2 deletions(-) (limited to 'constants/gfx_constants.asm') diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 21b379a3d..0104af9f1 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -19,8 +19,6 @@ EXP_BAR_LENGTH EQU 8 ; tiles HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels -PALPACKET_LENGTH EQU $10 - ; sprite_oam_struct members (see macros/wram.asm) const_def const SPRITEOAMSTRUCT_YCOORD ; 0 -- cgit v1.2.3 From 226d1812b34dad7ee0bb758c4c4970a731c9c79e Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 11:16:24 -0500 Subject: Only graphics data goes in gfx/ Introduce PALRGB_WHITE constant for $7fff --- constants/gfx_constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'constants/gfx_constants.asm') diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 0104af9f1..864a4bd50 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -4,6 +4,8 @@ LEN_2BPP_TILE EQU 2 * TILE_WIDTH ; bytes NUM_PAL_COLORS EQU 4 +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 -- cgit v1.2.3