diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/event_flags.asm | 4 | ||||
| -rw-r--r-- | constants/map_constants.asm | 55 | ||||
| -rw-r--r-- | constants/sprite_data_constants.asm | 38 | ||||
| -rw-r--r-- | constants/trainer_constants.asm | 14 |
4 files changed, 62 insertions, 49 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 22b02f1c1..1af4215a1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -3,17 +3,30 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map permissions (wPermission) +; map header fields (see maps/map_headers.asm) + const_def + const MAPHEADER_MAPHEADER2_BANK ; 0 + const MAPHEADER_TILESET ; 1 + const MAPHEADER_ENVIRONMENT ; 2 + const MAPHEADER_MAPHEADER2 ; 3 + const MAPHEADER_MAPHEADER2_HI ; 4 + const MAPHEADER_LOCATION ; 5 + const MAPHEADER_MUSIC ; 6 + const MAPHEADER_PALETTE ; 7 + const MAPHEADER_FISHGROUP ; 8 +NUM_MAPHEADER_ATTRIBUTES EQU const_value + +; map environments (wEnvironment) const_value SET 1 const TOWN const ROUTE const INDOOR const CAVE - const PERM_5 + const ENVIRONMENT_5 const GATE const DUNGEON -; map palettes (wPermission) +; map palettes (wEnvironment) const_def const PALETTE_AUTO const PALETTE_DAY @@ -163,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 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index f2fb72714..c41a6ed58 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -680,13 +680,13 @@ NUM_TRAINER_CLASSES EQU __enum__ ; TrainerClassAttributes fields (see data/trainers/trainer_attributes.asm) const_def - const TRNATTR_ITEM1 - const TRNATTR_ITEM2 - const TRNATTR_BASEMONEY - const TRNATTR_AI_MOVE_WEIGHTS - const TRNATTR_AI2 - const TRNATTR_AI_ITEM_SWITCH - const TRNATTR_AI4 + const TRNATTR_ITEM1 ; 0 + const TRNATTR_ITEM2 ; 1 + const TRNATTR_BASEMONEY ; 2 + const TRNATTR_AI_MOVE_WEIGHTS ; 3 + const TRNATTR_AI2 ; 4 + const TRNATTR_AI_ITEM_SWITCH ; 5 + const TRNATTR_AI4 ; 6 NUM_TRAINER_ATTRIBUTES EQU const_value ; TRNATTR_AI_MOVE_WEIGHTS bit flags (wEnemyTrainerAIFlags) |