diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/maps.h | 2 | ||||
| -rw-r--r-- | include/field_fadetransition.h | 1 | ||||
| -rw-r--r-- | include/field_weather.h | 1 | ||||
| -rw-r--r-- | include/help_system.h | 1 | ||||
| -rw-r--r-- | include/overworld.h | 6 | ||||
| -rw-r--r-- | include/seagallop.h | 21 |
6 files changed, 32 insertions, 0 deletions
diff --git a/include/constants/maps.h b/include/constants/maps.h index 8a8a023a8..5fb5f88fa 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -9,4 +9,6 @@ #define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_NUM(map) (MAP_##map & 0xFF) +#define MAP(map) MAP_GROUP(map), MAP_NUM(map) + #endif // GUARD_CONSTANTS_MAPS_H diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index a2a4d3eac..228ff3bfb 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -12,5 +12,6 @@ void DoFallWarp(void); void sub_807E59C(void); void sub_807E500(void); void sub_807DF64(void); +void sub_807DC18(void); #endif // GUARD_FIELD_FADETRANSITION_H diff --git a/include/field_weather.h b/include/field_weather.h index eb80c455a..eeda3b5b5 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -12,5 +12,6 @@ void sub_80AEDBC(void); void DoCurrentWeather(void); void SetSav1WeatherFromCurrMapHeader(void); void sub_807B0C4(u16 *, u16 *, u32); +void play_some_sound(void); #endif // GUARD_WEATHER_H diff --git a/include/help_system.h b/include/help_system.h index 3ef5f53e4..6398d306b 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -7,5 +7,6 @@ extern bool8 gUnknown_3005ECC; void sub_812B484(void); void HelpSystem_SetSomeVariable2(u8); +void sub_812B478(void); #endif //GUARD_HELP_SYSTEM_H diff --git a/include/overworld.h b/include/overworld.h index 8c32d3e06..0020e9f57 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -96,9 +96,15 @@ void sub_80563F0(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; +extern void (*gUnknown_3005020)(void); + extern bool8 (* gUnknown_3005024)(void); void SetLastHealLocationWarp(u8 healLocaionId); void sub_8055864(u8 mapGroup, u8 mapNum); void CB2_NewGame(void); +void Overworld_FadeOutMapMusic(void); +void sub_805671C(void); +bool8 sub_8055FC4(void); + #endif //GUARD_ROM4_H diff --git a/include/seagallop.h b/include/seagallop.h new file mode 100644 index 000000000..cce6da8ff --- /dev/null +++ b/include/seagallop.h @@ -0,0 +1,21 @@ +#ifndef GUARD_SEAGALLOP_H +#define GUARD_SEAGALLOP_H + +enum SeaGallopDestinations +{ + SEAGALLOP_VERMILION_CITY, + SEAGALLOP_ONE_ISLAND, + SEAGALLOP_TWO_ISLAND, + SEAGALLOP_THREE_ISLAND, + SEAGALLOP_FOUR_ISLAND, + SEAGALLOP_FIVE_ISLAND, + SEAGALLOP_SIX_ISLAND, + SEAGALLOP_SEVEN_ISLAND, + SEAGALLOP_CINNABAR_ISLAND, + SEAGALLOP_NAVEL_ROCK, + SEAGALLOP_BIRTH_ISLAND +}; + +void ScrSpecial_SeaGallopFerry(void); + +#endif //GUARD_SEAGALLOP_H |