Move Reminder and Deleter Overhaul

Reminder and Deleter in every PokéCenter now
Replaces previously useless Mystery Gift NPC area
No longer costs an item, but unlocks as you get badges
Deleter requires 2 badges, reminder requires 4 badges
Fixed weird behavior in their menu screens (double move bug)
Moved Draco Meteor tutor to Blackthorn City house
Draco Meteor tutor is now more elegantly scripted

P3D/Content/Data/Scripts/dragonsden/dracotutor.dat

@@ -1,24 +0,0 @@
-version=2
-@text.show(If you've come to Dragon's~Den, you must be looking~to master the Dragon-type.)
-:if:<player.hasbadge(8)>=False
-	@text.show(However, you must gather~more experience before you~are ready to handle the~power I have to share.)
-:else
-	@text.show(You are a respectable~trainer...)
-	:if:<pokemon.type1(0)>=dragon <or> <pokemon.type2(0)>=dragon <or> <pokemon.number(0)>=493 <or> <pokemon.number(0)>=773
-		:if:<pokemon.hasattack(0,434)>=false
-			@text.show(Your <pokemon.name(0)>~seems capable.*Do you want it to learn~Draco Meteor, the most~powerful Dragon move?)
-			@options.show(Yes,No)
-			:when:Yes
-				@text.show(I shall teach it, then.)
-				@pokemon.learnattack(0,434)
-			:when:No
-				@text.show(Such a waste of potential.)
-			:endwhen	
-		:else
-			@text.show(Now that <pokemon.name(0)>~masters the draconic power,~nothing stands a chance!)
-		:endif
-	:else
-		@text.show(But your <pokemon.name(0)>~is no Dragon-type.*If you catch any,~show it to me.)
-	:endif
-:endif
-:end

P3D/Content/Data/maps/quest/center.dat

@@ -37,14 +37,12 @@ Table:
 {"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[1,3]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[10,-0.3,0]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,48,16,16][0,32,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 sellTable:
-{"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[2,-0.3,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,96,16,16][16,80,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[mystery_event]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[2,-0.3,7]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,96,16,16][16,80,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[movereminder]}}{"Rotation"{int[1]}}]}}
+{"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[ScriptBlock]}}{"Position"{sngArr[2,-0.3,8]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,96,16,16][16,80,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[1]}}{"AdditionalValue"{str[movedeleter]}}{"Rotation"{int[1]}}]}}
 
 {"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[3,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[0,-0.3,5]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,96,16,16][0,80,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 {"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[2,-0.3,6]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,96,16,16][0,80,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
-{"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[1,2]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[2,-0.3,8]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,96,16,16][0,80,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
-
-sellComputer:
-{"Entity"{ENT[{"Scale"{sngArr[0.4,0.4,0.8]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[2.1,0.1,8]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[48,64,16,16][32,80,16,16][64,64,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,2,2,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
+{"EntityField"{ENT[{"Scale"{sngArr[1,0.4,1]}}{"Size"{intArr[1,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[2,-0.3,9]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,96,16,16][0,80,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
 
 sellBoxes:
 {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Scale"{sngArr[0.8,0.4,0.8]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[0,-0.3,9]}}{"TexturePath"{str[Center]}}{"Textures"{recArr[[0,64,16,16]]}}{"TextureIndex"{intArr[0,0,0,0,0,0,0,0,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}{"Rotation"{int[0]}}]}}
@@ -126,7 +124,9 @@ townmap:
 
 NPCs:
 {"NPC"{NPC[{"Position"{sngArr[7,0.2,1]}}{"TextureID"{str[0]}}{"ID"{int[0]}}{"Name"{str[NurseJoy]}}{"Action"{int[0]}}{"AdditionalValue"{str[center_script]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
-{"NPC"{NPC[{"Position"{sngArr[1,0.2,7]}}{"TextureID"{str[12]}}{"ID"{int[1]}}{"Name"{str[SellMan]}}{"Action"{int[0]}}{"AdditionalValue"{str[center_script]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+
+{"NPC"{NPC[{"Position"{sngArr[1,0.2,7]}}{"TextureID"{str[28]}}{"ID"{int[1]}}{"Name"{str[Reminder]}}{"Action"{int[0]}}{"AdditionalValue"{str[center_script]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
+{"NPC"{NPC[{"Position"{sngArr[1,0.2,8]}}{"TextureID"{str[11]}}{"ID"{int[1]}}{"Name"{str[Deleter]}}{"Action"{int[0]}}{"AdditionalValue"{str[center_script]}}{"Rotation"{int[3]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 
 {"NPC"{NPC[{"Position"{sngArr[8,0.2,1]}}{"TextureID"{str[[POKEMON|N]113]}}{"ID"{int[4]}}{"Name"{str[Chansey]}}{"Action"{int[1]}}{"AdditionalValue"{str[gts\information]}}{"Rotation"{int[2]}}{"Movement"{str[Still]}}{"MoveRectangles"{recArr[]}}]}}
 

P3D/P3D.vbproj

@@ -4270,12 +4270,6 @@
     <Content Include="Content\Data\Scripts\blackthorn\gym\warp_2.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\Scripts\blackthorn\movedeleter.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Data\Scripts\blackthorn\moverelearner.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\Scripts\blackthorn\santos.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -26411,9 +26405,6 @@
     <Content Include="Content\Data\Scripts\cinnabar\gymmap.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Data\Scripts\dragonsden\dracotutor.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\Data\Scripts\ecruteak\gymmap.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -26555,6 +26546,9 @@
     <Content Include="Content\Data\Scripts\embtower\zekms.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Data\Scripts\blackthorn\dracotutor.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\faraway\ancestoremblemcheck.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26822,6 +26816,12 @@
     <Content Include="Content\Data\Scripts\mtember\lstonemap.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Data\Scripts\movedeleter.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\Scripts\movereminder.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\mtmortar\bf1map.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

P3D/Screens/Pokemon/TeachMovesScreen.vb

@@ -20,9 +20,8 @@
             Dim tutorMove As BattleSystem.Attack = Pokemon.AttackLearns.Values(i)
             Dim learnLevel As Integer = Pokemon.AttackLearns.Keys(i)
 
-            'Commented those to test Tutor Gen 6+ behavior
-            'If learnLevel <= Pokemon.Level Then
-            Dim canLearnMove As Boolean = True
+            If learnLevel <= Pokemon.Level Then
+                Dim canLearnMove As Boolean = True
 
                 For Each learnedAttack As BattleSystem.Attack In Pokemon.Attacks
                     If learnedAttack.ID = tutorMove.ID Then
@@ -39,7 +38,7 @@
                 If canLearnMove = True Then
                     MovesList.Add(tutorMove)
                 End If
-            'End If
+            End If
         Next
 
         Me.MouseVisible = False
@@ -210,6 +209,9 @@
         If Pokemon.Attacks.Count < 4 Then
             LearnedMove = True
             Pokemon.Attacks.Add(BattleSystem.Attack.GetAttackByID(a.ID))
+            TextBox.Show("... " & Pokemon.GetDisplayName() & " learned~" & a.Name & "!")
+            SoundManager.PlaySound("success_small", False)
+            Core.SetScreen(Me.PreScreen)
         Else
             Core.SetScreen(New LearnAttackScreen(Core.CurrentScreen.PreScreen, Me.Pokemon, BattleSystem.Attack.GetAttackByID(a.ID)))
         End If