mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-05-31 01:16:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

port m4a

Browse Source
This commit is contained in:
Henny022p
2021-03-17 21:02:42 +01:00
parent c319dc53d3
commit 9aa9a44e52
14 changed files with 2327 additions and 3058 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1
View File
@@ -84,6 +84,7 @@ endif
#$(C_BUILDDIR)/need_interworking_file_name.o: CFLAGS += -mthumb-interwork
$(C_BUILDDIR)/arm_proxy.o: CFLAGS += -mthumb-interwork
$(C_BUILDDIR)/gba/m4a.o: CFLAGS += -mthumb-interwork
$(C_BUILDDIR)/eeprom.o: CFLAGS = -O1 -mthumb-interwork -Wimplicit -Wparentheses -Werror -Wno-multichar
C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c)
asm/code_080A3480.s
+4 -4
View File
@@ -138,8 +138,8 @@ _080A355E:
ldrsh r0, [r0, r1]
muls r0, r5, r0
lsrs r5, r0, #8
ldr r2, _080A3594 @ =gUnk_08A11C3C
ldr r1, _080A3598 @ =gUnk_08A11DBC
ldr r2, _080A3594 @ =gMPlayTable
ldr r1, _080A3598 @ =gSongTable
lsls r0, r3, #3
adds r0, r0, r1
ldrh r1, [r0, #4]
@@ -159,8 +159,8 @@ _080A358C:
pop {r4, r5, pc}
.align 2, 0
_080A3590: .4byte gUnk_02021EE0
_080A3594: .4byte gUnk_08A11C3C
_080A3598: .4byte gUnk_08A11DBC
_080A3594: .4byte gMPlayTable
_080A3598: .4byte gSongTable
_080A359C: .4byte 0x0000FFFF
thumb_func_start sub_080A35A0
asm/m4a.s
-3027
View File
File diff suppressed because it is too large Load Diff
asm/non_matching/m4a/CgbModVol.inc
+64
View File
@@ -0,0 +1,64 @@
.syntax unified
.text
push {r4, lr}
adds r2, r0, #0
ldrb r0, [r2, #2]
ldrb r1, [r2, #3]
lsls r3, r0, #0x18
lsrs r4, r3, #0x18
lsls r0, r1, #0x18
lsrs r1, r0, #0x18
cmp r4, r1
blo _080B0B0C
lsrs r0, r3, #0x19
cmp r0, r1
blo _080B0B18
movs r0, #0xf
strb r0, [r2, #0x1b]
b _080B0B26
_080B0B0C:
lsrs r0, r0, #0x19
cmp r0, r4
blo _080B0B18
movs r0, #0xf0
strb r0, [r2, #0x1b]
b _080B0B26
_080B0B18:
movs r0, #0xff
strb r0, [r2, #0x1b]
ldrb r0, [r2, #2]
ldrb r1, [r2, #3]
adds r0, r0, r1
lsrs r0, r0, #4
b _080B0B36
_080B0B26:
ldrb r0, [r2, #2]
ldrb r1, [r2, #3]
adds r0, r0, r1
lsrs r0, r0, #4
strb r0, [r2, #0xa]
cmp r0, #0xf
bls _080B0B38
movs r0, #0xf
_080B0B36:
strb r0, [r2, #0xa]
_080B0B38:
ldrb r1, [r2, #0xa]
ldrb r0, [r2, #6]
muls r0, r1, r0
adds r0, #0xf
asrs r0, r0, #4
strb r0, [r2, #0x19]
ldrb r1, [r2, #0x1b]
ldrb r0, [r2, #0x1c]
ands r0, r1
strb r0, [r2, #0x1b]
pop {r4}
pop {r0}
bx r0
.align 2, 0
.syntax divided
asm/non_matching/m4a/CgbSound.inc
+616
View File
@@ -0,0 +1,616 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
mov r7, sl
mov r6, sb
mov r5, r8
push {r5, r6, r7}
sub sp, #0x24
ldr r0, _080B0B74 @ =0x03007FF0
ldr r0, [r0]
str r0, [sp, #8]
ldrb r0, [r0, #0xa]
cmp r0, #0
beq _080B0B78
subs r0, #1
ldr r1, [sp, #8]
strb r0, [r1, #0xa]
b _080B0B7E
.align 2, 0
_080B0B74: .4byte 0x03007FF0
_080B0B78:
movs r0, #0xe
ldr r3, [sp, #8]
strb r0, [r3, #0xa]
_080B0B7E:
movs r6, #1
ldr r0, [sp, #8]
ldr r4, [r0, #0x1c]
mov r1, sp
str r1, [sp, #0x1c]
_080B0B88:
ldrb r1, [r4]
movs r0, #0xc7
ands r0, r1
adds r3, r6, #1
mov sl, r3
movs r1, #0x40
adds r1, r1, r4
mov sb, r1
cmp r0, #0
bne _080B0B9E
b _080B0FBA
_080B0B9E:
cmp r6, #2
beq _080B0BD4
cmp r6, #2
bgt _080B0BAC
cmp r6, #1
beq _080B0BB2
b _080B0C1C
_080B0BAC:
cmp r6, #3
beq _080B0BF8
b _080B0C1C
_080B0BB2:
ldr r3, _080B0BC8 @ =0x04000060
str r3, [sp, #0xc]
adds r3, #2
ldr r0, _080B0BCC @ =0x04000063
str r0, [sp, #0x10]
ldr r1, _080B0BD0 @ =0x04000064
str r1, [sp, #0x14]
adds r0, #2
str r0, [sp, #0x18]
movs r0, #0
b _080B0C30
.align 2, 0
_080B0BC8: .4byte 0x04000060
_080B0BCC: .4byte 0x04000063
_080B0BD0: .4byte 0x04000064
_080B0BD4:
ldr r3, _080B0BEC @ =0x04000061
str r3, [sp, #0xc]
adds r3, #7
ldr r0, _080B0BF0 @ =0x04000069
str r0, [sp, #0x10]
ldr r1, _080B0BF4 @ =0x0400006C
str r1, [sp, #0x14]
adds r0, #4
str r0, [sp, #0x18]
movs r0, #1
b _080B0C30
.align 2, 0
_080B0BEC: .4byte 0x04000061
_080B0BF0: .4byte 0x04000069
_080B0BF4: .4byte 0x0400006C
_080B0BF8:
ldr r3, _080B0C10 @ =0x04000070
str r3, [sp, #0xc]
adds r3, #2
ldr r0, _080B0C14 @ =0x04000073
str r0, [sp, #0x10]
ldr r1, _080B0C18 @ =0x04000074
str r1, [sp, #0x14]
adds r0, #2
str r0, [sp, #0x18]
movs r0, #2
b _080B0C30
.align 2, 0
_080B0C10: .4byte 0x04000070
_080B0C14: .4byte 0x04000073
_080B0C18: .4byte 0x04000074
_080B0C1C:
ldr r3, _080B0C84 @ =0x04000071
str r3, [sp, #0xc]
adds r3, #7
ldr r0, _080B0C88 @ =0x04000079
str r0, [sp, #0x10]
ldr r1, _080B0C8C @ =0x0400007C
str r1, [sp, #0x14]
adds r0, #4
str r0, [sp, #0x18]
movs r0, #3
_080B0C30:
ldr r1, [sp, #0x1c]
strb r0, [r1]
ldr r0, [sp, #8]
ldrb r0, [r0, #0xa]
str r0, [sp, #4]
ldr r1, [sp, #0x10]
ldrb r0, [r1]
mov r8, r0
ldrb r2, [r4]
movs r0, #0x80
ands r0, r2
cmp r0, #0
beq _080B0D2A
movs r7, #0x40
adds r0, r7, #0
ands r0, r2
lsls r0, r0, #0x18
lsrs r5, r0, #0x18
adds r0, r6, #1
mov sl, r0
movs r1, #0x40
adds r1, r1, r4
mov sb, r1
cmp r5, #0
beq _080B0C64
b _080B0D60
_080B0C64:
movs r0, #3
strb r0, [r4]
strb r0, [r4, #0x1d]
adds r0, r4, #0
str r3, [sp, #0x20]
bl CgbModVol
ldr r3, [sp, #0x20]
cmp r6, #2
beq _080B0C9C
cmp r6, #2
bgt _080B0C90
cmp r6, #1
beq _080B0C96
b _080B0CF0
.align 2, 0
_080B0C84: .4byte 0x04000071
_080B0C88: .4byte 0x04000079
_080B0C8C: .4byte 0x0400007C
_080B0C90:
cmp r6, #3
beq _080B0CA8
b _080B0CF0
_080B0C96:
ldrb r0, [r4, #0x1f]
ldr r1, [sp, #0xc]
strb r0, [r1]
_080B0C9C:
ldr r0, [r4, #0x24]
lsls r0, r0, #6
ldrb r1, [r4, #0x1e]
adds r0, r0, r1
strb r0, [r3]
b _080B0CFC
_080B0CA8:
ldr r1, [r4, #0x24]
ldr r0, [r4, #0x28]
cmp r1, r0
beq _080B0CD0
ldr r0, [sp, #0xc]
strb r7, [r0]
ldr r1, _080B0CE4 @ =0x04000090
ldr r2, [r4, #0x24]
ldr r0, [r2]
str r0, [r1]
adds r1, #4
ldr r0, [r2, #4]
str r0, [r1]
adds r1, #4
ldr r0, [r2, #8]
str r0, [r1]
adds r1, #4
ldr r0, [r2, #0xc]
str r0, [r1]
str r2, [r4, #0x28]
_080B0CD0:
ldr r1, [sp, #0xc]
strb r5, [r1]
ldrb r0, [r4, #0x1e]
strb r0, [r3]
ldrb r0, [r4, #0x1e]
cmp r0, #0
beq _080B0CE8
movs r0, #0xc0
b _080B0D0A
.align 2, 0
_080B0CE4: .4byte 0x04000090
_080B0CE8:
movs r3, #0x80
rsbs r3, r3, #0
strb r3, [r4, #0x1a]
b _080B0D0C
_080B0CF0:
ldrb r0, [r4, #0x1e]
strb r0, [r3]
ldr r0, [r4, #0x24]
lsls r0, r0, #3
ldr r1, [sp, #0x14]
strb r0, [r1]
_080B0CFC:
ldrb r0, [r4, #4]
adds r0, #8
mov r8, r0
ldrb r0, [r4, #0x1e]
cmp r0, #0
beq _080B0D0A
movs r0, #0x40
_080B0D0A:
strb r0, [r4, #0x1a]
_080B0D0C:
ldrb r1, [r4, #4]
movs r2, #0
strb r1, [r4, #0xb]
movs r0, #0xff
ands r0, r1
adds r3, r6, #1
mov sl, r3
movs r1, #0x40
adds r1, r1, r4
mov sb, r1
cmp r0, #0
bne _080B0D26
b _080B0E7A
_080B0D26:
strb r2, [r4, #9]
b _080B0EA8
_080B0D2A:
movs r0, #4
ands r0, r2
cmp r0, #0
bne _080B0D44
ldr r0, _080B0D70 @ =0x04000084
ldrb r1, [r0]
ldr r3, [sp, #0x1c]
ldrb r0, [r3]
asrs r1, r0
movs r0, #1
ands r1, r0
cmp r1, #0
bne _080B0D74
_080B0D44:
ldrb r0, [r4, #0xd]
subs r0, #1
strb r0, [r4, #0xd]
movs r1, #0xff
ands r0, r1
lsls r0, r0, #0x18
adds r3, r6, #1
mov sl, r3
movs r1, #0x40
adds r1, r1, r4
mov sb, r1
cmp r0, #0
ble _080B0D60
b _080B0EBA
_080B0D60:
lsls r0, r6, #0x18
lsrs r0, r0, #0x18
bl CgbOscOff
movs r0, #0
strb r0, [r4]
b _080B0FB6
.align 2, 0
_080B0D70: .4byte 0x04000084
_080B0D74:
movs r0, #0x40
ands r0, r2
adds r3, r6, #1
mov sl, r3
movs r1, #0x40
adds r1, r1, r4
mov sb, r1
cmp r0, #0
beq _080B0DB4
movs r0, #3
ands r0, r2
cmp r0, #0
beq _080B0DB4
movs r0, #0xfc
ands r0, r2
movs r2, #0
strb r0, [r4]
ldrb r1, [r4, #7]
strb r1, [r4, #0xb]
movs r0, #0xff
ands r0, r1
cmp r0, #0
beq _080B0DE6
ldrb r0, [r4, #0x1d]
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x1d]
cmp r6, #3
beq _080B0EA8
ldrb r3, [r4, #7]
mov r8, r3
b _080B0EA8
_080B0DB4:
ldrb r0, [r4, #0xb]
cmp r0, #0
bne _080B0EA8
cmp r6, #3
bne _080B0DC6
ldrb r1, [r4, #0x1d]
movs r0, #1
orrs r0, r1
strb r0, [r4, #0x1d]
_080B0DC6:
adds r0, r4, #0
bl CgbModVol
ldrb r0, [r4]
movs r1, #3
ands r1, r0
cmp r1, #0
bne _080B0E18
ldrb r0, [r4, #9]
subs r0, #1
strb r0, [r4, #9]
movs r1, #0xff
ands r0, r1
lsls r0, r0, #0x18
cmp r0, #0
bgt _080B0E14
_080B0DE6:
ldrb r1, [r4, #0xa]
ldrb r0, [r4, #0xc]
muls r0, r1, r0
adds r0, #0xff
asrs r0, r0, #8
movs r1, #0
strb r0, [r4, #9]
lsls r0, r0, #0x18
cmp r0, #0
beq _080B0D60
ldrb r0, [r4]
movs r1, #4
orrs r0, r1
strb r0, [r4]
ldrb r0, [r4, #0x1d]
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x1d]
cmp r6, #3
beq _080B0EBA
movs r3, #8
mov r8, r3
b _080B0EBA
_080B0E14:
ldrb r0, [r4, #7]
b _080B0EA6
_080B0E18:
cmp r1, #1
bne _080B0E24
_080B0E1C:
ldrb r0, [r4, #0x19]
strb r0, [r4, #9]
movs r0, #7
b _080B0EA6
_080B0E24:
cmp r1, #2
bne _080B0E6A
ldrb r0, [r4, #9]
subs r0, #1
strb r0, [r4, #9]
movs r1, #0xff
ands r0, r1
lsls r0, r0, #0x18
asrs r0, r0, #0x18
movs r1, #0x19
ldrsb r1, [r4, r1]
cmp r0, r1
bgt _080B0E66
_080B0E3E:
ldrb r0, [r4, #6]
cmp r0, #0
bne _080B0E4E
ldrb r1, [r4]
movs r0, #0xfc
ands r0, r1
strb r0, [r4]
b _080B0DE6
_080B0E4E:
ldrb r0, [r4]
subs r0, #1
strb r0, [r4]
ldrb r1, [r4, #0x1d]
movs r0, #1
orrs r0, r1
strb r0, [r4, #0x1d]
cmp r6, #3
beq _080B0E1C
movs r3, #8
mov r8, r3
b _080B0E1C
_080B0E66:
ldrb r0, [r4, #5]
b _080B0EA6
_080B0E6A:
ldrb r0, [r4, #9]
adds r0, #1
strb r0, [r4, #9]
movs r1, #0xff
ands r0, r1
ldrb r3, [r4, #0xa]
cmp r0, r3
blo _080B0EA4
_080B0E7A:
ldrb r0, [r4]
subs r0, #1
movs r2, #0
strb r0, [r4]
ldrb r1, [r4, #5]
strb r1, [r4, #0xb]
movs r0, #0xff
ands r0, r1
cmp r0, #0
beq _080B0E3E
ldrb r0, [r4, #0x1d]
movs r1, #1
orrs r0, r1
strb r0, [r4, #0x1d]
ldrb r0, [r4, #0xa]
strb r0, [r4, #9]
cmp r6, #3
beq _080B0EA8
ldrb r0, [r4, #5]
mov r8, r0
b _080B0EA8
_080B0EA4:
ldrb r0, [r4, #4]
_080B0EA6:
strb r0, [r4, #0xb]
_080B0EA8:
ldrb r0, [r4, #0xb]
subs r0, #1
strb r0, [r4, #0xb]
ldr r1, [sp, #4]
cmp r1, #0
bne _080B0EBA
subs r1, #1
str r1, [sp, #4]
b _080B0DB4
_080B0EBA:
ldrb r1, [r4, #0x1d]
movs r0, #2
ands r0, r1
cmp r0, #0
beq _080B0F34
cmp r6, #3
bgt _080B0EFA
ldrb r1, [r4, #1]
movs r0, #8
ands r0, r1
cmp r0, #0
beq _080B0EFA
ldr r0, _080B0EE4 @ =0x04000089
ldrb r0, [r0]
adds r1, r0, #0
cmp r1, #0x3f
bgt _080B0EEC
ldr r0, [r4, #0x20]
adds r0, #2
ldr r1, _080B0EE8 @ =0x000007FC
b _080B0EF6
.align 2, 0
_080B0EE4: .4byte 0x04000089
_080B0EE8: .4byte 0x000007FC
_080B0EEC:
cmp r1, #0x7f
bgt _080B0EFA
ldr r0, [r4, #0x20]
adds r0, #1
ldr r1, _080B0F04 @ =0x000007FE
_080B0EF6:
ands r0, r1
str r0, [r4, #0x20]
_080B0EFA:
cmp r6, #4
beq _080B0F08
ldr r0, [r4, #0x20]
b _080B0F14
.align 2, 0
_080B0F04: .4byte 0x000007FE
_080B0F08:
ldr r1, [sp, #0x14]
ldrb r0, [r1]
movs r1, #8
ands r1, r0
ldr r0, [r4, #0x20]
orrs r0, r1
_080B0F14:
ldr r3, [sp, #0x14]
strb r0, [r3]
ldrb r0, [r4, #0x1a]
movs r1, #0xc0
ands r1, r0
ldr r0, [r4, #0x20]
movs r2, #0xfc
lsls r2, r2, #6
ands r0, r2
lsrs r0, r0, #8
adds r1, r1, r0
strb r1, [r4, #0x1a]
movs r0, #0xff
ands r1, r0
ldr r3, [sp, #0x18]
strb r1, [r3]
_080B0F34:
ldrb r1, [r4, #0x1d]
movs r0, #1
ands r0, r1
cmp r0, #0
beq _080B0FB6
ldr r2, _080B0F7C @ =0x04000081
ldrb r1, [r4, #0x1c]
ldrb r0, [r2]
bics r0, r1
ldrb r1, [r4, #0x1b]
orrs r0, r1
strb r0, [r2]
cmp r6, #3
bne _080B0F84
ldr r1, _080B0F80 @ =gCgb3Vol
ldrb r0, [r4, #9]
adds r0, r0, r1
ldrb r0, [r0]
ldr r1, [sp, #0x10]
strb r0, [r1]
ldrb r1, [r4, #0x1a]
movs r2, #0x80
adds r0, r2, #0
ands r0, r1
cmp r0, #0
beq _080B0FB6
ldr r3, [sp, #0xc]
strb r2, [r3]
ldrb r0, [r4, #0x1a]
ldr r1, [sp, #0x18]
strb r0, [r1]
ldrb r1, [r4, #0x1a]
movs r0, #0x7f
ands r0, r1
strb r0, [r4, #0x1a]
b _080B0FB6
.align 2, 0
_080B0F7C: .4byte 0x04000081
_080B0F80: .4byte gCgb3Vol
_080B0F84:
movs r0, #0xf
mov r3, r8
ands r3, r0
mov r8, r3
ldrb r0, [r4, #9]
lsls r0, r0, #4
add r0, r8
ldr r1, [sp, #0x10]
strb r0, [r1]
ldrb r0, [r4, #0x1a]
movs r2, #0x80
orrs r0, r2
ldr r3, [sp, #0x18]
strb r0, [r3]
cmp r6, #1
bne _080B0FB6
ldr r0, [sp, #0xc]
ldrb r1, [r0]
movs r0, #8
ands r0, r1
cmp r0, #0
bne _080B0FB6
ldrb r0, [r4, #0x1a]
orrs r0, r2
strb r0, [r3]
_080B0FB6:
movs r0, #0
strb r0, [r4, #0x1d]
_080B0FBA:
mov r6, sl
mov r4, sb
cmp r6, #4
bgt _080B0FC4
b _080B0B88
_080B0FC4:
add sp, #0x24
pop {r3, r4, r5}
mov r8, r3
mov sb, r4
mov sl, r5
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.syntax divided
asm/non_matching/m4a/m4aMPlayImmInit.inc
+61
View File
@@ -0,0 +1,61 @@
.syntax unified
.text
push {r4, r5, r6, r7, lr}
sub sp, #4
adds r7, r0, #0
ldr r1, [r7, #0x34]
ldr r0, _080B0228 @ =0x68736D53
cmp r1, r0
bne _080B021E
adds r0, r1, #1
str r0, [r7, #0x34]
ldrb r5, [r7, #8]
ldr r4, [r7, #0x2c]
cmp r5, #0
ble _080B021A
movs r2, #0x80
_080B01E0:
ldrb r1, [r4]
adds r0, r2, #0
ands r0, r1
cmp r0, #0
beq _080B0212
movs r6, #0x40
adds r0, r6, #0
ands r0, r1
cmp r0, #0
beq _080B0212
adds r0, r4, #0
str r2, [sp]
bl Clear64byte
ldr r2, [sp]
strb r2, [r4]
movs r0, #2
strb r0, [r4, #0xf]
strb r6, [r4, #0x13]
movs r0, #0x16
strb r0, [r4, #0x19]
adds r1, r4, #0
adds r1, #0x24
movs r0, #1
strb r0, [r1]
_080B0212:
subs r5, #1
adds r4, #0x50
cmp r5, #0
bgt _080B01E0
_080B021A:
ldr r0, _080B0228 @ =0x68736D53
str r0, [r7, #0x34]
_080B021E:
add sp, #4
pop {r4, r5, r6, r7}
pop {r0}
bx r0
.align 2, 0
_080B0228: .4byte 0x68736D53
.syntax divided
asm/non_matching/m4a/m4aSoundVSync.inc
+54
View File
@@ -0,0 +1,54 @@
.syntax unified
.text
push {lr}
ldr r0, _080B06C4 @ =0x03007FF0
ldr r2, [r0]
ldr r0, [r2]
ldr r1, _080B06C8 @ =0x978C92AD
adds r0, r0, r1
cmp r0, #1
bhi _080B06BE
ldrb r0, [r2, #4]
subs r0, #1
ldrb r1, [r2, #4]
strb r0, [r2, #4]
ldrb r0, [r2, #4]
lsls r0, r0, #0x18
cmp r0, #0
bgt _080B06BE
ldrb r0, [r2, #0xb]
ldrb r1, [r2, #4]
strb r0, [r2, #4]
ldr r2, _080B06CC @ =0x040000C4
ldr r0, [r2]
movs r1, #0x80
lsls r1, r1, #0x12
ands r0, r1
cmp r0, #0
beq _080B06AC
ldr r0, _080B06D0 @ =0x84400004
str r0, [r2]
_080B06AC:
ldr r0, _080B06D4 @ =0x040000C6
movs r2, #0x80
lsls r2, r2, #3
adds r1, r2, #0
strh r1, [r0]
movs r2, #0xb6
lsls r2, r2, #8
adds r1, r2, #0
strh r1, [r0]
_080B06BE:
pop {r0}
bx r0
.align 2, 0
_080B06C4: .4byte 0x03007FF0
_080B06C8: .4byte 0x978C92AD
_080B06CC: .4byte 0x040000C4
_080B06D0: .4byte 0x84400004
_080B06D4: .4byte 0x040000C6
.syntax divided
asm/non_matching/m4a/m4aSoundVSyncOff.inc
+57
View File
@@ -0,0 +1,57 @@
.syntax unified
.text
push {lr}
sub sp, #4
ldr r0, _080B05E4 @ =0x03007FF0
ldr r2, [r0]
ldr r1, [r2]
ldr r3, _080B05E8 @ =0x978C92AD
adds r0, r1, r3
cmp r0, #1
bhi _080B05DC
adds r0, r1, #0
adds r0, #0xa
str r0, [r2]
ldr r1, _080B05EC @ =0x04000102
movs r0, #0
strh r0, [r1]
ldr r3, _080B05F0 @ =0x040000C4
ldr r0, [r3]
movs r1, #0x80
lsls r1, r1, #0x12
ands r0, r1
cmp r0, #0
beq _080B05C0
ldr r0, _080B05F4 @ =0x84400004
str r0, [r3]
_080B05C0:
ldr r1, _080B05F8 @ =0x040000C6
movs r3, #0x80
lsls r3, r3, #3
adds r0, r3, #0
strh r0, [r1]
movs r0, #0
str r0, [sp]
movs r0, #0xd4
lsls r0, r0, #2
adds r1, r2, r0
ldr r2, _080B05FC @ =0x0500018C
mov r0, sp
bl CpuSet
_080B05DC:
add sp, #4
pop {r0}
bx r0
.align 2, 0
_080B05E4: .4byte 0x03007FF0
_080B05E8: .4byte 0x978C92AD
_080B05EC: .4byte 0x04000102
_080B05F0: .4byte 0x040000C4
_080B05F4: .4byte 0x84400004
_080B05F8: .4byte 0x040000C6
_080B05FC: .4byte 0x0500018C
.syntax divided
asm/non_matching/m4a/m4aSoundVSyncOn.inc
+61
View File
@@ -0,0 +1,61 @@
.syntax unified
.text
push {r4, lr}
ldr r0, _080B0658 @ =0x03007FF0
ldr r2, [r0]
ldr r3, [r2]
ldr r0, _080B065C @ =0x68736D53
cmp r3, r0
beq _080B0650
ldr r1, _080B0660 @ =0x040000C6
movs r4, #0xb6
lsls r4, r4, #8
adds r0, r4, #0
strh r0, [r1]
ldrb r0, [r2, #4]
movs r0, #0
strb r0, [r2, #4]
adds r0, r3, #0
subs r0, #0xa
str r0, [r2]
ldr r3, _080B0664 @ =0x04000006
ldrb r0, [r3]
ldr r1, [r2, #0x10]
cmp r0, #0x9f
bne _080B0636
adds r2, r3, #0
_080B0630:
ldrb r0, [r2]
cmp r0, #0x9f
beq _080B0630
_080B0636:
ldr r2, _080B0664 @ =0x04000006
_080B0638:
ldrb r0, [r2]
cmp r0, #0x9f
bne _080B0638
ldr r4, _080B0668 @ =0x04000100
ldr r0, _080B066C @ =0x00044940
bl __divsi3
rsbs r0, r0, #0
strh r0, [r4]
ldr r1, _080B0670 @ =0x04000102
movs r0, #0x80
strh r0, [r1]
_080B0650:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B0658: .4byte 0x03007FF0
_080B065C: .4byte 0x68736D53
_080B0660: .4byte 0x040000C6
_080B0664: .4byte 0x04000006
_080B0668: .4byte 0x04000100
_080B066C: .4byte 0x00044940
_080B0670: .4byte 0x04000102
.syntax divided
asm/soundReq.s
+4 -4
View File
@@ -190,8 +190,8 @@ _080A33C4:
bl sub_080A35A0
b _080A347C
_080A33CC:
ldr r2, _080A33EC @ =gUnk_08A11C3C
ldr r1, _080A33F0 @ =gUnk_08A11DBC
ldr r2, _080A33EC @ =gMPlayTable
ldr r1, _080A33F0 @ =gSongTable
ldrh r0, [r5, #0x14]
lsls r0, r0, #3
adds r0, r0, r1
@@ -205,8 +205,8 @@ _080A33CC:
bl m4aMPlayTempoControl
b _080A347C
.align 2, 0
_080A33EC: .4byte gUnk_08A11C3C
_080A33F0: .4byte gUnk_08A11DBC
_080A33EC: .4byte gMPlayTable
_080A33F0: .4byte gSongTable
_080A33F4:
bl m4aMPlayAllStop
bl m4aSoundVSyncOff
data/data_089FC6C4.s
+10 -10
View File
@@ -43,31 +43,31 @@ gUnk_089FC6C4:: @ 089FC6C4
.4byte RealClearChain
.4byte SoundMainBTM
gUnk_089FC754:: @ 089FC754
gScaleTable:: @ 089FC754
.incbin "baserom.gba", 0x9FC754, 0x00000B4
gUnk_089FC808:: @ 089FC808
gFreqTable:: @ 089FC808
.incbin "baserom.gba", 0x9FC808, 0x0000030
gUnk_089FC838:: @ 089FC838
gPcmSamplesPerVBlankTable:: @ 089FC838
.incbin "baserom.gba", 0x9FC838, 0x0000018
gUnk_089FC850:: @ 089FC850
gCgbScaleTable:: @ 089FC850
.incbin "baserom.gba", 0x9FC850, 0x0000084
gUnk_089FC8D4:: @ 089FC8D4
gCgbFreqTable:: @ 089FC8D4
.incbin "baserom.gba", 0x9FC8D4, 0x0000018
gUnk_089FC8EC:: @ 089FC8EC
gNoiseTable:: @ 089FC8EC
.incbin "baserom.gba", 0x9FC8EC, 0x000003C
gUnk_089FC928:: @ 089FC928
gCgb3Vol:: @ 089FC928
.incbin "baserom.gba", 0x9FC928, 0x0000010
gUnk_089FC938:: @ 089FC938
.incbin "baserom.gba", 0x9FC938, 0x0000034
gUnk_089FC96C:: @ 089FC96C
gXcmdTable:: @ 089FC96C
@ replacing .incbin "baserom.gba", 0x009fc96c, 0x30
.4byte ply_xxx
.4byte ply_xwave
@@ -1690,10 +1690,10 @@ gUnk_08A11C0C:: @ 08A11C0C
gUnk_08A11C1C:: @ 08A11C1C
.incbin "baserom.gba", 0xA11C1C, 0x0000020
gUnk_08A11C3C:: @ 08A11C3C
gMPlayTable:: @ 08A11C3C
.incbin "baserom.gba", 0xA11C3C, 0x0000180
gUnk_08A11DBC:: @ 08A11DBC
gSongTable:: @ 08A11DBC
.incbin "baserom.gba", 0xA11DBC, 0x00009E5
gUnk_08A127A1:: @ 08A127A1
include/gba/m4a_internal.h
+7 -7
View File
@@ -98,7 +98,7 @@ struct CgbChannel {
u8 sw;
u32 fr;
u32* wp;
u32 cp;
u32* cp;
u32 tp;
u32 pp;
u32 np;
@@ -171,17 +171,17 @@ struct SoundInfo {
s32 pcmFreq;
s32 divFreq;
struct CgbChannel* cgbChans;
u32 func;
u32 intp;
void* func;
void* intp;
void (*CgbSound)(void);
void (*CgbOscOff)(u8);
u32 (*MidiKeyToCgbFreq)(u8, u8, u8);
u32 MPlayJumpTable;
void* MPlayJumpTable;
void* plynote;
void (*ExtVolPit)(void);
u8 gap2[16];
struct SoundChannel chans[MAX_DIRECTSOUND_CHANNELS];
s8 pcmBuffer[PCM_DMA_BUF_SIZE * 2];
s8 pcmBuffer[PCM_DMA_BUF_SIZE];
};
struct SongHeader {
@@ -272,8 +272,8 @@ struct MusicPlayerInfo {
struct MusicPlayerTrack* tracks;
struct ToneData* tone;
u32 ident;
u32 func;
u32 intp;
u32* func;
u32* intp;
};
struct MusicPlayer {
linker.ld
+9 -6
View File
@@ -1,5 +1,8 @@
ENTRY(__start)
gNumMusicPlayers = 0x20;
gMaxLines = 0;
MEMORY {
ewram (w!x) : ORIGIN = 0x02000000, LENGTH = 256K
iwram (w!x) : ORIGIN = 0x03000000, LENGTH = 32K
@@ -212,15 +215,15 @@ SECTIONS {
. = 0x00004020; gUnk_03004020 = .;
. = 0x00004030; gUnk_03004030 = .;
. = 0x00004040; gUnk_03004040 = .;
. = 0x0000404C; gUnk_0300404C = .;
. = 0x0000404C; SoundMainRAM_Buffer = .;
. = 0x0000404D; gUnk_0300404D = .;
. = 0x000043D0; gUnk_030043D0 = .;
. = 0x00004D50; gUnk_03004D50 = .;
. = 0x000043D0; gSoundInfo = .;
. = 0x00004D50; gMPlayJumpTable = .;
. = 0x00004D54; gUnk_03004D54 = .;
. = 0x00004DD8; gUnk_03004DD8 = .;
. = 0x00004DDC; gUnk_03004DDC = .;
. = 0x00004DE0; gUnk_03004DE0 = .;
. = 0x000055E0; gUnk_030055E0 = .;
. = 0x00004DE0; gCgbChans = .;
. = 0x000055E0; gMPlayMemAccArea = .;
. = 0x000056F0; gUnk_030056F0 = .;
. = 0x000056F1; gUnk_030056F1 = .;
. = 0x00005740; gUnk_03005740 = .;
@@ -901,7 +904,7 @@ SECTIONS {
asm/code_080AD90C.o(.text);
/* library functions */
asm/m4a_asm.o(.text);
asm/m4a.o(.text);
src/gba/m4a.o(.text);
asm/libagbsyscall.o(.text);
src/eeprom.o(.text);
*libc.a:memcpy.o(.text);
src/gba/m4a.c
+1379
View File
File diff suppressed because it is too large Load Diff