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

merge namespace file

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 18:55:13 +01:00
parent 4cc7df29de
commit 5d01ff1be6
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
17 changed files with 69 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
asm/src/FDGManager_80414518.s
View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@"
"T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@":
.4byte 0x3A455846
.4byte 0x6C61673A
.4byte 0
.4byte 0

10
asm/src/FDGManager_804537e0.s
View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49254_804537E0"
"@49254_804537E0":
.4byte 0x6664672F
.4byte 0x41726368
.4byte 0x6976652E
.4byte 0x64617400

8
asm/src/FDGManager_80556d10.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@"
"T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@":
.4byte "@49254_804537E0"
.4byte 0

8
asm/src/FDGManager_8055f650.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@"
"T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@":
.4byte 0x3A4D5347
.4byte 0x3A000000

8
asm/src/FileLoader_80556d18.s
View file

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

8
asm/src/Utility_80556d20.s
View file

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

6
asm/src/Utility_8055d180.s
View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@"
"t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@":
.skip 0x8

0
asm/src/FDGAccessor_801870ec.s → asm/src/fdg/FDGAccessor.s
View file

0
asm/src/DNOption_80187538.s → asm/src/file/DNOption.s
View file

36
asm/src/FDGManager_80187544.s → asm/src/file/FDGManager.s
View file

@ -374,3 +374,39 @@ reset__Q24file10FDGManagerFv:
/* 80187A44 00183884 7C 08 03 A6 */ mtlr r0
/* 80187A48 00183888 38 21 00 20 */ addi r1, r1, 0x20
/* 80187A4C 0018388C 4E 80 00 20 */ blr
.include "macros.inc"
.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0
.global "T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@"
"T_PREFIX_EXFLAG__Q24file24@unnamed@FDGManager_cpp@":
.4byte 0x3A455846
.4byte 0x6C61673A
.4byte 0
.4byte 0
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49254_804537E0"
"@49254_804537E0":
.4byte 0x6664672F
.4byte 0x41726368
.4byte 0x6976652E
.4byte 0x64617400
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@"
"T_FILE_PATH__Q24file24@unnamed@FDGManager_cpp@":
.4byte "@49254_804537E0"
.4byte 0
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@"
"T_PREFIX_MSG__Q24file24@unnamed@FDGManager_cpp@":
.4byte 0x3A4D5347
.4byte 0x3A000000

0
asm/src/FileAccessor_80187a50.s → asm/src/file/FileAccessor.s
View file

0
asm/src/FileClearDisableScope_80187b5c.s → asm/src/file/FileClearDisableScope.s
View file

8
asm/src/FileLoader_80187c00.s → asm/src/file/FileLoader.s
View file

@ -450,3 +450,11 @@ lbl_801881EC:
/* 801881F8 00184038 7C 08 03 A6 */ mtlr r0
/* 801881FC 0018403C 38 21 00 F0 */ addi r1, r1, 0xf0
/* 80188200 00184040 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49818_80556D18"
"@49818_80556D18":
.4byte 0x2E636D70
.4byte 0

0
asm/src/FileManager_80188204.s → asm/src/file/FileManager.s
View file

0
asm/src/FileTree_801882bc.s → asm/src/file/FileTree.s
View file

14
asm/src/Utility_80188bf4.s → asm/src/file/Utility.s
View file

@ -433,3 +433,17 @@ UncompressedFile__Q24file7UtilityFRCQ23mem8MemBlockRQ23mem10IAllocator:
/* 80189170 00184FB0 7C 08 03 A6 */ mtlr r0
/* 80189174 00184FB4 38 21 00 20 */ addi r1, r1, 0x20
/* 80189178 00184FB8 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49660"
"@49660":
.4byte 0x25732E25
.4byte 0x73257300
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@"
"t_isFileLoadWarningEnable__Q24file21@unnamed@Utility_cpp@":
.skip 0x8

27
obj_files.mk
View file

@ -687,17 +687,19 @@ $(BUILD_DIR)/asm/src/effect/detail/PtclEffectRes.o \
$(BUILD_DIR)/asm/src/effect/detail/RequestArg.o \
$(BUILD_DIR)/asm/src/effect/detail/RequestArgOption.o \
\
$(BUILD_DIR)/asm/src/fdg/FDGAccessor.o \
\
$(BUILD_DIR)/asm/src/file/DNOption.o \
$(BUILD_DIR)/asm/src/file/FDGManager.o \
$(BUILD_DIR)/asm/src/file/FileAccessor.o \
$(BUILD_DIR)/asm/src/file/FileClearDisableScope.o \
$(BUILD_DIR)/asm/src/file/FileLoader.o \
$(BUILD_DIR)/asm/src/file/FileManager.o \
$(BUILD_DIR)/asm/src/file/FileTree.o \
$(BUILD_DIR)/asm/src/file/Utility.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/FDGAccessor_801870ec.o \
$(BUILD_DIR)/asm/src/DNOption_80187538.o \
$(BUILD_DIR)/asm/src/FDGManager_80187544.o \
$(BUILD_DIR)/asm/src/FileAccessor_80187a50.o \
$(BUILD_DIR)/asm/src/FileClearDisableScope_80187b5c.o \
$(BUILD_DIR)/asm/src/FileLoader_80187c00.o \
$(BUILD_DIR)/asm/src/FileManager_80188204.o \
$(BUILD_DIR)/asm/src/FileTree_801882bc.o \
$(BUILD_DIR)/asm/src/Utility_80188bf4.o \
$(BUILD_DIR)/asm/src/Font_8018917c.o \
$(BUILD_DIR)/asm/src/FontKindUtil_8018933c.o \
$(BUILD_DIR)/asm/src/FontLoader_801893fc.o \
@ -3013,7 +3015,6 @@ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o
# .rodata
O_FILES += \
$(BUILD_DIR)/asm/src/FDGManager_80414518.o \
$(BUILD_DIR)/asm/src/FontKindUtil_80414528.o \
$(BUILD_DIR)/asm/src/FreezeThread_80414570.o \
$(BUILD_DIR)/asm/src/ColorAnimMaterialTarget_80414598.o \
@ -3146,7 +3147,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/FDGManager_804537e0.o \
$(BUILD_DIR)/asm/src/FontKindUtil_804537f0.o \
$(BUILD_DIR)/asm/src/Console_804538a0.o \
$(BUILD_DIR)/asm/src/Exception_80453990.o \
@ -4775,9 +4775,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o
# .sdata
O_FILES += \
$(BUILD_DIR)/asm/src/FDGManager_80556d10.o \
$(BUILD_DIR)/asm/src/FileLoader_80556d18.o \
$(BUILD_DIR)/asm/src/Utility_80556d20.o \
$(BUILD_DIR)/asm/src/FontKindUtil_80556d28.o \
$(BUILD_DIR)/asm/src/FontManager_80556d30.o \
$(BUILD_DIR)/asm/src/Exception_80556d38.o \
@ -5138,7 +5135,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
# .sbss
O_FILES += \
$(BUILD_DIR)/asm/src/Utility_8055d180.o \
$(BUILD_DIR)/asm/src/Exception_8055d188.o \
$(BUILD_DIR)/asm/src/FreezeManager_8055d190.o \
$(BUILD_DIR)/asm/src/MapFile_8055d1a0.o \
@ -5271,7 +5267,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o
# .sdata2
O_FILES += \
$(BUILD_DIR)/asm/src/FDGManager_8055f650.o \
$(BUILD_DIR)/asm/src/Exception_8055f658.o \
$(BUILD_DIR)/asm/src/AutoReqAnim_8055f660.o \
$(BUILD_DIR)/asm/src/CharaAnimBlender_8055f670.o \