initializeLink.c OK

asm/initializeLink.s

@@ -1,174 +0,0 @@
-	.include "asm/macros.inc"
-	.text
-	.syntax unified
-	
-	thumb_func_start InitializeLink
-InitializeLink: @ 0x080524A8
-	push {r4, r5, r6, lr}
-	bl sub_080784C8
-	ldr r0, _08052510 @ =gUnk_03000B80
-	movs r1, #0x70
-	bl _DmaZero
-	ldr r6, _08052514 @ =gLinkState
-	adds r0, r6, #0
-	movs r1, #0xb0
-	bl _DmaZero
-	movs r0, #1
-	rsbs r0, r0, #0
-	adds r1, r6, #0
-	adds r1, #0x40
-	movs r2, #0x40
-	bl _DmaFill32
-	ldr r4, _08052518 @ =gLinkEntity
-	adds r0, r4, #0
-	movs r1, #0x88
-	bl _DmaZero
-	ldr r0, _0805251C @ =gRoomControls
-	str r4, [r0, #0x30]
-	ldr r1, _08052520 @ =gUnk_080FCAC8
-	ldr r5, _08052524 @ =gScreenTransition
-	ldrb r0, [r5, #0xf]
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	strb r0, [r6, #0xc]
-	movs r0, #0x14
-	bl CheckGlobalFlag
-	cmp r0, #0
-	bne _080524FA
-	ldr r0, [r6, #0x30]
-	movs r1, #8
-	orrs r0, r1
-	str r0, [r6, #0x30]
-_080524FA:
-	ldrb r0, [r5, #0xf]
-	subs r0, #2
-	adds r2, r5, #0
-	cmp r0, #0xa
-	bhi _080525C2
-	lsls r0, r0, #2
-	ldr r1, _08052528 @ =_0805252C
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08052510: .4byte gUnk_03000B80
-_08052514: .4byte gLinkState
-_08052518: .4byte gLinkEntity
-_0805251C: .4byte gRoomControls
-_08052520: .4byte gUnk_080FCAC8
-_08052524: .4byte gScreenTransition
-_08052528: .4byte _0805252C
-_0805252C: @ jump table
-	.4byte _08052558 @ case 0
-	.4byte _08052576 @ case 1
-	.4byte _08052564 @ case 2
-	.4byte _080525C2 @ case 3
-	.4byte _08052558 @ case 4
-	.4byte _08052584 @ case 5
-	.4byte _08052584 @ case 6
-	.4byte _080525C2 @ case 7
-	.4byte _080525A0 @ case 8
-	.4byte _080525AC @ case 9
-	.4byte _080525B8 @ case 10
-_08052558:
-	ldr r0, _08052560 @ =0x0000FF40
-	strh r0, [r4, #0x36]
-	b _080525C0
-	.align 2, 0
-_08052560: .4byte 0x0000FF40
-_08052564:
-	ldr r0, _0805257C @ =gLinkState
-	adds r0, #0x38
-	movs r1, #0x10
-	strb r1, [r0]
-	ldr r1, _08052580 @ =gScreenTransition
-	ldrb r0, [r1, #0xe]
-	lsls r0, r0, #2
-	strb r0, [r4, #0x15]
-	adds r2, r1, #0
-_08052576:
-	movs r0, #0xe0
-	strh r0, [r4, #0x24]
-	b _080525C2
-	.align 2, 0
-_0805257C: .4byte gLinkState
-_08052580: .4byte gScreenTransition
-_08052584:
-	ldr r1, _08052598 @ =gLinkState
-	adds r2, r1, #0
-	adds r2, #0x38
-	movs r0, #1
-	strb r0, [r2]
-	ldr r2, _0805259C @ =gScreenTransition
-	ldrb r0, [r2, #0xf]
-	adds r1, #0x39
-	strb r0, [r1]
-	b _080525C2
-	.align 2, 0
-_08052598: .4byte gLinkState
-_0805259C: .4byte gScreenTransition
-_080525A0:
-	ldr r0, _080525A8 @ =gLinkState
-	adds r0, #0x38
-	movs r1, #1
-	b _080525BE
-	.align 2, 0
-_080525A8: .4byte gLinkState
-_080525AC:
-	ldr r0, _080525B4 @ =gLinkState
-	adds r0, #0x38
-	movs r1, #3
-	b _080525BE
-	.align 2, 0
-_080525B4: .4byte gLinkState
-_080525B8:
-	ldr r0, _08052614 @ =gLinkState
-	adds r0, #0x38
-	movs r1, #4
-_080525BE:
-	strb r1, [r0]
-_080525C0:
-	ldr r2, _08052618 @ =gScreenTransition
-_080525C2:
-	movs r0, #1
-	strb r0, [r4, #8]
-	ldrb r1, [r4, #0x10]
-	movs r0, #0xa0
-	orrs r0, r1
-	strb r0, [r4, #0x10]
-	adds r3, r4, #0
-	adds r3, #0x29
-	ldrb r1, [r3]
-	movs r0, #8
-	rsbs r0, r0, #0
-	ands r0, r1
-	movs r1, #4
-	orrs r0, r1
-	strb r0, [r3]
-	ldr r0, _0805261C @ =gUnk_02002A40
-	adds r0, #0xaa
-	ldrb r0, [r0]
-	adds r1, r4, #0
-	adds r1, #0x45
-	strb r0, [r1]
-	ldrh r0, [r2, #0x10]
-	strh r0, [r4, #0x2e]
-	ldrh r0, [r2, #0x12]
-	strh r0, [r4, #0x32]
-	ldrb r0, [r2, #0xe]
-	strb r0, [r4, #0x14]
-	ldrb r1, [r2, #0x14]
-	adds r0, r4, #0
-	adds r0, #0x38
-	strb r1, [r0]
-	adds r0, r4, #0
-	bl UpdateSpriteForCollisionLayer
-	adds r0, r4, #0
-	movs r1, #1
-	bl sub_0805EA2C
-	bl sub_08017640
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_08052614: .4byte gLinkState
-_08052618: .4byte gScreenTransition
-_0805261C: .4byte gUnk_02002A40

include/functions.h

@@ -41,6 +41,7 @@ extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
 extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
 extern u32 LoadFixedGFX(Entity*, u32);
 extern void ExecuteScriptCommandSet(Entity*, void *);
+extern void _DmaFill32(u32, void*, u32);
 
 // Unidentified
 extern void sub_0806ED78(Entity*);
@@ -228,4 +229,6 @@ extern u32 sub_0806F3E4(Entity*);
 extern void sub_0804A7D4(Entity*);
 extern void sub_08033744(Entity*);
 extern void sub_0800417E(Entity*, u32);
+extern void sub_080784C8();
+extern void sub_08017640();
 #endif

include/structures.h

@@ -62,7 +62,8 @@ typedef struct {
     u8 playerState;
     u8 field_0xf;
     Coords playerStartPos;
-    u16 playerLayer;
+    u8 playerLayer;
+    u8 field_0x13;
     u8 field_0x14[0xa];
     u16 field_0x20;
     u16 field_0x22;

linker.ld

@@ -448,9 +448,7 @@ SECTIONS {
 		src/sub_08050024.o(.text);
 		asm/code_08050038.o(.text);
 		asm/sub_08052418.o(.text);
-		asm/initializeLink.o(.text);
+		src/initializeLink.o(.text);
-		src/sub_08052620.o(.text);
-		src/sub_08052638.o(.text);
 		src/area.o(.text);
 		src/modHealth.o(.text);
 		src/modRupees.o(.text);

src/area.c

@@ -1,6 +1,17 @@
 #include "global.h"
+#include "entity.h"
 
 extern u8 gArea;
+extern u8 gUnk_08127D30[];
+
+bool32 sub_08052620(u32 r0) {
+    return gArea == 0x81;
+}
+
+bool32 sub_08052638(u32 r0) {
+
+    return gUnk_08127D30[r0 * 4] == 0x81;
+}
 
 u32 sub_08052654() {
     return (gArea >> 7) & 1;

src/initializeLink.c

@@ -0,0 +1,68 @@
+#include "global.h"
+#include "entity.h"
+#include "link.h"
+#include "structures.h"
+#include "functions.h"
+#include "room.h"
+#include "flags.h"
+
+extern u32 gUnk_03000B80;
+extern u32 gUnk_03003FC0;
+
+extern Entity gLinkEntity;
+
+extern u8 gUnk_080FCAC8[];
+
+void InitializeLink(void)
+{
+    Entity* pl;
+
+    sub_080784C8();
+    _DmaZero((void *)&gUnk_03000B80, 0x70);
+    _DmaZero((void *)&gLinkState, 0xb0);
+
+    _DmaFill32(0xffffffff, &gLinkState.field_0x40, 0x40);
+    pl = &gLinkEntity;
+    _DmaZero((void *)pl, 0x88);
+    gRoomControls.cameraTarget = pl;
+    gLinkState.linkAction = gUnk_080FCAC8[gScreenTransition.field_0xf];
+    if (!CheckGlobalFlag(0x14)) {
+        gLinkState.flags.all |= 8;
+    }
+    switch (gScreenTransition.field_0xf) {
+        case 0x2:
+        case 0x6:
+            pl->height.HALF.HI = -0xc0;
+            break;
+        case 0x4:
+            gLinkState.field_0x34[4] = 0x10;
+            pl->direction = gScreenTransition.playerState << 2;
+        case 0x3:
+            pl->nonPlanarMovement = 0xe0;
+            break;
+        case 0x7:
+        case 0x8:
+            gLinkState.field_0x34[4] = 1;
+            gLinkState.field_0x34[5] = gScreenTransition.field_0xf;
+            break;
+        case 0xa:
+            gLinkState.field_0x34[4] = 1;
+            break;
+        case 0xb:
+            gLinkState.field_0x34[4] = 3;
+            break;
+        case 0xc:
+            gLinkState.field_0x34[4] = 4;
+    }
+  pl->entityType.type = 1;
+  pl->flags |= 0xa0;
+  pl->spritePriority.b0 = 4;
+  pl->currentHealth = gUnk_02002A40.stats.health;
+  pl->x.HALF.HI = gScreenTransition.playerStartPos.HALF.x;
+  pl->y.HALF.HI = gScreenTransition.playerStartPos.HALF.y;
+  pl->animationState = gScreenTransition.playerState;
+  pl->collisionLayer = gScreenTransition.playerLayer;
+  UpdateSpriteForCollisionLayer(pl);
+  sub_0805EA2C(pl, 1);
+  sub_08017640();
+}

src/sub_08052620.c

@@ -1,7 +0,0 @@
-#include "global.h"
-
-extern u8 gArea;
-
-bool32 sub_08052620(u32 r0) {
-    return gArea == 0x81;
-}

src/sub_08052638.c

@@ -1,10 +0,0 @@
-#include "global.h"
-
-extern u8 gUnk_08127D30[69];
-
-u32 sub_08052638(u32 r0) {
-    // u32 r1 = gUnk_08127D30;
-    // u32 r1 = gUnk_08127D30;
-
-    return gUnk_08127D30[r0 * 4] == 129;
-}