wheaton.c OK

asm/wheaton.s

@@ -1,38 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start Wheaton
-Wheaton: @ 0x08062E20
-	push {r4, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _08062E50
-	adds r0, #1
-	strb r0, [r4, #0xc]
-	adds r0, r4, #0
-	movs r1, #2
-	bl sub_0805E3A0
-	adds r0, r4, #0
-	adds r1, r4, #0
-	bl ResolveEntityOnTop
-	ldr r0, _08062E5C @ =gUnk_0810C3C0
-	str r0, [r4, #0x48]
-	adds r1, r4, #0
-	adds r1, #0x63
-	movs r0, #0xfe
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl sub_0807DD64
-_08062E50:
-	adds r0, r4, #0
-	movs r1, #0
-	bl sub_0807DD94
-	pop {r4, pc}
-	.align 2, 0
-_08062E5C: .4byte gUnk_0810C3C0

linker.ld

@@ -535,7 +535,7 @@ SECTIONS {
 		asm/npc9.o(.text);
 		src/stamp.o(.text);
 		asm/marcy.o(.text);
-		asm/wheaton.o(.text);
+		src/wheaton.o(.text);
 		asm/pita.o(.text);
 		asm/minishEzlo.o(.text);
 		src/mailbox.o(.text);

src/wheaton.c

@@ -0,0 +1,26 @@
+#include "global.h"
+#include "entity.h"
+
+extern void sub_0805E3A0(Entity *, u32);
+extern void ResolveEntityOnTop(Entity *, Entity *);
+extern BoundingBox gUnk_0810C3C0;
+extern void sub_0807DD64(Entity *);
+extern void sub_0807DD94(Entity *, u32);
+
+void Wheaton(Entity *this) {
+    if (this->action == 0) {
+        this->action++;
+
+        sub_0805E3A0(this, 2);
+
+        ResolveEntityOnTop(this, this);
+
+        this->boundingBox = &gUnk_0810C3C0;
+
+        this->spriteOffsetY = 0xfe;
+
+        sub_0807DD64(this);
+    }
+
+    sub_0807DD94(this, 0);
+}