sub_800E174

2 files changed, 77 insertions, 246 deletions

diff --git a/asm/link_rfu.s b/asm/link_rfu.s
index 7e67be316..0a1881093 100644
--- a/asm/link_rfu.s
+++ b/asm/link_rfu.s
@@ -7,249 +7,6 @@
 
 @ file boundary?
 
-	thumb_func_start sub_800E174
-sub_800E174: @ 800E174
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	ldr r1, =gWirelessStatusIndicatorSpriteId
-	ldrb r0, [r1]
-	cmp r0, 0xFF
-	bne _0800E184
-	b _0800E346
-_0800E184:
-	ldr r2, =gSprites
-	adds r1, r0, 0
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, r0, r2
-	movs r0, 0x3C
-	ldrsh r1, [r2, r0]
-	ldr r0, =0x00001234
-	cmp r1, r0
-	beq _0800E19C
-	b _0800E346
-_0800E19C:
-	adds r6, r2, 0
-	movs r5, 0xFF
-	movs r4, 0
-	ldr r0, =gUnknown_03007890
-	ldr r0, [r0]
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _0800E1F6
-	adds r7, r6, 0
-	adds r7, 0x28
-	movs r1, 0x29
-	adds r1, r6
-	mov r8, r1
-	b _0800E1E6
-	.pool
-_0800E1C8:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	adds r0, r4, 0
-	bl sub_800DD1C
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r5, r0
-	bcc _0800E1E6
-	adds r0, r4, 0
-	bl sub_800DD1C
-	lsls r0, 24
-	lsrs r5, r0, 24
-_0800E1E6:
-	bl GetLinkPlayerCount
-	lsls r0, 24
-	lsrs r0, 24
-	subs r0, 0x1
-	cmp r4, r0
-	blt _0800E1C8
-	b _0800E208
-_0800E1F6:
-	bl sub_800E124
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r7, r6, 0
-	adds r7, 0x28
-	movs r2, 0x29
-	adds r2, r6
-	mov r8, r2
-_0800E208:
-	bl sub_8012224
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0800E218
-	movs r0, 0x4
-	b _0800E246
-_0800E218:
-	cmp r5, 0x18
-	bhi _0800E220
-	movs r0, 0x3
-	b _0800E246
-_0800E220:
-	adds r0, r5, 0
-	subs r0, 0x19
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x65
-	bhi _0800E230
-	movs r0, 0x2
-	b _0800E246
-_0800E230:
-	adds r0, r5, 0
-	subs r0, 0x7F
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x65
-	bhi _0800E240
-	movs r0, 0x1
-	b _0800E246
-_0800E240:
-	cmp r5, 0xE4
-	bls _0800E248
-	movs r0, 0
-_0800E246:
-	strh r0, [r6, 0x2E]
-_0800E248:
-	movs r3, 0x2E
-	ldrsh r1, [r6, r3]
-	movs r2, 0x30
-	ldrsh r0, [r6, r2]
-	cmp r1, r0
-	beq _0800E25E
-	adds r0, r6, 0
-	bl sub_800E15C
-	ldrh r0, [r6, 0x2E]
-	strh r0, [r6, 0x30]
-_0800E25E:
-	movs r0, 0x32
-	ldrsh r1, [r6, r0]
-	ldr r2, [r6, 0x8]
-	lsls r1, 2
-	adds r1, r2
-	movs r3, 0x36
-	ldrsh r0, [r6, r3]
-	ldr r1, [r1]
-	lsls r0, 2
-	adds r0, r1
-	ldr r0, [r0]
-	lsls r0, 10
-	lsrs r0, 26
-	movs r3, 0x34
-	ldrsh r1, [r6, r3]
-	cmp r0, r1
-	bge _0800E2AC
-	ldrh r0, [r6, 0x36]
-	adds r0, 0x1
-	movs r3, 0
-	strh r0, [r6, 0x36]
-	strh r3, [r6, 0x34]
-	movs r1, 0x32
-	ldrsh r0, [r6, r1]
-	lsls r0, 2
-	adds r0, r2
-	movs r2, 0x36
-	ldrsh r1, [r6, r2]
-	ldr r0, [r0]
-	lsls r1, 2
-	adds r1, r0
-	movs r0, 0
-	ldrsh r1, [r1, r0]
-	movs r0, 0x2
-	negs r0, r0
-	cmp r1, r0
-	bne _0800E2B2
-	strh r3, [r6, 0x36]
-	b _0800E2B2
-_0800E2AC:
-	ldrh r0, [r6, 0x34]
-	adds r0, 0x1
-	strh r0, [r6, 0x34]
-_0800E2B2:
-	ldr r4, =gMain
-	movs r1, 0x84
-	lsls r1, 3
-	adds r0, r4, r1
-	ldr r1, =sWirelessStatusIndicatorOamData
-	ldr r2, [r1, 0x4]
-	ldr r1, [r1]
-	str r1, [r0]
-	str r2, [r0, 0x4]
-	movs r3, 0x20
-	ldrsh r2, [r6, r3]
-	movs r1, 0
-	ldrsb r1, [r7, r1]
-	adds r2, r1
-	ldr r1, =0x00000422
-	adds r5, r4, r1
-	ldr r3, =0x000001ff
-	adds r1, r3, 0
-	ands r2, r1
-	ldrh r3, [r5]
-	ldr r1, =0xfffffe00
-	ands r1, r3
-	orrs r1, r2
-	strh r1, [r5]
-	ldrh r1, [r6, 0x22]
-	mov r2, r8
-	ldrb r2, [r2]
-	adds r1, r2
-	strb r1, [r0]
-	ldrb r2, [r6, 0x5]
-	ldr r3, =0x00000425
-	adds r5, r4, r3
-	lsrs r2, 4
-	lsls r2, 4
-	ldrb r3, [r5]
-	movs r1, 0xF
-	ands r1, r3
-	orrs r1, r2
-	strb r1, [r5]
-	movs r1, 0x32
-	ldrsh r2, [r6, r1]
-	ldr r1, [r6, 0x8]
-	lsls r2, 2
-	adds r2, r1
-	movs r3, 0x36
-	ldrsh r1, [r6, r3]
-	ldr r2, [r2]
-	lsls r1, 2
-	adds r1, r2
-	ldrh r2, [r1]
-	ldrh r6, [r6, 0x3A]
-	adds r2, r6
-	ldr r1, =0x00000424
-	adds r4, r1
-	ldr r3, =0x000003ff
-	adds r1, r3, 0
-	ands r2, r1
-	ldrh r3, [r4]
-	ldr r1, =0xfffffc00
-	ands r1, r3
-	orrs r1, r2
-	strh r1, [r4]
-	ldr r1, =0x070003e8
-	movs r2, 0x4
-	bl CpuSet
-	bl sub_8011A74
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0800E346
-	bl sub_800E084
-_0800E346:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_800E174
-
 	thumb_func_start sub_800E378
 sub_800E378: @ 800E378
 	push {lr}
diff --git a/src/link_rfu.c b/src/link_rfu.c
index eaf919bae..b663ec20e 100644
--- a/src/link_rfu.c
+++ b/src/link_rfu.c
@@ -45,6 +45,8 @@ static void sub_800D610(void);
 void sub_800D630(void);
 bool8 sub_800DAC8(struct UnkRfuStruct_2_Sub_c1c *q1, u8 *q2);
 bool32 sub_8010454(u16 a0);
+u8 sub_8011A74(void);
+u8 sub_8012224(void);
 
 // .rodata
 
@@ -2138,12 +2140,84 @@ u8 sub_800E124(void)
     return 0;
 }
 
-void sub_800E15C(struct Sprite *sprite, int val)
+void sub_800E15C(struct Sprite *sprite, int signalStrengthAnimNum)
 {
-    if (sprite->data2 != val)
+    if (sprite->data2 != signalStrengthAnimNum)
     {
-        sprite->data2 = val;
+        sprite->data2 = signalStrengthAnimNum;
         sprite->data3 = 0;
         sprite->data4 = 0;
     }
 }
+
+void sub_800E174(void)
+{
+    if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data7 == 0x1234)
+    {
+        struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId];
+        u8 signalStrength = 255;
+        u8 i = 0;
+        if (gUnknown_03007890->unk_00 == 1)
+        {
+            for (i = 0; i < GetLinkPlayerCount() - 1; i++)
+            {
+                if (signalStrength >= sub_800DD1C(i + 1))
+                {
+                    signalStrength = sub_800DD1C(i + 1);
+                }
+            }
+        }
+        else
+        {
+            signalStrength = sub_800E124();
+        }
+        if (sub_8012224() == TRUE)
+        {
+            sprite->data0 = 4;
+        }
+        else if (signalStrength < 25)
+        {
+            sprite->data0 = 3;
+        }
+        else if (signalStrength >= 25 && signalStrength < 127)
+        {
+            sprite->data0 = 2;
+        }
+        else if (signalStrength >= 127 && signalStrength < 229)
+        {
+            sprite->data0 = 1;
+        }
+        else if (signalStrength >= 229)
+        {
+            sprite->data0 = 0;
+        }
+        if (sprite->data0 != sprite->data1)
+        {
+            sub_800E15C(sprite, sprite->data0);
+            sprite->data1 = sprite->data0;
+        }
+        if (sprite->anims[sprite->data2][sprite->data4].frame.duration < sprite->data3)
+        {
+            sprite->data4++;
+            sprite->data3 = 0;
+            if (sprite->anims[sprite->data2][sprite->data4].type == -2)
+            {
+                sprite->data4 = 0;
+            }
+        }
+        else
+        {
+            sprite->data3++;
+        }
+        gMain.oamBuffer[125] = sWirelessStatusIndicatorOamData;
+        gMain.oamBuffer[125].x = sprite->pos1.x + sprite->centerToCornerVecX;
+        gMain.oamBuffer[125].y = sprite->pos1.y + sprite->centerToCornerVecY;
+        gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum;
+        gMain.oamBuffer[125].tileNum = sprite->data6 + sprite->anims[sprite->data2][sprite->data4].frame.imageValue;
+        CpuCopy16(gMain.oamBuffer + 125, (struct OamData *)OAM + 125, sizeof(struct OamData));
+        if (sub_8011A74() == 1)
+        {
+            sub_800E084();
+        }
+    }
+}