dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-overworld

Browse Source
This commit is contained in:
GriffinR
2020-07-18 20:24:09 -04:00
committed by GitHub
parent e129d04b93 8e6dd3bafe
commit af09e73d67
247 changed files with 4787 additions and 4035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_specials.c
+2 -2
View File
@@ -2854,7 +2854,7 @@ void SetBattleTowerLinkPlayerGfx(void)
void ShowNatureGirlMessage(void)
{
static const u8 *const sNatureGirlMessages[] = {
static const u8 *const sNatureGirlMessages[NUM_NATURES] = {
[NATURE_HARDY] = BattleFrontier_Lounge5_Text_NatureGirlHardy,
[NATURE_LONELY] = BattleFrontier_Lounge5_Text_NatureGirlLonely,
[NATURE_BRAVE] = BattleFrontier_Lounge5_Text_NatureGirlBrave,
@@ -3687,7 +3687,7 @@ void Unused_SetWeatherSunny(void)
SetCurrentAndNextWeather(WEATHER_SUNNY);
}
// Always returns 1
// All mart employees have a local id of 1, so function always returns 1
u32 GetMartEmployeeObjectEventId(void)
{
static const u8 sPokeMarts[][3] =