fix German build

2 files changed, 228 insertions, 13 deletions

diff --git a/include/easy_chat.h b/include/easy_chat.h
index d2b562931..9342663d8 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -75,16 +75,14 @@ struct Shared1000
     void (*unk1C4)(void);
     u8 unk1C8[0x6C8-0x1C8];
     u8 unk6C8[0xB78-0x6C8];
-    u16 unkB78[0x1B][255];
 #if GERMAN
-    u8 filler4142_de[0x32A];
+    u16 unkB78[0x1B][270];
+#else
+    u16 unkB78[0x1B][255];
 #endif
-    u16 unk4142[(0x78-0x42)/2];
+    u16 unk4142[(0x78-0x42)/2];  //0x446C
     u16 unk4178[(0x41A4-0x4178)/2]; // unknown length
-    const u8 *unk41A4[0x16][0x100];
-#if GERMAN
-    u8 filler99A4_de[2];
-#endif
+    const u8 *unk41A4[0x16][0x100];  //0x44CE in german
     s8 unk99A4;
     s8 unk99A5;
     s8 unk99A6[0xA28-0x9A6];
@@ -117,11 +115,6 @@ struct Shared1000
     u8 unk9F8E[7];  // unknown length
 };
 
-#define static_assert(cond) \
-  typedef char test_[(cond) ? 1 : -1]
-
-//static_assert(offsetof(struct Shared1000, unk1A8) == 0x1A8);
-
 extern u8 gUnknown_020388AC;
 extern u8 gUnknown_03000740;
 
@@ -145,7 +138,7 @@ u16 sub_80EB8EC(void);
 u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3);
 
 #if GERMAN
-u32 de_sub_80EB748(u32, u32);
+u32 de_sub_80EB748(s32, s32);
 #endif
 
 #endif // GUARD_EASYCHAT_H
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index 5dc4bb1c1..f9843cda9 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -2137,6 +2137,195 @@ u16 sub_80EAE88(u8 group)
     }
 }
 
+#if GERMAN
+__attribute__((naked))
+void sub_80EAECC(void)
+{
+    asm(".syntax unified\n\
+	push {r4-r7,lr}\n\
+	mov r7, r10\n\
+	mov r6, r9\n\
+	mov r5, r8\n\
+	push {r5-r7}\n\
+	sub sp, 0x10\n\
+	movs r7, 0\n\
+	ldr r1, _080EAF08 @ =gUnknown_083DB694\n\
+	ldr r0, [r1]\n\
+	ldr r3, _080EAF0C @ =0x0000446c\n\
+	adds r3, r0, r3\n\
+	str r3, [sp, 0x4]\n\
+_080EAEE4:\n\
+	ldr r1, _080EAF10 @ =gEasyChatWordsByLetter\n\
+	lsls r2, r7, 1\n\
+	adds r0, r2, r1\n\
+	ldrh r4, [r0]\n\
+	adds r3, r7, 0x1\n\
+	lsls r0, r3, 1\n\
+	adds r0, r1\n\
+	ldrh r0, [r0]\n\
+	str r0, [sp]\n\
+	ldr r0, [sp, 0x4]\n\
+	adds r1, r0, r2\n\
+	movs r0, 0\n\
+	strh r0, [r1]\n\
+	mov r9, r0\n\
+	adds r6, r4, 0\n\
+	mov r10, r2\n\
+	str r3, [sp, 0x8]\n\
+	b _080EB00C\n\
+	.align 2, 0\n\
+_080EAF08: .4byte gUnknown_083DB694\n\
+_080EAF0C: .4byte 0x0000446c\n\
+_080EAF10: .4byte gEasyChatWordsByLetter\n\
+_080EAF14:\n\
+	ldr r2, _080EAFAC @ =gEasyChatWordsAlphabetized\n\
+	adds r0, r6, 0\n\
+	adds r1, r0, 0x1\n\
+	lsls r1, 16\n\
+	lsrs r6, r1, 16\n\
+	lsls r0, 1\n\
+	adds r0, r2\n\
+	ldrh r1, [r0]\n\
+	adds r4, r1, 0\n\
+	ldr r0, _080EAFB0 @ =0x0000feff\n\
+	cmp r1, r0\n\
+	bls _080EAFC8\n\
+	movs r0, 0xFF\n\
+	ands r1, r0\n\
+	movs r3, 0\n\
+	subs r0, r1, 0x1\n\
+	lsls r0, 16\n\
+	lsrs r5, r0, 16\n\
+	ldr r0, _080EAFB4 @ =0x0000ffff\n\
+	cmp r5, r0\n\
+	beq _080EB00C\n\
+	lsls r0, r7, 4\n\
+	adds r0, r7\n\
+	lsls r0, 3\n\
+	subs r0, r7\n\
+	lsls r0, 2\n\
+	mov r8, r0\n\
+_080EAF4A:\n\
+	adds r1, r6, 0\n\
+	adds r0, r1, 0x1\n\
+	lsls r0, 16\n\
+	lsrs r6, r0, 16\n\
+	lsls r1, 1\n\
+	ldr r0, _080EAFAC @ =gEasyChatWordsAlphabetized\n\
+	adds r1, r0\n\
+	ldrh r4, [r1]\n\
+	lsrs r0, r4, 9\n\
+	ldr r1, _080EAFB8 @ =0x000001ff\n\
+	adds r2, r1, 0\n\
+	adds r1, r4, 0\n\
+	ands r1, r2\n\
+	str r3, [sp, 0xC]\n\
+	bl sub_80EADC0\n\
+	lsls r0, 24\n\
+	ldr r3, [sp, 0xC]\n\
+	cmp r0, 0\n\
+	beq _080EAF9E\n\
+	cmp r3, 0\n\
+	bne _080EAF9E\n\
+	ldr r3, _080EAFBC @ =gUnknown_083DB694\n\
+	ldr r2, [r3]\n\
+	mov r1, r9\n\
+	adds r0, r1, 0x1\n\
+	lsls r0, 16\n\
+	lsrs r0, 16\n\
+	mov r9, r0\n\
+	lsls r1, 1\n\
+	add r1, r8\n\
+	ldr r3, _080EAFC0 @ =0x00000b78\n\
+	adds r0, r2, r3\n\
+	adds r0, r1\n\
+	strh r4, [r0]\n\
+	ldr r0, _080EAFC4 @ =0x0000446c\n\
+	adds r2, r0\n\
+	add r2, r10\n\
+	ldrh r0, [r2]\n\
+	adds r0, 0x1\n\
+	strh r0, [r2]\n\
+	movs r3, 0x1\n\
+_080EAF9E:\n\
+	subs r0, r5, 0x1\n\
+	lsls r0, 16\n\
+	lsrs r5, r0, 16\n\
+	ldr r1, _080EAFB4 @ =0x0000ffff\n\
+	cmp r5, r1\n\
+	bne _080EAF4A\n\
+	b _080EB00C\n\
+	.align 2, 0\n\
+_080EAFAC: .4byte gEasyChatWordsAlphabetized\n\
+_080EAFB0: .4byte 0x0000feff\n\
+_080EAFB4: .4byte 0x0000ffff\n\
+_080EAFB8: .4byte 0x000001ff\n\
+_080EAFBC: .4byte gUnknown_083DB694\n\
+_080EAFC0: .4byte 0x00000b78\n\
+_080EAFC4: .4byte 0x0000446c\n\
+_080EAFC8:\n\
+	lsrs r0, r4, 9\n\
+	ldr r3, _080EB030 @ =0x000001ff\n\
+	adds r2, r3, 0\n\
+	adds r1, r4, 0\n\
+	ands r1, r2\n\
+	bl sub_80EADC0\n\
+	lsls r0, 24\n\
+	cmp r0, 0\n\
+	beq _080EB00C\n\
+	ldr r0, _080EB034 @ =gUnknown_083DB694\n\
+	ldr r2, [r0]\n\
+	mov r1, r9\n\
+	adds r0, r1, 0x1\n\
+	lsls r0, 16\n\
+	lsrs r0, 16\n\
+	mov r9, r0\n\
+	lsls r1, 1\n\
+	lsls r0, r7, 4\n\
+	adds r0, r7\n\
+	lsls r0, 3\n\
+	subs r0, r7\n\
+	lsls r0, 2\n\
+	adds r1, r0\n\
+	ldr r3, _080EB038 @ =0x00000b78\n\
+	adds r0, r2, r3\n\
+	adds r0, r1\n\
+	strh r4, [r0]\n\
+	ldr r0, _080EB03C @ =0x0000446c\n\
+	adds r2, r0\n\
+	add r2, r10\n\
+	ldrh r0, [r2]\n\
+	adds r0, 0x1\n\
+	strh r0, [r2]\n\
+_080EB00C:\n\
+	ldr r1, [sp]\n\
+	cmp r6, r1\n\
+	bcs _080EB014\n\
+	b _080EAF14\n\
+_080EB014:\n\
+	ldr r3, [sp, 0x8]\n\
+	lsls r0, r3, 16\n\
+	lsrs r7, r0, 16\n\
+	cmp r7, 0x1A\n\
+	bhi _080EB020\n\
+	b _080EAEE4\n\
+_080EB020:\n\
+	add sp, 0x10\n\
+	pop {r3-r5}\n\
+	mov r8, r3\n\
+	mov r9, r4\n\
+	mov r10, r5\n\
+	pop {r4-r7}\n\
+	pop {r0}\n\
+	bx r0\n\
+	.align 2, 0\n\
+_080EB030: .4byte 0x000001ff\n\
+_080EB034: .4byte gUnknown_083DB694\n\
+_080EB038: .4byte 0x00000b78\n\
+_080EB03C: .4byte 0x0000446c\n\
+    .syntax divided\n");
+}
+#else
 void sub_80EAECC(void)
 {
     u16 i;
@@ -2183,6 +2372,7 @@ void sub_80EAECC(void)
         }
     }
 }
+#endif
 
 extern const u8 *const gEasyChatGroupWords[];
 extern const u16 *const gEasyChatGroupOrders[];
@@ -2395,3 +2585,35 @@ bool8 sub_80EB37C(u16 word)
         return TRUE;
     }
 }
+
+#if GERMAN
+u32 de_sub_80EB748(s32 group, s32 index)
+{
+    s32 i;
+    u16 *words;
+    u32 r7 = 0;
+
+    switch (group)
+    {
+    case EC_GROUP_POKEMON:
+    case EC_GROUP_POKEMON_2:
+    case EC_GROUP_MOVE_1:
+    case EC_GROUP_MOVE_2:
+        words = (u16 *)gEasyChatGroupWords[group];
+        for (i = 0; i < gEasyChatGroupSizes[group]; i++)
+        {
+            if (index == words[i])
+            {
+                r7 = i;
+                break;
+            }
+        }
+        break;
+    default:
+        r7 = index;
+        break;
+    }
+
+    return r7;
+}
+#endif