diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-02 18:46:49 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-04 19:49:53 -0400 |
| commit | 3d87a88067c36e1296612bfaf3dc741884bc9bd4 (patch) | |
| tree | 34d3b32de85925087a5edff684adbe68867af1c3 | |
| parent | 608da287c1ecc593ac7b7f2c793114c99a032d04 (diff) | |
Make battle pyramid defines into enums
| -rw-r--r-- | include/constants/battle_pyramid.h | 10 | ||||
| -rw-r--r-- | src/battle_pyramid.c | 13 |
2 files changed, 13 insertions, 10 deletions
diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h index 004df7155..378197a4d 100644 --- a/include/constants/battle_pyramid.h +++ b/include/constants/battle_pyramid.h @@ -7,16 +7,6 @@ #define FLOOR_WALKABLE_METATILE 0x28D #define FLOOR_EXIT_METATILE 0x28E -#define HINT_EXIT_DIRECTION 0 -#define HINT_REMAINING_ITEMS 1 -#define HINT_REMAINING_TRAINERS 2 -#define HINT_EXIT_SHORT_REMAINING_TRAINERS 3 -#define HINT_EXIT_SHORT_REMAINING_ITEMS 4 -#define HINT_EXIT_MEDIUM_REMAINING_TRAINERS 5 -#define HINT_EXIT_MEDIUM_REMAINING_ITEMS 6 -#define HINT_EXIT_FAR_REMAINING_TRAINERS 7 -#define HINT_EXIT_FAR_REMAINING_ITEMS 8 - #define OBJ_TRAINERS 0 #define OBJ_ITEMS 1 diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index b015f3e0e..9e881d3a3 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -523,6 +523,19 @@ static const u8 sTrainerTextGroups[50][2] = {FACILITY_CLASS_HIKER, 4}, }; +enum +{ + HINT_EXIT_DIRECTION, + HINT_REMAINING_ITEMS, + HINT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_TRAINERS, + HINT_EXIT_SHORT_REMAINING_ITEMS, + HINT_EXIT_MEDIUM_REMAINING_TRAINERS, + HINT_EXIT_MEDIUM_REMAINING_ITEMS, + HINT_EXIT_FAR_REMAINING_TRAINERS, + HINT_EXIT_FAR_REMAINING_ITEMS, +}; + static const u8 *const sExitDirectionHintTexts1[] = { BattlePyramid_Text_ExitHintUp1, |