Merge branch 'master' of https://github.com/zeldaret/tmc

asm/archway.s

@@ -1,46 +0,0 @@
-	.include "asm/macros.inc"
-
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-
-	thumb_func_start Archway
-Archway: @ 0x08090F70
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0
-	bne _08090FB4
-	movs r5, #1
-	movs r0, #1
-	strb r0, [r4, #0xc]
-	ldrb r1, [r4, #0x18]
-	subs r0, #5
-	ands r0, r1
-	orrs r0, r5
-	strb r0, [r4, #0x18]
-	ldrb r0, [r4, #0xb]
-	strb r0, [r4, #0x1e]
-	adds r1, r4, #0
-	adds r1, #0x38
-	movs r0, #2
-	strb r0, [r1]
-	adds r0, r4, #0
-	bl UpdateSpriteOrderAndFlip
-	bl CheckIsDungeon
-	cmp r0, #0
-	beq _08090FB4
-	adds r2, r4, #0
-	adds r2, #0x29
-	ldrb r1, [r2]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	orrs r0, r5
-	strb r0, [r2]
-_08090FB4:
-	pop {r4, r5, pc}
-	.align 2, 0

linker.ld

@@ -734,7 +734,7 @@ SECTIONS {
 		asm/furniture.o(.text);
 		src/minishSizedEntrance.o(.text);
 		asm/minishSizedEntrance.o(.text);
-		asm/archway.o(.text);
+		src/archway.o(.text);
 		asm/giantRock.o(.text);
 		asm/object51.o(.text);
 		asm/object52.o(.text);

src/archway.c

@@ -0,0 +1,27 @@
+#include "global.h"
+#include "entity.h"
+
+extern void UpdateSpriteOrderAndFlip();
+extern u32 CheckIsDungeon();
+
+void Archway(Entity *this)
+{
+    u32 v1;
+    u32 v2;
+    u32 v3;
+
+    if (this->action == 0) {
+        v1 = this->action = 1;
+        v2 = this->spriteSettings.raw;
+        v1 = v1 - 0x5;
+        v1 = v1 & v2;
+        this->spriteSettings.raw = v1 | 1;
+        this->frameIndex = this->entityType.parameter;
+        this->collisionLayer = 2;
+        UpdateSpriteOrderAndFlip(this);
+        v3 = CheckIsDungeon();
+    if (v3 != 0) {
+      this->ticks.b0 = (this->ticks.b0 & 0xf8) | 1;
+    }
+  }
+}