diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/battle_anim.h | 2 | ||||
| -rw-r--r-- | include/constants/metatile_behaviors.h | 14 | ||||
| -rw-r--r-- | include/constants/quest_log.h | 11 |
3 files changed, 16 insertions, 11 deletions
diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 962cad668..80be08905 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -276,7 +276,7 @@ #define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) #define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) #define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) -#define ANIM_TAG_POKEBLOCK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_SAFARI_BAIT (ANIM_SPRITES_START + 269) #define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) #define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) #define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index da979084a..e26f79be0 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -16,12 +16,12 @@ #define MB_OCEAN_WATER 0x15 #define MB_PUDDLE 0x16 #define MB_SHALLOW_WATER 0x17 -#define MB_19 0x19 +#define MB_UNDERWATER_BLOCKED_ABOVE 0x19 #define MB_1A 0x1A #define MB_1B 0x1B #define MB_STRENGTH_BUTTON 0x20 #define MB_SAND 0x21 -#define MB_22 0x22 +#define MB_SEAWEED 0x22 #define MB_ICE 0x23 #define MB_THIN_ICE 0x26 #define MB_CRACKED_ICE 0x27 @@ -68,14 +68,14 @@ #define MB_SOUTH_ARROW_WARP 0x65 #define MB_FALL_WARP 0x66 #define MB_REGULAR_WARP 0x67 -#define MB_68 0x68 +#define MB_LAVARIDGE_1F_WARP 0x68 #define MB_WARP_DOOR 0x69 #define MB_UP_ESCALATOR 0x6A #define MB_DOWN_ESCALATOR 0x6B -#define MB_UNKNOWN_WARP_6C 0x6C -#define MB_UNKNOWN_WARP_6D 0x6D -#define MB_UNKNOWN_WARP_6E 0x6E -#define MB_UNKNOWN_WARP_6F 0x6F +#define MB_UP_RIGHT_STAIR_WARP 0x6C +#define MB_UP_LEFT_STAIR_WARP 0x6D +#define MB_DOWN_RIGHT_STAIR_WARP 0x6E +#define MB_DOWN_LEFT_STAIR_WARP 0x6F #define MB_UNION_ROOM_WARP 0x71 #define MB_COUNTER 0x80 #define MB_BOOKSHELF 0x81 diff --git a/include/constants/quest_log.h b/include/constants/quest_log.h index b5494e7b9..b6f8dc319 100644 --- a/include/constants/quest_log.h +++ b/include/constants/quest_log.h @@ -2,9 +2,14 @@ #define GUARD_CONSTANTS_QUEST_LOG_H // TODO: Name and use state constants -#define QL_STATE_1 1 -#define QL_STATE_2 2 -#define QL_STATE_3 3 +#define QL_STATE_RECORDING 1 +#define QL_STATE_PLAYBACK 2 +#define QL_STATE_PLAYBACK_LAST 3 + +#define QL_START_NORMAL 1 +#define QL_START_WARP 2 + +#define QL_IS_PLAYBACK_STATE (gQuestLogState == QL_STATE_PLAYBACK || gQuestLogState == QL_STATE_PLAYBACK_LAST) #define QL_EVENT_0 0 // Null #define QL_EVENT_1 1 // Null |