summaryrefslogtreecommitdiff
path: root/src/field_door.c
diff options
context:
space:
mode:
authorCameron Hall <camthesaxman@users.noreply.github.com>2017-09-13 11:01:47 -0500
committerGitHub <noreply@github.com>2017-09-13 11:01:47 -0500
commitc1c2015f7046676b043641c0d1f9d9e29bc73647 (patch)
treecbea3afbcdad3d6bcc178ae4abffa9bbe88549f7 /src/field_door.c
parent37cf3484223366ee381f15d9a2cfeaf3612fd228 (diff)
parent9e9c40214f7672662820636167d2cc1469ca2ba1 (diff)
Merge pull request #430 from camthesaxman/scrcmd_renaming
(don't merge yet) rename script commands
Diffstat (limited to 'src/field_door.c')
-rw-r--r--src/field_door.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/field_door.c b/src/field_door.c
index 791ed4c94..ab46f0696 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -3,6 +3,7 @@
#include "field_camera.h"
#include "fieldmap.h"
#include "metatile_behavior.h"
+#include "songs.h"
#include "task.h"
extern struct DoorAnimFrame gDoorOpenAnimFrames[];
@@ -212,10 +213,10 @@ bool8 FieldIsDoorAnimationRunning(void)
return FuncIsActiveTask(Task_AnimateDoor);
}
-u32 sub_8058790(u32 x, u32 y)
+u32 GetDoorSoundEffect(u32 x, u32 y)
{
if (cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y) == 0)
- return 8;
+ return SE_DOOR;
else
- return 18;
+ return SE_JIDO_DOA;
}