summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 13:46:34 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-24 14:33:17 -0500
commitc05b7f41dd5783315e9e4032b63ca84c6ed05893 (patch)
tree0c1995c8a928a297f842a75c2e009003534b3ec8 /constants
parent20d6c1d876cde19061c458761c7283163e316d8a (diff)
Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script - XYTriggers / xy_trigger → CoordEvents / coord_event - Signposts / signpost → BGEvents / bg_event - PersonEvents / person_event → ObjectEvents / object_event
Diffstat (limited to 'constants')
-rw-r--r--constants/event_flags.asm4
-rw-r--r--constants/map_constants.asm36
-rw-r--r--constants/sprite_data_constants.asm38
3 files changed, 39 insertions, 39 deletions
diff --git a/constants/event_flags.asm b/constants/event_flags.asm
index d1aa43610..b4c3fc18b 100644
--- a/constants/event_flags.asm
+++ b/constants/event_flags.asm
@@ -130,7 +130,7 @@
const EVENT_GOT_TM12_SWEET_SCENT
const EVENT_RELEASED_THE_BEASTS
const EVENT_GOT_MASTER_BALL_FROM_ELM
-; Johto signpost items
+; Johto hidden items
const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
@@ -236,7 +236,7 @@
const EVENT_TALKED_TO_OAK_IN_KANTO
const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
const EVENT_GOT_TM29_PSYCHIC
-; Kanto signpost items
+; Kanto hidden items
const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index d38fcfaba..1af4215a1 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -176,28 +176,28 @@ const_value = -1
NUM_SPAWNS EQU const_value
-; TryReadSign arguments (see engine/events.asm)
+; TryBGEvent arguments (see engine/events.asm)
const_def
- const SIGNPOST_READ
- const SIGNPOST_UP
- const SIGNPOST_DOWN
- const SIGNPOST_RIGHT
- const SIGNPOST_LEFT
- const SIGNPOST_IFSET
- const SIGNPOST_IFNOTSET
- const SIGNPOST_ITEM
- const SIGNPOST_COPY
+ const BGEVENT_READ
+ const BGEVENT_UP
+ const BGEVENT_DOWN
+ const BGEVENT_RIGHT
+ const BGEVENT_LEFT
+ const BGEVENT_IFSET
+ const BGEVENT_IFNOTSET
+ const BGEVENT_ITEM
+ const BGEVENT_COPY
-; person_event types
+; object_event types
; TryObjectEvent arguments (see engine/events.asm)
const_def
- const PERSONTYPE_SCRIPT
- const PERSONTYPE_ITEMBALL
- const PERSONTYPE_TRAINER
- const PERSONTYPE_3
- const PERSONTYPE_4
- const PERSONTYPE_5
- const PERSONTYPE_6
+ const OBJECTTYPE_SCRIPT
+ const OBJECTTYPE_ITEMBALL
+ const OBJECTTYPE_TRAINER
+ const OBJECTTYPE_3
+ const OBJECTTYPE_4
+ const OBJECTTYPE_5
+ const OBJECTTYPE_6
; EmotesPointers indexes (see engine/overworld.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