diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /include/field_door.h | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'include/field_door.h')
| -rw-r--r-- | include/field_door.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/field_door.h b/include/field_door.h index 1759e0dc1..091aac27f 100644 --- a/include/field_door.h +++ b/include/field_door.h @@ -5,8 +5,8 @@ struct DoorGraphics { u16 metatileNum; u8 unk2; - void *tiles; - void *palette; + const void *tiles; + const void *palette; }; struct DoorAnimFrame @@ -20,6 +20,6 @@ void FieldSetDoorClosed(u32, u32); s8 FieldAnimateDoorClose(u32, u32); s8 FieldAnimateDoorOpen(u32, u32); bool8 FieldIsDoorAnimationRunning(void); -u32 sub_8058790(u32 x, u32 y); +u32 GetDoorSoundEffect(u32 x, u32 y); #endif |