PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dtk & use asset extraction for font 

Former-commit-id: 87c251bd40b95b3e8ee03cdca5e0699a620c46c4
This commit is contained in:
Luke Street 2023-11-26 00:56:57 -05:00
parent 01b60994cb
commit 622219bb94
7 changed files with 25 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.vscode/c_cpp_properties.json vendored
View File

@ -3,8 +3,9 @@
{ {
"name": "Linux", "name": "Linux",
"includePath": [ "includePath": [
"${workspaceFolder}/include/**", "${workspaceFolder}/include",
"${workspaceFolder}/libc/**" "${workspaceFolder}/libc",
"${workspaceFolder}/build/*/include"
], ],
"cStandard": "c99", "cStandard": "c99",
"cppStandard": "c++98", "cppStandard": "c++98",

50
.vscode/settings.json vendored
View File

@ -19,54 +19,8 @@
"editor.tabSize": 2, "editor.tabSize": 2,
"files.associations": { "files.associations": {
"source_location": "cpp", "source_location": "cpp",
"stdio.h": "c", "*.h": "c",
"stddef.h": "c", "*.inc": "c"
"errno.h": "c",
"ansi_files.h": "c",
"types.h": "c",
"gba.h": "c",
"gbapriv.h": "c",
"os.h": "c",
"sipriv.h": "c",
"dvd_regs.h": "c",
"dvd.h": "c",
"dvdpriv.h": "c",
"__ppc_eabi_linker.h": "c",
"hack.h": "c",
"db.h": "c",
"ppcarch.h": "c",
"osalarm.h": "c",
"ospriv.h": "c",
"gx.h": "c",
"osthread.h": "c",
"osserial.h": "c",
"osmutex.h": "c",
"osexception.h": "c",
"oserror.h": "c",
"oscontext.h": "c",
"oscache.h": "c",
"stdlib.h": "c",
"musyx_priv.h": "c",
"gxenum.h": "c",
"trees.h": "c",
"musyx.h": "c",
"dsp_import.h": "c",
"osinterrupt.h": "c",
"osmodule.h": "c",
"dsp_regs.h": "c",
"dsp.h": "c",
"ar.h": "c",
"osrtcpriv.h": "c",
"osbootinfo.h": "c",
"assert.h": "c",
"math.h": "c",
"gxpriv.h": "c",
"osfastcast.h": "c",
"osfont.h": "c",
"arq.h": "c",
"string.h": "c",
"hw_regs.h": "c",
"synth.h": "c"
}, },
"files.autoSave": "onFocusChange", "files.autoSave": "onFocusChange",
"files.insertFinalNewline": true, "files.insertFinalNewline": true,

9
config/GM8E01_00/config.yml
View File

@ -6,6 +6,15 @@ mw_comment_version: 8
quick_analysis: true # Faster reruns after full analysis quick_analysis: true # Faster reruns after full analysis
fill_gaps: false # Alignments known fill_gaps: false # Alignments known
# Extract embedded assets
extract:
- symbol: sDefaultFontData
binary: MetroidPrime/DefaultFontData.bin
header: MetroidPrime/DefaultFontData.inc
- symbol: sDefaultFontTexture
binary: MetroidPrime/DefaultFontTexture.bin
header: MetroidPrime/DefaultFontTexture.inc
modules: modules:
- object: orig/GM8E01_00/files/NESemuP.rel - object: orig/GM8E01_00/files/NESemuP.rel
hash: 5ad6bb727d6dd220e6aceef9143c61a86a6f2bb5 hash: 5ad6bb727d6dd220e6aceef9143c61a86a6f2bb5

4
config/GM8E01_00/symbols.txt
View File

@ -16699,8 +16699,8 @@ _ctors = .ctors:0x803CB1C0; // type:label scope:global data:4byte
_dtors = .dtors:0x803CB380; // type:label scope:global data:4byte _dtors = .dtors:0x803CB380; // type:label scope:global data:4byte
__destroy_global_chain_reference = .dtors:0x803CB380; // type:object size:0x4 scope:global __destroy_global_chain_reference = .dtors:0x803CB380; // type:object size:0x4 scope:global
__fini_cpp_exceptions_reference = .dtors:0x803CB384; // type:object size:0x4 scope:global __fini_cpp_exceptions_reference = .dtors:0x803CB384; // type:object size:0x4 scope:global
lbl_803CB3A0 = .rodata:0x803CB3A0; // type:object size:0x650 sDefaultFontData = .rodata:0x803CB3A0; // type:object size:0x650 scope:local data:byte
lbl_803CB9F0 = .rodata:0x803CB9F0; // type:object size:0x45C sDefaultFontTexture = .rodata:0x803CB9F0; // type:object size:0x45C scope:local data:byte
lbl_803CBE4C = .rodata:0x803CBE4C; // type:object size:0x28 data:4byte lbl_803CBE4C = .rodata:0x803CBE4C; // type:object size:0x28 data:4byte
lbl_803CBE74 = .rodata:0x803CBE74; // type:object size:0xA data:string lbl_803CBE74 = .rodata:0x803CBE74; // type:object size:0xA data:string
lbl_803CBE7E = .rodata:0x803CBE7E; // type:object size:0xF data:string lbl_803CBE7E = .rodata:0x803CBE7E; // type:object size:0xF data:string

7
configure.py
View File

@ -125,10 +125,10 @@ if not is_windows():
config.wrapper = args.wrapper config.wrapper = args.wrapper
# Tool versions # Tool versions
config.compilers_tag = "20230715" config.compilers_tag = "20231018"
config.dtk_tag = "v0.5.8" config.dtk_tag = "v0.6.2"
config.sjiswrap_tag = "v1.1.1" config.sjiswrap_tag = "v1.1.1"
config.wibo_tag = "0.6.4" config.wibo_tag = "0.6.9"
# Project # Project
config.config_path = Path("config") / config.version / "config.yml" config.config_path = Path("config") / config.version / "config.yml"
@ -158,6 +158,7 @@ cflags_base = [
"-nosyspath", "-nosyspath",
"-i include", "-i include",
"-i libc", "-i libc",
f"-i build/{config.version}/include",
"-DPRIME1", "-DPRIME1",
f"-DVERSION={version_num}", f"-DVERSION={version_num}",
"-DNONMATCHING=0", "-DNONMATCHING=0",

180
src/MetroidPrime/main.cpp
View File

@ -220,181 +220,9 @@ CGameGlobalObjects::CGameGlobalObjects(COsContext& osContext, CMemorySys& memory
gpDefaultFont = &x154_defaultFont; gpDefaultFont = &x154_defaultFont;
} }
const uchar sDefaultFontData[] = { // Generated includes
0x78, 0xDA, 0x8D, 0x57, 0x5B, 0x6F, 0x54, 0x55, 0x14, 0x5E, 0xA5, 0x74, 0x3A, 0x9D, 0x96, 0x82, #include "MetroidPrime/DefaultFontData.inc"
0x18, 0x85, 0x48, 0xD2, 0x40, 0xB9, 0x28, 0xD7, 0x52, 0x29, 0xA5, 0xB7, 0xD9, 0x5B, 0x6B, 0x69, #include "MetroidPrime/DefaultFontTexture.inc"
0xA1, 0x42, 0xB9, 0xB4, 0x94, 0x8A, 0xD0, 0xD2, 0x4E, 0xE7, 0xD6, 0x4E, 0x67, 0xDA, 0xB9, 0x74,
0x68, 0x45, 0x99, 0x28, 0xF3, 0x40, 0xD4, 0xF0, 0x0B, 0x8C, 0x31, 0xC6, 0xF8, 0xA2, 0xF1, 0xC5,
0xC4, 0x18, 0x35, 0xC6, 0xC4, 0x17, 0xE3, 0x83, 0x31, 0x4A, 0x7C, 0x21, 0x31, 0x26, 0x26, 0x86,
0xE8, 0xA3, 0xC6, 0x17, 0x93, 0xBA, 0xF7, 0xDA, 0xDF, 0x39, 0x73, 0x66, 0x98, 0x72, 0xCE, 0x21,
0x3B, 0x1F, 0xFB, 0xCC, 0xB7, 0xBF, 0x59, 0x7B, 0xDD, 0xBA, 0x66, 0xF0, 0xDC, 0xC8, 0x18, 0x11,
0x6D, 0x50, 0x6B, 0x8B, 0x5A, 0x9B, 0xD5, 0x6A, 0x52, 0xAB, 0x8E, 0xF4, 0x53, 0xAF, 0xD6, 0xA6,
0x81, 0x70, 0x64, 0x3A, 0x14, 0x6E, 0x3F, 0xD6, 0x4F, 0xD7, 0xC3, 0x45, 0x49, 0xE6, 0x99, 0xA2,
0x9D, 0xE2, 0x4D, 0x22, 0x39, 0x42, 0x24, 0xEE, 0x2A, 0x1C, 0x27, 0xEB, 0xA9, 0xC1, 0xE9, 0x1A,
0x2C, 0xFD, 0x14, 0x69, 0x97, 0xF8, 0x4D, 0xB1, 0x0E, 0x28, 0xF6, 0x03, 0x85, 0x93, 0x36, 0xB3,
0x56, 0xAD, 0x66, 0x60, 0x13, 0x56, 0x91, 0x5A, 0x65, 0x43, 0x81, 0xD9, 0x72, 0xAB, 0xC2, 0x1E,
0x5B, 0xDB, 0xEF, 0xC0, 0x5A, 0x9B, 0xBD, 0xBB, 0x57, 0x81, 0xF8, 0x9D, 0x28, 0x38, 0xA1, 0x4E,
0xB4, 0xD8, 0xEC, 0x46, 0x7C, 0x87, 0x66, 0x05, 0xB0, 0x2F, 0xD2, 0x1E, 0x39, 0xA9, 0x34, 0x5B,
0x15, 0x33, 0x52, 0x60, 0xFB, 0xC1, 0xAA, 0x87, 0x17, 0xEA, 0xC1, 0x0E, 0x30, 0x7B, 0xAF, 0xE8,
0x37, 0xDA, 0x22, 0x49, 0x7C, 0x0A, 0x4F, 0xC0, 0x81, 0x8D, 0xB6, 0xF6, 0x3E, 0x79, 0x09, 0xDA,
0xD7, 0x3C, 0x68, 0x3F, 0x2D, 0x6B, 0x14, 0x6B, 0x58, 0xB1, 0x7D, 0x0A, 0xAF, 0xD8, 0xDA, 0x1B,
0x1D, 0x68, 0xDD, 0x92, 0xE8, 0x19, 0x79, 0x08, 0xDA, 0xC7, 0x0A, 0x96, 0x07, 0xC9, 0xE1, 0x6B,
0x1F, 0x3C, 0x69, 0x7C, 0xB2, 0x5F, 0x06, 0xC1, 0x1E, 0xF0, 0xC0, 0x3E, 0xC0, 0x96, 0x68, 0x7F,
0xFB, 0x15, 0xF6, 0xDB, 0x6C, 0x9F, 0x83, 0x5D, 0x67, 0xB3, 0x0F, 0x8A, 0x4F, 0x14, 0x73, 0x9F,
0xF2, 0xC9, 0xD7, 0x64, 0xB1, 0xAD, 0xDB, 0x35, 0x00, 0x7D, 0x88, 0x52, 0x91, 0x0E, 0x71, 0x2C,
0x85, 0x62, 0x36, 0x17, 0xAC, 0x3C, 0xA9, 0xC1, 0xED, 0x2C, 0xAC, 0xC3, 0x4D, 0x8B, 0x74, 0x98,
0xFD, 0xAC, 0x7C, 0x22, 0xEE, 0x90, 0x93, 0x5D, 0x0F, 0xF4, 0xE3, 0xBB, 0x7C, 0xCC, 0x3E, 0xC2,
0x96, 0x68, 0xF6, 0xE7, 0x64, 0x79, 0xB0, 0x52, 0xBB, 0xD6, 0xD6, 0x6E, 0x13, 0x5B, 0x11, 0x4B,
0x51, 0x16, 0xCB, 0x06, 0xB0, 0xAD, 0x58, 0x9A, 0x5B, 0x1E, 0xE5, 0xAC, 0x8A, 0xA9, 0xAC, 0xEA,
0x52, 0x78, 0xBF, 0x2C, 0xF2, 0x16, 0xBB, 0x94, 0xB1, 0xED, 0xF2, 0x2C, 0xFC, 0x3D, 0x56, 0x76,
0x4B, 0xA7, 0x07, 0x2D, 0x76, 0x0D, 0x3D, 0x1B, 0x3C, 0x05, 0xED, 0x2F, 0x3D, 0x68, 0x1F, 0x13,
0x11, 0xC3, 0xD6, 0x3E, 0x71, 0x65, 0x77, 0xE8, 0xBA, 0x64, 0xF6, 0x7B, 0x1E, 0xD8, 0xC7, 0xC5,
0xFB, 0x8A, 0x75, 0xC3, 0x78, 0x50, 0xFB, 0xE6, 0x91, 0xEC, 0x4E, 0xF1, 0x05, 0xD8, 0x3F, 0x7A,
0x60, 0x9F, 0x10, 0x3F, 0x81, 0xFD, 0xC0, 0x03, 0xBB, 0x4B, 0x52, 0x81, 0xFA, 0xD4, 0x7F, 0x65,
0x63, 0x81, 0xC4, 0x84, 0x0B, 0xBB, 0x5B, 0x36, 0x81, 0xBD, 0xCD, 0x03, 0xBB, 0x47, 0xFC, 0x6B,
0xBA, 0x8F, 0xFE, 0x0E, 0xD4, 0x25, 0x55, 0xE4, 0x89, 0xDF, 0xAE, 0xCB, 0x5E, 0xF1, 0x27, 0x7A,
0xD5, 0x3F, 0x0A, 0x2F, 0x56, 0x65, 0x37, 0xD8, 0xEC, 0x3E, 0xF1, 0x2E, 0xAA, 0xE1, 0x63, 0x93,
0x8B, 0x55, 0x6A, 0xA7, 0xA4, 0x1D, 0xE4, 0xFC, 0xD6, 0xDA, 0x45, 0x85, 0x83, 0x55, 0xD9, 0x3E,
0xE8, 0x17, 0x55, 0xA2, 0xDE, 0x85, 0xF6, 0x3B, 0x1E, 0xB4, 0xA5, 0xCE, 0x2A, 0x9D, 0x83, 0xC1,
0x8F, 0xCA, 0x6A, 0xC7, 0xEF, 0xC0, 0x92, 0x4F, 0x9E, 0x93, 0x51, 0x64, 0x6C, 0xCA, 0x43, 0xAF,
0x7A, 0x5E, 0x6E, 0x87, 0xBF, 0x77, 0x7B, 0xF0, 0x77, 0xBF, 0xDC, 0x03, 0x76, 0x9B, 0x2B, 0xBB,
0x9E, 0x5E, 0xE0, 0x88, 0xAB, 0xFC, 0x90, 0x4F, 0x14, 0xF8, 0xB6, 0x60, 0x35, 0x38, 0xB0, 0xA4,
0x3D, 0x20, 0x8F, 0x42, 0xBB, 0xD7, 0x83, 0x25, 0x27, 0x65, 0x1F, 0xD8, 0x43, 0x36, 0xBB, 0xA6,
0xA2, 0x7F, 0x97, 0xD8, 0x83, 0xF2, 0x49, 0x58, 0xB2, 0xD3, 0xB6, 0x84, 0xD6, 0xB5, 0x64, 0x48,
0x9E, 0x82, 0xF6, 0xA8, 0x07, 0x4B, 0x4E, 0xE9, 0xCE, 0xC0, 0xEC, 0x29, 0x0F, 0xEC, 0xD3, 0xE2,
0x17, 0x44, 0xFE, 0xD7, 0xB2, 0xCE, 0x56, 0xEB, 0x40, 0x8B, 0xED, 0xA7, 0x61, 0x79, 0x1D, 0xDA,
0xF3, 0x1E, 0x6E, 0xF9, 0xA2, 0x48, 0xA3, 0x0F, 0xBE, 0x4D, 0xEE, 0xFE, 0x3E, 0xA3, 0xAB, 0x81,
0xD9, 0x6B, 0x65, 0x6C, 0x7F, 0x55, 0xF6, 0x59, 0xDD, 0x35, 0xB5, 0x25, 0xC1, 0xDB, 0xE4, 0xB4,
0x64, 0xB3, 0x03, 0x2D, 0x76, 0x03, 0x8D, 0xC8, 0x04, 0xEC, 0xCE, 0x7B, 0xF0, 0xC9, 0x39, 0x5D,
0xBD, 0xBA, 0xB3, 0x71, 0xBE, 0xDC, 0x77, 0xB9, 0xE5, 0x79, 0xDD, 0x21, 0x98, 0xBD, 0xAD, 0xE0,
0xD6, 0x07, 0x03, 0x74, 0x41, 0xA8, 0x29, 0x43, 0xE8, 0xAE, 0x3C, 0x43, 0x4E, 0x6D, 0xA7, 0x4F,
0x4A, 0x7F, 0x2F, 0x2F, 0xEA, 0x6A, 0x60, 0xED, 0xDD, 0xAE, 0xDA, 0x8D, 0x34, 0xAA, 0xAB, 0x81,
0xD9, 0x6D, 0xAE, 0xEC, 0x26, 0x1A, 0xD3, 0x9D, 0x41, 0xFB, 0x44, 0xD7, 0x7C, 0x15, 0x9F, 0x34,
0x3A, 0xD8, 0xCD, 0x74, 0x49, 0x57, 0x03, 0x6B, 0xF7, 0x16, 0xDC, 0xBB, 0xFD, 0xB8, 0xAE, 0x06,
0x66, 0x0F, 0x79, 0x60, 0x5F, 0x0E, 0xBE, 0x05, 0x4B, 0x7C, 0xAE, 0xB1, 0xDC, 0x42, 0x13, 0xBA,
0x1A, 0x58, 0x7B, 0xD4, 0x83, 0xF6, 0x4B, 0x1C, 0x4B, 0x5D, 0x69, 0x01, 0x0F, 0x35, 0x7F, 0x45,
0xF7, 0x58, 0xB6, 0xE4, 0x33, 0xAA, 0x96, 0xDF, 0x8D, 0x65, 0xEC, 0x97, 0xF9, 0xEF, 0xBB, 0xAE,
0x1D, 0xD5, 0xBB, 0xE5, 0x4C, 0xD5, 0xA9, 0xA0, 0x14, 0xCB, 0xAB, 0x72, 0x17, 0xFA, 0xE0, 0xC1,
0xB2, 0x3E, 0xE8, 0xCC, 0xEF, 0xD2, 0xF4, 0x78, 0x4D, 0x2E, 0x82, 0xBD, 0x5C, 0x70, 0xCE, 0xB1,
0x1B, 0x1D, 0x93, 0x6F, 0x49, 0x7B, 0x52, 0x3E, 0x8E, 0xB9, 0x6A, 0x47, 0xD9, 0x1C, 0x5B, 0xE7,
0xE8, 0xB5, 0xA5, 0x39, 0x76, 0x4A, 0x6E, 0xC6, 0xA4, 0xF4, 0x54, 0xC1, 0xEA, 0xF6, 0x95, 0xF9,
0xBD, 0x01, 0xAB, 0x48, 0xD7, 0x59, 0x73, 0x18, 0xBD, 0xAA, 0x34, 0x7F, 0xD7, 0x3A, 0x2C, 0xDA,
0x60, 0x6B, 0x4F, 0xEB, 0x5B, 0xB2, 0xBF, 0xF5, 0x14, 0xD9, 0x52, 0x35, 0x3A, 0xD6, 0x7A, 0x8C,
0x66, 0x74, 0xAF, 0xE2, 0x58, 0x4E, 0xB9, 0xC6, 0x72, 0x3B, 0x85, 0xE4, 0x61, 0x68, 0x77, 0xD9,
0xDA, 0x95, 0x76, 0x5B, 0x6B, 0x07, 0xCD, 0xEA, 0x5E, 0xC5, 0xDA, 0xF3, 0xAE, 0x55, 0xBC, 0x97,
0xC2, 0xB2, 0x1B, 0xDA, 0x03, 0xAE, 0xDA, 0xFB, 0x29, 0x22, 0x4F, 0x22, 0x3A, 0x67, 0x5C, 0xA7,
0xB0, 0xA3, 0x14, 0xD5, 0x33, 0x0F, 0x67, 0xD5, 0x0F, 0x66, 0x62, 0xAA, 0xA2, 0xBD, 0x09, 0xD8,
0x41, 0x31, 0xDD, 0xAB, 0xD8, 0xEE, 0xBC, 0xAB, 0x4F, 0x7A, 0x29, 0x2E, 0xBE, 0x47, 0x0E, 0xDE,
0x5B, 0x77, 0x86, 0xB0, 0xEC, 0x96, 0x34, 0x27, 0x5A, 0xC1, 0xEE, 0xA1, 0x6A, 0xD3, 0x7A, 0x9D,
0xC3, 0x92, 0x93, 0x34, 0x1F, 0xFC, 0xD6, 0xF4, 0x28, 0xD1, 0xFC, 0xD0, 0x6F, 0x92, 0x4A, 0x4B,
0x06, 0x29, 0x21, 0xC6, 0xA1, 0x3D, 0x47, 0x95, 0xBF, 0x32, 0x2C, 0x4B, 0x2C, 0xF6, 0x10, 0x2D,
0x88, 0x00, 0x7C, 0xA2, 0x66, 0x13, 0xD1, 0x65, 0xB3, 0x9B, 0xC1, 0x6E, 0x76, 0xD8, 0x3D, 0x42,
0x49, 0xED, 0x6F, 0x8E, 0xCE, 0x79, 0xD7, 0xAC, 0xBA, 0x40, 0x29, 0x79, 0x01, 0xEC, 0xAB, 0xAE,
0xEC, 0x09, 0x5A, 0xD4, 0x33, 0x26, 0x5B, 0xF2, 0x87, 0x1D, 0x9D, 0x4A, 0xB6, 0xE5, 0x93, 0x59,
0x5A, 0xD2, 0x33, 0x26, 0xB3, 0xD7, 0x5C, 0x63, 0x19, 0xA5, 0xB4, 0xFE, 0x7D, 0xC6, 0x96, 0xC4,
0x1E, 0xB2, 0xA4, 0x32, 0xAB, 0x62, 0x94, 0x91, 0x71, 0xB0, 0xB3, 0xAE, 0x76, 0x2F, 0x50, 0x56,
0x76, 0x20, 0x07, 0xFB, 0xAA, 0xE6, 0x60, 0xBD, 0xC3, 0xDF, 0x69, 0xCA, 0xE9, 0x09, 0x4F, 0xFC,
0xA5, 0xD6, 0x07, 0xEB, 0xC6, 0xD2, 0x5A, 0x39, 0x5A, 0x16, 0x1F, 0x82, 0xFD, 0x95, 0x2B, 0xFB,
0x26, 0xE5, 0xC5, 0x30, 0x7C, 0xF2, 0x86, 0x1D, 0x4B, 0x2B, 0x86, 0x54, 0x11, 0xCB, 0x5B, 0x74,
0x43, 0xFF, 0x9A, 0x63, 0xED, 0x7B, 0xAE, 0xDA, 0x45, 0x5A, 0xD1, 0x79, 0xC2, 0x7F, 0x2F, 0x3B,
0xD5, 0xFA, 0xF9, 0x91, 0xD1, 0x79, 0x9D, 0x56, 0xF5, 0x54, 0xC0, 0x93, 0x69, 0x17, 0x39, 0x7B,
0x6C, 0x35, 0x7F, 0xDF, 0xA6, 0x57, 0x74, 0x85, 0xB1, 0x07, 0x6F, 0x79, 0x98, 0x4C, 0x6F, 0x8A,
0x6F, 0x90, 0xDF, 0xDF, 0xD9, 0xDD, 0x9E, 0x2A, 0x26, 0xA5, 0x52, 0x47, 0x7E, 0x35, 0xF8, 0xA9,
0x61, 0x07, 0xFF, 0xB6, 0xEB, 0x72, 0x7D, 0xED, 0xD7, 0x82, 0xFF, 0x41, 0xBB, 0xC5, 0x03, 0x9B,
0x7F, 0xD3, 0xD3, 0x11, 0x66, 0xB5, 0xAB, 0xFE, 0x62, 0xB0, 0x63, 0x4D, 0x3D, 0x0A, 0x8F, 0x63,
0xDF, 0x09, 0x3C, 0x81, 0xF7, 0xDD, 0xBC, 0xEF, 0xA7, 0x30, 0xEF, 0x4F, 0x53, 0x88, 0xF7, 0x67,
0x29, 0xCC, 0x78, 0x9E, 0x4C, 0x2E, 0x5F, 0xC4, 0xE7, 0xA3, 0x14, 0x02, 0x9A, 0xFD, 0x18, 0x4D,
0x03, 0xCD, 0xFE, 0x32, 0x70, 0x1A, 0xBC, 0x69, 0x9A, 0x05, 0x46, 0x81, 0x19, 0xD6, 0x9B, 0xA6,
0x2C, 0xF6, 0x79, 0xE0, 0x2A, 0xE3, 0x0C, 0xCE, 0xCF, 0xD0, 0x1C, 0x30, 0xC5, 0x18, 0x82, 0x3D,
0x21, 0xD8, 0x13, 0xA2, 0x79, 0x60, 0x02, 0x98, 0x02, 0x2E, 0x01, 0xD3, 0xC0, 0x2C, 0x30, 0x07,
0x5C, 0x61, 0x9C, 0xA5, 0x38, 0xFB, 0x72, 0x16, 0xE7, 0x67, 0x29, 0x09, 0x34, 0xF6, 0x85, 0xF1,
0x7D, 0x61, 0xD8, 0x11, 0x06, 0x2F, 0xAC, 0x2A, 0xCC, 0x60, 0x16, 0xB8, 0x02, 0x5C, 0x65, 0x8C,
0xC0, 0x1F, 0x11, 0xDC, 0x23, 0xA2, 0xFE, 0x99, 0xF7, 0x71, 0xC6, 0x28, 0xEC, 0x8F, 0xDA, 0xFB,
0x04, 0x30, 0x09, 0x4C, 0x01, 0x73, 0x40, 0xA3, 0x1F, 0x53, 0x1E, 0x32, 0x68, 0x74, 0x63, 0x38,
0x1F, 0x83, 0x1D, 0x71, 0xF8, 0x3B, 0xAE, 0x6E, 0x60, 0xF6, 0x61, 0x60, 0x04, 0x18, 0x05, 0x1A,
0x3F, 0xCF, 0xE1, 0xF3, 0x79, 0xE8, 0x25, 0xA0, 0x9F, 0x40, 0xBC, 0x12, 0xF6, 0xFB, 0x08, 0xDE,
0xC7, 0x81, 0x59, 0xBC, 0xCF, 0xF3, 0x7E, 0x01, 0xE7, 0x16, 0xC0, 0x5F, 0xA0, 0x45, 0xDE, 0x27,
0xF1, 0x3E, 0x09, 0xBB, 0x92, 0xD0, 0x4D, 0x82, 0x97, 0x84, 0x6E, 0x12, 0x79, 0x91, 0x84, 0x6E,
0x0A, 0xE7, 0x52, 0x38, 0x97, 0xC2, 0xB9, 0x14, 0xCE, 0xA5, 0x28, 0x02, 0x8C, 0x02, 0xE7, 0x80,
0x09, 0x9C, 0xCB, 0x00, 0x2D, 0xBD, 0x3C, 0xD0, 0xDC, 0x7B, 0x11, 0xFA, 0x8B, 0xD0, 0x5B, 0x04,
0x6F, 0x09, 0xFE, 0x4E, 0xE3, 0xF3, 0x34, 0xEA, 0x20, 0x0D, 0x3F, 0xA5, 0x71, 0xFF, 0x34, 0xF4,
0x33, 0xB0, 0x2F, 0x03, 0x9D, 0x8C, 0xFD, 0x3E, 0x8B, 0xBD, 0xF1, 0x4F, 0x16, 0x7A, 0x59, 0xE8,
0x65, 0xC1, 0xCF, 0xE1, 0x7C, 0x0E, 0xF7, 0xCB, 0xD9, 0xEF, 0xA3, 0x40, 0x73, 0x9F, 0x1C, 0x65,
0xB0, 0x37, 0x71, 0x5E, 0x86, 0xDE, 0x32, 0xF8, 0xCB, 0xB0, 0x2B, 0x8F, 0xF7, 0x79, 0xE4, 0x57,
0x1E, 0xEF, 0x57, 0xF0, 0xBD, 0x2B, 0xB8, 0xC7, 0xAA, 0xC1, 0xFF, 0x01, 0xCB, 0xC9, 0xBA, 0xB0,
};
const uchar sDefaultFontTexture[] = {
0x78, 0xDA, 0xED, 0x59, 0xDB, 0x92, 0x14, 0x31, 0x08, 0x05, 0xCB, 0x07, 0x1F, 0xC3, 0x1F, 0xF9,
0xAB, 0x7E, 0xA9, 0x4E, 0x37, 0x77, 0x02, 0xE9, 0x99, 0xD2, 0x37, 0xB7, 0xB7, 0x70, 0xA7, 0x77,
0x12, 0x42, 0x08, 0x07, 0x0E, 0x11, 0x00, 0xBE, 0x23, 0xC0, 0x4F, 0x00, 0x78, 0xFD, 0x82, 0x6F,
0xAF, 0x7F, 0x17, 0xC0, 0xEF, 0xDF, 0xBF, 0x7E, 0xC0, 0xF9, 0x21, 0x22, 0xBC, 0x05, 0xB0, 0x8A,
0x7C, 0xBD, 0xE8, 0x7A, 0x00, 0x37, 0xE1, 0xF9, 0x6B, 0x16, 0xFE, 0x9A, 0x26, 0xB9, 0xBE, 0xBF,
0x3F, 0xE2, 0x2D, 0x50, 0x45, 0xD6, 0xE7, 0x67, 0x98, 0x0F, 0xCD, 0xBC, 0x34, 0xFF, 0x69, 0x7D,
0x94, 0xF5, 0x9B, 0x1D, 0xF0, 0xFA, 0x3C, 0x78, 0xDD, 0xB6, 0x66, 0xE1, 0xE5, 0xD9, 0x7F, 0xE2,
0x77, 0xBA, 0x0D, 0x82, 0xEB, 0x9D, 0x1D, 0xC0, 0x2F, 0xEC, 0xAF, 0x25, 0x02, 0x26, 0xF7, 0xFE,
0x6E, 0x1F, 0x4F, 0x0E, 0x44, 0x3F, 0x1F, 0xA8, 0x62, 0xFA, 0x6D, 0x13, 0x59, 0xC2, 0xF9, 0xAD,
0xB0, 0xBC, 0xCB, 0xA8, 0xDF, 0xF6, 0x24, 0xFE, 0xEB, 0xF4, 0xC3, 0x68, 0xBF, 0xAD, 0x99, 0xE3,
0x0B, 0xEA, 0x1A, 0x6C, 0x3F, 0xBE, 0x67, 0xFF, 0xA0, 0xFF, 0xD9, 0x3F, 0xEF, 0xEA, 0x8F, 0x90,
0xE0, 0x33, 0x3F, 0xD8, 0x7F, 0xBD, 0x27, 0xFB, 0xD3, 0xCE, 0x82, 0xFE, 0xEE, 0x5C, 0xCB, 0x9A,
0x78, 0x90, 0x83, 0xFF, 0xDF, 0x8B, 0x9F, 0xD3, 0x33, 0x61, 0xDE, 0x80, 0x37, 0x61, 0x5E, 0xF6,
0x9D, 0x97, 0x93, 0x21, 0x3E, 0x3D, 0x63, 0x4F, 0x9E, 0xB8, 0x7E, 0xC2, 0x6B, 0x30, 0xCA, 0x9C,
0x5C, 0xB1, 0xEE, 0xEE, 0xC4, 0x4B, 0x64, 0xEE, 0x3D, 0x24, 0xAC, 0xEB, 0xF9, 0x6A, 0x58, 0xD7,
0x06, 0x3A, 0xCE, 0xA3, 0x58, 0xDE, 0x98, 0x30, 0xCF, 0x79, 0x0B, 0x49, 0xA1, 0xCE, 0x70, 0xE2,
0x83, 0xD8, 0x3C, 0xCC, 0x3E, 0xD3, 0xC5, 0xD2, 0x1A, 0x39, 0x16, 0xEC, 0x73, 0x99, 0xBD, 0xC7,
0x9F, 0xCF, 0x96, 0x58, 0x48, 0x3A, 0xD3, 0xF2, 0xAB, 0xC5, 0xFF, 0xEE, 0xEA, 0x84, 0x79, 0x3B,
0xFF, 0x14, 0x4D, 0x31, 0xA6, 0xE5, 0xFC, 0xF7, 0x98, 0x8E, 0xD3, 0xA1, 0xC3, 0x25, 0x84, 0xBC,
0x39, 0xC5, 0xB4, 0xE6, 0xB5, 0x67, 0xFD, 0xB3, 0xFD, 0x6C, 0x5D, 0xD1, 0x1F, 0xE3, 0x77, 0x21,
0xD5, 0x70, 0xC8, 0x79, 0x60, 0x43, 0x75, 0x3A, 0xDF, 0xF7, 0xF4, 0x3F, 0x60, 0x72, 0x45, 0xEC,
0xED, 0xF1, 0x53, 0x75, 0x7F, 0xAC, 0xFF, 0x11, 0xFF, 0x7D, 0xDE, 0x54, 0x69, 0x0A, 0x63, 0xDE,
0x6F, 0x9F, 0x97, 0x3F, 0x31, 0xA0, 0x13, 0xA9, 0x9F, 0x60, 0x38, 0x8F, 0xA2, 0x8B, 0xB3, 0x03,
0x90, 0x46, 0xE9, 0xF0, 0x88, 0x35, 0x47, 0x71, 0x1E, 0x57, 0x91, 0x19, 0xFA, 0x0E, 0x5D, 0xD1,
0xF4, 0x7C, 0x12, 0x67, 0x94, 0x3C, 0xE8, 0xB5, 0x13, 0x03, 0xE6, 0xC9, 0x4A, 0x8B, 0xAD, 0xC7,
0x3E, 0x8B, 0xF9, 0x45, 0xF3, 0xD7, 0x8A, 0xFA, 0x27, 0xEA, 0xB6, 0xD8, 0x53, 0xD3, 0xF9, 0xFD,
0x9B, 0xF3, 0x3F, 0x08, 0x8D, 0xB5, 0x6D, 0xD0, 0x9F, 0x73, 0x59, 0x87, 0x1F, 0x2D, 0xBD, 0xEA,
0xCA, 0x82, 0xD1, 0x54, 0xEB, 0x4E, 0xB6, 0xBF, 0x63, 0xFF, 0x89, 0xBC, 0xBE, 0xBE, 0x0E, 0xFA,
0xAF, 0x78, 0x0B, 0xE1, 0x75, 0xEF, 0x81, 0x47, 0xA8, 0x28, 0xAF, 0x5B, 0xA5, 0x56, 0x76, 0xFC,
0x25, 0x13, 0xE4, 0x99, 0xBF, 0x3C, 0xDB, 0xFF, 0xD7, 0xF5, 0x7F, 0xAF, 0x5B, 0x48, 0xA8, 0xE7,
0xD4, 0xE6, 0x35, 0x10, 0x76, 0x4B, 0x53, 0xDE, 0x7C, 0x84, 0x3B, 0x3A, 0x7F, 0x8A, 0x9A, 0x62,
0x5A, 0x54, 0x2C, 0x2C, 0x68, 0xA3, 0x5F, 0xEA, 0x2E, 0x77, 0x05, 0x79, 0xAB, 0xD7, 0xA1, 0x5C,
0x65, 0xEF, 0x92, 0x18, 0x34, 0xB1, 0x6E, 0x69, 0xC5, 0xCE, 0x4C, 0x1D, 0x76, 0xBA, 0x36, 0xA0,
0x49, 0x93, 0x41, 0x0D, 0x4C, 0x5F, 0xE3, 0x5A, 0xFC, 0x3E, 0x21, 0xCF, 0x2B, 0x71, 0xBC, 0xA8,
0x2C, 0x39, 0x65, 0x8D, 0xFA, 0x2B, 0xEE, 0x45, 0x06, 0xBC, 0x6F, 0x5C, 0xA6, 0xF3, 0xED, 0x82,
0xB1, 0xAE, 0x59, 0x4D, 0xEA, 0xCF, 0x1F, 0x43, 0xD2, 0xEB, 0xDA, 0x49, 0x2E, 0x12, 0x97, 0xAA,
0x96, 0xB3, 0x04, 0x42, 0xD6, 0xF1, 0x8A, 0x9C, 0xA3, 0x9B, 0xBA, 0xCF, 0x00, 0xB3, 0x1C, 0x5D,
0xED, 0x8F, 0xCE, 0x94, 0x5C, 0x92, 0x0F, 0x2F, 0x98, 0xAF, 0x07, 0x93, 0xAB, 0x3E, 0xE7, 0x6C,
0xD7, 0xBF, 0xD9, 0x6F, 0xF9, 0xB9, 0xE3, 0x2D, 0xD9, 0x3D, 0xAD, 0xFD, 0xF4, 0x60, 0xFF, 0x47,
0xFA, 0x2B, 0xD6, 0x3F, 0x62, 0x01, 0x2F, 0x08, 0xA8, 0x18, 0x7F, 0xD2, 0xBF, 0x95, 0x40, 0x52,
0xA4, 0x8E, 0x81, 0xD5, 0xC3, 0x54, 0xF6, 0xD9, 0xE7, 0x38, 0xC3, 0xB9, 0xEF, 0x42, 0x0B, 0x2D,
0x73, 0xFE, 0xD0, 0x31, 0x47, 0xB2, 0xEE, 0x5C, 0xDC, 0x33, 0xA5, 0x42, 0xFA, 0x35, 0x93, 0xB9,
0x82, 0x72, 0xF4, 0xA6, 0x2F, 0xB3, 0xCC, 0x6E, 0xA4, 0x46, 0x8E, 0xA0, 0x36, 0x79, 0x7D, 0xD7,
0x7C, 0x03, 0x16, 0x99, 0x60, 0xAC, 0x22, 0x1A, 0xBC, 0x97, 0x66, 0xDC, 0x13, 0x3A, 0x59, 0x4E,
0x23, 0x8B, 0x05, 0xB2, 0x3A, 0x6F, 0xAC, 0xC5, 0xB7, 0x9D, 0x7C, 0xBD, 0x76, 0x70, 0xD3, 0x49,
0xBA, 0xFE, 0x25, 0xF2, 0x8C, 0xDC, 0xFB, 0xA9, 0x13, 0x42, 0x2D, 0x2F, 0xB2, 0x0A, 0xD1, 0x39,
0xF5, 0xAE, 0x1A, 0xB4, 0x1E, 0x3F, 0x82, 0x85, 0x9A, 0x9C, 0xB0, 0x72, 0x28, 0xC7, 0x7F, 0xC3,
0xC9, 0xF4, 0x1D, 0x61, 0xDE, 0x97, 0xF7, 0x7B, 0x91, 0x8F, 0x4D, 0xFA, 0xBD, 0xBF, 0xA4, 0xD0,
0xFA, 0x93, 0xC6, 0xCF, 0x24, 0xF3, 0xDD, 0x57, 0xD6, 0x8F, 0x1D, 0xC7, 0x4C, 0xFA, 0x61, 0xBC,
0x5B, 0xEA, 0xFA, 0xEA, 0xAD, 0xD6, 0x14, 0x0E, 0xB8, 0xD5, 0xB3, 0xB7, 0x38, 0x20, 0x51, 0xBA,
0xBB, 0x42, 0x2F, 0xBC, 0xF5, 0xFE, 0xAA, 0xDC, 0x59, 0x48, 0x5E, 0xA8, 0xFC, 0x9C, 0xCD, 0xA9,
0x26, 0x57, 0x67, 0xD4, 0xDE, 0xAB, 0xFE, 0x3C, 0xF4, 0x09, 0x10, 0x79, 0x3C, 0x51, 0x77, 0xBF,
0x27, 0x1C, 0x89, 0x6B, 0xB2, 0x39, 0x4E, 0xDF, 0xBB, 0xA2, 0x19, 0xDF, 0x6D, 0x79, 0xF3, 0x71,
0x4E, 0x54, 0x75, 0x80, 0xBA, 0xCD, 0xC6, 0x96, 0xA4, 0x6C, 0x5C, 0x69, 0xE3, 0x2C, 0x7B, 0x9C,
0xE8, 0xFD, 0x52, 0xE4, 0x13, 0x55, 0x32, 0x8C, 0xF6, 0x9A, 0x95, 0x38, 0x85, 0xEC, 0x7F, 0xEF,
0x20, 0x4A, 0x65, 0x42, 0xF9, 0xCD, 0x29, 0x6C, 0x8F, 0x3B, 0xE5, 0x55, 0x00, 0x5A, 0xE7, 0x23,
0xAF, 0x48, 0xE5, 0x96, 0x1A, 0xEE, 0xB1, 0xD5, 0x0E, 0x5C, 0x61, 0x29, 0x4A, 0x2F, 0x21, 0xD6,
0x42, 0xDA, 0x70, 0x9E, 0xAD, 0x18, 0xEA, 0xEF, 0x56, 0x73, 0xAC, 0xEE, 0xB7, 0x1F, 0x66, 0x93,
0xC1, 0xA6, 0xBB, 0x1F, 0x0E, 0xD9, 0x03, 0x97, 0xB3, 0x93, 0xFB, 0xB3, 0xE3, 0xA3, 0x17, 0xF5,
0xD1, 0x25, 0xAB, 0x91, 0x13, 0x36, 0xC8, 0xEF, 0xBF, 0x5B, 0x6C, 0x28, 0x3E, 0x6C, 0x53, 0x73,
0x7B, 0x31, 0xCE, 0x9F, 0xEF, 0xAD, 0x22, 0x9D, 0x36, 0x55, 0x86, 0xF9, 0x70, 0xBE, 0x58, 0xFC,
0x9B, 0xA3, 0xAB, 0x24, 0xED, 0xBD, 0x7F, 0x95, 0x9F, 0xA9, 0x87, 0x68, 0x30, 0xAF, 0xA7, 0x7D,
0xBC, 0xDB, 0xB7, 0x03, 0xC8, 0x78, 0xAF, 0x56, 0xA4, 0xCF, 0x4D, 0x27, 0x72, 0xE3, 0x78, 0x1D,
0xFF, 0xEF, 0xE4, 0x61, 0xC0, 0xAE, 0x9F, 0x08, 0x4E, 0xB8, 0xCF, 0x74, 0x61, 0xC3, 0x7B, 0x4E,
0x1C, 0xE5, 0x2E, 0x1A, 0xD3, 0x8D, 0x63, 0xC1, 0xFD, 0x7A, 0xDB, 0xC0, 0xD5, 0x1B, 0x8D, 0xFB,
0x5E, 0xC7, 0xBB, 0xD5, 0x36, 0xA7, 0x12, 0x34, 0xCE, 0xA2, 0x2E, 0xAE, 0xE2, 0x1D, 0x6B, 0xE8,
0xA5, 0xA3, 0x60, 0x0D, 0x10, 0x45, 0x01, 0x95, 0x7B, 0xDA, 0xA6, 0xA7, 0xA2, 0x7C, 0xB7, 0x1E,
0xA4, 0xCC, 0x57, 0xCC, 0x2F, 0xCF, 0x52, 0x54, 0x8C, 0x77, 0x0F, 0x35, 0xF1, 0xB3, 0xE2, 0x7D,
0x55, 0x67, 0xD3, 0xC3, 0x15, 0xCF, 0x11, 0x1B, 0x03, 0xFF, 0x88, 0x40, 0x7C, 0x9C, 0xFF, 0xF5,
0x7C, 0x3D, 0x5F, 0xCF, 0x7F, 0xFB, 0xFC, 0x01, 0x92, 0xD9, 0xBE, 0x26,
};
CRasterFont* CGameGlobalObjects::LoadDefaultFont() { CRasterFont* CGameGlobalObjects::LoadDefaultFont() {
CZipInputStream fontDataStream(rs_new CMemoryInStream(sDefaultFontData, sizeof(sDefaultFontData))); CZipInputStream fontDataStream(rs_new CMemoryInStream(sDefaultFontData, sizeof(sDefaultFontData)));
@ -704,7 +532,7 @@ void CMain::EnsureWorldPakReady(CAssetId id) {
rstl::vector< rstl::pair< rstl::string, SObjectTag > > nameList = pakFile.NameList(); rstl::vector< rstl::pair< rstl::string, SObjectTag > > nameList = pakFile.NameList();
rstl::vector< rstl::pair< rstl::string, SObjectTag > >::iterator cur = nameList.begin(); rstl::vector< rstl::pair< rstl::string, SObjectTag > >::iterator cur = nameList.begin();
while (cur != nameList.end()) { while (cur != nameList.end()) {
if (cur->second.id == id) { if (cur->second.GetId() == id) {
notInNameList = false; notInNameList = false;
} }
++cur; ++cur;

1
tools/project.py
View File

@ -799,6 +799,7 @@ def generate_objdiff_config(config, build_config):
"*.cpp", "*.cpp",
"*.h", "*.h",
"*.hpp", "*.hpp",
"*.inc",
"*.py", "*.py",
"*.yml", "*.yml",
"*.txt", "*.txt",