diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2016-12-02 19:06:22 +0100 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-02 10:06:22 -0800 |
| commit | 1f222c04ef1d10ff5a5c6bb98cd4380ecf2bba86 (patch) | |
| tree | 573d6368233110b17292e498f49532c1c9244404 /src/field_door.c | |
| parent | 4258e60771aa9fdabd678930eca534423bd371b8 (diff) | |
[WIP] Extract all external function declarations to headers (#114)
* Extract other external function declarations
* Fix GBA compilation
* Revert `sub_803C434` to asm
Diffstat (limited to 'src/field_door.c')
| -rw-r--r-- | src/field_door.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/field_door.c b/src/field_door.c index 8aac6cce3..da57988ca 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -1,9 +1,8 @@ #include "global.h" +#include "asm.h" #include "task.h" #include "field_camera.h" -extern u8 MetatileBehavior_IsDoor(u8); - struct DoorGraphics { u16 metatileNum; @@ -225,7 +224,7 @@ bool8 FieldIsDoorAnimationRunning(void) return FuncIsActiveTask(Task_AnimateDoor); } -u8 sub_8058790(u32 x, u32 y) +u32 sub_8058790(u32 x, u32 y) { if (cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y) == 0) return 8; |