diff options
-rw-r--r-- | arm9/asm/unk_02003B98.s | 100 | ||||
-rw-r--r-- | arm9/asm/unk_020040F4.s | 20 | ||||
-rw-r--r-- | arm9/asm/unk_020AF030.s | 4 | ||||
-rw-r--r-- | arm9/global.inc | 2 |
4 files changed, 95 insertions, 31 deletions
diff --git a/arm9/asm/unk_02003B98.s b/arm9/asm/unk_02003B98.s index 4085011c..83b1e1d3 100644 --- a/arm9/asm/unk_02003B98.s +++ b/arm9/asm/unk_02003B98.s @@ -12,8 +12,68 @@ UNK_02104780: ; 0x02104780 UNK_02107070: ; 0x02107070 .space 0x8 - .global UNK_02107078 -UNK_02107078: ; 0x02107078 + .global sSoundDataBuffer +sSoundDataBuffer: ; 0x02107078 + ; 00: SDATHeader + ; - 00: char magic[4] + ; - 04: u16 byte_order + ; - 06: u16 version + ; - 08: u32 filesize + ; - 0C: u16 header size + ; - 0E: u16 section count + ; - 10: u32 symb_offset + ; - 14: u32 symb_size + ; - 18: u32 info_offset + ; - 1C: u32 info_size + ; - 20: u32 fat_offset + ; - 24: u32 fat_size + ; - 28: u32 file_offset + ; - 2c: u32 file_size + ; 30: u32 + ; 34: FSFile + ; 7C: FSFileID + ; 84: u32 + ; 88: u32 + ; 8C: u32 + ; 90: u32 + ; 94: u8[0xBBB6C] + ; BBC00: u8[0x94] + ; BBC94: u8[0x24] + ; BBCB8: u32 + ; BBCBC: u32 + ; BBCC0: u8[0x20] + ; BBCE0: u8[0x1000] + ; BCCE0: u8[0x1C] + ; BCCFC: u16 + ; BCCFE: u16 + ; BCD00: u32 + ; BCD10: u8 + ; BCD11: u8 + ; BCD12: u16 + ; BCD14: u8 + ; BCD15: u8 + ; BCD16: u8 + ; BCD17: u8 + ; BCD18: u8 + ; BCD19: u8 + ; BCD1A: u8 + ; BCD1B: u8 + ; BCD1C: u32 + ; BCD20: u32 + ; BCD24: u32 + ; BCD28: u32 + ; BCD2C: u32 + ; BCD30: u32 + ; BCD34: u32 + ; BCD38: u32 + ; BCD3C: u32 + ; BCD40: u64 + ; BCD48: u32 + ; BCD4C: u32 + ; BCD50: u32 + ; BCD54: u32 + ; BCD58: u32 + ; BCD5C: u32 .space 0xbcd60 .text @@ -23,7 +83,7 @@ FUN_02003B98: ; 0x02003B98 push {r4-r6, lr} add r5, r0, #0x0 add r6, r1, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r4, r0, #0x0 bl FUN_020C01D0 bl FUN_020040C8 @@ -70,7 +130,7 @@ _02003C0C: .word 0x000BCD4C thumb_func_start FUN_02003C10 FUN_02003C10: ; 0x02003C10 push {r4, lr} - bl FUN_02003D30 + bl GetSoundDataPointer add r4, r0, #0x0 bl FUN_02003D04 cmp r0, #0x0 @@ -93,7 +153,7 @@ _02003C3C: .word 0x000BCD00 thumb_func_start FUN_02003C40 FUN_02003C40: ; 0x02003C40 push {r4, lr} - bl FUN_02003D30 + bl GetSoundDataPointer add r4, r0, #0x0 ldr r0, _02003CDC ; =UNK_02107070 ldr r0, [r0, #0x0] @@ -170,7 +230,7 @@ _02003CE4: .word 0x000BCD08 FUN_02003CE8: ; 0x02003CE8 push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer ldr r1, _02003CFC ; =0x000BCCFC mov r2, #0x0 strh r2, [r0, r1] @@ -184,7 +244,7 @@ _02003D00: .word UNK_02107070 thumb_func_start FUN_02003D04 FUN_02003D04: ; 0x02003D04 push {r4, lr} - bl FUN_02003D30 + bl GetSoundDataPointer add r4, r0, #0x0 mov r0, #0x2 bl FUN_020048BC @@ -205,18 +265,18 @@ _02003D26: nop _02003D2C: .word 0x000BCD12 - thumb_func_start FUN_02003D30 -FUN_02003D30: ; 0x02003D30 - ldr r0, _02003D34 ; =UNK_02107078 + thumb_func_start GetSoundDataPointer +GetSoundDataPointer: ; 0x02003D30 + ldr r0, _02003D34 ; =sSoundDataBuffer bx lr .balign 4 -_02003D34: .word UNK_02107078 +_02003D34: .word sSoundDataBuffer thumb_func_start FUN_02003D38 FUN_02003D38: ; 0x02003D38 push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer cmp r4, #0x27 bls _02003D46 b _02003E92 @@ -478,7 +538,7 @@ _02003F38: .word 0x000BCD5C FUN_02003F3C: ; 0x02003F3C push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r0, #0x90 ldr r0, [r0, #0x0] bl FUN_020C290C @@ -500,7 +560,7 @@ _02003F60: FUN_02003F64: ; 0x02003F64 push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r0, #0x90 ldr r0, [r0, #0x0] add r1, r4, #0x0 @@ -511,7 +571,7 @@ FUN_02003F64: ; 0x02003F64 FUN_02003F78: ; 0x02003F78 push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r1, r0, #0x0 add r1, #0x90 ldr r1, [r1, #0x0] @@ -524,7 +584,7 @@ FUN_02003F78: ; 0x02003F78 FUN_02003F90: ; 0x02003F90 push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r1, r0, #0x0 add r1, #0x90 ldr r1, [r1, #0x0] @@ -538,7 +598,7 @@ FUN_02003FA8: ; 0x02003FA8 push {r3-r5, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r2, r0, #0x0 add r2, #0x90 ldr r2, [r2, #0x0] @@ -552,7 +612,7 @@ FUN_02003FA8: ; 0x02003FA8 FUN_02003FC4: ; 0x02003FC4 push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r1, r0, #0x0 add r1, #0x90 ldr r1, [r1, #0x0] @@ -565,7 +625,7 @@ FUN_02003FC4: ; 0x02003FC4 FUN_02003FDC: ; 0x02003FDC push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r1, r0, #0x0 add r1, #0x90 ldr r1, [r1, #0x0] @@ -578,7 +638,7 @@ FUN_02003FDC: ; 0x02003FDC FUN_02003FF4: ; 0x02003FF4 push {r3-r5, lr} add r5, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer add r4, r0, #0x0 cmp r5, #0x9 blt _02004008 diff --git a/arm9/asm/unk_020040F4.s b/arm9/asm/unk_020040F4.s index 0f85144b..fdd87128 100644 --- a/arm9/asm/unk_020040F4.s +++ b/arm9/asm/unk_020040F4.s @@ -809,7 +809,7 @@ FUN_02004704: ; 0x02004704 FUN_02004724: ; 0x02004724 push {r4, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer bl FUN_020051AC add r0, r4, #0x0 bl FUN_0200521C @@ -828,7 +828,7 @@ FUN_02004738: ; 0x02004738 FUN_02004748: ; 0x02004748 push {r3-r5, lr} add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer cmp r4, #0x7 blt _02004762 bl ErrorHandling @@ -1089,7 +1089,7 @@ _02004918: .word MIC_StartAutoSampling thumb_func_start FUN_0200491C FUN_0200491C: ; 0x0200491C push {r3, lr} - bl FUN_02003D30 + bl GetSoundDataPointer bl MIC_StopAutoSampling pop {r3, pc} @@ -1103,7 +1103,7 @@ FUN_02004928: ; 0x02004928 FUN_02004930: ; 0x02004930 push {r4-r6, lr} add r5, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer mov r0, #0xf bl FUN_02003D38 add r6, r0, #0x0 @@ -1144,7 +1144,7 @@ _0200497C: FUN_02004984: ; 0x02004984 push {r4-r6, lr} add r5, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer mov r0, #0xf bl FUN_02003D38 add r6, r0, #0x0 @@ -1208,7 +1208,7 @@ _020049FE: FUN_02004A04: ; 0x02004A04 push {r4-r6, lr} add r5, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer mov r0, #0xf bl FUN_02003D38 add r6, r0, #0x0 @@ -1364,7 +1364,7 @@ FUN_02004B30: ; 0x02004B30 str r1, [sp, #0x0] str r2, [sp, #0x4] add r5, r3, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer mov r0, #0x21 bl FUN_02003D38 add r4, r0, #0x0 @@ -1491,7 +1491,7 @@ _02004C36: FUN_02004C3C: ; 0x02004C3C push {r4-r6, lr} add r5, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer mov r0, #0xe bl FUN_02003D38 add r4, r0, #0x0 @@ -1528,7 +1528,7 @@ FUN_02004C80: ; 0x02004C80 push {r3-r4, lr} sub sp, #0x4 add r4, r0, #0x0 - bl FUN_02003D30 + bl GetSoundDataPointer mov r0, #0x3 bl FUN_02003D38 mov r1, #0x1 @@ -1559,7 +1559,7 @@ _02004CB0: .word FUN_020C1FA4 FUN_02004CB4: ; 0x02004CB4 push {r3-r4, lr} sub sp, #0xc - bl FUN_02003D30 + bl GetSoundDataPointer mov r0, #0x4 bl FUN_02003D38 mov r1, #0x0 diff --git a/arm9/asm/unk_020AF030.s b/arm9/asm/unk_020AF030.s index 0c6087f2..ffbbdd7c 100644 --- a/arm9/asm/unk_020AF030.s +++ b/arm9/asm/unk_020AF030.s @@ -24510,6 +24510,10 @@ _020C26F4: .word FUN_020C209C arm_func_start FUN_020C26F8 FUN_020C26F8: ; 0x020C26F8 + ; r0: &sSoundDataBuffer + ; r1: char* filename + ; r2: (&sSoundDataBuffer)->unk_0090 + ; r3: 0 stmdb sp!, {r4-r6,lr} mov r6, r0 mov r12, #0x0 diff --git a/arm9/global.inc b/arm9/global.inc index 62c42c39..7882ccca 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -196,7 +196,7 @@ .extern FUN_02003B98
.extern FUN_02003C10
.extern FUN_02003CE8
-.extern FUN_02003D30
+.extern GetSoundDataPointer
.extern FUN_02003D38
.extern FUN_02003F3C
.extern FUN_02003F64
|