summaryrefslogtreecommitdiff
path: root/src/field_door.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2019-07-29 20:44:18 -0500
committercamthesaxman <cameronghall@cox.net>2019-07-29 20:44:18 -0500
commitdb4af549fdf13cdaca6654f7bb9ef54ecef14359 (patch)
treec06f2d86efac079db46a3e9767faee1207f7f7e7 /src/field_door.c
parentb8393b3a799f92e7064c266600607d98f6baf4d9 (diff)
resolve some Emerald differences
Diffstat (limited to 'src/field_door.c')
-rw-r--r--src/field_door.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_door.c b/src/field_door.c
index 89dae725c..db840e663 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -3,8 +3,8 @@
#include "field_camera.h"
#include "fieldmap.h"
#include "metatile_behavior.h"
-#include "constants/songs.h"
#include "task.h"
+#include "constants/songs.h"
const u8 DoorAnimTiles_04[][0x100] =
{
@@ -517,7 +517,7 @@ static s8 StartDoorAnimationTask(const struct DoorGraphics *gfx, const struct Do
}
}
-static void DrawClosedDoor(const struct DoorGraphics *unused, u32 x, u32 y)
+static void DrawClosedDoor(const struct DoorGraphics *gfx, u32 x, u32 y)
{
DrawClosedDoorTiles(x, y);
}
@@ -553,7 +553,7 @@ static s8 cur_mapdata_get_door_x2_at(const struct DoorGraphics *gfx, u32 x, u32
if (gfx == NULL)
return -1;
else
- return gfx->unk2;
+ return gfx->sound;
}
void unref_sub_805869C(u32 x, u32 y)