Merge branch 'develop' into ocarinadpad
This commit is contained in:
commit
22dbdc984c
|
@ -20,6 +20,7 @@ Globals::Globals()
|
||||||
profile = false;
|
profile = false;
|
||||||
useLegacyZDList = false;
|
useLegacyZDList = false;
|
||||||
useExternalResources = true;
|
useExternalResources = true;
|
||||||
|
singleThreaded = true;
|
||||||
verbosity = VerbosityLevel::VERBOSITY_SILENT;
|
verbosity = VerbosityLevel::VERBOSITY_SILENT;
|
||||||
outputPath = Directory::GetCurrentDirectory();
|
outputPath = Directory::GetCurrentDirectory();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<Root>
|
<Root>
|
||||||
<File Name="nes_message_data_static">
|
<File Name="nes_message_data_static">
|
||||||
<Text Name="nes_message_data_static" CodeOffset="0x12E4C0"/>
|
<Text Name="nes_message_data_static" CodeOffset="0x12E4E0"/>
|
||||||
</File>
|
</File>
|
||||||
</Root>
|
</Root>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<Root>
|
<Root>
|
||||||
<File Name="staff_message_data_static">
|
<File Name="staff_message_data_static">
|
||||||
<Text Name="staff_message_data_static" CodeOffset="0x136908"/>
|
<Text Name="staff_message_data_static" CodeOffset="0x136928"/>
|
||||||
</File>
|
</File>
|
||||||
</Root>
|
</Root>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<Root>
|
<Root>
|
||||||
<File Name="nes_message_data_static">
|
<File Name="nes_message_data_static">
|
||||||
<Text Name="nes_message_data_static" CodeOffset="0x0F68F0"/>
|
<Text Name="nes_message_data_static" CodeOffset="0xF6910"/>
|
||||||
</File>
|
</File>
|
||||||
</Root>
|
</Root>
|
||||||
|
|
|
@ -2,4 +2,4 @@
|
||||||
<File Name="staff_message_data_static">
|
<File Name="staff_message_data_static">
|
||||||
<Text Name="staff_message_data_static" CodeOffset="0xFED58"/>
|
<Text Name="staff_message_data_static" CodeOffset="0xFED58"/>
|
||||||
</File>
|
</File>
|
||||||
</Root>
|
</Root>
|
||||||
|
|
Loading…
Reference in New Issue