From c05b7f41dd5783315e9e4032b63ca84c6ed05893 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 24 Dec 2017 13:46:34 -0500 Subject: =?UTF-8?q?Renaming:=20(fix=20#412)=20-=20MapTriggers=20/=20maptri?= =?UTF-8?q?gger=20=E2=86=92=20SceneScripts=20/=20scene=5Fscript=20-=20XYTr?= =?UTF-8?q?iggers=20/=20xy=5Ftrigger=20=E2=86=92=20CoordEvents=20/=20coord?= =?UTF-8?q?=5Fevent=20-=20Signposts=20/=20signpost=20=E2=86=92=20BGEvents?= =?UTF-8?q?=20/=20bg=5Fevent=20-=20PersonEvents=20/=20person=5Fevent=20?= =?UTF-8?q?=E2=86=92=20ObjectEvents=20/=20object=5Fevent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/sprite_data_constants.asm | 38 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'constants/sprite_data_constants.asm') diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm index 29f88d63d..77d9e3975 100644 --- a/constants/sprite_data_constants.asm +++ b/constants/sprite_data_constants.asm @@ -25,7 +25,7 @@ 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 +; object_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 @@ -138,25 +138,25 @@ SPRITEMOVEDATA_FIELDS EQU 6 const STEP_TYPE_18 ; 18 const STEP_TYPE_SKYFALL_TOP ; 19 -; PersonActionPairPointers indexes (see engine/map_object_action.asm) +; ObjectActionPairPointers indexes (see engine/map_object_action.asm) const_def - const PERSON_ACTION_00 ; 00 - const PERSON_ACTION_STAND ; 01 - const PERSON_ACTION_STEP ; 02 - const PERSON_ACTION_BUMP ; 03 - const PERSON_ACTION_SPIN ; 04 - const PERSON_ACTION_SPIN_FLICKER ; 05 - const PERSON_ACTION_FISHING ; 06 - const PERSON_ACTION_SHADOW ; 07 - const PERSON_ACTION_EMOTE ; 08 - const PERSON_ACTION_BIG_SNORLAX ; 09 - const PERSON_ACTION_BOUNCE ; 0a - const PERSON_ACTION_WEIRD_TREE ; 0b - const PERSON_ACTION_BIG_LAPRAS ; 0c - const PERSON_ACTION_BIG_DOLL ; 0d - const PERSON_ACTION_BOULDER_DUST ; 0e - const PERSON_ACTION_GRASS_SHAKE ; 0f - const PERSON_ACTION_SKYFALL ; 10 + const OBJECT_ACTION_00 ; 00 + const OBJECT_ACTION_STAND ; 01 + const OBJECT_ACTION_STEP ; 02 + const OBJECT_ACTION_BUMP ; 03 + const OBJECT_ACTION_SPIN ; 04 + const OBJECT_ACTION_SPIN_FLICKER ; 05 + const OBJECT_ACTION_FISHING ; 06 + const OBJECT_ACTION_SHADOW ; 07 + const OBJECT_ACTION_EMOTE ; 08 + const OBJECT_ACTION_BIG_SNORLAX ; 09 + const OBJECT_ACTION_BOUNCE ; 0a + const OBJECT_ACTION_WEIRD_TREE ; 0b + const OBJECT_ACTION_BIG_LAPRAS ; 0c + const OBJECT_ACTION_BIG_DOLL ; 0d + const OBJECT_ACTION_BOULDER_DUST ; 0e + const OBJECT_ACTION_GRASS_SHAKE ; 0f + const OBJECT_ACTION_SKYFALL ; 10 ; Facings indexes (see data/facings.asm) const_def -- cgit v1.2.3