diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-11 22:23:05 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-10-12 15:14:57 -0500 |
| commit | 4e2be7ff5e4e4f6b7f664bfee4f1d4433c7f238f (patch) | |
| tree | a3052dcc1b7c7ad80846e8c4296d1a8d1e392a89 /include | |
| parent | 714b122da6c4357b94b4284e8c2d1b2c0803253d (diff) | |
Review changes for #835
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/dodrio_berry_picking.h | 2 | ||||
| -rw-r--r-- | include/pokemon_jump.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 3fde9cc11..3030581c6 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -77,7 +77,7 @@ #define VAR_REGICE_STEPS_2 0x403C #define VAR_REGICE_STEPS_3 0x403D #define VAR_ALTERING_CAVE_WILD_SET 0x403E -#define VAR_DISTRIBUTE_EON_TICKET 0x403F // This var is read and written, but is always zero. Presumably meant to be set externally by Mystery Gift distribution +#define VAR_DISTRIBUTE_EON_TICKET 0x403F // This var is read and written, but is always zero. The only way to obtain the Eon Ticket in Emerald is via Record Mixing #define VAR_DAYS 0x4040 #define VAR_FANCLUB_UNKNOWN_1 0x4041 #define VAR_FANCLUB_UNKNOWN_2 0x4042 diff --git a/include/dodrio_berry_picking.h b/include/dodrio_berry_picking.h index ac802a2b5..9995decc2 100644 --- a/include/dodrio_berry_picking.h +++ b/include/dodrio_berry_picking.h @@ -2,7 +2,7 @@ #define GUARD_DODRIO_BERRY_PICKING_H void sub_802493C(u16 a0, void (*callback)(void)); -void DoesPartyHaveDodrio(void); +void IsDodrioInParty(void); void ShowDodrioBerryPickingRecords(void); #endif // GUARD_DODRIO_BERRY_PICKING_H diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index 4586ad6a6..dde59aac5 100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -5,7 +5,7 @@ void sub_802A9A8(u16 monId, MainCallback callback); bool32 IsSpeciesAllowedInPokemonJump(u16 species); -void DoesPartyHavePokemonJumpSpecies(void); +void IsPokemonJumpSpeciesInParty(void); void ResetPokeJumpResults(void); void ShowPokemonJumpRecords(void); void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority); |