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

merge dsp

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 09:21:05 +01:00
parent 4c874f273d
commit 249e454b1f
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
9 changed files with 168 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
asm/dsp/dsp_800472f0.s → asm/dsp/dsp.s
View file

@ -181,3 +181,55 @@ lbl_80047534:
/* 80047544 00043384 38 21 00 10 */ addi r1, r1, 0x10
/* 80047548 00043388 4E 80 00 20 */ blr
/* 8004754C 0004338C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@1_804361C0"
"@1_804361C0":
.4byte 0x3C3C2052
.4byte 0x564C5F53
.4byte 0x444B202D
.4byte 0x20445350
.4byte 0x20097265
.4byte 0x6C656173
.4byte 0x65206275
.4byte 0x696C643A
.4byte 0x20417567
.4byte 0x20323320
.4byte 0x32303130
.4byte 0x2031373A
.4byte 0x33303A30
.4byte 0x33202830
.4byte 0x78343330
.4byte 0x325F3134
.4byte 0x3529203E
.4byte 0x3E000000
.4byte 0x44535049
.4byte 0x6E697428
.4byte 0x293A2042
.4byte 0x75696C64
.4byte 0x20446174
.4byte 0x653A2025
.4byte 0x73202573
.4byte 0x0A000000
.4byte 0x41756720
.4byte 0x32332032
.4byte 0x30313000
.4byte 0x31373A33
.4byte 0x303A3033
.4byte 0
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global __DSPVersion
__DSPVersion:
.4byte "@1_804361C0"
.4byte 0
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global __DSP_init_flag
__DSP_init_flag:
.skip 0x8

38
asm/dsp/dsp_804361c0.s
View file

@ -1,38 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@1_804361C0"
"@1_804361C0":
.4byte 0x3C3C2052
.4byte 0x564C5F53
.4byte 0x444B202D
.4byte 0x20445350
.4byte 0x20097265
.4byte 0x6C656173
.4byte 0x65206275
.4byte 0x696C643A
.4byte 0x20417567
.4byte 0x20323320
.4byte 0x32303130
.4byte 0x2031373A
.4byte 0x33303A30
.4byte 0x33202830
.4byte 0x78343330
.4byte 0x325F3134
.4byte 0x3529203E
.4byte 0x3E000000
.4byte 0x44535049
.4byte 0x6E697428
.4byte 0x293A2042
.4byte 0x75696C64
.4byte 0x20446174
.4byte 0x653A2025
.4byte 0x73202573
.4byte 0x0A000000
.4byte 0x41756720
.4byte 0x32332032
.4byte 0x30313000
.4byte 0x31373A33
.4byte 0x303A3033
.4byte 0

8
asm/dsp/dsp_80556630.s
View file

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

6
asm/dsp/dsp_8055ccc0.s
View file

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

0
asm/dsp/dsp_debug_80047550.s → asm/dsp/dsp_debug.s
View file

112
asm/dsp/dsp_task_800475a0.s → asm/dsp/dsp_task.s
View file

@ -701,3 +701,115 @@ lbl_80047E18:
/* 80047E34 00043C74 4E 80 00 20 */ blr
/* 80047E38 00043C78 00 00 00 00 */ .4byte 0x00000000
/* 80047E3C 00043C7C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@2654"
"@2654":
.4byte 0x44535020
.4byte 0x69732062
.4byte 0x6F6F7469
.4byte 0x6E672074
.4byte 0x61736B3A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20495241
.4byte 0x4D204D4D
.4byte 0x454D2041
.4byte 0x4444523A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20495241
.4byte 0x4D204453
.4byte 0x50204144
.4byte 0x4452203A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20495241
.4byte 0x4D204C45
.4byte 0x4E475448
.4byte 0x2020203A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20445241
.4byte 0x4D204D4D
.4byte 0x454D2041
.4byte 0x4444523A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20537461
.4byte 0x72742056
.4byte 0x6563746F
.4byte 0x7220203A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F6164
.4byte 0x645F7461
.4byte 0x736B2829
.4byte 0x203A2041
.4byte 0x64646564
.4byte 0x20746173
.4byte 0x6B202020
.4byte 0x203A2030
.4byte 0x78253038
.4byte 0x580A0000
.4byte 0
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global __DSP_rude_task_pending
__DSP_rude_task_pending:
.skip 0x4
.global __DSP_rude_task
__DSP_rude_task:
.skip 0x4
.global __DSP_tmp_task
__DSP_tmp_task:
.skip 0x4
.global __DSP_last_task
__DSP_last_task:
.skip 0x4
.global __DSP_first_task
__DSP_first_task:
.skip 0x4
.global __DSP_curr_task
__DSP_curr_task:
.skip 0x4

86
asm/dsp/dsp_task_80436240.s
View file

@ -1,86 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@2654"
"@2654":
.4byte 0x44535020
.4byte 0x69732062
.4byte 0x6F6F7469
.4byte 0x6E672074
.4byte 0x61736B3A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20495241
.4byte 0x4D204D4D
.4byte 0x454D2041
.4byte 0x4444523A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20495241
.4byte 0x4D204453
.4byte 0x50204144
.4byte 0x4452203A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20495241
.4byte 0x4D204C45
.4byte 0x4E475448
.4byte 0x2020203A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20445241
.4byte 0x4D204D4D
.4byte 0x454D2041
.4byte 0x4444523A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F626F
.4byte 0x6F745F74
.4byte 0x61736B28
.4byte 0x2920203A
.4byte 0x20537461
.4byte 0x72742056
.4byte 0x6563746F
.4byte 0x7220203A
.4byte 0x20307825
.4byte 0x3038580A
.4byte 0
.4byte 0x5F5F4453
.4byte 0x505F6164
.4byte 0x645F7461
.4byte 0x736B2829
.4byte 0x203A2041
.4byte 0x64646564
.4byte 0x20746173
.4byte 0x6B202020
.4byte 0x203A2030
.4byte 0x78253038
.4byte 0x580A0000
.4byte 0

26
asm/dsp/dsp_task_8055ccc8.s
View file

@ -1,26 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global __DSP_rude_task_pending
__DSP_rude_task_pending:
.skip 0x4
.global __DSP_rude_task
__DSP_rude_task:
.skip 0x4
.global __DSP_tmp_task
__DSP_tmp_task:
.skip 0x4
.global __DSP_last_task
__DSP_last_task:
.skip 0x4
.global __DSP_first_task
__DSP_first_task:
.skip 0x4
.global __DSP_curr_task
__DSP_curr_task:
.skip 0x4

12
obj_files.mk
View file

@ -209,11 +209,12 @@ $(BUILD_DIR)/asm/axfx/AXFXHooks.o \
$(BUILD_DIR)/asm/cx/CXUncompression.o \
$(BUILD_DIR)/asm/cx/CXSecureUncompression.o \
\
$(BUILD_DIR)/asm/dsp/dsp.o \
$(BUILD_DIR)/asm/dsp/dsp_debug.o \
$(BUILD_DIR)/asm/dsp/dsp_task.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/dsp/dsp_800472f0.o \
$(BUILD_DIR)/asm/dsp/dsp_debug_80047550.o \
$(BUILD_DIR)/asm/dsp/dsp_task_800475a0.o \
$(BUILD_DIR)/asm/nand/nand_80047e40.o \
$(BUILD_DIR)/asm/nand/NANDOpenClose_800492a0.o \
$(BUILD_DIR)/asm/nand/NANDCore_800497b0.o \
@ -3228,8 +3229,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
$(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
$(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
$(BUILD_DIR)/asm/dsp/dsp_804361c0.o \
$(BUILD_DIR)/asm/dsp/dsp_task_80436240.o \
$(BUILD_DIR)/asm/nand/NANDCore_80436380.o \
$(BUILD_DIR)/asm/nand/NANDCheck_804364d0.o \
$(BUILD_DIR)/asm/nand/NANDLogging_80436580.o \
@ -5154,7 +5153,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
$(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
$(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o \
$(BUILD_DIR)/asm/dsp/dsp_80556630.o \
$(BUILD_DIR)/asm/nand/nand_80556638.o \
$(BUILD_DIR)/asm/nand/NANDCore_80556640.o \
$(BUILD_DIR)/asm/nand/NANDCheck_80556660.o \
@ -5591,8 +5589,6 @@ $(BUILD_DIR)/asm/src/StepMain_8055c688.o \
$(BUILD_DIR)/asm/src/CinemaScopeModel_8055c6a0.o \
$(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o \
$(BUILD_DIR)/asm/dsp/dsp_8055ccc0.o \
$(BUILD_DIR)/asm/dsp/dsp_task_8055ccc8.o \
$(BUILD_DIR)/asm/nand/NANDCore_8055cce0.o \
$(BUILD_DIR)/asm/nand/NANDLogging_8055cce8.o \
$(BUILD_DIR)/asm/nand/NANDErrorMessage_8055ccf0.o \