diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
| commit | 9d44bc0bda9294c4d4cb3744efe9c2d96278c3bd (patch) | |
| tree | 6ac0ef8acbace05710da0052b4decaf4146d5d3f /include/constants/maps.h | |
| parent | 9397d6d23ad460f7019d4a12da035f53a450d237 (diff) | |
| parent | 71fec599bbe144af8d4a16e98ec32454fd10a4a8 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump
Diffstat (limited to 'include/constants/maps.h')
| -rw-r--r-- | include/constants/maps.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/include/constants/maps.h b/include/constants/maps.h index db8ee451c..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,33 +12,4 @@ #define MAP(map) MAP_GROUP(map), MAP_NUM(map) -// temporary map constants -#define BATTLE_SCENE_0 0 -#define BATTLE_SCENE_1 1 -#define BATTLE_SCENE_2 2 -#define BATTLE_SCENE_3 3 -#define BATTLE_SCENE_4 4 -#define BATTLE_SCENE_5 5 -#define BATTLE_SCENE_6 6 -#define BATTLE_SCENE_7 7 -#define BATTLE_SCENE_8 8 -#define BATTLE_SCENE_9 9 -#define BATTLE_SCENE_10 10 -#define BATTLE_SCENE_11 11 -#define BATTLE_SCENE_12 12 -#define BATTLE_SCENE_13 13 -#define BATTLE_SCENE_14 14 -#define BATTLE_SCENE_15 15 - -#define MAP_TYPE_0 0 -#define MAP_TYPE_1 1 -#define MAP_TYPE_2 2 -#define MAP_TYPE_3 3 -#define MAP_TYPE_4 4 -#define MAP_TYPE_5 5 -#define MAP_TYPE_6 6 -#define MAP_TYPE_7 7 -#define MAP_TYPE_8 8 -#define MAP_TYPE_9 9 - #endif // GUARD_CONSTANTS_MAPS_H |