diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2019-07-30 21:31:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 21:31:27 -0500 |
| commit | bc159dbb03735db55e6a09bb7947dccc70d0532b (patch) | |
| tree | 5b27866fe839d0f2f7ae76e0f13580ecea2dd863 /src/field_door.c | |
| parent | b8393b3a799f92e7064c266600607d98f6baf4d9 (diff) | |
| parent | cf0da4c3bb5658908275068591fe51fb6f2ce49d (diff) | |
Merge pull request #752 from camthesaxman/emerald_diff
resolve some Emerald differences
Diffstat (limited to 'src/field_door.c')
| -rw-r--r-- | src/field_door.c | 6 |
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) |