merge axfx

This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 09:19:03 +01:00
parent 7a13c73b51
commit b3635c4ccf
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
8 changed files with 200 additions and 203 deletions

View file

@ -30,3 +30,15 @@ AXFXGetHooks:
/* 80047084 00042EC4 00 00 00 00 */ .4byte 0x00000000 /* 80047084 00042EC4 00 00 00 00 */ .4byte 0x00000000
/* 80047088 00042EC8 00 00 00 00 */ .4byte 0x00000000 /* 80047088 00042EC8 00 00 00 00 */ .4byte 0x00000000
/* 8004708C 00042ECC 00 00 00 00 */ .4byte 0x00000000 /* 8004708C 00042ECC 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global __AXFXAlloc
__AXFXAlloc:
.4byte __AXFXAllocFunction
.global __AXFXFree
__AXFXFree:
.4byte __AXFXFreeFunction

View file

@ -1,12 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global __AXFXAlloc
__AXFXAlloc:
.4byte __AXFXAllocFunction
.global __AXFXFree
__AXFXFree:
.4byte __AXFXFreeFunction

View file

@ -51,3 +51,15 @@ AXFXReverbHiCallback:
/* 80046204 00042044 00 00 00 00 */ .4byte 0x00000000 /* 80046204 00042044 00 00 00 00 */ .4byte 0x00000000
/* 80046208 00042048 00 00 00 00 */ .4byte 0x00000000 /* 80046208 00042048 00 00 00 00 */ .4byte 0x00000000
/* 8004620C 0004204C 00 00 00 00 */ .4byte 0x00000000 /* 8004620C 0004204C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@2209"
"@2209":
.4byte 0
.global "@2210"
"@2210":
.4byte 0x3F800000

View file

@ -1069,3 +1069,175 @@ lbl_80047004:
/* 80047034 00042E74 00 00 00 00 */ .4byte 0x00000000 /* 80047034 00042E74 00 00 00 00 */ .4byte 0x00000000
/* 80047038 00042E78 00 00 00 00 */ .4byte 0x00000000 /* 80047038 00042E78 00 00 00 00 */ .4byte 0x00000000
/* 8004703C 00042E7C 00 00 00 00 */ .4byte 0x00000000 /* 8004703C 00042E7C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __EarlySizeTable
__EarlySizeTable:
.4byte 0x0000009D
.4byte 0x000001DF
.4byte 0x0000033D
.4byte 0x0000013D
.4byte 0x00000329
.4byte 0x0000045D
.4byte 0x000001DF
.4byte 0x000003AD
.4byte 0x000005CF
.4byte 0x00000281
.4byte 0x000004EB
.4byte 0x0000079D
.4byte 0x0000031D
.4byte 0x00000683
.4byte 0x00000A13
.4byte 0x000003C7
.4byte 0x0000076D
.4byte 0x00000B57
.4byte 0x00000463
.4byte 0x00000883
.4byte 0x00000D55
.4byte 0x000004FF
.4byte 0x000009AD
.4byte 0x00000F31
.4byte 0x3ECCCCCD
.4byte 0xBF800000
.4byte 0x3E99999A
.4byte 0x3F000000
.4byte 0xBF733333
.4byte 0x3E99999A
.4byte 0x3F19999A
.4byte 0xBF666666
.4byte 0x3E99999A
.4byte 0x3F400000
.4byte 0xBF59999A
.4byte 0x3E99999A
.4byte 0xBF666666
.4byte 0x3F4CCCCD
.4byte 0x3E99999A
.4byte 0xBF800000
.4byte 0x3F333333
.4byte 0x3E99999A
.4byte 0xBF800000
.4byte 0x3F333333
.4byte 0x3E99999A
.4byte 0xBF800000
.4byte 0x3F333333
.4byte 0x3E99999A
.global __FilterSizeTable
__FilterSizeTable:
.4byte 0x000006FD
.4byte 0x000007CF
.4byte 0x0000091D
.4byte 0x000001B1
.4byte 0x00000095
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x00000095
.4byte 0x00000125
.4byte 0x000001C1
.4byte 0x000000FB
.4byte 0x00000067
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x000003B3
.4byte 0x00000551
.4byte 0x000005FB
.4byte 0x000001B1
.4byte 0x00000089
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x000004FF
.4byte 0x000005FB
.4byte 0x000007B5
.4byte 0x000001FD
.4byte 0x00000095
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x000005FB
.4byte 0x00000737
.4byte 0x000008F9
.4byte 0x00000233
.4byte 0x000000B3
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x0000071F
.4byte 0x00000935
.4byte 0x00000A85
.4byte 0x0000023B
.4byte 0x00000089
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x0000071F
.4byte 0x00000935
.4byte 0x00000A85
.4byte 0x0000023B
.4byte 0x000000B3
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@3078"
"@3078":
.4byte 0x46FA0000
.global "@3123"
"@3123":
.4byte 0
.global "@3288"
"@3288":
.4byte 0x3F800000
.global "@3289"
"@3289":
.4byte 0x3F19999A
.global "@3290"
"@3290":
.4byte 0x3F000000
.4byte 0
.global "@3294"
"@3294":
.4byte 0x43300000
.4byte 0x80000000
.global "@3484"
"@3484":
.4byte 0xC0400000
.4byte 0
.global "@3485_8055E6F8"
"@3485_8055E6F8":
.4byte 0x40240000
.4byte 0
.global "@3486_8055E700"
"@3486_8055E700":
.4byte 0x3F733333
.4byte 0
.global "@3489_8055E708"
"@3489_8055E708":
.4byte 0x43300000
.4byte 0

View file

@ -1,114 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global __EarlySizeTable
__EarlySizeTable:
.4byte 0x0000009D
.4byte 0x000001DF
.4byte 0x0000033D
.4byte 0x0000013D
.4byte 0x00000329
.4byte 0x0000045D
.4byte 0x000001DF
.4byte 0x000003AD
.4byte 0x000005CF
.4byte 0x00000281
.4byte 0x000004EB
.4byte 0x0000079D
.4byte 0x0000031D
.4byte 0x00000683
.4byte 0x00000A13
.4byte 0x000003C7
.4byte 0x0000076D
.4byte 0x00000B57
.4byte 0x00000463
.4byte 0x00000883
.4byte 0x00000D55
.4byte 0x000004FF
.4byte 0x000009AD
.4byte 0x00000F31
.4byte 0x3ECCCCCD
.4byte 0xBF800000
.4byte 0x3E99999A
.4byte 0x3F000000
.4byte 0xBF733333
.4byte 0x3E99999A
.4byte 0x3F19999A
.4byte 0xBF666666
.4byte 0x3E99999A
.4byte 0x3F400000
.4byte 0xBF59999A
.4byte 0x3E99999A
.4byte 0xBF666666
.4byte 0x3F4CCCCD
.4byte 0x3E99999A
.4byte 0xBF800000
.4byte 0x3F333333
.4byte 0x3E99999A
.4byte 0xBF800000
.4byte 0x3F333333
.4byte 0x3E99999A
.4byte 0xBF800000
.4byte 0x3F333333
.4byte 0x3E99999A
.global __FilterSizeTable
__FilterSizeTable:
.4byte 0x000006FD
.4byte 0x000007CF
.4byte 0x0000091D
.4byte 0x000001B1
.4byte 0x00000095
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x00000095
.4byte 0x00000125
.4byte 0x000001C1
.4byte 0x000000FB
.4byte 0x00000067
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x000003B3
.4byte 0x00000551
.4byte 0x000005FB
.4byte 0x000001B1
.4byte 0x00000089
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x000004FF
.4byte 0x000005FB
.4byte 0x000007B5
.4byte 0x000001FD
.4byte 0x00000095
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x000005FB
.4byte 0x00000737
.4byte 0x000008F9
.4byte 0x00000233
.4byte 0x000000B3
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x0000071F
.4byte 0x00000935
.4byte 0x00000A85
.4byte 0x0000023B
.4byte 0x00000089
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043
.4byte 0x0000071F
.4byte 0x00000935
.4byte 0x00000A85
.4byte 0x0000023B
.4byte 0x000000B3
.4byte 0x0000002F
.4byte 0x00000049
.4byte 0x00000043

View file

@ -1,58 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@3078"
"@3078":
.4byte 0x46FA0000
.global "@3123"
"@3123":
.4byte 0
.global "@3288"
"@3288":
.4byte 0x3F800000
.global "@3289"
"@3289":
.4byte 0x3F19999A
.global "@3290"
"@3290":
.4byte 0x3F000000
.4byte 0
.global "@3294"
"@3294":
.4byte 0x43300000
.4byte 0x80000000
.global "@3484"
"@3484":
.4byte 0xC0400000
.4byte 0
.global "@3485_8055E6F8"
"@3485_8055E6F8":
.4byte 0x40240000
.4byte 0
.global "@3486_8055E700"
"@3486_8055E700":
.4byte 0x3F733333
.4byte 0
.global "@3489_8055E708"
"@3489_8055E708":
.4byte 0x43300000
.4byte 0

View file

@ -1,12 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@2209"
"@2209":
.4byte 0
.global "@2210"
"@2210":
.4byte 0x3F800000

View file

@ -202,11 +202,12 @@ $(BUILD_DIR)/asm/ax/AXProf.o \
$(BUILD_DIR)/asm/ax/AXComp.o \ $(BUILD_DIR)/asm/ax/AXComp.o \
$(BUILD_DIR)/asm/ax/DSPCode.o \ $(BUILD_DIR)/asm/ax/DSPCode.o \
\ \
$(BUILD_DIR)/asm/axfx/AXFXReverbHi.o \
$(BUILD_DIR)/asm/axfx/AXFXReverbHiExp.o \
$(BUILD_DIR)/asm/axfx/AXFXHooks.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/axfx/AXFXReverbHi_80046160.o \
$(BUILD_DIR)/asm/axfx/AXFXReverbHiExp_80046210.o \
$(BUILD_DIR)/asm/axfx/AXFXHooks_80047040.o \
$(BUILD_DIR)/asm/cx/CXUncompression_80047090.o \ $(BUILD_DIR)/asm/cx/CXUncompression_80047090.o \
$(BUILD_DIR)/asm/cx/CXSecureUncompression_800470d0.o \ $(BUILD_DIR)/asm/cx/CXSecureUncompression_800470d0.o \
$(BUILD_DIR)/asm/dsp/dsp_800472f0.o \ $(BUILD_DIR)/asm/dsp/dsp_800472f0.o \
@ -3226,7 +3227,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
$(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \ $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
$(BUILD_DIR)/asm/src/SoundManager_80420f28.o \ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \ $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
$(BUILD_DIR)/asm/axfx/AXFXReverbHiExp_80436020.o \
$(BUILD_DIR)/asm/dsp/dsp_804361c0.o \ $(BUILD_DIR)/asm/dsp/dsp_804361c0.o \
$(BUILD_DIR)/asm/dsp/dsp_task_80436240.o \ $(BUILD_DIR)/asm/dsp/dsp_task_80436240.o \
$(BUILD_DIR)/asm/nand/NANDCore_80436380.o \ $(BUILD_DIR)/asm/nand/NANDCore_80436380.o \
@ -5153,7 +5153,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
$(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \ $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
$(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o \ $(BUILD_DIR)/asm/src/Table_80556398.o \
$(BUILD_DIR)/asm/axfx/AXFXHooks_80556628.o \
$(BUILD_DIR)/asm/dsp/dsp_80556630.o \ $(BUILD_DIR)/asm/dsp/dsp_80556630.o \
$(BUILD_DIR)/asm/nand/nand_80556638.o \ $(BUILD_DIR)/asm/nand/nand_80556638.o \
$(BUILD_DIR)/asm/nand/NANDCore_80556640.o \ $(BUILD_DIR)/asm/nand/NANDCore_80556640.o \
@ -5801,8 +5800,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
$(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
$(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \
$(BUILD_DIR)/asm/axfx/AXFXReverbHi_8055e6c8.o \
$(BUILD_DIR)/asm/axfx/AXFXReverbHiExp_8055e6d0.o \
$(BUILD_DIR)/asm/nand/NANDErrorMessage_8055e710.o \ $(BUILD_DIR)/asm/nand/NANDErrorMessage_8055e710.o \
$(BUILD_DIR)/asm/wenc/wenc_8055e740.o \ $(BUILD_DIR)/asm/wenc/wenc_8055e740.o \
$(BUILD_DIR)/asm/wpad/WPAD_8055e748.o \ $(BUILD_DIR)/asm/wpad/WPAD_8055e748.o \