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

merge namespace msg

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-22 07:24:46 +01:00
parent 8fe4065ee4
commit afb6fc101e
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
11 changed files with 302 additions and 308 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asm/src/Manager_80406344.s
View file

@ -1,4 +0,0 @@
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_\\Manager_cpp"

92
asm/src/Manager_8045d108.s
View file

@ -1,92 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49094"
"@49094":
.4byte 0x4368616C
.4byte 0x6C656E67
.4byte 0x65000000
.global "@49095"
"@49095":
.4byte 0x4368616C
.4byte 0x6C656E67
.4byte 0x65546974
.4byte 0x6C650000
.global "@49096_8045D124"
"@49096_8045D124":
.4byte 0x4368616C
.4byte 0x6C656E67
.4byte 0x6546696C
.4byte 0x6553656C
.4byte 0x65637400
.global "@49103"
"@49103":
.4byte 0x506C6179
.4byte 0x4D6F7669
.4byte 0x65000000
.global "@49104_8045D144"
"@49104_8045D144":
.4byte 0x52657369
.4byte 0x64656E74
.4byte 0
.global "@49105"
"@49105":
.4byte 0x4772616E
.4byte 0x644D656E
.4byte 0x75000000
.global "@49106"
"@49106":
.4byte 0x4772616E
.4byte 0x64546974
.4byte 0x6C650000
.global "@49107"
"@49107":
.4byte 0x53746166
.4byte 0x66437265
.4byte 0x64697400
.4byte 0
.global "t_fileNames__Q23msg21@unnamed@Manager_cpp@"
"t_fileNames__Q23msg21@unnamed@Manager_cpp@":
.4byte "@49090"
.4byte "@49091"
.4byte "@49092"
.4byte "@49093"
.4byte "@49094"
.4byte "@49095"
.4byte "@49096_8045D124"
.4byte "@49097_805575F0"
.4byte "@49098"
.4byte "@49099"
.4byte "@49100"
.4byte "@49101"
.4byte "@49102"
.4byte "@49103"
.4byte "@49104_8045D144"
.4byte "@49105"
.4byte "@49106"
.4byte "@49107"
.global "@49787"
"@49787":
.4byte 0x4D73674D
.4byte 0x616E6167
.4byte 0x65720000
.4byte 0

72
asm/src/Manager_805575d0.s
View file

@ -1,72 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49090"
"@49090":
.4byte 0x4E616D65
.4byte 0
.global "@49091"
"@49091":
.4byte 0x4C764D61
.4byte 0x70000000
.global "@49092"
"@49092":
.4byte 0x53686970
.4byte 0
.global "@49093"
"@49093":
.4byte 0x53746570
.4byte 0
.global "@49097_805575F0"
"@49097_805575F0":
.4byte 0x50617573
.4byte 0x65000000
.global "@49098"
"@49098":
.4byte 0x436F6D6D
.4byte 0x6F6E0000
.global "@49099"
"@49099":
.4byte 0x4F707469
.4byte 0x6F6E0000
.global "@49100"
"@49100":
.4byte 0x48697374
.4byte 0x6F727900
.global "@49101"
"@49101":
.4byte 0x50726F64
.4byte 0x75637400
.global "@49102"
"@49102":
.4byte 0x4E657773
.4byte 0
.global "@49848"
"@49848":
.4byte 0x49554B00
.global "@49870_80557624"
"@49870_80557624":
.4byte 0x003F0000

10
asm/src/Manager_8055d2d8.s
View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_manager__Q23msg21@unnamed@Manager_cpp@"
"t_manager__Q23msg21@unnamed@Manager_cpp@":
.skip 0x4
.global "isExist___Q33hel6common32PrivateSingleton<Q23msg7Manager>"
"isExist___Q33hel6common32PrivateSingleton<Q23msg7Manager>":
.skip 0x4

96
asm/src/Message_8045d1d0.s
View file

@ -1,96 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48890_8045D1D0"
"@48890_8045D1D0":
.4byte 0x55535F45
.4byte 0x6E676C69
.4byte 0x73680000
.global "@48891_8045D1DC"
"@48891_8045D1DC":
.4byte 0x55535F46
.4byte 0x72656E63
.4byte 0x68000000
.global "@48892_8045D1E8"
"@48892_8045D1E8":
.4byte 0x55535F53
.4byte 0x70616E69
.4byte 0x73680000
.4byte 0
.4byte "@48890_8045D1D0"
.4byte 0
.4byte "@48891_8045D1DC"
.4byte "@48892_8045D1E8"
.4byte 0
.4byte 0
.global "@48894_8045D210"
"@48894_8045D210":
.4byte 0x45555F45
.4byte 0x6E676C69
.4byte 0x73680000
.global "@48895_8045D21C"
"@48895_8045D21C":
.4byte 0x45555F47
.4byte 0x65726D61
.4byte 0x6E000000
.global "@48896_8045D228"
"@48896_8045D228":
.4byte 0x45555F46
.4byte 0x72656E63
.4byte 0x68000000
.global "@48897_8045D234"
"@48897_8045D234":
.4byte 0x45555F53
.4byte 0x70616E69
.4byte 0x73680000
.global "@48898_8045D240"
"@48898_8045D240":
.4byte 0x45555F49
.4byte 0x74616C69
.4byte 0x616E0000
.global "@48899_8045D24C"
"@48899_8045D24C":
.4byte 0x45555F44
.4byte 0x75746368
.4byte 0
.4byte 0
.4byte "@48894_8045D210"
.4byte "@48895_8045D21C"
.4byte "@48896_8045D228"
.4byte "@48897_8045D234"
.4byte "@48898_8045D240"
.4byte "@48899_8045D24C"
.global "@48901_8045D274"
"@48901_8045D274":
.4byte 0x4A505F4A
.4byte 0x6170616E
.4byte 0x65736500
.4byte "@48901_8045D274"
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0x6D73672F
.4byte 0x25732F25
.4byte 0x73000000

14
asm/src/Message_80557628.s
View file

@ -1,14 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49207_80557628"
"@49207_80557628":
.4byte 0x2E6D7362
.4byte 0x74000000
.global "@49208_80557630"
"@49208_80557630":
.4byte 0x25732573
.4byte 0

10
asm/src/Project_8045d2a8.s
View file

@ -1,10 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49096_8045D2A8"
"@49096_8045D2A8":
.4byte 0x6D73672F
.4byte 0x25732E6D
.4byte 0x73627000
.4byte 0

178
asm/src/Manager_801d0e54.s → asm/src/msg/Manager.s
View file

@ -433,3 +433,181 @@ MemFree__Q23msg7ManagerFPv:
"__sinit_\\Manager_cpp":
/* 801D13FC 001CD23C 38 6D EE B8 */ addi r3, r13, "t_manager__Q23msg21@unnamed@Manager_cpp@"@sda21
/* 801D1400 001CD240 4B F0 BF E0 */ b __ct__Q34nw4r3g3d8LightObjFv
.include "macros.inc"
.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0
.4byte "__sinit_\\Manager_cpp"
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49094"
"@49094":
.4byte 0x4368616C
.4byte 0x6C656E67
.4byte 0x65000000
.global "@49095"
"@49095":
.4byte 0x4368616C
.4byte 0x6C656E67
.4byte 0x65546974
.4byte 0x6C650000
.global "@49096_8045D124"
"@49096_8045D124":
.4byte 0x4368616C
.4byte 0x6C656E67
.4byte 0x6546696C
.4byte 0x6553656C
.4byte 0x65637400
.global "@49103"
"@49103":
.4byte 0x506C6179
.4byte 0x4D6F7669
.4byte 0x65000000
.global "@49104_8045D144"
"@49104_8045D144":
.4byte 0x52657369
.4byte 0x64656E74
.4byte 0
.global "@49105"
"@49105":
.4byte 0x4772616E
.4byte 0x644D656E
.4byte 0x75000000
.global "@49106"
"@49106":
.4byte 0x4772616E
.4byte 0x64546974
.4byte 0x6C650000
.global "@49107"
"@49107":
.4byte 0x53746166
.4byte 0x66437265
.4byte 0x64697400
.4byte 0
.global "t_fileNames__Q23msg21@unnamed@Manager_cpp@"
"t_fileNames__Q23msg21@unnamed@Manager_cpp@":
.4byte "@49090"
.4byte "@49091"
.4byte "@49092"
.4byte "@49093"
.4byte "@49094"
.4byte "@49095"
.4byte "@49096_8045D124"
.4byte "@49097_805575F0"
.4byte "@49098"
.4byte "@49099"
.4byte "@49100"
.4byte "@49101"
.4byte "@49102"
.4byte "@49103"
.4byte "@49104_8045D144"
.4byte "@49105"
.4byte "@49106"
.4byte "@49107"
.global "@49787"
"@49787":
.4byte 0x4D73674D
.4byte 0x616E6167
.4byte 0x65720000
.4byte 0
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49090"
"@49090":
.4byte 0x4E616D65
.4byte 0
.global "@49091"
"@49091":
.4byte 0x4C764D61
.4byte 0x70000000
.global "@49092"
"@49092":
.4byte 0x53686970
.4byte 0
.global "@49093"
"@49093":
.4byte 0x53746570
.4byte 0
.global "@49097_805575F0"
"@49097_805575F0":
.4byte 0x50617573
.4byte 0x65000000
.global "@49098"
"@49098":
.4byte 0x436F6D6D
.4byte 0x6F6E0000
.global "@49099"
"@49099":
.4byte 0x4F707469
.4byte 0x6F6E0000
.global "@49100"
"@49100":
.4byte 0x48697374
.4byte 0x6F727900
.global "@49101"
"@49101":
.4byte 0x50726F64
.4byte 0x75637400
.global "@49102"
"@49102":
.4byte 0x4E657773
.4byte 0
.global "@49848"
"@49848":
.4byte 0x49554B00
.global "@49870_80557624"
"@49870_80557624":
.4byte 0x003F0000
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "t_manager__Q23msg21@unnamed@Manager_cpp@"
"t_manager__Q23msg21@unnamed@Manager_cpp@":
.skip 0x4
.global "isExist___Q33hel6common32PrivateSingleton<Q23msg7Manager>"
"isExist___Q33hel6common32PrivateSingleton<Q23msg7Manager>":
.skip 0x4

110
asm/src/Message_801d1404.s → asm/src/msg/Message.s
View file

@ -193,3 +193,113 @@ lbl_801D1674:
/* 801D1680 001CD4C0 7C 08 03 A6 */ mtlr r0
/* 801D1684 001CD4C4 38 21 00 10 */ addi r1, r1, 0x10
/* 801D1688 001CD4C8 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48890_8045D1D0"
"@48890_8045D1D0":
.4byte 0x55535F45
.4byte 0x6E676C69
.4byte 0x73680000
.global "@48891_8045D1DC"
"@48891_8045D1DC":
.4byte 0x55535F46
.4byte 0x72656E63
.4byte 0x68000000
.global "@48892_8045D1E8"
"@48892_8045D1E8":
.4byte 0x55535F53
.4byte 0x70616E69
.4byte 0x73680000
.4byte 0
.4byte "@48890_8045D1D0"
.4byte 0
.4byte "@48891_8045D1DC"
.4byte "@48892_8045D1E8"
.4byte 0
.4byte 0
.global "@48894_8045D210"
"@48894_8045D210":
.4byte 0x45555F45
.4byte 0x6E676C69
.4byte 0x73680000
.global "@48895_8045D21C"
"@48895_8045D21C":
.4byte 0x45555F47
.4byte 0x65726D61
.4byte 0x6E000000
.global "@48896_8045D228"
"@48896_8045D228":
.4byte 0x45555F46
.4byte 0x72656E63
.4byte 0x68000000
.global "@48897_8045D234"
"@48897_8045D234":
.4byte 0x45555F53
.4byte 0x70616E69
.4byte 0x73680000
.global "@48898_8045D240"
"@48898_8045D240":
.4byte 0x45555F49
.4byte 0x74616C69
.4byte 0x616E0000
.global "@48899_8045D24C"
"@48899_8045D24C":
.4byte 0x45555F44
.4byte 0x75746368
.4byte 0
.4byte 0
.4byte "@48894_8045D210"
.4byte "@48895_8045D21C"
.4byte "@48896_8045D228"
.4byte "@48897_8045D234"
.4byte "@48898_8045D240"
.4byte "@48899_8045D24C"
.global "@48901_8045D274"
"@48901_8045D274":
.4byte 0x4A505F4A
.4byte 0x6170616E
.4byte 0x65736500
.4byte "@48901_8045D274"
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0
.4byte 0x6D73672F
.4byte 0x25732F25
.4byte 0x73000000
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49207_80557628"
"@49207_80557628":
.4byte 0x2E6D7362
.4byte 0x74000000
.global "@49208_80557630"
"@49208_80557630":
.4byte 0x25732573
.4byte 0

10
asm/src/Project_801d168c.s → asm/src/msg/Project.s
View file

@ -93,3 +93,13 @@ listItemName__Q23msg7ProjectCFUsUsUsUs:
/* 801D17C0 001CD600 54 C6 04 3E */ clrlwi r6, r6, 16
/* 801D17C4 001CD604 54 E7 04 3E */ clrlwi r7, r7, 16
/* 801D17C8 001CD608 4B FA 30 F8 */ b LMS_GetTagListItemName
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49096_8045D2A8"
"@49096_8045D2A8":
.4byte 0x6D73672F
.4byte 0x25732E6D
.4byte 0x73627000
.4byte 0

14
obj_files.mk
View file

@ -972,11 +972,12 @@ $(BUILD_DIR)/asm/src/mov/MoviePlayer.o \
$(BUILD_DIR)/asm/src/mov/MovieThread.o \
$(BUILD_DIR)/asm/src/mov/MovieYuv.o \
\
$(BUILD_DIR)/asm/src/msg/Manager.o \
$(BUILD_DIR)/asm/src/msg/Message.o \
$(BUILD_DIR)/asm/src/msg/Project.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/Manager_801d0e54.o \
$(BUILD_DIR)/asm/src/Message_801d1404.o \
$(BUILD_DIR)/asm/src/Project_801d168c.o \
$(BUILD_DIR)/asm/src/NandManager_801d17cc.o \
$(BUILD_DIR)/asm/src/NandThread_801d1950.o \
$(BUILD_DIR)/asm/src/Manager_801d3028.o \
@ -2960,7 +2961,6 @@ $(BUILD_DIR)/asm/src/Thread_80405f14.o \
$(BUILD_DIR)/asm/src/UIntAABBox_8040603c.o
# .ctors
O_FILES += \
$(BUILD_DIR)/asm/src/Manager_80406344.o \
$(BUILD_DIR)/asm/src/Trophy_80406348.o \
$(BUILD_DIR)/asm/src/Commander_8040634c.o \
$(BUILD_DIR)/asm/src/BG_80406354.o \
@ -3139,9 +3139,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/Manager_8045d108.o \
$(BUILD_DIR)/asm/src/Message_8045d1d0.o \
$(BUILD_DIR)/asm/src/Project_8045d2a8.o \
$(BUILD_DIR)/asm/src/NandThread_8045d2b8.o \
$(BUILD_DIR)/asm/src/Nururi_8045d3c8.o \
$(BUILD_DIR)/asm/src/Hit_8045d3d8.o \
@ -4660,8 +4657,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o
# .sdata
O_FILES += \
$(BUILD_DIR)/asm/src/Manager_805575d0.o \
$(BUILD_DIR)/asm/src/Message_80557628.o \
$(BUILD_DIR)/asm/src/NandThread_80557638.o \
$(BUILD_DIR)/asm/src/ParamAccessor_80557658.o \
$(BUILD_DIR)/asm/src/ButtonPanel_80557660.o \
@ -4966,7 +4961,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
# .sbss
O_FILES += \
$(BUILD_DIR)/asm/src/Manager_8055d2d8.o \
$(BUILD_DIR)/asm/src/SceneAnime_8055d2e0.o \
$(BUILD_DIR)/asm/src/SceneChallengeFileSelect_8055d2f0.o \
$(BUILD_DIR)/asm/src/Table_8055d300.o \