From 729c224bf2421c30e64f2082f19907b5e66b8138 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:16:03 -0500 Subject: Name battle scene and map type constants --- include/constants/map_types.h | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 include/constants/map_types.h (limited to 'include/constants/map_types.h') diff --git a/include/constants/map_types.h b/include/constants/map_types.h deleted file mode 100644 index 96ea73702..000000000 --- a/include/constants/map_types.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef GUARD_CONSTANTS_MAP_TYPES_H -#define GUARD_CONSTANTS_MAP_TYPES_H - -#define MAP_TYPE_0 0 -#define MAP_TYPE_TOWN 1 -#define MAP_TYPE_CITY 2 -#define MAP_TYPE_ROUTE 3 -#define MAP_TYPE_UNDERGROUND 4 -#define MAP_TYPE_UNDERWATER 5 -#define MAP_TYPE_OCEAN_ROUTE 6 -#define MAP_TYPE_7 7 -#define MAP_TYPE_INDOOR 8 -#define MAP_TYPE_SECRET_BASE 9 - -#endif // GUARD_CONSTANTS_MAP_TYPES_H -- cgit v1.2.3 From 753e894b6a9aa9f51789d4e1945d310749fd6c54 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:22:43 -0500 Subject: Move map type/battle scene constants for porymap --- include/constants/map_types.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 include/constants/map_types.h (limited to 'include/constants/map_types.h') diff --git a/include/constants/map_types.h b/include/constants/map_types.h new file mode 100644 index 000000000..d32a4e2a4 --- /dev/null +++ b/include/constants/map_types.h @@ -0,0 +1,25 @@ +#ifndef GUARD_CONSTANTS_MAP_TYPES_H +#define GUARD_CONSTANTS_MAP_TYPES_H + +#define MAP_TYPE_NONE 0 +#define MAP_TYPE_TOWN 1 +#define MAP_TYPE_CITY 2 // Unused. RSE use this map type to distinguish Town and City. FRLG make no distinction +#define MAP_TYPE_ROUTE 3 +#define MAP_TYPE_UNDERGROUND 4 +#define MAP_TYPE_UNDERWATER 5 // Unused +#define MAP_TYPE_OCEAN_ROUTE 6 // Unused +#define MAP_TYPE_UNKNOWN 7 // Unused +#define MAP_TYPE_INDOOR 8 +#define MAP_TYPE_SECRET_BASE 9 // Unused + +#define MAP_BATTLE_SCENE_NORMAL 0 +#define MAP_BATTLE_SCENE_GYM 1 +#define MAP_BATTLE_SCENE_INDOOR_1 2 // Pokemon Tower, Tanoby ruins +#define MAP_BATTLE_SCENE_INDOOR_2 3 // Pokemon Mansion, Power Plant, Rocket Hideout/Warehouse +#define MAP_BATTLE_SCENE_LORELEI 4 +#define MAP_BATTLE_SCENE_BRUNO 5 +#define MAP_BATTLE_SCENE_AGATHA 6 +#define MAP_BATTLE_SCENE_LANCE 7 +#define MAP_BATTLE_SCENE_LINK 8 + +#endif // GUARD_CONSTANTS_MAP_TYPES_H -- cgit v1.2.3