diff --git a/Source/AtlusScriptLibrary/AtlusScriptLibrary.csproj b/Source/AtlusScriptLibrary/AtlusScriptLibrary.csproj
index 1b3f8c6..b5df123 100644
--- a/Source/AtlusScriptLibrary/AtlusScriptLibrary.csproj
+++ b/Source/AtlusScriptLibrary/AtlusScriptLibrary.csproj
@@ -1,348 +1,354 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
-		<OutputType>Library</OutputType>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<LangVersion>latest</LangVersion>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-		<OutputPath>..\..\Build\Debug\</OutputPath>
-	</PropertyGroup>
-	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-		<OutputPath>..\..\Build\Release\</OutputPath>
-	</PropertyGroup>
-	<ItemGroup>
-		<Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseListener.cs" />
-		<Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseVisitor.cs" />
-		<Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptLexer.cs" />
-		<Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptListener.cs" />
-		<Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptParser.cs" />
-		<Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptVisitor.cs" />
-		<Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptLexer.cs" />
-		<Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptParser.cs" />
-		<Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseListener.cs" />
-		<Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseVisitor.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<Content Include="Charsets\P3P_CHT.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P3_EFIGS.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P4G_CHT.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P5_Korean.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScript.g4" />
-		<None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseListener.cs" />
-		<None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseVisitor.cs" />
-		<None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptLexer.cs" />
-		<None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptListener.cs" />
-		<None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptParser.cs" />
-		<None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptVisitor.cs" />
-		<None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptLexer.cs" />
-		<None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptLexer.g4" />
-		<None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParser.cs" />
-		<None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParser.g4" />
-		<None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseListener.cs" />
-		<None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseVisitor.cs" />
-	</ItemGroup>
-	<ItemGroup>
-		<Content Include="Charsets\P3.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P3P_EFIGS.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P4.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P4_Spanish.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P5.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P5R_Chinese.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P5R_EFIGS.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P5R_Japanese.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Charsets\P5_Chinese.tsv">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\AI\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\Common\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\Facility\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\Field\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\Field\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\Net\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\Social\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5\Modules\AI\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\DigitalDevilSaga.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\DigitalDevilSaga\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\DigitalDevilSaga\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\DigitalDevilSaga\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Nocturne.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Nocturne\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Nocturne\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Nocturne\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Nocturne\Modules\Common\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\DigitalDevilSaga\Modules\Common\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\AI\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\AI\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\Facility\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\Event\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\Field\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\Net\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4\Modules\AI\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4\Modules\AI\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4\Modules\Event\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4\Modules\Field\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Battle\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Camp\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Dungeon\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Event\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Facility\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Map\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Script\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\PersonaQ2\Modules\Window\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3FES.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3FES\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3FES\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3FES\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\MessageScriptLibrary.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\AI\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\Common\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\Facility\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\Field\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\Net\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\Social\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\FlowScriptModules.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3FES\Modules\Common\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\Modules\AI\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\Modules\Facility\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\Modules\Event\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\Modules\Field\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona3Portable\Modules\Shared\Functions.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona4Golden\Modules\Common\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\Field\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-		<Content Include="Libraries\Persona5Royal\Modules\Common\Enums.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Antlr4.CodeGenerator">
-			<Version>4.6.6</Version>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Antlr4.Runtime">
-			<Version>4.6.6</Version>
-		</PackageReference>
-		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="morelinq">
-			<Version>3.3.2</Version>
-		</PackageReference>
-		<PackageReference Include="System.Text.Json" Version="5.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-	</ItemGroup>
-	<PropertyGroup />
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <OutputType>Library</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <LangVersion>latest</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\Build\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\Build\Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseListener.cs" />
+    <Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseVisitor.cs" />
+    <Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptLexer.cs" />
+    <Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptListener.cs" />
+    <Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptParser.cs" />
+    <Compile Remove="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptVisitor.cs" />
+    <Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptLexer.cs" />
+    <Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptParser.cs" />
+    <Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseListener.cs" />
+    <Compile Remove="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseVisitor.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Charsets\P3P_CHT.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P3_EFIGS.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P4G_CHT.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P5_Korean.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScript.g4" />
+    <None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseListener.cs" />
+    <None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptBaseVisitor.cs" />
+    <None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptLexer.cs" />
+    <None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptListener.cs" />
+    <None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptParser.cs" />
+    <None Include="FlowScriptLanguage\Compiler\Parser\Grammar\FlowScriptVisitor.cs" />
+    <None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptLexer.cs" />
+    <None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptLexer.g4" />
+    <None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParser.cs" />
+    <None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParser.g4" />
+    <None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseListener.cs" />
+    <None Include="MessageScriptLanguage\Compiler\Parser\MessageScriptParserBaseVisitor.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Charsets\P3.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P3P_EFIGS.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P4.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P4_Spanish.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P5.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P5R_Chinese.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P5R_EFIGS.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P5R_Japanese.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Charsets\P5_Chinese.tsv">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\AI\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\Common\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\Facility\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\Field\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\Field\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\Net\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\Social\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5\Modules\AI\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\DigitalDevilSaga.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\DigitalDevilSaga\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\DigitalDevilSaga\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\DigitalDevilSaga\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Nocturne.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Nocturne\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Nocturne\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Nocturne\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Nocturne\Modules\Common\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\DigitalDevilSaga\Modules\Common\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\AI\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\AI\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\Facility\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\Event\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\Field\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\Net\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4\Modules\AI\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4\Modules\AI\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4\Modules\Event\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4\Modules\Field\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Battle\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Camp\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Dungeon\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Event\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Facility\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Map\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Script\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Script\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Window\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\PersonaQ2\Modules\Window\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3FES.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3FES\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3FES\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3FES\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\MessageScriptLibrary.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\AI\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\Common\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\Facility\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\Field\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\Net\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\Social\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\FlowScriptModules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3FES\Modules\Common\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\Modules\AI\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\Modules\Facility\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\Modules\Event\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\Modules\Field\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona3Portable\Modules\Shared\Functions.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona4Golden\Modules\Common\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\Field\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Libraries\Persona5Royal\Modules\Common\Enums.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Antlr4.CodeGenerator">
+      <Version>4.6.6</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Antlr4.Runtime">
+      <Version>4.6.6</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="morelinq">
+      <Version>3.3.2</Version>
+    </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="5.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
+  </ItemGroup>
+  <PropertyGroup />
 </Project>
\ No newline at end of file
diff --git a/Source/AtlusScriptLibrary/Libraries/Persona5Royal/MessageScriptLibrary.json b/Source/AtlusScriptLibrary/Libraries/Persona5Royal/MessageScriptLibrary.json
index ec31379..b4c4981 100644
--- a/Source/AtlusScriptLibrary/Libraries/Persona5Royal/MessageScriptLibrary.json
+++ b/Source/AtlusScriptLibrary/Libraries/Persona5Royal/MessageScriptLibrary.json
@@ -594,10 +594,32 @@
         "Name": "selTex",
         "Description": "overrides game logic deciding which dialogue select portrait to display",
         "Parameters": [
-			{
+          {
             "Name": "selMajorId",
             "Description": "the major id of the select portrait to display (FONT/SELECT/CUTIN_XXX_000.DDS)"
-			}
+          }
+        ]
+      },
+      {
+        "Index": 30,
+        "Name": "",
+        "Description": "",
+        "Parameters": [
+        ]
+      },
+      {
+        "Index": 31,
+        "Name": "sumi",
+        "Description": "Yoshizawa name check.",
+        "Parameters": [
+          {
+            "Name": "partyID",
+            "Description": ""
+          },
+          {
+            "Name": "unknown",
+            "Description": ""
+          }
         ]
       }
     ]
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/FlowScriptModules.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/FlowScriptModules.json
index 168e7bc..2a44f93 100644
--- a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/FlowScriptModules.json
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/FlowScriptModules.json
@@ -12,7 +12,7 @@
     "ShortName": "wnd",
     "Description": "",
     "ConstantsPath": "",
-    "EnumsPath": "",
+    "EnumsPath": "PersonaQ2\\Modules\\Window\\Enums.json",
     "FunctionsPath": "PersonaQ2\\Modules\\Window\\Functions.json"
   },
   {
@@ -44,7 +44,7 @@
     "ShortName": "scr",
     "Description": "",
     "ConstantsPath": "",
-    "EnumsPath": "",
+    "EnumsPath": "PersonaQ2\\Modules\\Script\\Enums.json",
     "FunctionsPath": "PersonaQ2\\Modules\\Script\\Functions.json"
   },
   {
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/MessageScriptLibrary.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/MessageScriptLibrary.json
index c44dc44..aaa3bcd 100644
--- a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/MessageScriptLibrary.json
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/MessageScriptLibrary.json
@@ -1,3 +1,188 @@
 [
-
+  {
+    "Index": 0,
+    "Name": "",
+    "Description": "",
+    "Functions": [
+      {
+        "Index": 0,
+        "Name": "clr",
+        "Description": "",
+        "Parameters": [
+          {
+            "Name": "color"
+          }
+        ]
+      },
+      {
+        "Index": 5,
+        "Semantic": "Unused"
+      }
+    ]
+  },
+  {
+    "Index": 1,
+    "Name": "",
+    "Description": "",
+    "Functions": [
+      {
+        "Index": 1,
+        "Name": "w",
+        "Description": "Waits for button press.",
+        "Parameters": []
+      },
+      {
+        "Index": 3,
+        "Description": "",
+        "Parameters": [
+          {
+            "Name": "unknown"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "Index": 2,
+    "Name": "",
+    "Description": "",
+    "Functions": [
+      {
+        "Index": 1,
+        "Name": "s",
+        "Description": "Indicates the start of a line",
+        "Parameters": [
+        ]
+      },
+      {
+        "Index": 7,
+        "Name": "unknown",
+        "Description": "",
+        "Parameters": [
+          {
+            "Name": "unknown",
+            "Description": ""
+          },
+          {
+            "Name": "modelID",
+            "Description": ""
+          },
+          {
+            "Name": "unknown",
+            "Description": ""
+          },
+          {
+            "Name": "unknown",
+            "Description": ""
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "Index": 3,
+    "Name": "",
+    "Description": "",
+    "Functions": [
+      {
+        "Index": 1,
+        "Name": "vp",
+        "Description": "Plays a voice sound cue.",
+        "Parameters": [
+          {
+            "Name": "unknown",
+            "Description": "unknown"
+          },
+          {
+            "Name": "unknown",
+            "Description": "unknown"
+          },
+          {
+            "Name": "unknown",
+            "Description": "unknown"
+          },
+          {
+            "Name": "cueID",
+            "Description": "Cue ID of the voiceline."
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "Index": 4,
+    "Name": "",
+    "Description": "",
+    "Functions": [
+      {
+        "Index": 6,
+        "Name": "bup",
+        "Description": "Displays a bustup.",
+        "Parameters": [
+          {
+            "Name": "modelID",
+            "Description": ""
+          },
+          {
+            "Name": "animID",
+            "Description": ""
+          },
+          {
+            "Name": "unknown",
+            "Description": ""
+          },
+          {
+            "Name": "location",
+            "Description": "Determines model's location on screen."
+          }
+        ]
+      },
+      {
+        "Index": 7,
+        "Name": "",
+        "Description": "",
+        "Parameters": [
+          {
+            "Name": "unknown1"
+          },
+          {
+            "Name": "unknown2"
+          },
+          {
+            "Name": "unknown3"
+          }
+        ]
+      }
+    ]
+  },
+  {
+    "Index": 6,
+    "Name": "",
+    "Description": "",
+    "Functions": [
+      {
+        "Index": 1,
+        "Name": "name",
+        "Description": "Displays a protagonist name.",
+        "Parameters": [
+          {
+            "Name": "id",
+            "Description": "Designates which PC name to call and whether to call first, last, or full name."
+          },
+          {
+            "Name": "unknown",
+            "Description": ""
+          },
+          {
+            "Name": "unknown",
+            "Description": ""
+          },
+          {
+            "Name": "unknown",
+            "Description": ""
+          }
+        ]
+      }
+    ]
+  }
 ]
\ No newline at end of file
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Battle/Functions.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Battle/Functions.json
index 19a7cd7..261d5cb 100644
--- a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Battle/Functions.json
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Battle/Functions.json
@@ -1923,14 +1923,17 @@
   {
     "Index": "0x309d",
     "ReturnType": "int",
-    "Name": "BTL_FUNCTION_009D",
-    "Description": "",
+    "Name": "GET_ENEMY_ID",
+    "Description": "Get ID of enemy in a given formation slot.",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "fSlot",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "BTL_FUNCTION_009D"
     ]
   },
   {
@@ -5033,21 +5036,28 @@
   {
     "Index": "0x3157",
     "ReturnType": "int",
-    "Name": "BTL_FUNCTION_0157",
+    "Name": "GET_ENCOUNT_ID",
     "Description": "",
-    "Parameters": []
+    "Parameters": [
+    ],
+    "Aliases": [
+      "BTL_FUNCTION_0157"
+    ]
   },
   {
     "Index": "0x3158",
     "ReturnType": "void",
-    "Name": "BTL_FUNCTION_0158",
+    "Name": "PLAY_BATTLE_BGM",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "cueID",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "BTL_FUNCTION_0158"
     ]
   },
   {
@@ -6293,5 +6303,43 @@
         "Description": ""
       }
     ]
+  },
+  {
+    "Index": "0x31a3",
+    "ReturnType": "void",
+    "Name": "MSG_UNISON",
+    "Description": "Displays a message as a subtitle during a Unison Skill.",
+    "Parameters": [
+      {
+        "Type": "int",
+        "Name": "msgID",
+        "Description": "",
+        "Semantic": "MsgId"
+      },
+      {
+        "Type": "int",
+        "Name": "frame",
+        "Description": "Time (in frames?) at which message appears."
+      }
+    ],
+    "Aliases": [
+      "BTL_FUNCTION_01A3"
+    ]
+  },
+  {
+    "Index": "0x31a4",
+    "ReturnType": "void",
+    "Name": "MSG_UNISON_SET_DURATION",
+    "Description": "Sets length of time for which messages during Unison Skills are displayed.",
+    "Parameters": [
+      {
+        "Type": "int",
+        "Name": "duration",
+        "Description": ""
+      }
+    ],
+    "Aliases": [
+      "BTL_FUNCTION_01A4"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Common/Functions.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Common/Functions.json
index 1ce4ce0..8ba4ac8 100644
--- a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Common/Functions.json
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Common/Functions.json
@@ -110,40 +110,52 @@
   {
     "Index": "0x0008",
     "ReturnType": "void",
-    "Name": "FUNCTION_0008",
+    "Name": "BIT_ON",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": ""
+        "Name": "bitID",
+        "Description": "",
+        "Semantic": "BitId"
       }
+    ],
+    "Aliases": [
+      "FUNCTION_0008"
     ]
   },
   {
     "Index": "0x0009",
     "ReturnType": "void",
-    "Name": "FUNCTION_0009",
+    "Name": "BIT_OFF",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": ""
+        "Name": "bitID",
+        "Description": "",
+        "Semantic": "BitId"
       }
+    ],
+    "Aliases": [
+      "FUNCTION_0009"
     ]
   },
   {
     "Index": "0x000a",
-    "ReturnType": "int",
-    "Name": "FUNCTION_000A",
+    "ReturnType": "bool",
+    "Name": "BIT_CHK",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": ""
+        "Name": "bitID",
+        "Description": "",
+        "Semantic": "BitId"
       }
+    ],
+    "Aliases": [
+      "FUNCTION_000A"
     ]
   },
   {
@@ -223,14 +235,17 @@
   {
     "Index": "0x0010",
     "ReturnType": "int",
-    "Name": "FUNCTION_0010",
+    "Name": "GET_COUNT",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "countID",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "FUNCTION_0010"
     ]
   },
   {
@@ -406,14 +421,17 @@
   {
     "Index": "0x001a",
     "ReturnType": "int",
-    "Name": "FUNCTION_001A",
-    "Description": "",
+    "Name": "RND",
+    "Description": "Returns a random value between 0 and upperBound.",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "upperBound",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "FUNCTION_001A"
     ]
   },
   {
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Event/Functions.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Event/Functions.json
index dbd967e..72b4bbc 100644
--- a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Event/Functions.json
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Event/Functions.json
@@ -2,19 +2,22 @@
   {
     "Index": "0x4000",
     "ReturnType": "void",
-    "Name": "EVT_FUNCTION_0000",
+    "Name": "CALL_EVENT",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "majorID",
         "Description": ""
       },
       {
         "Type": "int",
-        "Name": "param2",
+        "Name": "minorID",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "EVT_FUNCTION_0000"
     ]
   },
   {
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Script/Enums.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Script/Enums.json
new file mode 100644
index 0000000..2f39a9b
--- /dev/null
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Script/Enums.json
@@ -0,0 +1,120 @@
+[
+  {
+    "Name": "Party",
+    "Description": "ID of each party member.",
+    "Members": [
+      {
+        "Name": "Yu",
+        "Value": 1
+      },
+      {
+        "Name": "Makoto3",
+        "Value": 2
+      },
+      {
+        "Name": "Yosuke",
+        "Value": 3
+      },
+      {
+        "Name": "Chie",
+        "Value": 4
+      },
+      {
+        "Name": "Yukiko",
+        "Value": 5
+      },
+      {
+        "Name": "Rise",
+        "Value": 6
+      },
+      {
+        "Name": "Kanji",
+        "Value": 7
+      },
+      {
+        "Name": "Naoto",
+        "Value": 8
+      },
+      {
+        "Name": "Teddie",
+        "Value": 9
+      },
+      {
+        "Name": "Yukari",
+        "Value": 10
+      },
+      {
+        "Name": "Junpei",
+        "Value": 11
+      },
+      {
+        "Name": "Akihiko",
+        "Value": 12
+      },
+      {
+        "Name": "Mitsuru",
+        "Value": 13
+      },
+      {
+        "Name": "Fuuka",
+        "Value": 14
+      },
+      {
+        "Name": "Aigis",
+        "Value": 15
+      },
+      {
+        "Name": "Ken",
+        "Value": 16
+      },
+      {
+        "Name": "Koromaru",
+        "Value": 17
+      },
+      {
+        "Name": "Shinjiro",
+        "Value": 18
+      },
+      {
+        "Name": "Kotone",
+        "Value": 19
+      },
+      {
+        "Name": "Ren",
+        "Value": 20
+      },
+      {
+        "Name": "Ryuji",
+        "Value": 21
+      },
+      {
+        "Name": "Ann",
+        "Value": 22
+      },
+      {
+        "Name": "Morgana",
+        "Value": 23
+      },
+      {
+        "Name": "Yusuke",
+        "Value": 24
+      },
+      {
+        "Name": "Makoto5",
+        "Value": 25
+      },
+      {
+        "Name": "Futaba",
+        "Value": 26
+      },
+      {
+        "Name": "Haru",
+        "Value": 27
+      },
+      {
+        "Name": "Akechi",
+        "Value": 28
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Script/Functions.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Script/Functions.json
index dbe7289..8b97510 100644
--- a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Script/Functions.json
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Script/Functions.json
@@ -51,9 +51,13 @@
   {
     "Index": "0x5003",
     "ReturnType": "int",
-    "Name": "SCR_FUNCTION_0003",
-    "Description": "",
-    "Parameters": []
+    "Name": "GET_PARTY_SIZE",
+    "Description": "Gets current number of active party members.",
+    "Parameters": [
+    ],
+    "Aliases": [
+      "SCR_FUNCTION_0003"
+    ]
   },
   {
     "Index": "0x5004",
@@ -317,14 +321,17 @@
   {
     "Index": "0x5015",
     "ReturnType": "int",
-    "Name": "SCR_FUNCTION_0015",
-    "Description": "",
+    "Name": "GET_PARTY_ID",
+    "Description": "Returns ID of party member in a given formation slot.",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "fSlot",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "SCR_FUNCTION_0015"
     ]
   },
   {
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Window/Enums.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Window/Enums.json
new file mode 100644
index 0000000..2f39a9b
--- /dev/null
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Window/Enums.json
@@ -0,0 +1,120 @@
+[
+  {
+    "Name": "Party",
+    "Description": "ID of each party member.",
+    "Members": [
+      {
+        "Name": "Yu",
+        "Value": 1
+      },
+      {
+        "Name": "Makoto3",
+        "Value": 2
+      },
+      {
+        "Name": "Yosuke",
+        "Value": 3
+      },
+      {
+        "Name": "Chie",
+        "Value": 4
+      },
+      {
+        "Name": "Yukiko",
+        "Value": 5
+      },
+      {
+        "Name": "Rise",
+        "Value": 6
+      },
+      {
+        "Name": "Kanji",
+        "Value": 7
+      },
+      {
+        "Name": "Naoto",
+        "Value": 8
+      },
+      {
+        "Name": "Teddie",
+        "Value": 9
+      },
+      {
+        "Name": "Yukari",
+        "Value": 10
+      },
+      {
+        "Name": "Junpei",
+        "Value": 11
+      },
+      {
+        "Name": "Akihiko",
+        "Value": 12
+      },
+      {
+        "Name": "Mitsuru",
+        "Value": 13
+      },
+      {
+        "Name": "Fuuka",
+        "Value": 14
+      },
+      {
+        "Name": "Aigis",
+        "Value": 15
+      },
+      {
+        "Name": "Ken",
+        "Value": 16
+      },
+      {
+        "Name": "Koromaru",
+        "Value": 17
+      },
+      {
+        "Name": "Shinjiro",
+        "Value": 18
+      },
+      {
+        "Name": "Kotone",
+        "Value": 19
+      },
+      {
+        "Name": "Ren",
+        "Value": 20
+      },
+      {
+        "Name": "Ryuji",
+        "Value": 21
+      },
+      {
+        "Name": "Ann",
+        "Value": 22
+      },
+      {
+        "Name": "Morgana",
+        "Value": 23
+      },
+      {
+        "Name": "Yusuke",
+        "Value": 24
+      },
+      {
+        "Name": "Makoto5",
+        "Value": 25
+      },
+      {
+        "Name": "Futaba",
+        "Value": 26
+      },
+      {
+        "Name": "Haru",
+        "Value": 27
+      },
+      {
+        "Name": "Akechi",
+        "Value": 28
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Window/Functions.json b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Window/Functions.json
index a3175c3..afc100d 100644
--- a/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Window/Functions.json
+++ b/Source/AtlusScriptLibrary/Libraries/PersonaQ2/Modules/Window/Functions.json
@@ -2,29 +2,40 @@
   {
     "Index": "0x2000",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0000",
+    "Name": "MSG_SIMPLE",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "msgID",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0000"
     ]
   },
   {
     "Index": "0x2001",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0001",
+    "Name": "MSG_WND_DSP",
     "Description": "",
-    "Parameters": []
+    "Parameters": [
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0001"
+    ]
   },
   {
     "Index": "0x2002",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0002",
+    "Name": "MSG_WND_CLS",
     "Description": "",
-    "Parameters": []
+    "Parameters": [
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0002"
+    ]
   },
   {
     "Index": "0x2003",
@@ -56,7 +67,7 @@
   {
     "Index": "0x2006",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0006",
+    "Name": "SET_MSG_VAR",
     "Description": "",
     "Parameters": [
       {
@@ -74,12 +85,15 @@
         "Name": "param3",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0006"
     ]
   },
   {
     "Index": "0x2007",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0007",
+    "Name": "SEL_DEFKEY",
     "Description": "",
     "Parameters": [
       {
@@ -92,6 +106,9 @@
         "Name": "param2",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0007"
     ]
   },
   {
@@ -110,7 +127,7 @@
   {
     "Index": "0x2009",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0009",
+    "Name": "MSG_INFO",
     "Description": "",
     "Parameters": [
       {
@@ -118,6 +135,10 @@
         "Name": "param1",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0009",
+      "MSG_INFORMATION"
     ]
   },
   {
@@ -146,32 +167,41 @@
   {
     "Index": "0x200b",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_000B",
+    "Name": "MSG",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": ""
+        "Name": "msgID",
+        "Description": "",
+        "Semantic": "MsgId"
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_000B"
     ]
   },
   {
     "Index": "0x200c",
     "ReturnType": "int",
-    "Name": "WND_FUNCTION_000C",
-    "Description": "",
+    "Name": "MSG_SEL",
+    "Description": "Displays a msg followed by a selection dialog.",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": ""
+        "Name": "msgID",
+        "Description": "The label of the message preceding the selection.",
+        "Semantic": "MsgId"
       },
       {
         "Type": "int",
-        "Name": "param2",
-        "Description": ""
+        "Name": "selID",
+        "Description": "The label of the selection dialogue.",
+        "Semantic": "SelId"
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_000C"
     ]
   },
   {
@@ -243,14 +273,17 @@
   {
     "Index": "0x2011",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0011",
+    "Name": "MSG_CAPTION",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "msgID",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0011"
     ]
   },
   {
@@ -276,14 +309,18 @@
   {
     "Index": "0x2014",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0014",
+    "Name": "SEL",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": "Unknown type; assumed int"
+        "Name": "selID",
+        "Description": "",
+        "Semantic": "SelId"
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0014"
     ]
   },
   {
@@ -322,7 +359,7 @@
   {
     "Index": "0x2016",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0016",
+    "Name": "MSG_TUTORIAL",
     "Description": "",
     "Parameters": [
       {
@@ -335,12 +372,15 @@
         "Name": "param2",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0016"
     ]
   },
   {
     "Index": "0x2017",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0017",
+    "Name": "MSG_INFO2",
     "Description": "",
     "Parameters": [
       {
@@ -348,12 +388,16 @@
         "Name": "param1",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0017",
+      "MSG_INFORMATION2"
     ]
   },
   {
     "Index": "0x2018",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0018",
+    "Name": "MSG_OBTAINED",
     "Description": "",
     "Parameters": [
       {
@@ -366,6 +410,9 @@
         "Name": "param2",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0018"
     ]
   },
   {
@@ -378,7 +425,7 @@
   {
     "Index": "0x201a",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_001A",
+    "Name": "MSG_NEWMEMBER",
     "Description": "",
     "Parameters": [
       {
@@ -386,32 +433,44 @@
         "Name": "param1",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_001A"
     ]
   },
   {
     "Index": "0x201b",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_001B",
+    "Name": "MSG_PartyIntro",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": ""
+        "Name": "partyID",
+        "Description": "",
+        "Semantic": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_001B",
+      "MSG_INTRODUCTION"
     ]
   },
   {
     "Index": "0x201c",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_001C",
-    "Description": "",
+    "Name": "MSG_MIND",
+    "Description": "Displays text as a thought bubble.",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
-        "Description": ""
+        "Name": "msgID",
+        "Description": "The label of the message to be displayed.",
+        "Semantic": "MsgId"
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_001C"
     ]
   },
   {
@@ -435,7 +494,7 @@
   {
     "Index": "0x201e",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_001E",
+    "Name": "MSG_EX",
     "Description": "",
     "Parameters": [
       {
@@ -453,12 +512,15 @@
         "Name": "param3",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_001E"
     ]
   },
   {
     "Index": "0x201f",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_001F",
+    "Name": "MSG_MIND_EX",
     "Description": "",
     "Parameters": [
       {
@@ -476,12 +538,15 @@
         "Name": "param3",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_001F"
     ]
   },
   {
     "Index": "0x2020",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0020",
+    "Name": "MSG_MISSION",
     "Description": "",
     "Parameters": [
       {
@@ -514,19 +579,25 @@
         "Name": "param6",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0020"
     ]
   },
   {
     "Index": "0x2021",
     "ReturnType": "void",
-    "Name": "WND_FUNCTION_0021",
+    "Name": "MSG_SIMPLE_TUTORIAL",
     "Description": "",
     "Parameters": [
       {
         "Type": "int",
-        "Name": "param1",
+        "Name": "msgID",
         "Description": ""
       }
+    ],
+    "Aliases": [
+      "WND_FUNCTION_0021"
     ]
   },
   {