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

merge namespace effect

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 16:58:03 +01:00
parent 793c8aee2a
commit c43d4d625b
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
8 changed files with 155 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
asm/src/Group_804531a0.s
View file

@ -1,82 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>@0"
"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>"
"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode@0"
"@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode"
"@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv@0"
"@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv"
"@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv@0"
"@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv@0":
.4byte 0x4E573452
.4byte 0x3A466169
.4byte 0x6C656420
.4byte 0x61737365
.4byte 0x7274696F
.4byte 0x6E202149
.4byte 0x73456D70
.4byte 0x74792829
.4byte 0
.global "@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv"
"@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000

6
asm/src/Manager_8055d160.s
View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "isExist___Q33hel6common35PrivateSingleton<Q26effect7Manager>"
"isExist___Q33hel6common35PrivateSingleton<Q26effect7Manager>":
.skip 0x8

62
asm/src/Requestor_80453260.s
View file

@ -1,62 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode@0"
"@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode"
"@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv@0"
"@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv"
"@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv@0"
"@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv@0":
.4byte 0x4E573452
.4byte 0x3A466169
.4byte 0x6C656420
.4byte 0x61737365
.4byte 0x7274696F
.4byte 0x6E202149
.4byte 0x73456D70
.4byte 0x74792829
.4byte 0
.global "@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv"
"@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000

82
asm/src/Group_8017de08.s → asm/src/effect/Group.s
View file

@ -560,3 +560,85 @@ lbl_8017E518:
/* 8017E530 0017A370 7C 08 03 A6 */ mtlr r0
/* 8017E534 0017A374 38 21 00 20 */ addi r1, r1, 0x20
/* 8017E538 0017A378 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>@0"
"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>"
"@STRING@GetNodeFromPointer__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode@0"
"@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode"
"@STRING@GetPointerFromNode__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>FPQ34nw4r2ut12LinkListNode":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv@0"
"@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv"
"@STRING@__ml__Q44nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>8IteratorCFv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv@0"
"@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv@0":
.4byte 0x4E573452
.4byte 0x3A466169
.4byte 0x6C656420
.4byte 0x61737365
.4byte 0x7274696F
.4byte 0x6E202149
.4byte 0x73456D70
.4byte 0x74792829
.4byte 0
.global "@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv"
"@STRING@GetBack__Q34nw4r2ut73LinkList<Q24util52ObjListNode<Q36effect6detail6Effect,Q26effect5Group>,0>Fv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000

6
asm/src/Manager_8017e53c.s → asm/src/effect/Manager.s
View file

@ -112,3 +112,9 @@ updatePolyMtxAll__Q26effect7ManagerFv:
.global updatePtclAll__Q26effect7ManagerFRCQ36effect6detail10CameraInfo
updatePtclAll__Q26effect7ManagerFRCQ36effect6detail10CameraInfo:
/* 8017E66C 0017A4AC 48 00 28 C4 */ b updatePtclAll__Q36effect6detail13EffectManagerFRCQ36effect6detail10CameraInfo
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "isExist___Q33hel6common35PrivateSingleton<Q26effect7Manager>"
"isExist___Q33hel6common35PrivateSingleton<Q26effect7Manager>":
.skip 0x8

62
asm/src/Requestor_8017e670.s → asm/src/effect/Requestor.s
View file

@ -627,3 +627,65 @@ lbl_8017EE98:
/* 8017EEA0 0017ACE0 7C 08 03 A6 */ mtlr r0
/* 8017EEA4 0017ACE4 38 21 00 10 */ addi r1, r1, 0x10
/* 8017EEA8 0017ACE8 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode@0"
"@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode"
"@STRING@GetPointerFromNode__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>FPQ34nw4r2ut12LinkListNode":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv@0"
"@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv@0":
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.global "@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv"
"@STRING@__ml__Q44nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>8IteratorCFv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.global "@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv@0"
"@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv@0":
.4byte 0x4E573452
.4byte 0x3A466169
.4byte 0x6C656420
.4byte 0x61737365
.4byte 0x7274696F
.4byte 0x6E202149
.4byte 0x73456D70
.4byte 0x74792829
.4byte 0
.global "@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv"
"@STRING@GetBack__Q34nw4r2ut77LinkList<Q24util56ObjListNode<Q36effect6detail6Effect,Q26effect9Requestor>,0>Fv":
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000

0
asm/src/StdRequestor_8017eeac.s → asm/src/effect/StdRequestor.s
View file

12
obj_files.mk
View file

@ -660,12 +660,13 @@ $(BUILD_DIR)/asm/src/dynamics/ModelNode.o \
$(BUILD_DIR)/asm/src/dynamics/ModelTree.o \
$(BUILD_DIR)/asm/src/dynamics/Util.o \
\
$(BUILD_DIR)/asm/src/effect/Group.o \
$(BUILD_DIR)/asm/src/effect/Manager.o \
$(BUILD_DIR)/asm/src/effect/Requestor.o \
$(BUILD_DIR)/asm/src/effect/StdRequestor.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/Group_8017de08.o \
$(BUILD_DIR)/asm/src/Manager_8017e53c.o \
$(BUILD_DIR)/asm/src/Requestor_8017e670.o \
$(BUILD_DIR)/asm/src/StdRequestor_8017eeac.o \
$(BUILD_DIR)/asm/src/CameraInfo_8017f338.o \
$(BUILD_DIR)/asm/src/DrawInfo_8017f38c.o \
$(BUILD_DIR)/asm/src/Effect_8017f550.o \
@ -3144,8 +3145,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/Group_804531a0.o \
$(BUILD_DIR)/asm/src/Requestor_80453260.o \
$(BUILD_DIR)/asm/src/Effect_804532f0.o \
$(BUILD_DIR)/asm/src/EffectManager_80453350.o \
$(BUILD_DIR)/asm/src/G3DAutoReqAnimCallback_804533e0.o \
@ -5148,7 +5147,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
# .sbss
O_FILES += \
$(BUILD_DIR)/asm/src/Manager_8055d160.o \
$(BUILD_DIR)/asm/src/EffectManager_8055d168.o \
$(BUILD_DIR)/asm/src/PtclEffectManager_8055d170.o \
$(BUILD_DIR)/asm/src/PtclEffectMemManager_8055d178.o \