Fix nonmatching build

This commit is contained in:
GriffinR
2020-05-14 19:14:34 -04:00
parent ea01b132b2
commit 992fba2bc5
4 changed files with 5 additions and 1 deletions
+2
View File
@@ -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"
+1 -1
View File
@@ -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;
+1
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "malloc.h"
#include "menu.h"
static EWRAM_DATA u8 sHelpMessageWindowId = 0;
+1
View File
@@ -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[];