darkkirb/donut-decomp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge namespace font

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-18 19:38:49 +01:00
parent 5d01ff1be6
commit 396313127e
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
9 changed files with 131 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
asm/src/FontKindUtil_80414528.s
View file

@ -1,24 +0,0 @@
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "T_FONT_CONTEXT_TABLE__Q24font26@unnamed@FontKindUtil_cpp@"
"T_FONT_CONTEXT_TABLE__Q24font26@unnamed@FontKindUtil_cpp@":
.4byte "@48723_80556D28"
.4byte "@48724_804537F0"
.4byte "@48723_80556D28"
.4byte "@48725_80453800"
.4byte "@48723_80556D28"
.4byte "@48726_80453814"
.4byte "@48723_80556D28"
.4byte "@48727_80453828"
.4byte "@48723_80556D28"
.4byte "@48728_80453840"
.4byte "@48723_80556D28"
.4byte "@48729_8045384C"
.4byte "@48723_80556D28"
.4byte "@48730_80453860"
.4byte "@48723_80556D28"
.4byte "@48731_80453874"
.4byte "@48723_80556D28"
.4byte "@48732_80453888"

86
asm/src/FontKindUtil_804537f0.s
View file

@ -1,86 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48724_804537F0"
"@48724_804537F0":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48725_80453800"
"@48725_80453800":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x46697865
.4byte 0x642E6272
.4byte 0x666E7400
.global "@48726_80453814"
"@48726_80453814":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x4F4C2E62
.4byte 0x72666E74
.4byte 0
.global "@48727_80453828"
"@48727_80453828":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x4F4C4669
.4byte 0x7865642E
.4byte 0x6272666E
.4byte 0x74000000
.global "@48728_80453840"
"@48728_80453840":
.4byte 0x536B6970
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48729_8045384C"
"@48729_8045384C":
.4byte 0x536B6970
.4byte 0x4F75746C
.4byte 0x696E652E
.4byte 0x6272666E
.4byte 0x74000000
.global "@48730_80453860"
"@48730_80453860":
.4byte 0x45787465
.4byte 0x726E616C
.4byte 0x43686172
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48731_80453874"
"@48731_80453874":
.4byte 0x53746166
.4byte 0x66437265
.4byte 0x64697473
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48732_80453888"
"@48732_80453888":
.4byte 0x41726172
.4byte 0x652E6272
.4byte 0x666E7400
.global "@48861_80453894"
"@48861_80453894":
.4byte 0x666F6E74
.4byte 0x2F257325
.4byte 0x73000000

8
asm/src/FontKindUtil_80556d28.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@48723_80556D28"
"@48723_80556D28":
.4byte 0x6A702F00
.4byte 0

8
asm/src/FontManager_80556d30.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49284_80556D30"
"@49284_80556D30":
.4byte 0x466F6E74
.4byte 0

0
asm/src/Font_8018917c.s → asm/src/font/Font.s
View file

118
asm/src/FontKindUtil_8018933c.s → asm/src/font/FontKindUtil.s
View file

@ -57,3 +57,121 @@ Name__Q24font12FontKindUtilFQ24font8FontKind:
/* 801893F0 00185230 7C 08 03 A6 */ mtlr r0
/* 801893F4 00185234 38 21 00 10 */ addi r1, r1, 0x10
/* 801893F8 00185238 4E 80 00 20 */ blr
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "T_FONT_CONTEXT_TABLE__Q24font26@unnamed@FontKindUtil_cpp@"
"T_FONT_CONTEXT_TABLE__Q24font26@unnamed@FontKindUtil_cpp@":
.4byte "@48723_80556D28"
.4byte "@48724_804537F0"
.4byte "@48723_80556D28"
.4byte "@48725_80453800"
.4byte "@48723_80556D28"
.4byte "@48726_80453814"
.4byte "@48723_80556D28"
.4byte "@48727_80453828"
.4byte "@48723_80556D28"
.4byte "@48728_80453840"
.4byte "@48723_80556D28"
.4byte "@48729_8045384C"
.4byte "@48723_80556D28"
.4byte "@48730_80453860"
.4byte "@48723_80556D28"
.4byte "@48731_80453874"
.4byte "@48723_80556D28"
.4byte "@48732_80453888"
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48724_804537F0"
"@48724_804537F0":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48725_80453800"
"@48725_80453800":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x46697865
.4byte 0x642E6272
.4byte 0x666E7400
.global "@48726_80453814"
"@48726_80453814":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x4F4C2E62
.4byte 0x72666E74
.4byte 0
.global "@48727_80453828"
"@48727_80453828":
.4byte 0x436F6D6D
.4byte 0x6F6E4542
.4byte 0x4F4C4669
.4byte 0x7865642E
.4byte 0x6272666E
.4byte 0x74000000
.global "@48728_80453840"
"@48728_80453840":
.4byte 0x536B6970
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48729_8045384C"
"@48729_8045384C":
.4byte 0x536B6970
.4byte 0x4F75746C
.4byte 0x696E652E
.4byte 0x6272666E
.4byte 0x74000000
.global "@48730_80453860"
"@48730_80453860":
.4byte 0x45787465
.4byte 0x726E616C
.4byte 0x43686172
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48731_80453874"
"@48731_80453874":
.4byte 0x53746166
.4byte 0x66437265
.4byte 0x64697473
.4byte 0x2E627266
.4byte 0x6E740000
.global "@48732_80453888"
"@48732_80453888":
.4byte 0x41726172
.4byte 0x652E6272
.4byte 0x666E7400
.global "@48861_80453894"
"@48861_80453894":
.4byte 0x666F6E74
.4byte 0x2F257325
.4byte 0x73000000
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@48723_80556D28"
"@48723_80556D28":
.4byte 0x6A702F00
.4byte 0

0
asm/src/FontLoader_801893fc.s → asm/src/font/FontLoader.s
View file

8
asm/src/FontManager_801894a8.s → asm/src/font/FontManager.s
View file

@ -123,3 +123,11 @@ isSetupFinished__Q24font11FontManagerCFv:
font__Q24font11FontManagerFQ24font8FontKind:
/* 80189640 00185480 38 63 00 60 */ addi r3, r3, 0x60
/* 80189644 00185484 4B FF FF 9C */ b "__vc__Q23mem39ExplicitAutoDeleteArray<Q24font4Font,9>FUl"
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49284_80556D30"
"@49284_80556D30":
.4byte 0x466F6E74
.4byte 0

13
obj_files.mk
View file

@ -698,12 +698,13 @@ $(BUILD_DIR)/asm/src/file/FileManager.o \
$(BUILD_DIR)/asm/src/file/FileTree.o \
$(BUILD_DIR)/asm/src/file/Utility.o \
\
$(BUILD_DIR)/asm/src/font/Font.o \
$(BUILD_DIR)/asm/src/font/FontKindUtil.o \
$(BUILD_DIR)/asm/src/font/FontLoader.o \
$(BUILD_DIR)/asm/src/font/FontManager.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/Font_8018917c.o \
$(BUILD_DIR)/asm/src/FontKindUtil_8018933c.o \
$(BUILD_DIR)/asm/src/FontLoader_801893fc.o \
$(BUILD_DIR)/asm/src/FontManager_801894a8.o \
$(BUILD_DIR)/asm/src/Console_80189648.o \
$(BUILD_DIR)/asm/src/Exception_801899d0.o \
$(BUILD_DIR)/asm/src/FreezeHandler_8018a2d0.o \
@ -3015,7 +3016,6 @@ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o
# .rodata
O_FILES += \
$(BUILD_DIR)/asm/src/FontKindUtil_80414528.o \
$(BUILD_DIR)/asm/src/FreezeThread_80414570.o \
$(BUILD_DIR)/asm/src/ColorAnimMaterialTarget_80414598.o \
$(BUILD_DIR)/asm/src/VISetting_804145b8.o \
@ -3147,7 +3147,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/FontKindUtil_804537f0.o \
$(BUILD_DIR)/asm/src/Console_804538a0.o \
$(BUILD_DIR)/asm/src/Exception_80453990.o \
$(BUILD_DIR)/asm/src/FreezeHandler_80453eb8.o \
@ -4775,8 +4774,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o
# .sdata
O_FILES += \
$(BUILD_DIR)/asm/src/FontKindUtil_80556d28.o \
$(BUILD_DIR)/asm/src/FontManager_80556d30.o \
$(BUILD_DIR)/asm/src/Exception_80556d38.o \
$(BUILD_DIR)/asm/src/FreezeManager_80556d68.o \
$(BUILD_DIR)/asm/src/FreezeThread_80556d70.o \