From 699495bfcb732559114ad1450e704844a86308a1 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 13:37:15 -0500 Subject: Consistent capitalization for map names, matching their constants --- constants/sprite_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants/sprite_constants.asm') diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 8dc63402a..b0e20fd15 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -146,8 +146,8 @@ SPRITE_POKEMON EQU const_value ; special GetMonSprite values (see engine/overworld.asm) const_value SET $e0 - const SPRITE_DAYCARE_MON_1 ; e0 - const SPRITE_DAYCARE_MON_2 ; e1 + const SPRITE_DAY_CARE_MON_1 ; e0 + const SPRITE_DAY_CARE_MON_2 ; e1 ; VariableSprites indexes (see wram.asm) const_value SET $f0 -- cgit v1.2.3 From a0bef01a1ddcd80eb098e88dc0514d07a4f1bc50 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 10 Dec 2017 20:10:39 -0500 Subject: Define more palette constants --- constants/sprite_constants.asm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'constants/sprite_constants.asm') diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index b0e20fd15..1a716f51b 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -193,6 +193,17 @@ const_value SET 1 const PAL_OW_TREE ; 6 const PAL_OW_ROCK ; 7 +; person_events set bit 3 so as not to use the sprite's default palette +const_value set (1 << 3) + const PAL_NPC_RED ; 8 + const PAL_NPC_BLUE ; 9 + const PAL_NPC_GREEN ; a + const PAL_NPC_BROWN ; b + const PAL_NPC_PINK ; c + const PAL_NPC_SILVER ; d + const PAL_NPC_TREE ; e + const PAL_NPC_ROCK ; f + ; SpriteMovementData indexes (see data/map_objects.asm) const_def const SPRITEMOVEDATA_00 ; 00 -- cgit v1.2.3 From c6fefd0fe878a350a5e8cb1140d0356c78648ba5 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 00:17:39 -0500 Subject: Rename overworld sprite files, consistent with their constants --- constants/sprite_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants/sprite_constants.asm') diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 1a716f51b..787e130f4 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -1,5 +1,5 @@ ; sprite ids -; SpriteHeaders indexes (see gfx/overworld/sprite_headers.asm) +; SpriteHeaders indexes (see gfx/sprite_headers.asm) const_def const SPRITE_NONE ; 00 const SPRITE_CHRIS ; 01 @@ -166,7 +166,7 @@ SPRITE_VARS EQU const_value const SPRITE_COPYCAT ; fb const SPRITE_JANINE_IMPERSONATOR ; fc -; sprite_header struct members (see gfx/overworld/sprite_headers.asm) +; sprite_header struct members (see gfx/sprite_headers.asm) const_def const SPRITEHEADER_ADDR_LO const SPRITEHEADER_ADDR_HI -- cgit v1.2.3 From 31cce83e9b3bab01d8a605b170549fbd25ca5fee Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 13:47:58 -0500 Subject: Move lots of data tables into individual data/ files (This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.) --- constants/sprite_constants.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'constants/sprite_constants.asm') diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 787e130f4..d2416c0fe 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -105,7 +105,7 @@ const SPRITE_RAIKOU ; 65 const SPRITE_STANDING_YOUNGSTER ; 66 -; SpriteMons indexes (see engine/overworld.asm) +; SpriteMons indexes (see data/sprite_mons.asm) const_value SET $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN ; 80 @@ -326,7 +326,7 @@ SPRITEMOVEDATA_FIELDS EQU 6 const PERSON_ACTION_GRASS_SHAKE const PERSON_ACTION_SKYFALL -; Facings indexes (see engine/facings.asm) +; Facings indexes (see data/facings.asm) const_def const FACING_STEP_DOWN_0 const FACING_STEP_DOWN_1 @@ -487,7 +487,7 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITE_ANIM_SEQ_INTRO_UNOWN_F const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY -; SpriteAnimSeqData indexes (see engine/sprites.asm) +; SpriteAnimSeqData indexes (see data/sprite_anim_seqs.asm) const_def const SPRITE_ANIM_INDEX_PARTY_MON const SPRITE_ANIM_INDEX_01 -- cgit v1.2.3 From f1f84743f7759a0f808f935add82439ba6637d2b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 11 Dec 2017 22:44:25 -0500 Subject: Keep table labels in the same files as their contents. --- constants/sprite_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'constants/sprite_constants.asm') diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index d2416c0fe..cf8d50a91 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -380,7 +380,7 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITEANIMSTRUCT_0E ; e const SPRITEANIMSTRUCT_0F ; f -; SpriteAnimFrameData indexes (see data/sprite_engine.asm) +; SpriteAnimFrameData indexes (see data/sprite_anim_frames.asm) const_def const SPRITE_ANIM_FRAMESET_00 const SPRITE_ANIM_FRAMESET_PARTY_MON @@ -535,7 +535,7 @@ SPRITEMOVEDATA_FIELDS EQU 6 const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY const SPRITE_ANIM_INDEX_CELEBI -; SpriteAnimOAMData indexes (see data/sprite_engine.asm) +; SpriteAnimOAMData indexes (see data/sprite_anim_oam.asm) const_def const SPRITE_ANIM_FRAME_IDX_00 const SPRITE_ANIM_FRAME_IDX_01 -- cgit v1.2.3