summaryrefslogtreecommitdiff
path: root/src/object/button.c
diff options
context:
space:
mode:
authornotyourav <65437533+notyourav@users.noreply.github.com>2021-03-17 20:23:01 -0700
committerGitHub <noreply@github.com>2021-03-17 20:23:01 -0700
commit8b812692714e76cca2bb9e643f6b1984cddedd9c (patch)
tree5cbdee9825dd1c2763d04c3add11c9ac077350e3 /src/object/button.c
parenta39686c24c4b1acc2459088659c6f648b7dff80e (diff)
parent2d1b0da52ef1e51abfb5b57b8954602740bd146e (diff)
Merge branch 'master' into ply
Diffstat (limited to 'src/object/button.c')
-rw-r--r--src/object/button.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/object/button.c b/src/object/button.c
index b98d6169..e545953c 100644
--- a/src/object/button.c
+++ b/src/object/button.c
@@ -105,7 +105,6 @@ void sub_08081C98(Entity* this) {
}
Entity* sub_08081D74(Entity*);
-void sub_0807B7D8(u32, u32, u32);
u32 sub_080001DA(u32, u32);
u32 sub_08081CB0(Entity* this) {
@@ -142,8 +141,7 @@ u32 sub_08081D28(Entity* this) {
}
extern u32 sub_080002E0(u32, u32);
-extern Entity* gUnk_03004040[];
-extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
+extern Entity* gUnk_03004040[3];
u32 sub_08081E0C(Entity*);
Entity* sub_08081D74(Entity* this) {
@@ -171,8 +169,6 @@ Entity* sub_08081D74(Entity* this) {
return ent;
}
-extern u32 sub_08079F8C();
-
u32 sub_08081E0C(Entity* this) {
Entity* tmp = &gPlayerEntity;
if (tmp->height.HALF.HI != 0 || !sub_08079F8C()) {
@@ -273,7 +269,6 @@ u32 sub_08081F7C(Entity* this, u32 r7) {
return 1;
}
-extern Entity* gUnk_03004040[3];
extern void sub_080044AE(Entity*, u32, u32);
void sub_08081FF8(Entity* this) {