diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/event_object_movement.h | 24 | ||||
| -rw-r--r-- | include/constants/layouts.h | 4 | ||||
| -rw-r--r-- | include/constants/map_groups.h | 4 | ||||
| -rw-r--r-- | include/constants/metatile_behaviors.h | 2 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index b029b47c4..008d3a117 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -70,19 +70,19 @@ #define MOVEMENT_TYPE_WALK_IN_PLACE_UP 0x41 #define MOVEMENT_TYPE_WALK_IN_PLACE_LEFT 0x42 #define MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT 0x43 -#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x44 -#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x45 -#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x46 -#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x47 -#define MOVEMENT_TYPE_RUN_IN_PLACE_DOWN 0x48 -#define MOVEMENT_TYPE_RUN_IN_PLACE_UP 0x49 -#define MOVEMENT_TYPE_RUN_IN_PLACE_LEFT 0x4A -#define MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT 0x4B +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x44 +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x45 +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x46 +#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x47 +#define MOVEMENT_TYPE_JOG_IN_PLACE_DOWN 0x48 +#define MOVEMENT_TYPE_JOG_IN_PLACE_UP 0x49 +#define MOVEMENT_TYPE_JOG_IN_PLACE_LEFT 0x4A +#define MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT 0x4B #define MOVEMENT_TYPE_INVISIBLE 0x4C -#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN 0x4D -#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP 0x4E -#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT 0x4F -#define MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT 0x50 +#define MOVEMENT_TYPE_VS_SEEKER_4D 0x4D +#define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E +#define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F +#define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50 #define MOVEMENT_ACTION_FACE_DOWN 0x0 #define MOVEMENT_ACTION_FACE_UP 0x1 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 01a452970..5218ee717 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -7,7 +7,7 @@ #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_1F 1 #define LAYOUT_PALLET_TOWN_PLAYERS_HOUSE_2F 2 -#define LAYOUT_PALLET_TOWN_GARYS_HOUSE 3 +#define LAYOUT_PALLET_TOWN_RIVALS_HOUSE 3 #define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 4 #define LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB 5 #define LAYOUT_HOUSE1 6 @@ -42,7 +42,7 @@ #define LAYOUT_RS_SAFARI_ZONE_ENTRANCE 46 #define LAYOUT_BATTLE_COLOSSEUM_2P 47 #define LAYOUT_TRADE_CENTER 48 -#define LAYOUT_RECORD_CENTER 49 +#define LAYOUT_RECORD_CORNER 49 #define LAYOUT_BATTLE_COLOSSEUM_4P 50 #define LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE 51 #define LAYOUT_RS_SAFARI_ZONE_NORTHEAST 52 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index b087b2c33..788ea7bda 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -8,7 +8,7 @@ // Map Group 0 #define MAP_BATTLE_COLOSSEUM_2P (0 | (0 << 8)) #define MAP_TRADE_CENTER (1 | (0 << 8)) -#define MAP_RECORD_CENTER (2 | (0 << 8)) +#define MAP_RECORD_CORNER (2 | (0 << 8)) #define MAP_BATTLE_COLOSSEUM_4P (3 | (0 << 8)) #define MAP_UNION_ROOM (4 | (0 << 8)) @@ -270,7 +270,7 @@ // Map Group 4 #define MAP_PALLET_TOWN_PLAYERS_HOUSE_1F (0 | (4 << 8)) #define MAP_PALLET_TOWN_PLAYERS_HOUSE_2F (1 | (4 << 8)) -#define MAP_PALLET_TOWN_GARYS_HOUSE (2 | (4 << 8)) +#define MAP_PALLET_TOWN_RIVALS_HOUSE (2 | (4 << 8)) #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8)) // Map Group 5 diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index 77cd6de1b..c953ae20b 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -6,7 +6,7 @@ #define MB_01 0x01 #define MB_TALL_GRASS 0x02 #define MB_CAVE 0x08 -#define MB_0A 0x0A +#define MB_RUNNING_DISALLOWED 0x0A #define MB_0B 0x0B #define MB_0C 0x0C #define MB_POND_WATER 0x10 diff --git a/include/constants/vars.h b/include/constants/vars.h index 468b9566e..70efab478 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -135,7 +135,7 @@ #define VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB 0x4055 #define VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F 0x4056 #define VAR_MAP_SCENE_VIRIDIAN_CITY_MART 0x4057 -#define VAR_MAP_SCENE_PALLET_TOWN_GARYS_HOUSE 0x4058 +#define VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE 0x4058 #define VAR_MAP_SCENE_POKEMON_TOWER_6F 0x4059 #define VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR 0x405A #define VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR 0x405B |