diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 16:22:43 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 16:22:43 -0500 |
| commit | 753e894b6a9aa9f51789d4e1945d310749fd6c54 (patch) | |
| tree | a9928af64ee6a0ee6c9409ca40d43ddefe14c27d | |
| parent | 729c224bf2421c30e64f2082f19907b5e66b8138 (diff) | |
Move map type/battle scene constants for porymap
| -rw-r--r-- | include/constants/map_types.h | 25 | ||||
| -rw-r--r-- | include/constants/maps.h | 22 |
2 files changed, 26 insertions, 21 deletions
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 diff --git a/include/constants/maps.h b/include/constants/maps.h index b1d7588f1..395b07f46 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -2,6 +2,7 @@ #define GUARD_CONSTANTS_MAPS_H #include "constants/map_groups.h" +#include "constants/map_types.h" #define MAP_NONE (0x7F | (0x7F << 8)) #define MAP_UNDEFINED (0xFF | (0xFF << 8)) @@ -11,25 +12,4 @@ #define MAP(map) MAP_GROUP(map), MAP_NUM(map) -#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 - -#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 - #endif // GUARD_CONSTANTS_MAPS_H |