diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-01 01:49:11 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-01 01:49:11 -0500 |
| commit | a7e5852f1d95dd2b438e94fbf31b865196c6e951 (patch) | |
| tree | f6cd0dba609ae171a407b21bb90ee098851a6229 /include | |
| parent | 99bfd8c80fcfcafa55166ff65f5264c727b16ed0 (diff) | |
More minor fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/main.h | 4 | ||||
| -rw-r--r-- | include/overworld.h | 2 | ||||
| -rw-r--r-- | include/trainer_hill.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 72b02ee8f..c025d62fc 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -167,7 +167,7 @@ #define VAR_LILYCOVE_MUSEUM_2F_STATE 0x4094 #define VAR_LILYCOVE_FAN_CLUB_STATE 0x4095 #define VAR_BRINEY_LOCATION 0x4096 -#define VAR_SECRET_BASE_SHOULD_BE_INIT 0x4097 +#define VAR_INIT_SECRET_BASE 0x4097 #define VAR_PETALBURG_WOODS_STATE 0x4098 #define VAR_LILYCOVE_CONTEST_LOBBY_STATE 0x4099 #define VAR_RUSTURF_TUNNEL_STATE 0x409A diff --git a/include/main.h b/include/main.h index 014b4942e..2c241bf97 100644 --- a/include/main.h +++ b/include/main.h @@ -61,8 +61,8 @@ void SetHBlankCallback(IntrCallback callback); void SetVCountCallback(IntrCallback callback); void SetSerialCallback(IntrCallback callback); void InitFlashTimer(void); -void SetVBlankCounterPointer(u32 *var); -void ClearVBlankCounterPointer(void); +void SetTrainerHillVBlankCounter(u32 *var); +void ClearTrainerHillVBlankCounter(void); void DoSoftReset(void); void ClearPokemonCrySongs(void); void RestoreSerialTimer3IntrHandlers(void); diff --git a/include/overworld.h b/include/overworld.h index 54715ecc0..7ca442957 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -96,7 +96,7 @@ u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); u8 GetMapTypeByWarpData(struct WarpData *warp); u8 GetCurrentMapType(void); u8 GetLastUsedWarpMapType(void); -bool8 IsMapTypeOutside(u8 mapType); +bool8 IsMapTypeOutdoors(u8 mapType); bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); bool8 Overworld_MapTypeIsIndoors(u8 mapType); u8 GetSavedWarpRegionMapSectionId(void); diff --git a/include/trainer_hill.h b/include/trainer_hill.h index 35b0c5d6d..ad2713316 100644 --- a/include/trainer_hill.h +++ b/include/trainer_hill.h @@ -1,7 +1,7 @@ #ifndef GUARD_TRAINER_HILL_H #define GUARD_TRAINER_HILL_H -extern u32 *gVBlankCounterPointer; +extern u32 *gTrainerHillVBlankCounter; void CallTrainerHillFunction(void); void ResetTrainerHillResults(void); |