diff options
| author | theo3 <arisstephenson2@gmail.com> | 2021-01-31 11:24:17 -0800 |
|---|---|---|
| committer | theo3 <arisstephenson2@gmail.com> | 2021-01-31 11:24:17 -0800 |
| commit | 82e6c864bd07b7b33f3368e56cd9dc36f42510f4 (patch) | |
| tree | bd73fafbe7522a5623d00500a106a9ea4d91dfd3 /src/object | |
| parent | ced13c2c8d727e01bdb687a4c982ed9296c9e10e (diff) | |
| parent | 4120161dece358f27f337cea5f5e362b7a07c321 (diff) | |
Merge branch 'upstream/master' into main
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/houseDoorExterior.c | 1 | ||||
| -rw-r--r-- | src/object/lightableSwitch.c | 1 | ||||
| -rw-r--r-- | src/object/lilypadSmall.c | 1 | ||||
| -rw-r--r-- | src/object/object48.c | 2 |
4 files changed, 1 insertions, 4 deletions
diff --git a/src/object/houseDoorExterior.c b/src/object/houseDoorExterior.c index c15f94f0..cdee3afe 100644 --- a/src/object/houseDoorExterior.c +++ b/src/object/houseDoorExterior.c @@ -26,7 +26,6 @@ static u8 sub_08086954(Entity*); extern u32 sub_080562CC(u32, u32, u32, u32); extern void sub_08078AC0(u32, u32, u32); -extern void* GetCurrentRoomProperty(u8); extern void (*const gUnk_081206B4[])(Entity*); extern BoundingBox gUnk_081206AC; // TODO: should be const diff --git a/src/object/lightableSwitch.c b/src/object/lightableSwitch.c index 16609d50..9b858a4a 100644 --- a/src/object/lightableSwitch.c +++ b/src/object/lightableSwitch.c @@ -9,7 +9,6 @@ extern void sub_0809EAD8(Entity*); extern void sub_0809EABC(Entity*); extern void EnqueueSFX(u32); extern void sub_080A2CC0(Entity*, Entity**, u16*); -extern Entity* GetCurrentRoomProperty(u32); extern void SetTile(u32, u32, u32); extern void sub_0806F69C(Entity*); diff --git a/src/object/lilypadSmall.c b/src/object/lilypadSmall.c index 32991f65..7dc35ae2 100644 --- a/src/object/lilypadSmall.c +++ b/src/object/lilypadSmall.c @@ -3,7 +3,6 @@ #include "functions.h" #include "player.h" -extern Entity* GetCurrentRoomProperty(u32); extern void sub_080A2CC0(Entity*, Entity**, u16*); extern u16 gUnk_08123318[]; diff --git a/src/object/object48.c b/src/object/object48.c index f340da1c..e62b174a 100644 --- a/src/object/object48.c +++ b/src/object/object48.c @@ -323,7 +323,7 @@ void sub_0808EBB8(Entity* this) { } static Entity* sub_0808EC80(int form) { - Entity* entityA = &gUnk_03003DA0; + Entity* entityA = (Entity*) &gUnk_03003DA0; Entity* entityB = entityA->next; while (entityB != entityA) { if ((entityB->entityType.type == 0x6 && entityB->entityType.subtype == 0x48) && |