From 5ed44da99b2570de2a6632f9b9e95437a2a478e9 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Sun, 23 Jul 2023 20:53:21 +0200
Subject: [PATCH 1/7] Mail system progress
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Made it possible to attach already written mail to a pokémon
Added a taken item message if the pokémon that the mail gets attached to already has an item
Replaced the MiniFont and InGameFont on the mail screen with MainFont
Working on mouse support
---
 P3D/Content/Data/Scripts/computer_choose.dat |   6 +-
 P3D/Pokemon/Attacks/Dark/KnockOff.vb         |   4 +-
 P3D/Pokemon/Attacks/Dark/Switcheroo.vb       |   4 +-
 P3D/Pokemon/Attacks/Dark/Thief.vb            |   2 +-
 P3D/Pokemon/Attacks/Normal/Bestow.vb         |   2 +-
 P3D/Pokemon/Attacks/Normal/Covet.vb          |   2 +-
 P3D/Pokemon/Attacks/Psychic/Trick.vb         |   4 +-
 P3D/Screens/PC/MailSystemScreen.vb           | 289 ++++++++++++++-----
 8 files changed, 232 insertions(+), 81 deletions(-)

diff --git a/P3D/Content/Data/Scripts/computer_choose.dat b/P3D/Content/Data/Scripts/computer_choose.dat
index e0c9c5035..4d08d3830 100644
--- a/P3D/Content/Data/Scripts/computer_choose.dat
+++ b/P3D/Content/Data/Scripts/computer_choose.dat
@@ -7,10 +7,10 @@ version=2
 	
 	:if:<register.registered(pokemongot)>=true
 		@storage.set(int,canind,2)
-		@storage.set(str,computer_options,<storage.get(str,billspcname)>,Inbox)
+		@storage.set(str,computer_options,<storage.get(str,billspcname)>,Mailbox)
 	:else
 		@storage.set(int,canind,1)
-		@storage.set(str,computer_options,Inbox)
+		@storage.set(str,computer_options,Mailbox)
 	:endif
 
 	:if:<player.haspokedex>=true
@@ -43,7 +43,7 @@ version=2
 			@sound.play(PC\LogOn)
 			@screen.mysteryevent
 			@script.start(computer_choose)
-		:when:Inbox
+		:when:Mailbox
 			@sound.play(PC\LogOn)
 			@screen.mailsystem
 			@script.start(computer_choose)
diff --git a/P3D/Pokemon/Attacks/Dark/KnockOff.vb b/P3D/Pokemon/Attacks/Dark/KnockOff.vb
index 384b610da..f02d437e7 100644
--- a/P3D/Pokemon/Attacks/Dark/KnockOff.vb
+++ b/P3D/Pokemon/Attacks/Dark/KnockOff.vb
@@ -79,7 +79,7 @@
             If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
                 Return Power
             End If
-            If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If op.Item.IsMail = True Then
                 Return Power
             End If
 
@@ -113,7 +113,7 @@
             If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
                 Exit Sub
             End If
-            If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If op.Item.IsMail = True Then
                 Exit Sub
             End If
 
diff --git a/P3D/Pokemon/Attacks/Dark/Switcheroo.vb b/P3D/Pokemon/Attacks/Dark/Switcheroo.vb
index be103383f..48b3f2446 100644
--- a/P3D/Pokemon/Attacks/Dark/Switcheroo.vb
+++ b/P3D/Pokemon/Attacks/Dark/Switcheroo.vb
@@ -93,10 +93,10 @@ Namespace BattleSystem.Moves.Dark
             If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") = True AndAlso op.Number = 773 Then
                 CanSwitchItems = False
             End If
-            If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If Not p.Item Is Nothing AndAlso p.Item.IsMail = True Then
                 CanSwitchItems = False
             End If
-            If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If Not op.Item Is Nothing AndAlso op.Item.IsMail = True Then
                 CanSwitchItems = False
             End If
             If (p.Item IsNot Nothing AndAlso p.Item.IsMegaStone) OrElse (op.Item IsNot Nothing AndAlso op.Item.IsMegaStone) Then
diff --git a/P3D/Pokemon/Attacks/Dark/Thief.vb b/P3D/Pokemon/Attacks/Dark/Thief.vb
index 4a08b97a0..a1b0e41d2 100644
--- a/P3D/Pokemon/Attacks/Dark/Thief.vb
+++ b/P3D/Pokemon/Attacks/Dark/Thief.vb
@@ -79,7 +79,7 @@
             If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
                 Exit Sub
             End If
-            If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If op.Item.IsMail = True Then
                 Exit Sub
             End If
 
diff --git a/P3D/Pokemon/Attacks/Normal/Bestow.vb b/P3D/Pokemon/Attacks/Normal/Bestow.vb
index 7df966ee6..bd13f273d 100644
--- a/P3D/Pokemon/Attacks/Normal/Bestow.vb
+++ b/P3D/Pokemon/Attacks/Normal/Bestow.vb
@@ -86,7 +86,7 @@
                 If p.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso p.Number = 649 Then
                     b = True
                 End If
-                If p.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+                If p.Item.IsMail = True Then
                     b = True
                 End If
             Else
diff --git a/P3D/Pokemon/Attacks/Normal/Covet.vb b/P3D/Pokemon/Attacks/Normal/Covet.vb
index a0679ae98..86d3c3b48 100644
--- a/P3D/Pokemon/Attacks/Normal/Covet.vb
+++ b/P3D/Pokemon/Attacks/Normal/Covet.vb
@@ -82,7 +82,7 @@ Namespace BattleSystem.Moves.Normal
             If op.Item.OriginalName.ToLower().EndsWith(" drive") = True AndAlso op.Number = 649 Then
                 Exit Sub
             End If
-            If op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If op.Item.IsMail = True Then
                 Exit Sub
             End If
 
diff --git a/P3D/Pokemon/Attacks/Psychic/Trick.vb b/P3D/Pokemon/Attacks/Psychic/Trick.vb
index aa9ed000d..034602a6e 100644
--- a/P3D/Pokemon/Attacks/Psychic/Trick.vb
+++ b/P3D/Pokemon/Attacks/Psychic/Trick.vb
@@ -93,10 +93,10 @@ Namespace BattleSystem.Moves.Psychic
             If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" memory") = True AndAlso op.Number = 773 Then
                 CanSwitchItems = False
             End If
-            If Not p.Item Is Nothing AndAlso p.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If Not p.Item Is Nothing AndAlso p.Item.IsMail = True Then
                 CanSwitchItems = False
             End If
-            If Not op.Item Is Nothing AndAlso op.Item.OriginalName.ToLower().EndsWith(" mail") = True Then
+            If Not op.Item Is Nothing AndAlso op.Item.IsMail = True Then
                 CanSwitchItems = False
             End If
             If (p.Item IsNot Nothing AndAlso p.Item.IsMegaStone) OrElse (op.Item IsNot Nothing AndAlso op.Item.IsMegaStone) Then
diff --git a/P3D/Screens/PC/MailSystemScreen.vb b/P3D/Screens/PC/MailSystemScreen.vb
index 921798134..ce797bbc5 100644
--- a/P3D/Screens/PC/MailSystemScreen.vb
+++ b/P3D/Screens/PC/MailSystemScreen.vb
@@ -12,7 +12,7 @@
         Me.PreScreen = currentScreen
         Me.Identification = Identifications.MailSystemScreen
 
-        Me.MouseVisible = False
+        Me.MouseVisible = True
         Me.CanBePaused = True
         Me.CanMuteAudio = False
         Me.CanChat = False
@@ -21,7 +21,7 @@
     Public Overrides Sub Draw()
         Canvas.DrawRectangle(Core.windowSize, Color.White)
 
-        Core.SpriteBatch.DrawString(FontManager.InGameFont, "Inbox", New Vector2(42, 28), Color.Black)
+        Core.SpriteBatch.DrawString(FontManager.MainFont, "Mailbox", New Vector2(42, 28), Color.Black)
         Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 2, New Rectangle(32, 64, 320, 576))
 
         Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 2, New Rectangle(400, 64, 672, 576))
@@ -44,9 +44,9 @@
 
         If message <> "" Then
             Canvas.DrawRectangle(Core.windowSize, New Color(0, 0, 0, 150))
-            Dim t As String = message.CropStringToWidth(FontManager.InGameFont, 800)
+            Dim t As String = message.CropStringToWidth(FontManager.MainFont, 800)
 
-            Core.SpriteBatch.DrawString(FontManager.InGameFont, t, New Vector2(CSng(Core.windowSize.Width / 2 - FontManager.InGameFont.MeasureString(t).X / 2), 340), Color.White)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CSng(Core.windowSize.Width / 2 - FontManager.MainFont.MeasureString(t).X / 2), 340), Color.White)
         End If
     End Sub
 
@@ -64,7 +64,7 @@
             End If
 
             Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 1, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, "Write new mail.", New Vector2(CInt(P.X) + 13, CInt(P.Y) + 14), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Write new mail.", New Vector2(CInt(P.X) + 13, CInt(P.Y) + 14), Color.Black)
         Else
             Dim item As Item = Item.GetItemByID(mail.MailID.ToString)
 
@@ -82,7 +82,7 @@
             Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 1, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
             Core.SpriteBatch.Draw(item.Texture, New Rectangle(CInt(P.X), CInt(P.Y), 48, 48), Color.White)
 
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, mail.MailHeader, New Vector2(CInt(P.X) + 52, CInt(P.Y) + 14), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, mail.MailHeader, New Vector2(CInt(P.X) + 52, CInt(P.Y) + 14), Color.Black)
 
             If mail.MailAttachment > -1 Then
                 Dim t As TrophyInformation = GetTrophyInformation(mail.MailAttachment)
@@ -113,74 +113,88 @@
                 c = Color.Gray
             End If
 
-            Core.SpriteBatch.DrawString(FontManager.InGameFont, "Header: " & mail.MailHeader, New Vector2(480, 92), c)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Header: " & mail.MailHeader, New Vector2(480, 92), c)
 
             Canvas.DrawRectangle(New Rectangle(420, 140, 660, 2), Color.DarkGray)
 
-            Dim text As String = ("Text: (" & mail.MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & mail.MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MiniFont, 600)
+            Dim text As String = ("Text: (" & mail.MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & mail.MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MainFont, 600)
             If EditMailIndex = 1 Then
                 c = Color.Blue
                 text &= "_"
             Else
                 c = Color.Gray
             End If
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, text, New Vector2(430, 160), c)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, text, New Vector2(430, 160), c)
 
-            Dim yPlus As Integer = CInt(FontManager.MiniFont.MeasureString(text).Y)
+            Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
 
             If EditMailIndex = 2 Then
                 c = Color.Blue
             Else
                 c = Color.Gray
             End If
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, "Signature: " & mail.MailSignature, New Vector2(430, yPlus + 200), c)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Signature: " & mail.MailSignature, New Vector2(430, yPlus + 200), c)
 
             Canvas.DrawRectangle(New Rectangle(420, yPlus + 240, 660, 2), Color.DarkGray)
 
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, "Mail OT: " & mail.MailSender & " (" & mail.MailOriginalTrainerOT & ")", New Vector2(430, yPlus + 260), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Mail OT: " & mail.MailSender & " (" & mail.MailOriginalTrainerOT & ")", New Vector2(430, yPlus + 260), Color.Black)
 
             If EditMailIndex = 3 Then
                 Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
             Else
                 Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
             End If
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, "Attach", New Vector2(496, yPlus + 334), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Attach", New Vector2(CInt(524 - FontManager.MainFont.MeasureString("Attach").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Attach").Y / 2)), Color.Black)
 
             If EditMailIndex = 4 Then
                 Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
             Else
                 Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
             End If
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, "Cancel", New Vector2(696, yPlus + 334), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Cancel", New Vector2(CInt(724 - FontManager.MainFont.MeasureString("Cancel").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Cancel").Y / 2)), Color.Black)
         Else
             Dim mail As Items.MailItem.MailData = Core.Player.Mails(index - 1)
             Dim item As Item = Item.GetItemByID(mail.MailID.ToString)
 
             Core.SpriteBatch.Draw(item.Texture, New Rectangle(420, 84, 48, 48), Color.White)
 
-            Core.SpriteBatch.DrawString(FontManager.InGameFont, mail.MailHeader, New Vector2(480, 92), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, mail.MailHeader, New Vector2(480, 92), Color.Black)
 
             Canvas.DrawRectangle(New Rectangle(420, 140, 660, 2), Color.DarkGray)
 
-            Dim text As String = ("Text: " & Environment.NewLine & Environment.NewLine & mail.MailText).CropStringToWidth(FontManager.MiniFont, 600)
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, text, New Vector2(430, 160), Color.Black)
+            Dim text As String = ("Text: " & Environment.NewLine & Environment.NewLine & mail.MailText).CropStringToWidth(FontManager.MainFont, 600)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, text, New Vector2(430, 160), Color.Black)
 
-            Dim yPlus As Integer = CInt(FontManager.MiniFont.MeasureString(text).Y)
+            Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
 
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, mail.MailSignature, New Vector2(430, yPlus + 200), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, mail.MailSignature, New Vector2(430, yPlus + 200), Color.Black)
 
             Canvas.DrawRectangle(New Rectangle(420, yPlus + 240, 660, 2), Color.DarkGray)
 
-            Core.SpriteBatch.DrawString(FontManager.MiniFont, "Mail OT: " & mail.MailSender & " (" & mail.MailOriginalTrainerOT & ")", New Vector2(430, yPlus + 260), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Mail OT: " & mail.MailSender & " (" & mail.MailOriginalTrainerOT & ")", New Vector2(430, yPlus + 260), Color.Black)
 
             If mail.MailAttachment > -1 Then
                 Canvas.DrawRectangle(New Rectangle(420, yPlus + 300, 660, 2), Color.DarkGray)
 
                 Dim t As TrophyInformation = GetTrophyInformation(mail.MailAttachment)
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, "Trophy:", New Vector2(430, yPlus + 320), Color.Black)
+                Core.SpriteBatch.DrawString(FontManager.MainFont, "Trophy:", New Vector2(430, yPlus + 320), Color.Black)
                 Core.SpriteBatch.Draw(t.Texture, New Rectangle(430, yPlus + 340, 64, 64), Color.White)
-                Core.SpriteBatch.DrawString(FontManager.MiniFont, (t.Name & Environment.NewLine & Environment.NewLine & t.Description).CropStringToWidth(FontManager.MiniFont, 500), New Vector2(510, yPlus + 340), Color.Black)
+                Core.SpriteBatch.DrawString(FontManager.MainFont, (t.Name & Environment.NewLine & Environment.NewLine & t.Description).CropStringToWidth(FontManager.MainFont, 500), New Vector2(510, yPlus + 340), Color.Black)
             End If
+
+            If EditMailIndex = 0 Then
+                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
+            Else
+                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
+            End If
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Attach", New Vector2(CInt(524 - FontManager.MainFont.MeasureString("Attach").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Attach").Y / 2)), Color.Black)
+
+            If EditMailIndex = 1 Then
+                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
+            Else
+                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
+            End If
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Cancel", New Vector2(CInt(724 - FontManager.MainFont.MeasureString("Cancel").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Cancel").Y / 2)), Color.Black)
         End If
     End Sub
 
@@ -194,54 +208,123 @@
         End If
 
         If index <> 0 Then
-            If Controls.Down(True, True, True, True, True) = True Then
-                Me.selectIndex += 1
-                If Me.selectIndex = Me.index And Me.selectIndex < Core.Player.Mails.Count Then
-                    Me.selectIndex += 1
+            If index > -1 Then
+
+                Dim pressedSystemKey As Boolean = False
+                If Controls.Down(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = False Then
+                    EditMailIndex += 1
                 End If
-            End If
-            If Controls.Up(True, True, True, True, True) = True Then
-                Me.selectIndex -= 1
-                If Me.selectIndex = Me.index And Me.selectIndex > 0 Then
-                    Me.selectIndex -= 1
+                If Controls.Up(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = True Then
+                    EditMailIndex -= 1
                 End If
-            End If
-
-            selectIndex = selectIndex.Clamp(0, Core.Player.Mails.Count)
-
-            While selectIndex - scrollIndex > 8
-                scrollIndex += 1
-            End While
-
-            While selectIndex - scrollIndex < 0
-                scrollIndex -= 1
-            End While
-
-            If Controls.Accept(True, True, True) = True Then
-                If Me.selectIndex = 0 Then
-                    Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
-                    selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
-                    selScreen.CanExit = True
-
-                    AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
-                    Core.SetScreen(selScreen)
-                Else
-                    If Me.index = Me.selectIndex Then
-                        Me.index = -1
-                    Else
-                        Me.index = Me.selectIndex
-
-                        Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
-                        Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                If Controls.Left(True, True, False, False, False) = True Then
+                    If EditMailIndex = 1 Then
+                        EditMailIndex -= 1
+                    End If
+                End If
+                If Controls.Right(True, True, False, False, False) = True Then
+                    If EditMailIndex = 0 Then
+                        EditMailIndex += 1
                     End If
                 End If
-            End If
 
-            If Controls.Dismiss(True, True, True) = True Then
-                SoundManager.PlaySound("select")
-                If Me.index <> -1 Then
+                EditMailIndex = EditMailIndex.Clamp(0, 1)
+
+                If Controls.Accept(False, True, True) = True Then
+
+                    If EditMailIndex = 0 Then
+                        Me.TempNewMail = Core.Player.Mails(Me.index - 1)
+                        SoundManager.PlaySound("select")
+                        Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                        AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                        Core.SetScreen(selScreen)
+                    Else
+                        Me.index = -1
+                        EditMailIndex = 0
+
+                    End If
+                End If
+
+                Dim text As String = ("Text: (" & Core.Player.Mails(Me.index - 1).MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & Core.Player.Mails(Me.index - 1).MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MainFont, 600)
+                Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
+
+                If Controls.Accept(True, False, False) = True Then
+                    If New Rectangle(440, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
+                        EditMailIndex = 0
+                    End If
+                    If New Rectangle(640, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
+                        EditMailIndex = 1
+                    End If
+
+                    If EditMailIndex = 0 Then
+                        Me.TempNewMail = Core.Player.Mails(Me.index - 1)
+                        SoundManager.PlaySound("select")
+                        Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                        AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                        Core.SetScreen(selScreen)
+                    Else
+                        Me.index = -1
+                        EditMailIndex = 0
+
+                    End If
+                End If
+
+                If Controls.Dismiss(True, True, True) = True Then
+                    SoundManager.PlaySound("select")
                     Me.index = -1
-                Else
+
+                End If
+            Else
+
+                If Controls.Down(True, True, True, True, True) = True Then
+                    Me.selectIndex += 1
+                    If Me.selectIndex = Me.index And Me.selectIndex < Core.Player.Mails.Count Then
+                        Me.selectIndex += 1
+                    End If
+                End If
+                If Controls.Up(True, True, True, True, True) = True Then
+                    Me.selectIndex -= 1
+                    If Me.selectIndex = Me.index And Me.selectIndex > 0 Then
+                        Me.selectIndex -= 1
+                    End If
+                End If
+
+                selectIndex = selectIndex.Clamp(0, Core.Player.Mails.Count)
+
+                While selectIndex - scrollIndex > 8
+                    scrollIndex += 1
+                End While
+
+                While selectIndex - scrollIndex < 0
+                    scrollIndex -= 1
+                End While
+
+                If Controls.Accept(True, True, True) = True Then
+                    If Me.selectIndex = 0 Then
+                        SoundManager.PlaySound("select")
+                        Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
+                        selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
+                        selScreen.CanExit = True
+
+                        AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
+                        Core.SetScreen(selScreen)
+                    Else
+                        SoundManager.PlaySound("select")
+                        If Me.index = Me.selectIndex Then
+                            Me.index = -1
+                        Else
+                            Me.index = Me.selectIndex
+
+                            Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                            Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                        End If
+                    End If
+                End If
+
+                If Controls.Dismiss(True, True, True) = True Then
+                    SoundManager.PlaySound("select")
                     Core.SetScreen(New TransitionScreen(Me, Me.PreScreen, Color.White, False))
                 End If
             End If
@@ -255,8 +338,27 @@
                 EditMailIndex -= 1
                 pressedSystemKey = True
             End If
-            If Controls.Left(True, True, False, False, False) = True Or Controls.Right(True, True, False, False, False) = True Then
+            If Controls.Left(True, True, False, False, False) = True Then
                 pressedSystemKey = True
+                If EditMailIndex = 4 Then
+                    EditMailIndex -= 1
+                End If
+            End If
+            If Controls.Right(True, True, False, False, False) = True Then
+                pressedSystemKey = True
+                If EditMailIndex = 3 Then
+                    EditMailIndex += 1
+                End If
+            End If
+            If Controls.Left(False, False, True, True, True) = True Then
+                If EditMailIndex = 1 Then
+                    EditMailIndex -= 1
+                End If
+            End If
+            If Controls.Right(False, False, True, True, True) = True Then
+                If EditMailIndex = 0 Then
+                    EditMailIndex += 1
+                End If
             End If
 
             EditMailIndex = EditMailIndex.Clamp(0, 4)
@@ -275,9 +377,10 @@
                 End Select
             End If
 
-            If Controls.Accept(True, True, True) = True Then
+            If Controls.Accept(False, True, True) = True Then
                 Select Case EditMailIndex
                     Case 3
+                        SoundManager.PlaySound("select")
                         If TempNewMail.MailHeader = "" Or TempNewMail.MailText = "" Or TempNewMail.MailSignature = "" Then
                             message = "Please fill in the Header, the Message and the Signature."
                         Else
@@ -287,7 +390,48 @@
                             Core.SetScreen(selScreen)
                         End If
                     Case 4
+                        SoundManager.PlaySound("select")
                         Me.index = -1
+                        EditMailIndex = 0
+                End Select
+            End If
+
+            Dim rect As Rectangle = New Rectangle(400, 64, 672, 576)
+            Dim text As String = ("Text: (" & TempNewMail.MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & TempNewMail.MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MainFont, 600)
+            Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
+
+            If Controls.Accept(True, False, False) = True Then
+                If New Rectangle(420, 92, 660, 40).Contains(MouseHandler.MousePosition) Then
+                    EditMailIndex = 0
+                End If
+                If New Rectangle(420, 140, 660, yPlus + 20).Contains(MouseHandler.MousePosition) Then
+                    EditMailIndex = 1
+                End If
+                If New Rectangle(420, yPlus + 200, 660, 40).Contains(MouseHandler.MousePosition) Then
+                    EditMailIndex = 2
+                End If
+                If New Rectangle(440, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
+                    EditMailIndex = 3
+                End If
+                If New Rectangle(640, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
+                    EditMailIndex = 4
+                End If
+
+                Select Case EditMailIndex
+                    Case 3
+                        SoundManager.PlaySound("select")
+                        If TempNewMail.MailHeader = "" Or TempNewMail.MailText = "" Or TempNewMail.MailSignature = "" Then
+                            message = "Please fill in the Header, the Message and the Signature."
+                        Else
+                            Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                            AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                            Core.SetScreen(selScreen)
+                        End If
+                    Case 4
+                        SoundManager.PlaySound("select")
+                        Me.index = -1
+                        EditMailIndex = 0
                 End Select
             End If
 
@@ -321,22 +465,29 @@
     End Sub
 
     Private Sub ChosenPokemon(ByVal PokeIndex As Integer)
+        Dim text As String = "Attached the Mail to " & Core.Player.Pokemons(PokeIndex).GetDisplayName() & "."
         If Not Core.Player.Pokemons(PokeIndex).Item Is Nothing Then
             If Core.Player.Pokemons(PokeIndex).Item.IsGameModeItem Then
                 Core.Player.Inventory.AddItem(Core.Player.Pokemons(PokeIndex).Item.gmID, 1)
             Else
                 Core.Player.Inventory.AddItem(Core.Player.Pokemons(PokeIndex).Item.ID.ToString, 1)
             End If
-
+            text = "Taken " & Core.Player.Pokemons(PokeIndex).Item.Name & " from " & Core.Player.Pokemons(PokeIndex).GetDisplayName() & ", and attached the Mail to " & Core.Player.Pokemons(PokeIndex).GetDisplayName() & "."
         End If
 
         Core.Player.Pokemons(PokeIndex).Item = Item.GetItemByID(TempNewMail.MailID.ToString)
         Core.Player.Pokemons(PokeIndex).Item.AdditionalData = Items.MailItem.GetStringFromMail(TempNewMail)
 
-        Core.Player.Inventory.RemoveItem(TempNewMail.MailID.ToString, 1)
+        If index = 0 Then
+            Core.Player.Inventory.RemoveItem(TempNewMail.MailID.ToString, 1)
+        Else
+            Core.Player.Mails.RemoveAt(Me.index - 1)
+            selectIndex -= 1
+            selectIndex = selectIndex.Clamp(0, Core.Player.Mails.Count)
+        End If
         Me.index = -1
 
-        Me.message = "Attached the Mail to " & Core.Player.Pokemons(PokeIndex).GetDisplayName() & "."
+        Me.message = text
     End Sub
 
 #Region "Trophies"

From 9749ba72bc7c795f6e1bdee848591318e1d1a958 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Mon, 24 Jul 2023 16:22:44 +0200
Subject: [PATCH 2/7] Mouse support added to mailscreen

---
 P3D/Screens/PC/MailSystemScreen.vb | 134 +++++++++++++++++++++++++----
 1 file changed, 116 insertions(+), 18 deletions(-)

diff --git a/P3D/Screens/PC/MailSystemScreen.vb b/P3D/Screens/PC/MailSystemScreen.vb
index ce797bbc5..36bbc6585 100644
--- a/P3D/Screens/PC/MailSystemScreen.vb
+++ b/P3D/Screens/PC/MailSystemScreen.vb
@@ -162,7 +162,7 @@
 
             Canvas.DrawRectangle(New Rectangle(420, 140, 660, 2), Color.DarkGray)
 
-            Dim text As String = ("Text: " & Environment.NewLine & Environment.NewLine & mail.MailText).CropStringToWidth(FontManager.MainFont, 600)
+            Dim text As String = mail.MailText.CropStringToWidth(FontManager.MainFont, 600)
             Core.SpriteBatch.DrawString(FontManager.MainFont, text, New Vector2(430, 160), Color.Black)
 
             Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
@@ -246,28 +246,67 @@
                     End If
                 End If
 
-                Dim text As String = ("Text: (" & Core.Player.Mails(Me.index - 1).MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & Core.Player.Mails(Me.index - 1).MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MainFont, 600)
+                Dim text As String = Core.Player.Mails(index - 1).MailText.CropStringToWidth(FontManager.MainFont, 600)
                 Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
 
                 If Controls.Accept(True, False, False) = True Then
-                    If New Rectangle(440, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
-                        EditMailIndex = 0
-                    End If
-                    If New Rectangle(640, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
-                        EditMailIndex = 1
-                    End If
+                    Dim MailIndex As Integer = -1
+                    For i = 0 To 8
+                        If i < Core.Player.Mails.Count + 1 Then
+                            If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
+                                MailIndex = scrollIndex + i
+                                Exit For
+                            End If
+                        Else
+                            If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
+                                EditMailIndex = 1
+                                Exit For
+                            End If
+                        End If
+                    Next
+                    If MailIndex <> -1 Then
+                        selectIndex = MailIndex
+                        If Me.selectIndex = 0 Then
+                            Me.index = -1
+                            SoundManager.PlaySound("select")
+                            Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
+                            selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
+                            selScreen.CanExit = True
 
-                    If EditMailIndex = 0 Then
-                        Me.TempNewMail = Core.Player.Mails(Me.index - 1)
-                        SoundManager.PlaySound("select")
-                        Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
-                        AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+                            AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
+                            Core.SetScreen(selScreen)
+                        Else
+                            SoundManager.PlaySound("select")
+                            If Me.index = Me.selectIndex Then
+                                Me.index = -1
+                            Else
+                                Me.index = Me.selectIndex
 
-                        Core.SetScreen(selScreen)
+                                Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                                Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                            End If
+                        End If
                     Else
-                        Me.index = -1
-                        EditMailIndex = 0
 
+                        If New Rectangle(440, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 0
+                        End If
+                        If New Rectangle(640, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 1
+                        End If
+
+                        If EditMailIndex = 0 Then
+                            Me.TempNewMail = Core.Player.Mails(Me.index - 1)
+                            SoundManager.PlaySound("select")
+                            Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                            AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                            Core.SetScreen(selScreen)
+                        Else
+                            Me.index = -1
+                            EditMailIndex = 0
+
+                        End If
                     End If
                 End If
 
@@ -301,7 +340,7 @@
                     scrollIndex -= 1
                 End While
 
-                If Controls.Accept(True, True, True) = True Then
+                If Controls.Accept(False, True, True) = True Then
                     If Me.selectIndex = 0 Then
                         SoundManager.PlaySound("select")
                         Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
@@ -322,6 +361,40 @@
                         End If
                     End If
                 End If
+                If Controls.Accept(True, False, False) Then
+                    Dim MailIndex As Integer = -1
+                    For i = 0 To 8
+                        If i < Core.Player.Mails.Count + 1 Then
+                            If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
+                                MailIndex = scrollIndex + i
+                                Exit For
+                            End If
+                        End If
+                    Next
+                    If MailIndex <> -1 Then
+                        selectIndex = MailIndex
+                        If Me.selectIndex = 0 Then
+                            SoundManager.PlaySound("select")
+                            Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
+                            selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
+                            selScreen.CanExit = True
+
+                            AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
+                            Core.SetScreen(selScreen)
+                        Else
+                            SoundManager.PlaySound("select")
+                            If Me.index = Me.selectIndex Then
+                                Me.index = -1
+                            Else
+                                Me.index = Me.selectIndex
+
+                                Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                                Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                            End If
+                        End If
+                    End If
+
+                End If
 
                 If Controls.Dismiss(True, True, True) = True Then
                     SoundManager.PlaySound("select")
@@ -396,11 +469,36 @@
                 End Select
             End If
 
-            Dim rect As Rectangle = New Rectangle(400, 64, 672, 576)
             Dim text As String = ("Text: (" & TempNewMail.MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & TempNewMail.MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MainFont, 600)
             Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
 
             If Controls.Accept(True, False, False) = True Then
+                Dim MailIndex As Integer = -1
+                For i = 0 To 8
+                    If i < Core.Player.Mails.Count + 1 Then
+                        If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
+                            MailIndex = scrollIndex + i
+                            Exit For
+                        End If
+                    Else
+                        If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 4
+                            Exit For
+                        End If
+                    End If
+                Next
+                If MailIndex <> -1 Then
+                    selectIndex = MailIndex
+                    SoundManager.PlaySound("select")
+                    If Me.selectIndex = 0 Then
+                        Me.index = -1
+                    Else
+                        Me.index = Me.selectIndex
+
+                        Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                        Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                    End If
+                End If
                 If New Rectangle(420, 92, 660, 40).Contains(MouseHandler.MousePosition) Then
                     EditMailIndex = 0
                 End If

From 970feaefbc5dca769b6c1f289d4b8d6cdb7f5057 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Mon, 24 Jul 2023 19:47:26 +0200
Subject: [PATCH 3/7] Progress trying to make mailscreen prettier

---
 P3D/Content/GUI/Menus/MailMenuBackground.png | Bin 0 -> 3160 bytes
 P3D/P3D.vbproj                               |   3 ++
 P3D/Screens/PC/MailSystemScreen.vb           |  38 +++++++++++++++----
 3 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 P3D/Content/GUI/Menus/MailMenuBackground.png

diff --git a/P3D/Content/GUI/Menus/MailMenuBackground.png b/P3D/Content/GUI/Menus/MailMenuBackground.png
new file mode 100644
index 0000000000000000000000000000000000000000..64bffb2945bffc3ed55d611c984427b9d65553f7
GIT binary patch
literal 3160
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
LK2~Xc{^q{`=3z4h

literal 0
HcmV?d00001

diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 8a9d58edf..5630a5f5f 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -11033,6 +11033,9 @@
     <Content Include="Content\GUI\Menus\InterfaceColors.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\GUI\Menus\MailMenuBackground.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\GUI\PokemonMenu\Alcremie.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/P3D/Screens/PC/MailSystemScreen.vb b/P3D/Screens/PC/MailSystemScreen.vb
index 36bbc6585..caadbd201 100644
--- a/P3D/Screens/PC/MailSystemScreen.vb
+++ b/P3D/Screens/PC/MailSystemScreen.vb
@@ -19,19 +19,41 @@
     End Sub
 
     Public Overrides Sub Draw()
-        Canvas.DrawRectangle(Core.windowSize, Color.White)
 
-        Core.SpriteBatch.DrawString(FontManager.MainFont, "Mailbox", New Vector2(42, 28), Color.Black)
-        Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 2, New Rectangle(32, 64, 320, 576))
+        Dim backSize As New Size(windowSize.Width, windowSize.Height)
+        Dim origSize As New Size(380, 210)
+        Dim aspectRatio As Single = CSng(origSize.Width / origSize.Height)
 
-        Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 2, New Rectangle(400, 64, 672, 576))
+        backSize.Width = CInt(windowSize.Width * aspectRatio)
+        backSize.Height = CInt(backSize.Width / aspectRatio)
+
+        If backSize.Width > backSize.Height Then
+            backSize.Width = windowSize.Width
+            backSize.Height = CInt(windowSize.Width / aspectRatio)
+        Else
+            backSize.Height = windowSize.Height
+            backSize.Width = CInt(windowSize.Height / aspectRatio)
+        End If
+        If backSize.Height < windowSize.Height Then
+            backSize.Height = windowSize.Height
+            backSize.Width = CInt(windowSize.Height / origSize.Height * origSize.Width)
+        End If
+
+        Dim background As Texture2D = TextureManager.GetTexture("GUI\Menus\MailMenuBackground")
+
+        Core.SpriteBatch.Draw(background, New Rectangle(0, 0, backSize.Width, backSize.Height), Color.White)
+        Canvas.DrawRectangle(New Rectangle(32, 16, 240, 48), Color.White)
+
+        Core.SpriteBatch.DrawString(FontManager.MainFont, "Mailbox", New Vector2(48, 24), Color.Black)
+        Canvas.DrawRectangle(New Rectangle(32, 64, 352, 592), New Color(255, 255, 255, 224))
+        Canvas.DrawRectangle(New Rectangle(400, 64, 704, 592), New Color(255, 255, 255, 224))
 
         For i = scrollIndex To scrollIndex + 8
             If i = 0 Then
-                DrawMail(Nothing, New Vector2(46, 82 + (i - scrollIndex) * 64), i)
+                DrawMail(Nothing, New Vector2(42, 78 + (i - scrollIndex) * 64), i)
             Else
                 If i <= Core.Player.Mails.Count Then
-                    DrawMail(Core.Player.Mails(i - 1), New Vector2(46, 82 + (i - scrollIndex) * 64), i)
+                    DrawMail(Core.Player.Mails(i - 1), New Vector2(42, 78 + (i - scrollIndex) * 64), i)
                 End If
             End If
         Next
@@ -63,7 +85,7 @@
                 End If
             End If
 
-            Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 1, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
+            Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 2, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
             Core.SpriteBatch.DrawString(FontManager.MainFont, "Write new mail.", New Vector2(CInt(P.X) + 13, CInt(P.Y) + 14), Color.Black)
         Else
             Dim item As Item = Item.GetItemByID(mail.MailID.ToString)
@@ -79,7 +101,7 @@
                 End If
             End If
 
-            Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 1, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
+            Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 2, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
             Core.SpriteBatch.Draw(item.Texture, New Rectangle(CInt(P.X), CInt(P.Y), 48, 48), Color.White)
 
             Core.SpriteBatch.DrawString(FontManager.MainFont, mail.MailHeader, New Vector2(CInt(P.X) + 52, CInt(P.Y) + 14), Color.Black)

From fdcbdfa62b1f7a521f8cd3bd93f3155019357ced Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Tue, 25 Jul 2023 12:48:43 +0200
Subject: [PATCH 4/7] Add mail delete menu + modern buttons

---
 P3D/Content/GUI/Menus/General.png             | Bin 10071 -> 2491 bytes
 ...nuBackground.png => MailboxBackground.png} | Bin
 P3D/P3D.vbproj                                |   2 +-
 P3D/Screens/PC/MailSystemScreen.vb            | 891 +++++++++++-------
 .../V2/ScriptCommands/DoScreen.vb             |   2 +-
 5 files changed, 537 insertions(+), 358 deletions(-)
 rename P3D/Content/GUI/Menus/{MailMenuBackground.png => MailboxBackground.png} (100%)

diff --git a/P3D/Content/GUI/Menus/General.png b/P3D/Content/GUI/Menus/General.png
index 654793d7268fc3d53472ce7a736e0a75bf7cb7d3..9470cb5d5482f379c22aa5a2397d79c00b9dc47e 100644
GIT binary patch
literal 2491
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
Q{_%qS=C)=9CT@}c1ERJ-+W-In

literal 10071
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
O0TgA`Wa^~MBmNKH=|ao^

diff --git a/P3D/Content/GUI/Menus/MailMenuBackground.png b/P3D/Content/GUI/Menus/MailboxBackground.png
similarity index 100%
rename from P3D/Content/GUI/Menus/MailMenuBackground.png
rename to P3D/Content/GUI/Menus/MailboxBackground.png
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 5630a5f5f..a6439cdbb 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -11033,7 +11033,7 @@
     <Content Include="Content\GUI\Menus\InterfaceColors.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\GUI\Menus\MailMenuBackground.png">
+    <Content Include="Content\GUI\Menus\MailboxBackground.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\GUI\PokemonMenu\Alcremie.png">
diff --git a/P3D/Screens/PC/MailSystemScreen.vb b/P3D/Screens/PC/MailSystemScreen.vb
index caadbd201..5c347309d 100644
--- a/P3D/Screens/PC/MailSystemScreen.vb
+++ b/P3D/Screens/PC/MailSystemScreen.vb
@@ -6,6 +6,10 @@
     Dim scrollIndex As Integer = 0
     Dim selectIndex As Integer = 0
 
+    Dim MenuEntries As New List(Of MenuEntry)
+    Dim MenuVisible As Boolean = False
+    Dim MenuCursor As Integer = 0
+    Dim MenuHeader As String = ""
     Dim message As String = ""
 
     Public Sub New(ByVal currentScreen As Screen)
@@ -39,72 +43,91 @@
             backSize.Width = CInt(windowSize.Height / origSize.Height * origSize.Width)
         End If
 
-        Dim background As Texture2D = TextureManager.GetTexture("GUI\Menus\MailMenuBackground")
+        Dim background As Texture2D = TextureManager.GetTexture("GUI\Menus\MailboxBackground")
 
         Core.SpriteBatch.Draw(background, New Rectangle(0, 0, backSize.Width, backSize.Height), Color.White)
         Canvas.DrawRectangle(New Rectangle(32, 16, 240, 48), Color.White)
 
         Core.SpriteBatch.DrawString(FontManager.MainFont, "Mailbox", New Vector2(48, 24), Color.Black)
-        Canvas.DrawRectangle(New Rectangle(32, 64, 352, 592), New Color(255, 255, 255, 224))
-        Canvas.DrawRectangle(New Rectangle(400, 64, 704, 592), New Color(255, 255, 255, 224))
+        Canvas.DrawRectangle(New Rectangle(32, 64, 352, 624), New Color(255, 255, 255, 224))
+        Canvas.DrawRectangle(New Rectangle(400, 64, 704, 624), New Color(255, 255, 255, 224))
 
         For i = scrollIndex To scrollIndex + 8
             If i = 0 Then
                 DrawMail(Nothing, New Vector2(42, 78 + (i - scrollIndex) * 64), i)
             Else
                 If i <= Core.Player.Mails.Count Then
-                    DrawMail(Core.Player.Mails(i - 1), New Vector2(42, 78 + (i - scrollIndex) * 64), i)
+                    DrawMail(Core.Player.Mails(i - 1), New Vector2(42, 78 + (i - scrollIndex) * 64 + 2 * (i - scrollIndex)), i)
                 End If
             End If
         Next
 
-        Canvas.DrawScrollBar(New Vector2(358, 86), Core.Player.Mails.Count + 1, 9, scrollIndex, New Size(6, 560), False, Color.LightGray, Color.Black)
+        Canvas.DrawScrollBar(New Vector2(368, 86), Core.Player.Mails.Count + 1, 9, scrollIndex, New Size(6, 560), False, Color.LightGray, Color.Black)
 
         If Me.index <> -1 Then
             DrawCurrentMail()
         End If
 
+        If MenuVisible = True Then
+            DrawMenuEntries()
+        End If
+
         If message <> "" Then
             Canvas.DrawRectangle(Core.windowSize, New Color(0, 0, 0, 150))
             Dim t As String = message.CropStringToWidth(FontManager.MainFont, 800)
 
             Core.SpriteBatch.DrawString(FontManager.MainFont, t, New Vector2(CSng(Core.windowSize.Width / 2 - FontManager.MainFont.MeasureString(t).X / 2), 340), Color.White)
         End If
+
     End Sub
 
     Private Sub DrawMail(ByVal mail As Items.MailItem.MailData, ByVal P As Vector2, ByVal i As Integer)
+
         If i = 0 Then
-            Dim x As Integer = 0
-            Dim y As Integer = 0
+            Dim x As Integer = 16
+            Dim y As Integer = 16
             If i = Me.index Then
-                y = 48
+                x = 80
+                y = 72
             Else
                 If i = selectIndex Then
-                    y = 0
                     x = 48
+                    y = 72
                 End If
             End If
 
-            Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 2, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
-            Core.SpriteBatch.DrawString(FontManager.MainFont, "Write new mail.", New Vector2(CInt(P.X) + 13, CInt(P.Y) + 14), Color.Black)
+            Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(x, y, 16, 16), ""), New Rectangle(CInt(P.X), CInt(CInt(P.Y)), 64, 64), Color.White)
+            For i = 64 To 224 Step 64
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(x + 16, y, 16, 16), ""), New Rectangle(CInt(P.X + i), CInt(CInt(P.Y)), 64, 64), Color.White)
+            Next
+            Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(x, y, 16, 16), ""), New Rectangle(CInt(P.X + 256), CInt(CInt(P.Y)), 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
+
+
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Write new mail.", New Vector2(CInt(P.X) + 13, CInt(P.Y) + 18), Color.Black)
         Else
             Dim item As Item = Item.GetItemByID(mail.MailID.ToString)
 
-            Dim x As Integer = 0
-            Dim y As Integer = 0
+            Dim x As Integer = 16
+            Dim y As Integer = 16
             If i = Me.index Then
-                y = 48
+                x = 80
+                y = 72
             Else
                 If i = selectIndex Then
-                    y = 0
                     x = 48
+                    y = 72
                 End If
             End If
 
-            Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(x, y, 48, 48), ""), 2, New Rectangle(CInt(P.X), CInt(P.Y), 288, 32))
-            Core.SpriteBatch.Draw(item.Texture, New Rectangle(CInt(P.X), CInt(P.Y), 48, 48), Color.White)
+            Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(x, y, 16, 16), ""), New Rectangle(CInt(P.X), CInt(CInt(P.Y)), 64, 64), Color.White)
+            For i = 64 To 224 Step 64
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(x + 16, y, 16, 16), ""), New Rectangle(CInt(P.X + i), CInt(CInt(P.Y)), 64, 64), Color.White)
+            Next
+            Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(x, y, 16, 16), ""), New Rectangle(CInt(P.X + 256), CInt(CInt(P.Y)), 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
 
-            Core.SpriteBatch.DrawString(FontManager.MainFont, mail.MailHeader, New Vector2(CInt(P.X) + 52, CInt(P.Y) + 14), Color.Black)
+            Core.SpriteBatch.Draw(item.Texture, New Rectangle(CInt(P.X), CInt(P.Y) + 4, 48, 48), Color.White)
+
+            Core.SpriteBatch.DrawString(FontManager.MainFont, mail.MailHeader, New Vector2(CInt(P.X) + 52, CInt(P.Y) + 18), Color.Black)
 
             If mail.MailAttachment > -1 Then
                 Dim t As TrophyInformation = GetTrophyInformation(mail.MailAttachment)
@@ -112,7 +135,7 @@
             End If
 
             If mail.MailRead = False Then
-                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\GTS"), New Rectangle(CInt(P.X) + 272, CInt(P.Y), 32, 32), New Rectangle(320, 144, 32, 32), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\GTS"), New Rectangle(CInt(P.X) + 272, CInt(P.Y) + 4, 32, 32), New Rectangle(320, 144, 32, 32), Color.White)
             End If
         End If
     End Sub
@@ -162,18 +185,26 @@
             Core.SpriteBatch.DrawString(FontManager.MainFont, "Mail OT: " & mail.MailSender & " (" & mail.MailOriginalTrainerOT & ")", New Vector2(430, yPlus + 260), Color.Black)
 
             If EditMailIndex = 3 Then
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(440, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(96, 72, 16, 16), ""), New Rectangle(440 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(440 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             Else
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(440, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(32, 16, 16, 16), ""), New Rectangle(440 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(440 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             End If
-            Core.SpriteBatch.DrawString(FontManager.MainFont, "Attach", New Vector2(CInt(524 - FontManager.MainFont.MeasureString("Attach").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Attach").Y / 2)), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Attach", New Vector2(CInt(534 - FontManager.MainFont.MeasureString("Attach").X / 2), yPlus + CInt(348 - FontManager.MainFont.MeasureString("Attach").Y / 2)), Color.Black)
 
             If EditMailIndex = 4 Then
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(640, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(96, 72, 16, 16), ""), New Rectangle(640 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(640 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             Else
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(640, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(32, 16, 16, 16), ""), New Rectangle(640 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(640 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             End If
-            Core.SpriteBatch.DrawString(FontManager.MainFont, "Cancel", New Vector2(CInt(724 - FontManager.MainFont.MeasureString("Cancel").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Cancel").Y / 2)), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Cancel", New Vector2(CInt(734 - FontManager.MainFont.MeasureString("Cancel").X / 2), yPlus + CInt(348 - FontManager.MainFont.MeasureString("Cancel").Y / 2)), Color.Black)
         Else
             Dim mail As Items.MailItem.MailData = Core.Player.Mails(index - 1)
             Dim item As Item = Item.GetItemByID(mail.MailID.ToString)
@@ -205,18 +236,37 @@
             End If
 
             If EditMailIndex = 0 Then
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(440, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(96, 72, 16, 16), ""), New Rectangle(440 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(440 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             Else
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(440, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(440, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(32, 16, 16, 16), ""), New Rectangle(440 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(440 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             End If
-            Core.SpriteBatch.DrawString(FontManager.MainFont, "Attach", New Vector2(CInt(524 - FontManager.MainFont.MeasureString("Attach").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Attach").Y / 2)), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Attach", New Vector2(CInt(534 - FontManager.MainFont.MeasureString("Attach").X / 2), yPlus + CInt(348 - FontManager.MainFont.MeasureString("Attach").Y / 2)), Color.Black)
 
             If EditMailIndex = 1 Then
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 48, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(640, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(96, 72, 16, 16), ""), New Rectangle(640 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(640 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             Else
-                Canvas.DrawImageBorder(TextureManager.GetTexture("GUI\Menus\Menu", New Rectangle(0, 0, 48, 48), ""), 1, New Rectangle(640, yPlus + 320, 160, 32))
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(640, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(32, 16, 16, 16), ""), New Rectangle(640 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(640 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
             End If
-            Core.SpriteBatch.DrawString(FontManager.MainFont, "Cancel", New Vector2(CInt(724 - FontManager.MainFont.MeasureString("Cancel").X / 2), yPlus + CInt(344 - FontManager.MainFont.MeasureString("Cancel").Y / 2)), Color.Black)
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Delete", New Vector2(CInt(734 - FontManager.MainFont.MeasureString("Delete").X / 2), yPlus + CInt(348 - FontManager.MainFont.MeasureString("Delete").Y / 2)), Color.Black)
+
+            If EditMailIndex = 2 Then
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(840, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(96, 72, 16, 16), ""), New Rectangle(840 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(80, 72, 16, 16), ""), New Rectangle(840 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
+            Else
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(840, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(32, 16, 16, 16), ""), New Rectangle(840 + 64, yPlus + 320, 64, 64), Color.White)
+                Core.SpriteBatch.Draw(TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), ""), New Rectangle(840 + 128, yPlus + 320, 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
+            End If
+            Core.SpriteBatch.DrawString(FontManager.MainFont, "Cancel", New Vector2(CInt(934 - FontManager.MainFont.MeasureString("Cancel").X / 2), yPlus + CInt(348 - FontManager.MainFont.MeasureString("Cancel").Y / 2)), Color.Black)
         End If
     End Sub
 
@@ -227,337 +277,375 @@
             End If
 
             Exit Sub
-        End If
-
-        If index <> 0 Then
-            If index > -1 Then
-
-                Dim pressedSystemKey As Boolean = False
-                If Controls.Down(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = False Then
-                    EditMailIndex += 1
-                End If
-                If Controls.Up(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = True Then
-                    EditMailIndex -= 1
-                End If
-                If Controls.Left(True, True, False, False, False) = True Then
-                    If EditMailIndex = 1 Then
-                        EditMailIndex -= 1
-                    End If
-                End If
-                If Controls.Right(True, True, False, False, False) = True Then
-                    If EditMailIndex = 0 Then
-                        EditMailIndex += 1
-                    End If
-                End If
-
-                EditMailIndex = EditMailIndex.Clamp(0, 1)
-
-                If Controls.Accept(False, True, True) = True Then
-
-                    If EditMailIndex = 0 Then
-                        Me.TempNewMail = Core.Player.Mails(Me.index - 1)
-                        SoundManager.PlaySound("select")
-                        Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
-                        AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
-
-                        Core.SetScreen(selScreen)
-                    Else
-                        Me.index = -1
-                        EditMailIndex = 0
-
-                    End If
-                End If
-
-                Dim text As String = Core.Player.Mails(index - 1).MailText.CropStringToWidth(FontManager.MainFont, 600)
-                Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
-
-                If Controls.Accept(True, False, False) = True Then
-                    Dim MailIndex As Integer = -1
-                    For i = 0 To 8
-                        If i < Core.Player.Mails.Count + 1 Then
-                            If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
-                                MailIndex = scrollIndex + i
-                                Exit For
-                            End If
-                        Else
-                            If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
-                                EditMailIndex = 1
-                                Exit For
-                            End If
-                        End If
-                    Next
-                    If MailIndex <> -1 Then
-                        selectIndex = MailIndex
-                        If Me.selectIndex = 0 Then
-                            Me.index = -1
-                            SoundManager.PlaySound("select")
-                            Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
-                            selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
-                            selScreen.CanExit = True
-
-                            AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
-                            Core.SetScreen(selScreen)
-                        Else
-                            SoundManager.PlaySound("select")
-                            If Me.index = Me.selectIndex Then
-                                Me.index = -1
-                            Else
-                                Me.index = Me.selectIndex
-
-                                Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
-                                Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
-                            End If
-                        End If
-                    Else
-
-                        If New Rectangle(440, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
-                            EditMailIndex = 0
-                        End If
-                        If New Rectangle(640, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
-                            EditMailIndex = 1
-                        End If
-
-                        If EditMailIndex = 0 Then
-                            Me.TempNewMail = Core.Player.Mails(Me.index - 1)
-                            SoundManager.PlaySound("select")
-                            Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
-                            AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
-
-                            Core.SetScreen(selScreen)
-                        Else
-                            Me.index = -1
-                            EditMailIndex = 0
-
-                        End If
-                    End If
-                End If
-
-                If Controls.Dismiss(True, True, True) = True Then
-                    SoundManager.PlaySound("select")
-                    Me.index = -1
-
-                End If
-            Else
-
-                If Controls.Down(True, True, True, True, True) = True Then
-                    Me.selectIndex += 1
-                    If Me.selectIndex = Me.index And Me.selectIndex < Core.Player.Mails.Count Then
-                        Me.selectIndex += 1
-                    End If
-                End If
-                If Controls.Up(True, True, True, True, True) = True Then
-                    Me.selectIndex -= 1
-                    If Me.selectIndex = Me.index And Me.selectIndex > 0 Then
-                        Me.selectIndex -= 1
-                    End If
-                End If
-
-                selectIndex = selectIndex.Clamp(0, Core.Player.Mails.Count)
-
-                While selectIndex - scrollIndex > 8
-                    scrollIndex += 1
-                End While
-
-                While selectIndex - scrollIndex < 0
-                    scrollIndex -= 1
-                End While
-
-                If Controls.Accept(False, True, True) = True Then
-                    If Me.selectIndex = 0 Then
-                        SoundManager.PlaySound("select")
-                        Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
-                        selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
-                        selScreen.CanExit = True
-
-                        AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
-                        Core.SetScreen(selScreen)
-                    Else
-                        SoundManager.PlaySound("select")
-                        If Me.index = Me.selectIndex Then
-                            Me.index = -1
-                        Else
-                            Me.index = Me.selectIndex
-
-                            Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
-                            Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
-                        End If
-                    End If
-                End If
-                If Controls.Accept(True, False, False) Then
-                    Dim MailIndex As Integer = -1
-                    For i = 0 To 8
-                        If i < Core.Player.Mails.Count + 1 Then
-                            If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
-                                MailIndex = scrollIndex + i
-                                Exit For
-                            End If
-                        End If
-                    Next
-                    If MailIndex <> -1 Then
-                        selectIndex = MailIndex
-                        If Me.selectIndex = 0 Then
-                            SoundManager.PlaySound("select")
-                            Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
-                            selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
-                            selScreen.CanExit = True
-
-                            AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
-                            Core.SetScreen(selScreen)
-                        Else
-                            SoundManager.PlaySound("select")
-                            If Me.index = Me.selectIndex Then
-                                Me.index = -1
-                            Else
-                                Me.index = Me.selectIndex
-
-                                Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
-                                Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
-                            End If
-                        End If
-                    End If
-
-                End If
-
-                If Controls.Dismiss(True, True, True) = True Then
-                    SoundManager.PlaySound("select")
-                    Core.SetScreen(New TransitionScreen(Me, Me.PreScreen, Color.White, False))
-                End If
-            End If
         Else
-            Dim pressedSystemKey As Boolean = False
-            If Controls.Down(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = False Then
-                EditMailIndex += 1
-                pressedSystemKey = True
-            End If
-            If Controls.Up(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = True Then
-                EditMailIndex -= 1
-                pressedSystemKey = True
-            End If
-            If Controls.Left(True, True, False, False, False) = True Then
-                pressedSystemKey = True
-                If EditMailIndex = 4 Then
-                    EditMailIndex -= 1
-                End If
-            End If
-            If Controls.Right(True, True, False, False, False) = True Then
-                pressedSystemKey = True
-                If EditMailIndex = 3 Then
-                    EditMailIndex += 1
-                End If
-            End If
-            If Controls.Left(False, False, True, True, True) = True Then
-                If EditMailIndex = 1 Then
-                    EditMailIndex -= 1
-                End If
-            End If
-            If Controls.Right(False, False, True, True, True) = True Then
-                If EditMailIndex = 0 Then
-                    EditMailIndex += 1
-                End If
-            End If
+            If MenuVisible = True Then
+                For i = 0 To Me.MenuEntries.Count - 1
+                    If i <= Me.MenuEntries.Count - 1 Then
+                        Dim m As MenuEntry = Me.MenuEntries(i)
 
-            EditMailIndex = EditMailIndex.Clamp(0, 4)
-
-            If pressedSystemKey = False Then
-                Select Case EditMailIndex
-                    Case 0
-                        KeyBindings.GetInput(TempNewMail.MailHeader, 25, True, True)
-                        TempNewMail.MailHeader = TempNewMail.MailHeader.Replace("\,", ",").Replace(Environment.NewLine, "").Replace("|", "/")
-                    Case 1
-                        KeyBindings.GetInput(TempNewMail.MailText, 200, True, True)
-                        TempNewMail.MailText = TempNewMail.MailText.Replace("\,", ",").Replace(Environment.NewLine, "<br>").Replace("|", "/")
-                    Case 2
-                        KeyBindings.GetInput(TempNewMail.MailSignature, 25, True, True)
-                        TempNewMail.MailSignature = TempNewMail.MailSignature.Replace("\,", ",").Replace(Environment.NewLine, "").Replace("|", "/")
-                End Select
-            End If
-
-            If Controls.Accept(False, True, True) = True Then
-                Select Case EditMailIndex
-                    Case 3
-                        SoundManager.PlaySound("select")
-                        If TempNewMail.MailHeader = "" Or TempNewMail.MailText = "" Or TempNewMail.MailSignature = "" Then
-                            message = "Please fill in the Header, the Message and the Signature."
-                        Else
-                            Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
-                            AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
-
-                            Core.SetScreen(selScreen)
-                        End If
-                    Case 4
-                        SoundManager.PlaySound("select")
-                        Me.index = -1
-                        EditMailIndex = 0
-                End Select
-            End If
-
-            Dim text As String = ("Text: (" & TempNewMail.MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & TempNewMail.MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MainFont, 600)
-            Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
-
-            If Controls.Accept(True, False, False) = True Then
-                Dim MailIndex As Integer = -1
-                For i = 0 To 8
-                    If i < Core.Player.Mails.Count + 1 Then
-                        If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
-                            MailIndex = scrollIndex + i
-                            Exit For
-                        End If
-                    Else
-                        If New Rectangle(46, 82 + 64 * i, 288, 64).Contains(MouseHandler.MousePosition) Then
-                            EditMailIndex = 4
-                            Exit For
-                        End If
+                        m.Update(Me)
                     End If
                 Next
-                If MailIndex <> -1 Then
-                    selectIndex = MailIndex
-                    SoundManager.PlaySound("select")
-                    If Me.selectIndex = 0 Then
-                        Me.index = -1
-                    Else
-                        Me.index = Me.selectIndex
 
-                        Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
-                        Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                If Controls.Up(True, True) = True Then
+                    Me.MenuCursor -= 1
+                End If
+                If Controls.Down(True, True) = True Then
+                    Me.MenuCursor += 1
+                End If
+
+                Dim maxIndex As Integer = 0
+                Dim minIndex As Integer = 100
+
+                For Each e As MenuEntry In Me.MenuEntries
+                    If e.Index < minIndex Then
+                        minIndex = e.Index
+                    End If
+                    If e.Index > maxIndex Then
+                        maxIndex = e.Index
+                    End If
+                Next
+
+                If Me.MenuCursor > maxIndex Then
+                    Me.MenuCursor = minIndex
+                ElseIf Me.MenuCursor < minIndex Then
+                    Me.MenuCursor = maxIndex
+                End If
+
+            Else
+
+                If index <> 0 Then
+                    If index > -1 Then
+
+                        Dim pressedSystemKey As Boolean = False
+                        If Controls.Down(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = False Then
+                            EditMailIndex += 1
+                        End If
+                        If Controls.Up(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = True Then
+                            EditMailIndex -= 1
+                        End If
+                        If Controls.Left(True, True, False, True, True) = True Then
+                            EditMailIndex -= 1
+                        End If
+                        If Controls.Right(True, True, False, True, True) = True Then
+                            EditMailIndex += 1
+                        End If
+
+                        EditMailIndex = EditMailIndex.Clamp(0, 2)
+
+                        If Controls.Accept(False, True, True) = True Then
+
+                            Select Case EditMailIndex
+                                Case 0
+                                    Me.TempNewMail = Core.Player.Mails(Me.index - 1)
+                                    SoundManager.PlaySound("select")
+                                    Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                                    AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                                    Core.SetScreen(selScreen)
+                                Case 1
+                                    Dim e1 As New MenuEntry(3, "Yes", False, AddressOf DeleteMail)
+                                    Dim e2 As New MenuEntry(4, "No", True, Nothing)
+                                    SetupMenu({e1, e2}, "Delete this mail?")
+
+                                Case 2
+                                    Me.index = -1
+                                    EditMailIndex = 0
+                            End Select
+                        End If
+
+                        Dim text As String = Core.Player.Mails(index - 1).MailText.CropStringToWidth(FontManager.MainFont, 600)
+                        Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
+
+                        If Controls.Accept(True, False, False) = True Then
+                            Dim MailIndex As Integer = -1
+                            For i = 0 To 8
+                                If i < Core.Player.Mails.Count + 1 Then
+                                    If New Rectangle(46, 82 + 64 * i + 2 * (i - scrollIndex), 288, 64).Contains(MouseHandler.MousePosition) Then
+                                        MailIndex = scrollIndex + i
+                                        Exit For
+                                    End If
+                                Else
+                                    If New Rectangle(46, 82 + 64 * i + 2 * (i - scrollIndex), 288, 64).Contains(MouseHandler.MousePosition) Then
+                                        EditMailIndex = 1
+                                        Exit For
+                                    End If
+                                End If
+                            Next
+                            If MailIndex <> -1 Then
+                                selectIndex = MailIndex
+                                If Me.selectIndex = 0 Then
+                                    Me.index = -1
+                                    SoundManager.PlaySound("select")
+                                    Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
+                                    selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
+                                    selScreen.CanExit = True
+
+                                    AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
+                                    Core.SetScreen(selScreen)
+                                Else
+                                    SoundManager.PlaySound("select")
+                                    If Me.index = Me.selectIndex Then
+                                        Me.index = -1
+                                    Else
+                                        Me.index = Me.selectIndex
+
+                                        Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                                        Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                                    End If
+                                End If
+                            Else
+
+                                If New Rectangle(440, yPlus + 320, 192, 64).Contains(MouseHandler.MousePosition) Then
+                                    EditMailIndex = 0
+                                    Me.TempNewMail = Core.Player.Mails(Me.index - 1)
+                                    SoundManager.PlaySound("select")
+                                    Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                                    AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                                    Core.SetScreen(selScreen)
+                                End If
+                                If New Rectangle(640, yPlus + 320, 192, 64).Contains(MouseHandler.MousePosition) Then
+                                    EditMailIndex = 1
+                                    Dim e1 As New MenuEntry(3, "Yes", False, AddressOf DeleteMail)
+                                    Dim e2 As New MenuEntry(4, "No", True, Nothing)
+                                    SetupMenu({e1, e2}, "Delete this mail?")
+                                End If
+                                If New Rectangle(840, yPlus + 320, 192, 64).Contains(MouseHandler.MousePosition) Then
+                                    Me.index = -1
+                                    EditMailIndex = 0
+                                End If
+                            End If
+                        End If
+
+                        If Controls.Dismiss(True, True, True) = True Then
+                            SoundManager.PlaySound("select")
+                            Me.index = -1
+
+                        End If
+                    Else
+
+                        If Controls.Down(True, True, True, True, True) = True Then
+                            Me.selectIndex += 1
+                            If Me.selectIndex = Me.index And Me.selectIndex < Core.Player.Mails.Count Then
+                                Me.selectIndex += 1
+                            End If
+                        End If
+                        If Controls.Up(True, True, True, True, True) = True Then
+                            Me.selectIndex -= 1
+                            If Me.selectIndex = Me.index And Me.selectIndex > 0 Then
+                                Me.selectIndex -= 1
+                            End If
+                        End If
+
+                        selectIndex = selectIndex.Clamp(0, Core.Player.Mails.Count)
+
+                        While selectIndex - scrollIndex > 8
+                            scrollIndex += 1
+                        End While
+
+                        While selectIndex - scrollIndex < 0
+                            scrollIndex -= 1
+                        End While
+
+                        If Controls.Accept(False, True, True) = True Then
+                            If Me.selectIndex = 0 Then
+                                SoundManager.PlaySound("select")
+                                Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
+                                selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
+                                selScreen.CanExit = True
+
+                                AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
+                                Core.SetScreen(selScreen)
+                            Else
+                                SoundManager.PlaySound("select")
+                                If Me.index = Me.selectIndex Then
+                                    Me.index = -1
+                                Else
+                                    Me.index = Me.selectIndex
+
+                                    Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                                    Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                                End If
+                            End If
+                        End If
+                        If Controls.Accept(True, False, False) Then
+                            Dim MailIndex As Integer = -1
+                            For i = 0 To 8
+                                If i < Core.Player.Mails.Count + 1 Then
+                                    If New Rectangle(46, 82 + 64 * i + 2 * (i - scrollIndex), 288, 64).Contains(MouseHandler.MousePosition) Then
+                                        MailIndex = scrollIndex + i
+                                        Exit For
+                                    End If
+                                End If
+                            Next
+                            If MailIndex <> -1 Then
+                                selectIndex = MailIndex
+                                If Me.selectIndex = 0 Then
+                                    SoundManager.PlaySound("select")
+                                    Dim selScreen As New NewInventoryScreen(Core.CurrentScreen, {5}, 5, Nothing)
+                                    selScreen.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection
+                                    selScreen.CanExit = True
+
+                                    AddHandler selScreen.SelectedObject, AddressOf ChosenMailHandler
+                                    Core.SetScreen(selScreen)
+                                Else
+                                    SoundManager.PlaySound("select")
+                                    If Me.index = Me.selectIndex Then
+                                        Me.index = -1
+                                    Else
+                                        Me.index = Me.selectIndex
+
+                                        Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                                        Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                                    End If
+                                End If
+                            End If
+
+                        End If
+
+                        If Controls.Dismiss(True, True, True) = True Then
+                            SoundManager.PlaySound("select")
+                            Core.SetScreen(New TransitionScreen(Me, Me.PreScreen, Color.Black, False))
+                        End If
+                    End If
+                Else
+                    Dim pressedSystemKey As Boolean = False
+                    If Controls.Down(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = False Then
+                        EditMailIndex += 1
+                        pressedSystemKey = True
+                    End If
+                    If Controls.Up(True, True, True, False, True) = True Or KeyBoardHandler.KeyPressed(Keys.Tab) = True And Controls.ShiftDown() = True Then
+                        EditMailIndex -= 1
+                        pressedSystemKey = True
+                    End If
+                    If Controls.Left(True, True, False, False, False) = True Then
+                        pressedSystemKey = True
+                        If EditMailIndex = 4 Or EditMailIndex = 5 Then
+                            EditMailIndex -= 1
+                        End If
+                    End If
+                    If Controls.Right(True, True, False, False, False) = True Then
+                        pressedSystemKey = True
+                        If EditMailIndex = 3 Or EditMailIndex = 4 Then
+                            EditMailIndex += 1
+                        End If
+                    End If
+                    If Controls.Left(False, False, False, True, True) = True Then
+                        If EditMailIndex = 4 Or EditMailIndex = 5 Then
+                            EditMailIndex -= 1
+                        End If
+                    End If
+                    If Controls.Right(False, False, False, True, True) = True Then
+                        If EditMailIndex = 3 Or EditMailIndex = 4 Then
+                            EditMailIndex += 1
+                        End If
+                    End If
+
+                    EditMailIndex = EditMailIndex.Clamp(0, 4)
+
+                    If pressedSystemKey = False Then
+                        Select Case EditMailIndex
+                            Case 0
+                                KeyBindings.GetInput(TempNewMail.MailHeader, 25, True, True)
+                                TempNewMail.MailHeader = TempNewMail.MailHeader.Replace("\,", ",").Replace(Environment.NewLine, "").Replace("|", "/")
+                            Case 1
+                                KeyBindings.GetInput(TempNewMail.MailText, 200, True, True)
+                                TempNewMail.MailText = TempNewMail.MailText.Replace("\,", ",").Replace(Environment.NewLine, "<br>").Replace("|", "/")
+                            Case 2
+                                KeyBindings.GetInput(TempNewMail.MailSignature, 25, True, True)
+                                TempNewMail.MailSignature = TempNewMail.MailSignature.Replace("\,", ",").Replace(Environment.NewLine, "").Replace("|", "/")
+                        End Select
+                    End If
+
+                    If Controls.Accept(False, True, True) = True Then
+                        Select Case EditMailIndex
+                            Case 3
+                                SoundManager.PlaySound("select")
+                                If TempNewMail.MailHeader = "" Or TempNewMail.MailText = "" Or TempNewMail.MailSignature = "" Then
+                                    message = "Please fill in the Header, the Message and the Signature."
+                                Else
+                                    Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                                    AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                                    Core.SetScreen(selScreen)
+                                End If
+                            Case 4
+                                SoundManager.PlaySound("select")
+                                Me.index = -1
+                                EditMailIndex = 0
+                        End Select
+                    End If
+
+                    Dim text As String = ("Text: (" & TempNewMail.MailText.Length & "/" & 200 & ")" & Environment.NewLine & Environment.NewLine & TempNewMail.MailText.Replace("<br>", Environment.NewLine)).CropStringToWidth(FontManager.MainFont, 600)
+                    Dim yPlus As Integer = CInt(FontManager.MainFont.MeasureString(text).Y)
+
+                    If Controls.Accept(True, False, False) = True Then
+                        Dim MailIndex As Integer = -1
+                        For i = 0 To 8
+                            If i < Core.Player.Mails.Count + 1 Then
+                                If New Rectangle(46, 82 + 64 * i + 2 * (i - scrollIndex), 288, 64).Contains(MouseHandler.MousePosition) Then
+                                    MailIndex = scrollIndex + i
+                                    Exit For
+                                End If
+                            Else
+                                If New Rectangle(46, 82 + 64 * i + 2 * (i - scrollIndex), 288, 64).Contains(MouseHandler.MousePosition) Then
+                                    EditMailIndex = 4
+                                    Exit For
+                                End If
+                            End If
+                        Next
+                        If MailIndex <> -1 Then
+                            selectIndex = MailIndex
+                            SoundManager.PlaySound("select")
+                            If Me.selectIndex = 0 Then
+                                Me.index = -1
+                            Else
+                                Me.index = Me.selectIndex
+
+                                Dim m As Items.MailItem.MailData = Core.Player.Mails(Me.index - 1)
+                                Core.Player.Mails(Me.index - 1) = New Items.MailItem.MailData With {.MailHeader = m.MailHeader, .MailID = m.MailID, .MailOriginalTrainerOT = m.MailOriginalTrainerOT, .MailAttachment = m.MailAttachment, .MailRead = True, .MailSender = m.MailSender, .MailSignature = m.MailSignature, .MailText = m.MailText}
+                            End If
+                        End If
+                        If New Rectangle(420, 92, 660, 40).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 0
+                        End If
+                        If New Rectangle(420, 140, 660, yPlus + 20).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 1
+                        End If
+                        If New Rectangle(420, yPlus + 200, 660, 40).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 2
+                        End If
+                        If New Rectangle(440, yPlus + 320, 192, 64).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 3
+                        End If
+                        If New Rectangle(640, yPlus + 320, 192, 64).Contains(MouseHandler.MousePosition) Then
+                            EditMailIndex = 4
+                        End If
+
+                        Select Case EditMailIndex
+                            Case 3
+                                SoundManager.PlaySound("select")
+                                If TempNewMail.MailHeader = "" Or TempNewMail.MailText = "" Or TempNewMail.MailSignature = "" Then
+                                    message = "Please fill in the Header, the Message and the Signature."
+                                Else
+                                    Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
+                                    AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
+
+                                    Core.SetScreen(selScreen)
+                                End If
+                            Case 4
+                                SoundManager.PlaySound("select")
+                                Me.index = -1
+                                EditMailIndex = 0
+                        End Select
+                    End If
+
+                    If Controls.Dismiss(True, False, True) = True Then
+                        Me.index = -1
+                        SoundManager.PlaySound("select")
                     End If
                 End If
-                If New Rectangle(420, 92, 660, 40).Contains(MouseHandler.MousePosition) Then
-                    EditMailIndex = 0
-                End If
-                If New Rectangle(420, 140, 660, yPlus + 20).Contains(MouseHandler.MousePosition) Then
-                    EditMailIndex = 1
-                End If
-                If New Rectangle(420, yPlus + 200, 660, 40).Contains(MouseHandler.MousePosition) Then
-                    EditMailIndex = 2
-                End If
-                If New Rectangle(440, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
-                    EditMailIndex = 3
-                End If
-                If New Rectangle(640, yPlus + 320, 160, 32).Contains(MouseHandler.MousePosition) Then
-                    EditMailIndex = 4
-                End If
-
-                Select Case EditMailIndex
-                    Case 3
-                        SoundManager.PlaySound("select")
-                        If TempNewMail.MailHeader = "" Or TempNewMail.MailText = "" Or TempNewMail.MailSignature = "" Then
-                            message = "Please fill in the Header, the Message and the Signature."
-                        Else
-                            Dim selScreen = New PartyScreen(Me, Item.GetItemByID(TempNewMail.MailID.ToString), AddressOf Me.ChosenPokemon, "Give mail to:", True) With {.Mode = Screens.UI.ISelectionScreen.ScreenMode.Selection, .CanExit = True}
-                            AddHandler selScreen.SelectedObject, AddressOf ChosenPokemonHandler
-
-                            Core.SetScreen(selScreen)
-                        End If
-                    Case 4
-                        SoundManager.PlaySound("select")
-                        Me.index = -1
-                        EditMailIndex = 0
-                End Select
-            End If
-
-            If Controls.Dismiss(True, False, True) = True Then
-                Me.index = -1
-                SoundManager.PlaySound("select")
             End If
         End If
     End Sub
@@ -610,6 +698,8 @@
         Me.message = text
     End Sub
 
+
+
 #Region "Trophies"
 
     Public Structure TrophyInformation
@@ -650,4 +740,93 @@
 
 #End Region
 
-End Class
\ No newline at end of file
+#Region "DeleteMailMenu"
+    Private Sub DeleteMail()
+        Me.message = "The mail has been removed from the mailbox."
+        Core.Player.Mails.RemoveAt(Me.index - 1)
+        Me.index = -1
+        EditMailIndex = 0
+        selectIndex -= 1
+        selectIndex = selectIndex.Clamp(0, Core.Player.Mails.Count)
+    End Sub
+
+    Private Sub SetupMenu(ByVal entries() As MenuEntry, ByVal header As String)
+        Me.MenuEntries.Clear()
+        Me.MenuEntries.AddRange(entries)
+        Me.MenuVisible = True
+        Me.MenuCursor = MenuEntries(0).Index
+        Me.MenuHeader = header
+    End Sub
+
+    Private Sub DrawMenuEntries()
+        If Me.MenuHeader <> "" Then
+            Canvas.DrawRectangle(New Rectangle(Core.windowSize.Width - 334, 100, 320, 64), New Color(0, 0, 0, 180))
+            Core.SpriteBatch.DrawString(FontManager.MainFont, MenuHeader, New Vector2(Core.windowSize.Width - 174 - FontManager.MainFont.MeasureString(MenuHeader).X / 2, 120), Color.White)
+        End If
+
+        For Each e As MenuEntry In Me.MenuEntries
+            e.Draw(Me.MenuCursor, TextureManager.GetTexture("GUI\Menus\General", New Rectangle(0, 0, 16, 16), ""))
+        Next
+    End Sub
+
+    Class MenuEntry
+
+        Public Index As Integer = 0
+        Public TAG As Object = Nothing
+
+        Public Text As String = "Menu"
+        Public IsBack As Boolean = False
+        Public Delegate Sub ClickEvent(ByVal m As MenuEntry)
+        Public ClickHandler As ClickEvent = Nothing
+
+        Dim t1 As Texture2D
+        Dim t2 As Texture2D
+
+        Public Sub New(ByVal Index As Integer, ByVal text As String, ByVal isBack As Boolean, ByVal ClickHandler As ClickEvent)
+            Me.New(Index, text, isBack, ClickHandler, Nothing)
+        End Sub
+
+        Public Sub New(ByVal Index As Integer, ByVal text As String, ByVal isBack As Boolean, ByVal ClickHandler As ClickEvent, ByVal TAG As Object)
+            Me.Index = Index
+            Me.TAG = TAG
+
+            Me.Text = text
+            Me.IsBack = isBack
+            Me.ClickHandler = ClickHandler
+
+            t1 = TextureManager.GetTexture("GUI\Menus\General", New Rectangle(16, 16, 16, 16), "")
+            t2 = TextureManager.GetTexture("GUI\Menus\General", New Rectangle(32, 16, 16, 16), "")
+        End Sub
+
+        Public Sub Update(ByVal s As MailSystemScreen)
+            If Controls.Accept(True, False, False) = True And s.MenuCursor = Me.Index And New Rectangle(Core.windowSize.Width - 270, 66 * Index, 256, 64).Contains(MouseHandler.MousePosition) = True Or Controls.Accept(False, True, True) = True And s.MenuCursor = Me.Index Or Controls.Dismiss(True, True, True) = True And Me.IsBack = True Then
+                s.MenuVisible = False
+                If Not ClickHandler Is Nothing Then
+                    ClickHandler(Me)
+                End If
+            End If
+            If New Rectangle(Core.windowSize.Width - 270, 66 * Index, 256, 64).Contains(MouseHandler.MousePosition) = True And Controls.Accept(True, False, False) = True Then
+                s.MenuCursor = Me.Index
+            End If
+        End Sub
+
+        Public Sub Draw(ByVal CursorIndex As Integer, ByVal CursorTexture As Texture2D)
+            Dim startPos As New Vector2(Core.windowSize.Width - 270, 66 * Index)
+
+            Core.SpriteBatch.Draw(t1, New Rectangle(CInt(startPos.X), CInt(startPos.Y), 64, 64), Color.White)
+            Core.SpriteBatch.Draw(t2, New Rectangle(CInt(startPos.X + 64), CInt(startPos.Y), 64, 64), Color.White)
+            Core.SpriteBatch.Draw(t2, New Rectangle(CInt(startPos.X + 128), CInt(startPos.Y), 64, 64), Color.White)
+            Core.SpriteBatch.Draw(t1, New Rectangle(CInt(startPos.X + 192), CInt(startPos.Y), 64, 64), Nothing, Color.White, 0.0F, New Vector2(0), SpriteEffects.FlipHorizontally, 0.0F)
+
+            Core.SpriteBatch.DrawString(FontManager.MainFont, Me.Text, New Vector2(startPos.X + 128 - (FontManager.MainFont.MeasureString(Me.Text).X * 1.4F) / 2, startPos.Y + 15), Color.Black, 0.0F, Vector2.Zero, 1.4F, SpriteEffects.None, 0.0F)
+
+            If Me.Index = CursorIndex Then
+                Dim cPosition As Vector2 = New Vector2(startPos.X + 128, startPos.Y - 40)
+                Dim t As Texture2D = CursorTexture
+                Core.SpriteBatch.Draw(t, New Rectangle(CInt(cPosition.X), CInt(cPosition.Y), 64, 64), Color.White)
+            End If
+        End Sub
+
+    End Class
+#End Region
+End Class
diff --git a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb
index b9bbd4aee..07b225a4a 100644
--- a/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb
+++ b/P3D/World/ActionScript/V2/ScriptCommands/DoScreen.vb
@@ -207,7 +207,7 @@
 
                     CanContinue = False
                 Case "mailsystem"
-                    Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New MailSystemScreen(Core.CurrentScreen), Color.White, False))
+                    Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New MailSystemScreen(Core.CurrentScreen), Color.Black, False))
 
                     IsReady = True
 

From af2831673efed09a4bf12cc2f45279d7cd812628 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Tue, 25 Jul 2023 14:11:41 +0200
Subject: [PATCH 5/7] Mail sender name and ot constructs

---
 .../V2/ScriptConstructs/DoPokemon.vb           | 18 ++++++++++++++++++
 P3D/World/ActionScript/V2/ScriptLibrary.vb     |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb
index 9430ec09a..20450a68f 100644
--- a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb
+++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb
@@ -246,6 +246,24 @@
                         data = Core.Player.Pokemons(index).Item.AdditionalData
                     End If
                     Return data
+                Case "mailsendername"
+                    Dim index As Integer = int(argument)
+                    Dim name As String = ""
+                    If Not Core.Player.Pokemons(index).Item Is Nothing Then
+                        If Core.Player.Pokemons(index).Item.IsMail Then
+                            name = Core.Player.Pokemons(index).Item.AdditionalData.GetSplit(1, "\,")
+                        End If
+                    End If
+                    Return name
+                Case "mailsenderot"
+                    Dim index As Integer = int(argument)
+                    Dim ot As String = ""
+                    If Not Core.Player.Pokemons(index).Item Is Nothing Then
+                        If Core.Player.Pokemons(index).Item.IsMail Then
+                            ot = Core.Player.Pokemons(index).Item.AdditionalData.GetSplit(6, "\,")
+                        End If
+                    End If
+                    Return ot
                 Case "counthalloffame"
                     Return HallOfFameScreen.GetHallOfFameCount()
                 Case "learnedtutormove"
diff --git a/P3D/World/ActionScript/V2/ScriptLibrary.vb b/P3D/World/ActionScript/V2/ScriptLibrary.vb
index 5709ee53b..ebcf42dd3 100644
--- a/P3D/World/ActionScript/V2/ScriptLibrary.vb
+++ b/P3D/World/ActionScript/V2/ScriptLibrary.vb
@@ -823,6 +823,8 @@ Namespace ScriptVersion2
             r(New ScriptCommand("pokemon", "maxhp", "int", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the Maximum Hit Points of a Pokémon in the player's party.", ",", True))
             r(New ScriptCommand("pokemon", "isegg", "bool", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the Pokémon in the players party is an Egg.", ",", True))
             r(New ScriptCommand("pokemon", "additionaldata", "str", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the additional data for the Pokémon in the player's party.", ",", True))
+            r(New ScriptCommand("pokemon", "mailsendername", "str", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the name of the sender of a mail if there's one on the Pokémon in the player's party.", ",", True))
+            r(New ScriptCommand("pokemon", "mailsenderot", "str", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the OT of the sender of a mail if there's one on the Pokémon in the player's party.", ",", True))
             r(New ScriptCommand("pokemon", "nickname", "str", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the nickname of a Pokémon in the player's party.", ",", True))
             r(New ScriptCommand("pokemon", "hasnickname", "bool", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns if a Pokémon in the player's party has a nickname.", ",", True))
             r(New ScriptCommand("pokemon", "name", "str", {New ScriptArgument("pokemonIndex", ScriptArgument.ArgumentTypes.Int)}.ToList(), "Returns the name of a Pokémon in the player's party.", ",", True))

From d390e72c69fd5f1d5f14333d3557883d71f3bb0c Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Tue, 25 Jul 2023 18:02:07 +0200
Subject: [PATCH 6/7] Route 32 Spearow quest update

---
 .../Data/Scripts/goldenrod/gate_spearow.dat   | Bin 3518 -> 3926 bytes
 .../Data/Scripts/route31/sleepy_guy.dat       | Bin 8416 -> 4366 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/P3D/Content/Data/Scripts/goldenrod/gate_spearow.dat b/P3D/Content/Data/Scripts/goldenrod/gate_spearow.dat
index 9e4c19d4deede85550b65e74b976d9af315171b1..f2d5cc300e05568f5906b84d14d2d8f8d2292369 100644
GIT binary patch
delta 949
zcmaJ<%}x_x6g|UqhE7W(gn%)mIum0E2?a%rP$7bnxX`#TZcGTKrUjbPj%kZT7y1Bh
z7;lVA9>Aq5H||`c8x!Bajp!qIzHfe*X^4yY=AQePd(XLFrhZ&J+!}79h9>rc*0kXS
zM-{6@R1dy?H5_?w%uhL};sCp7phN2k|2>pYfCEQ<8uJ$aw2tjdvN$vs7R%1i$H+fs
zwi9by4$TKCbYk8~&;|LMTaZ_|LdLTw-*WkkXC*<Zn=KnwHSMw1(unb2*|=$+YogB`
z+Ng8wK5FvEs=V36EFKYe=zR%=HWUePiG1wy-(t)s4=!tV8SCM8lvhKSQ5Sbv|AL)e
z?D4I!x~H>!zN)jYD;vyq`T07-(>?Bwu%LnG4EX4XF)}_A1}eCw6Ru*J))E#XG!qLz
z;yrscTsb&8FMWG61fP!WvN5cs!CK&5meKs=%}8iG<!lX3+0^rPx#MZWs*d#dMjC5v
zugL5C%BpIo;)<mvwv&w57gnUN<slb}`f$8=&eDx^k2pW<7~h!k4oo4xoqO?_%4cWV
zR2N6z#OX#|&UHXeyQs^0p`1`M@tATc`dgG^mJI9bmJfxu(V=)nFS6E)*9RE8b!LC^
ix1-hkFKbGUlj5`GP=hQ*XVEyYG8`>oDU&Kesr(Pd{-*r^

delta 572
zcmca6w@-RP9B(m00YfT7B0~{FK12D$RCQh}h7yJhpimwIF9X+PMGo<aOT<{y8A=%{
zC+<Hwxs6dz)QX`Ts=|sP5~#8mtnxggK89ZT$x2Lm5Y3ZAnO0Apz#=hOjyYuV99D_R
z6PVo?9VQF13QzvP>;RPUn%uy`1*AiO*oWPiK@)81Y*xw1F|1ZV9YK?Q*c2v<uo+Fx
zV7Hm9#345M0DH`4B@P)zMu&-t%9D9`#f(ur!w}Dq0(4ytLncERkS=1VgqX=-1r{v^
zk`N!NPQJxyGg*&cLLA5k$|8K{2MiQwC```cvd{(T%mbPVQvp#A5reUFfZ+i#*`M1T
zHFzhha-)YYrkd5<vKZkgKKTi^05lwba(7Se;!&8qfyW5$aZPlOrvn{cg2TJwlS_D$
lG+|zWIUD4yOolX&cQFDek=>smlp%z{b#f=iR$xGB002zge4PLQ

diff --git a/P3D/Content/Data/Scripts/route31/sleepy_guy.dat b/P3D/Content/Data/Scripts/route31/sleepy_guy.dat
index 7b2f562dd4f85179359f2a9ee4f547781d94ec96..869c89121366737f83e9ba51673979122afcca78 100644
GIT binary patch
literal 4366
zcmeI0U2hXt5QgVANc|7ntAq$51Fh7e5F(We5Tr#FQdMq{6Pwt=StGB52^apq{0YkY
zobhBoyqm^|+@Y22-LvP+*O__WIsWg<2OHYV3LD$ha(iU=?I*is5B2<3-}`zuv{OA5
zHcvD6)<%XlupP~r+C+ClNtx+>U~lZq`dT^B9pe+-yS59vZ3ogd*UWRhLF3j9>%_`7
zty^}OJo~8cJ$X5j?F;$y%8u+;>sgk3&+JeAp6cy9c|}zAY}cOYd0VS8d75e6*iP)7
z-VOA0CQ10a)SQvt&o$;z?CU*oxzNaoA~4tZZkjdJ$Wwc%@2TSNQVY!->Uys=xopUE
zpX+m`_1N&2=5men#I=;|uFowiq@%A$Gn)&mGg-iXZzro3dY`Aexki_1HI`>~tT*^F
zNW0#b&O#DyU+x&YT4<*4U{@?%?`!*%E`P$$b7^`kd;Y1}8_{|!z5mLd^O{9RvWVDa
ziqBM55$B<#giX~vdaoJm20M|<?vo@9PY-nUF0IDy=3KlY?kAePWB2S%`t&M#s+w|1
zM(X~Ra>xtv{;p(2#I|ag-z{e>`FJvxjGb%g@oXo9_tXBOoBO7x-zND$Nb$R_n~}b6
z4^(~iC{^SAeSCN%ExlCZS4SvtjGV|7e-JZQOv$`W_Tul=K2Z0YYb3)q(bm)M+_T?S
zh)$lxb(pI8YE<70(H&i@In8c0(V^5&F0Ui*NZAdRmNm|Epj5TqOAHE`u8-YWw}Mgl
ztoo+Qx^^}Iq1ZLI4}|i&mkD7$uMh@&2R{qd7|1c!eoqp@!4r<T!-_|swBs!Ji~R6>
z-9PMYdKY7L-`Yl-V-bm)<@s*T?P3bhX`-lH$lI9^JE{!iB3fR31I5_675ry6;Hvsw
zz+&E!1Z&2;_87PC`wK}9hNt>reXiZr?-SWH6USus$K_ta8n9*|E8$aE+;JT{v6%jd
z86oRc@-6hxNzp&y8QJtMtzIOpJ~P)CbrKbEEQ#)=e|yIfxrzlK6;>amEPI>gdp?!j
zOXyvy$2ix#J6h)v&-4TjZ)+Wq?x!4I=zgLrlQpoC+dH+NQ-`sgM(FuqV1MToKz&S;
zMeIoIPH3mba>+;2TslG8x@7bb&xJH)sh27H7q>IwUe=duDzu{P6Uf2fzCHQu-RX|-
z@)vPJ*E}Lw=;~{Qcg9q3tfEV(uWU!UAHC)O^_JjziB8>p(YLcA983r4T~W7&T$w>v
zA6T>r2R~PCfb4x`>h-j7CZfZo!=G)$_hokx=uQj|RYmPwOI6a@P+zC|bta-x+R&7f
z08xla?ndf5cfmaMGlE;y?BJ;PI5Ax}!lj>0e)Fy%Mq^%^E$#7%6G?dnsh*gY!XDxV
zr}KNEyFjw)No2hz35!a`ZjNAU)6RAqojo{5<-$pj@^r;0)w306J*=H194=8B_JF$_
zD+ju#|Cp#EI5Pz*JHsp++*)N4IFUGvk_8bF82Xv`;!JPK^K114%IVf^BhQ^x`~=Ov
o2u+P}5%RGAShJV<^d%XaontxU&Xu8Y3J!*@pE@0zn=y~)uglTN00000

literal 8416
zcmeHN+iu%N5S`}&`3L67j^P@PFF<SfA|QE)kva_u14a8%$QEr0mMKG`qNor2-~L3?
zb9OW#xml4C1y_J$5D~eTnLRr@XGqWF%fFu_mZ6NKCj&|3ME2x`{2)hY-{AKcW3k+#
zHImfL-1(*_mX2&<&OrKjilJqQ=Z^dZnFqAnu027UqkZVoHK+1QPO)N&@i9iYZZx}&
z(A#yo%Ds<|io2PQs~Vq;ww$d#<97!(=)xKkSm;tN<WP38Ls~PE54hiAG?ja2qZqTd
z<Q(k{H{Qma3FchO9W2p7>mHhDy9{%>kV(;}=hDV_54N46=Ni^b(ZA(p#prn_AMrcD
ziAIp3OdnceoK6p?b&DRJS`7VDhv8Su<<&)tR|f35o+2Az4W24z^CId92<Sl@4%GzX
ziF-=Xn>lGBkK_s?+)D@Y^o@I<*@4B&=S)8tVZ7K|ZCyq3r~K_MZE@#gtbGQAzn6Ak
z_B#WTKY(yt!gv8(v}Od04S<uDkD*0ThA`!Pd4L4Zi)WQ!XV*?UZE=cgH@G9)S=j4s
z)b8`w>cOg;SVR4HPhJE0u{((l*5<R1ZU9`l#IF1dnV%2?>g0Nm;~vW^?qhBGclDa&
zJMBx48x~goZHAOST&*F2G+B{Af+v&j;5}Li{IXqX=iHK^C}X4keZJj`XM6$+hCIaA
zX6?n!+-BQ79AVBK!^y=I7N8gMNtv4=2GBGAnRzCCn{oOcbEeKmx51LhY&PQr`DtU3
zi|-mO7<~p989RnDnk8tF*C{SW7GsK`t-Bw&Q|l~bH_n|O8|JOl`o{CQJBz34Kg*n2
z%UP%Tz1ZZPsBfP|keJQ*My#4&H_smr=~~S5PXqDh@xC7N_w)@suihgT<JtV3YNUI;
zbZj+=rm@xJo5fa>UM04gj>n9xb^IiTkZ1aQUmq`h9{I@p@z8GOdtdPla~gO*KQ*51
zEzL8NXv#B_Z^ko|UWI3-W1T!BhLC6a-u!*=Y#-k><uB2v#<TsUd1ew#d1ms>cxKY8
z@XU0qlV`;6%rpC|_~6O&>|kl0nM6~bnS3*zne-|=Gac*X88JNb%y@SA<au_uG|x<;
zDbGy48P8056`q-nb@GfDz9*jjAK!tYx`_WBzF1ZxoGoNFxR2b)6q&FgGS!w%Wu}-p
z!vxu6W?3?1`?O-C*+gaq%eh46_qF<C^#skUMyPmbCf(2Q`}+tZ`~~Y<HH6gwR!Del
z&F*iZeTbZ9ByaGf^#$f1Sz#Cfx8^Ci6Xv;DPhu{gSx?R|U6-?*r`9%D$71!0du8Q<
zS!UL6xT?-f(8v0X)dsGhQTP2L<`*rXbsj~*JT-M(z}}jB?V*P@&Z|APc7|;081uF<
zQ_sQjup3y5_HSdQ5l}G~$~uM4SIh%>iFMAQm%CuS?as+44pwO>%gisW+x?2zR@aPf
z=2l99V+fRG&Cyq@yu=9e&3U~?bIE3V`jMWCt~3I+>PXQ79<43xU{_iz+(gFXz|}RX
zVoXtzdmG_uLx<KciNf@3BU4$2f*77Fc&sog5Au^-q=M)3+p=Gw^W#{3{<h`3!aotK
z>g9F3VjVIo_$7HXE%<v~jiL@Qnd|4?O~(4U+wktfyU~cms$~M+k$JbXC{?Uv8sGYk
z*A}T*kzpo$2zK+tI(TNJ>EoGoAB#&Gwft&OF)}gE^4z-)0iQGmWiF<$UX<65ixps2
zmlYf1tVSuVVDtY4_$xBDS&X{E><s_f&`iu4saRu9QRlNNv_<`LjaPZ>Ti)9L0hLG6
AIRF3v


From 3761524fba26666715379a665aaaa1692c32bdb5 Mon Sep 17 00:00:00 2001
From: JappaWakka <jjlspeelman@outlook.com>
Date: Tue, 25 Jul 2023 18:14:44 +0200
Subject: [PATCH 7/7] Header polish

---
 P3D/Screens/PC/MailSystemScreen.vb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/P3D/Screens/PC/MailSystemScreen.vb b/P3D/Screens/PC/MailSystemScreen.vb
index 5c347309d..4c0c605db 100644
--- a/P3D/Screens/PC/MailSystemScreen.vb
+++ b/P3D/Screens/PC/MailSystemScreen.vb
@@ -46,9 +46,10 @@
         Dim background As Texture2D = TextureManager.GetTexture("GUI\Menus\MailboxBackground")
 
         Core.SpriteBatch.Draw(background, New Rectangle(0, 0, backSize.Width, backSize.Height), Color.White)
-        Canvas.DrawRectangle(New Rectangle(32, 16, 240, 48), Color.White)
+        Canvas.DrawRectangle(New Rectangle(32, 16, 240, 48), New Color(255, 255, 255, 224))
+        Canvas.DrawRectangle(New Rectangle(48, 64 - 2, 208, 2), Color.DarkGray)
 
-        Core.SpriteBatch.DrawString(FontManager.MainFont, "Mailbox", New Vector2(48, 24), Color.Black)
+        Core.SpriteBatch.DrawString(FontManager.MainFont, "Mailbox", New Vector2(56, 24), Color.Black)
         Canvas.DrawRectangle(New Rectangle(32, 64, 352, 624), New Color(255, 255, 255, 224))
         Canvas.DrawRectangle(New Rectangle(400, 64, 704, 624), New Color(255, 255, 255, 224))