diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/field_effects.h | 1 | ||||
| -rw-r--r-- | include/constants/flags.h | 8 | ||||
| -rw-r--r-- | include/field_effect.h | 1 | ||||
| -rw-r--r-- | include/field_specials.h | 2 | ||||
| -rw-r--r-- | include/fieldmap.h | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 62ab5af0c..8a5e11fcf 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -67,6 +67,7 @@ #define FLDEFF_USE_TELEPORT 63 #define FLDEFF_UNK_40 64 #define FLDEFF_UNK_41 65 // TODO: related to vs_seeker +#define FLDEFF_UNK_43 67 // TODO: related to deoxys #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/include/constants/flags.h b/include/constants/flags.h index 50619c941..226032b2d 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -748,10 +748,10 @@ #define FLAG_NO_ROOM_FOR_TOGEPI_EGG 0x2DB #define FLAG_RECOVERED_SAPPHIRE 0x2DC #define FLAG_GOT_RUBY 0x2DD -#define FLAG_0x2DE 0x2DE -#define FLAG_0x2DF 0x2DF -#define FLAG_0x2E0 0x2E0 -#define FLAG_LEARNED_MOVE_AT_CAPE_BRINK 0x2E1 +#define FLAG_TUTOR_FRENZY_PLANT 0x2DE +#define FLAG_TUTOR_BLAST_BURN 0x2DF +#define FLAG_TUTOR_HYDRO_CANNON 0x2E0 +#define FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK 0x2E1 #define FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL 0x2E2 #define FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE 0x2E3 #define FLAG_FOUGHT_DEOXYS 0x2E4 diff --git a/include/field_effect.h b/include/field_effect.h index fa66929ea..70398313b 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -20,5 +20,6 @@ void sub_8084454(void); void sub_8084784(u8 a0, u8 a1); void sub_8084F2C(u8 a0); void sub_80853CC(u8 a0); +void sub_8083598(u8 a0); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_specials.h b/include/field_specials.h index e82439fe7..c435bdaee 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -15,7 +15,7 @@ u8 GetLeadMonIndex(void); s32 CountDigits(s32 number); void TV_PrintIntToStringVar(u8, int); u16 ScrSpecial_GetStarter(void); -void sub_80CCB68(void); +void StopPokemonLeagueLightingEffectTask(void); void nullsub_60(void); void nullsub_61(void); u8 ContextNpcGetTextColor(void); diff --git a/include/fieldmap.h b/include/fieldmap.h index dde05b7ed..c3709c616 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -25,6 +25,7 @@ bool32 CanCameraMoveInDirection(s32); u32 GetBehaviorByMetatileIdAndMapData(struct MapData *mapData, u16 metatile, u8 attr); const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * connection); struct MapConnection * GetMapConnectionAtPos(s16 x, s16 y); +void sub_8059948(u8 a0, u8 a1); void save_serialize_map(void); |