From 992fba2bc534e6ceaa69938baada1427e03d83e1 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 14 May 2020 19:14:34 -0400 Subject: Fix nonmatching build --- src/credits.c | 2 ++ src/event_object_movement.c | 2 +- src/help_message.c | 1 + src/help_system.c | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/credits.c b/src/credits.c index e00587ff2..4ef4a1a9d 100644 --- a/src/credits.c +++ b/src/credits.c @@ -9,6 +9,8 @@ #include "graphics.h" #include "strings.h" #include "trainer_pokemon_sprites.h" +#include "menu.h" +#include "field_weather.h" #include "constants/species.h" #include "constants/maps.h" #include "constants/field_weather.h" diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 7d2a13b33..bc3bea584 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1335,7 +1335,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, s16 y2; s16 elevation2; - if(template->unk2 == 0xFF) + if(template->inConnection == 0xFF) { var = 1; mapNum = template2->trainerType; diff --git a/src/help_message.c b/src/help_message.c index 2fd76e432..49b2c5114 100644 --- a/src/help_message.c +++ b/src/help_message.c @@ -1,4 +1,5 @@ #include "global.h" +#include "malloc.h" #include "menu.h" static EWRAM_DATA u8 sHelpMessageWindowId = 0; diff --git a/src/help_system.c b/src/help_system.c index 9c794f878..87fabbd09 100644 --- a/src/help_system.c +++ b/src/help_system.c @@ -5,6 +5,7 @@ #include "help_system.h" #include "list_menu.h" #include "strings.h" +#include "event_data.h" #include "constants/songs.h" extern u8 gGlyphInfo[]; -- cgit v1.2.3