Various german patches

3 files changed, 47 insertions, 21 deletions

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 712bb8be9..d0ee712af 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -43,6 +43,13 @@ struct UnknownStruct3 {
     s16 unk2E;
 };
 
+#if ENGLISH
+#define WINDOW_LEFT 3
+#define WINDOW_RIGHT 26
+#elif GERMAN
+#define WINDOW_LEFT 0
+#define WINDOW_RIGHT 29
+#endif
 
 #define EWRAM_1000 (*(struct UnknownStruct2 *)(unk_2000000 + 0x1000))
 #define EWRAM_1B000 (*(struct UnknownStruct1 *)(unk_2000000 + 0x1B000))
@@ -141,7 +148,7 @@ static void sub_8133E74(u8 taskId) {
         return;
     }
 
-    MenuZeroFillWindowRect(3, 14, 26, 19);
+    MenuZeroFillWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
     sub_806D538(3, 0);
     gTasks[taskId].func = sub_806CB74;
 }
@@ -153,9 +160,6 @@ static void sub_8133EB8(u8 taskId) {
     gTasks[taskId].func = sub_8133E74;
 }
 
-#define WINDOW_LEFT 3
-#define WINDOW_RIGHT 26
-
 static void sub_8133EF8(void) {
     sub_806CCE4();
     EWRAM_1B000.unk261 = 2;
diff --git a/src/intro.c b/src/intro.c
index a6b6b2734..e41cbe6d5 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -310,6 +310,13 @@ static const union AnimCmd gSpriteAnim_840AF10[] =
     ANIMCMD_FRAME(128, 8),
     ANIMCMD_END,
 };
+#if GERMAN
+static const union AnimCmd gSpriteAnim_8416DA4[] =
+{
+    ANIMCMD_FRAME(118, 8),
+    ANIMCMD_END,
+};
+#endif
 static const union AnimCmd *const gSpriteAnimTable_840AF18[] =
 {
     gSpriteAnim_840AEA8,
@@ -319,6 +326,9 @@ static const union AnimCmd *const gSpriteAnimTable_840AF18[] =
     gSpriteAnim_840AEC8,
     gSpriteAnim_840AED0,
     gSpriteAnim_840AED8,
+#if GERMAN
+    gSpriteAnim_8416DA4,
+#endif
 };
 static const union AnimCmd *const gSpriteAnimTable_840AF34[] =
 {
diff --git a/src/rom_800D42C.c b/src/rom_800D42C.c
index 7b572ba73..93fbce556 100644
--- a/src/rom_800D42C.c
+++ b/src/rom_800D42C.c
@@ -12,8 +12,16 @@ extern u8 BattleText_Win[];
 extern u8 BattleText_Loss[];
 extern u8 BattleText_Tie[];
 
+#if ENGLISH
 #define LEFT_MESSAGE_X 6
 #define RIGHT_MESSAGE_X 21
+#define TILE_OFFSET_LOSS 168
+#elif GERMAN
+#define LEFT_MESSAGE_X 5
+#define RIGHT_MESSAGE_X 20
+#define TILE_OFFSET_LOSS 172
+#endif
+#define TILE_OFFSET_WIN 160
 #define CENTER_MESSAGE_X 13
 #define MESSAGE_Y 2
 
@@ -31,7 +39,7 @@ void sub_800DC24(void)
 
     if (gUnknown_02024D26 == 3)
     {
-        PRINT_MESSAGE(BattleText_Tie, 160, CENTER_MESSAGE_X);
+        PRINT_MESSAGE(BattleText_Tie, TILE_OFFSET_WIN, CENTER_MESSAGE_X);
         return;
     }
 
@@ -46,13 +54,15 @@ void sub_800DC24(void)
             switch (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18)
             {
             case 0:
-            case 2: PRINT_MESSAGE_LEFT(BattleText_Win, 160);
-                PRINT_MESSAGE_RIGHT(BattleText_Loss, 168);
+            case 2:
+                PRINT_MESSAGE_LEFT(BattleText_Win, TILE_OFFSET_WIN);
+                PRINT_MESSAGE_RIGHT(BattleText_Loss, TILE_OFFSET_LOSS);
                 return;
 
             case 1:
-            case 3: PRINT_MESSAGE_RIGHT(BattleText_Win, 160)
-                PRINT_MESSAGE_LEFT(BattleText_Loss, 168)
+            case 3:
+                PRINT_MESSAGE_RIGHT(BattleText_Win, TILE_OFFSET_WIN)
+                PRINT_MESSAGE_LEFT(BattleText_Loss, TILE_OFFSET_LOSS)
                 return;
             }
         }
@@ -62,13 +72,15 @@ void sub_800DC24(void)
             switch (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18)
             {
             case 1:
-            case 3: PRINT_MESSAGE_LEFT(BattleText_Win, 160);
-                PRINT_MESSAGE_RIGHT(BattleText_Loss, 168);
+            case 3:
+                PRINT_MESSAGE_LEFT(BattleText_Win, TILE_OFFSET_WIN);
+                PRINT_MESSAGE_RIGHT(BattleText_Loss, TILE_OFFSET_LOSS);
                 return;
 
             case 0:
-            case 2: PRINT_MESSAGE_RIGHT(BattleText_Win, 160);
-                PRINT_MESSAGE_LEFT(BattleText_Loss, 168);
+            case 2:
+                PRINT_MESSAGE_RIGHT(BattleText_Win, TILE_OFFSET_WIN);
+                PRINT_MESSAGE_LEFT(BattleText_Loss, TILE_OFFSET_LOSS);
                 return;
             }
         }
@@ -81,26 +93,26 @@ void sub_800DC24(void)
     {
         if (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18 != 0)
         {
-            PRINT_MESSAGE_RIGHT(BattleText_Win, 160);
-            PRINT_MESSAGE_LEFT(BattleText_Loss, 168);
+            PRINT_MESSAGE_RIGHT(BattleText_Win, TILE_OFFSET_WIN);
+            PRINT_MESSAGE_LEFT(BattleText_Loss, TILE_OFFSET_LOSS);
         }
         else
         {
-            PRINT_MESSAGE_LEFT(BattleText_Win, 160);
-            PRINT_MESSAGE_RIGHT(BattleText_Loss, 168);
+            PRINT_MESSAGE_LEFT(BattleText_Win, TILE_OFFSET_WIN);
+            PRINT_MESSAGE_RIGHT(BattleText_Loss, TILE_OFFSET_LOSS);
         }
     }
     else
     {
         if (gLinkPlayers[BATTLE_STRUCT->linkPlayerIndex].lp_field_18 != 0)
         {
-            PRINT_MESSAGE_LEFT(BattleText_Win, 160);
-            PRINT_MESSAGE_RIGHT(BattleText_Loss, 168);
+            PRINT_MESSAGE_LEFT(BattleText_Win, TILE_OFFSET_WIN);
+            PRINT_MESSAGE_RIGHT(BattleText_Loss, TILE_OFFSET_LOSS);
         }
         else
         {
-            PRINT_MESSAGE_RIGHT(BattleText_Win, 160);
-            PRINT_MESSAGE_LEFT(BattleText_Loss, 168);
+            PRINT_MESSAGE_RIGHT(BattleText_Win, TILE_OFFSET_WIN);
+            PRINT_MESSAGE_LEFT(BattleText_Loss, TILE_OFFSET_LOSS);
         }
     }
 }