diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/metatile_behaviors.h | 4 | ||||
| -rw-r--r-- | include/constants/pokemon.h | 20 | ||||
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/field_weather.h | 4 | ||||
| -rw-r--r-- | include/metatile_behavior.h | 2 | ||||
| -rw-r--r-- | include/quest_log.h | 7 |
7 files changed, 21 insertions, 20 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 83d9bf28b..9e76dd4de 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1324,7 +1324,7 @@ #define FLAG_SYS_FLASH_ACTIVE (SYS_FLAGS + 0x6) #define FLAG_SYS_SPECIAL_WILD_BATTLE (SYS_FLAGS + 0x7) -#define FLAG_QL_DEPARTED (SYS_FLAGS + 0x8) +#define FLAG_SYS_QL_DEPARTED (SYS_FLAGS + 0x8) #define FLAG_0x809 (SYS_FLAGS + 0x9) #define FLAG_0x80A (SYS_FLAGS + 0xA) #define FLAG_0x80B (SYS_FLAGS + 0xB) diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index e26f79be0..77cd6de1b 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -107,11 +107,11 @@ #define MB_CUP 0x9B #define MB_PORTHOLE 0x9C #define MB_BLINKING_LIGHTS 0x9E -#define MB_9F 0x9F +#define MB_NEATLY_LINED_UP_TOOLS 0x9F #define MB_IMPRESSIVE_MACHINE 0xA0 #define MB_VIDEO_GAME 0xA1 #define MB_BURGLARY 0xA2 -#define MB_A3 0xA3 +#define MB_TRAINER_TOWER_MONITOR 0xA3 #define MB_CYCLING_ROAD_PULL_DOWN 0xD0 #define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index d58c51d72..737eed4d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -198,16 +198,16 @@ #define MON_FEMALE 0xFE #define MON_GENDERLESS 0xFF -#define FRIENDSHIP_EVENT_GROW_LEVEL 0x0 -#define FRIENDSHIP_EVENT_VITAMIN 0x1 -#define FRIENDSHIP_EVENT_BATTLE_ITEM 0x2 -#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 0x3 -#define FRIENDSHIP_EVENT_LEARN_TMHM 0x4 -#define FRIENDSHIP_EVENT_WALKING 0x5 -#define FRIENDSHIP_EVENT_MASSAGE 0x6 -#define FRIENDSHIP_EVENT_FAINT_SMALL 0x7 -#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 0x8 -#define FRIENDSHIP_EVENT_FAINT_LARGE 0x9 +#define FRIENDSHIP_EVENT_GROW_LEVEL 0 +#define FRIENDSHIP_EVENT_VITAMIN 1 +#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 4 +#define FRIENDSHIP_EVENT_WALKING 5 +#define FRIENDSHIP_EVENT_MASSAGE 6 +#define FRIENDSHIP_EVENT_FAINT_SMALL 7 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 8 +#define FRIENDSHIP_EVENT_FAINT_LARGE 9 #define PARTY_SIZE 6 #define MAX_TOTAL_EVS 510 diff --git a/include/constants/vars.h b/include/constants/vars.h index e10a96bd0..468b9566e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -122,7 +122,7 @@ #define VAR_EGG_BRAG_STATE 0x404A #define VAR_LINK_WIN_BRAG_STATE 0x404B #define VAR_POKELOT_RND2 0x404C -#define VAR_QL_ENTRANCE 0x404D +#define VAR_QL_ENTRANCE 0x404D #define VAR_0x404E 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F diff --git a/include/field_weather.h b/include/field_weather.h index c8921c1fe..334bc0863 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -35,8 +35,8 @@ struct Weather u8 fadeScreenCounter; bool8 readyForInit; u8 taskId; - u8 fade_in_active; - u8 fade_in_counter; + u8 fadeInActive; + u8 fadeInCounter; u16 initStep; u16 finishStep; u8 currWeather; diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index d00b4b4a5..9d29c31e9 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -146,7 +146,7 @@ bool8 MetatileBehavior_IsCup(u8 metatileBehavior); bool8 MetatileBehavior_IsPolishedWindow(u8 metatileBehavior); bool8 MetatileBehavior_IsBeautifulSkyWindow(u8 metatileBehavior); bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior); -bool8 MetatileBehavior_IsIsNeatlyLinedUpTools(u8 metatileBehavior); +bool8 MetatileBehavior_IsNeatlyLinedUpTools(u8 metatileBehavior); bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior); bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior); bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior); diff --git a/include/quest_log.h b/include/quest_log.h index 748b9c3da..295f942f2 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -6,6 +6,10 @@ #include "constants/quest_log.h" #include "field_control_avatar.h" +// Parameter to QuestLog_OnEscalatorWarp +#define QL_ESCALATOR_OUT 1 +#define QL_ESCALATOR_IN 2 + struct QuestLogEntry { // When command == 2, these fields have different meanings @@ -57,9 +61,6 @@ void SetQuestLogRecordAndPlaybackPointers(void *oldSave); void sub_811246C(struct Sprite *sprite); void QuestLogRecordNPCStep(u8 a0, u8 a1, u8 a2, u8 a3); bool8 sub_8111C2C(void); - -#define QL_ESCALATOR_OUT 1 -#define QL_ESCALATOR_IN 2 void QuestLog_OnEscalatorWarp(u8 direction); void QuestLogRecordPlayerAvatarGfxTransitionWithDuration(u8 movementActionId, u8 duration); void Special_UpdateTrainerFansAfterLinkBattle(void); |