Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nes_metroid/emulator/asm/part1.s
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,8 @@ _0600666C:
str r0, [sp, #SP_890] @ SP_890 = 0x030073FF
mov r0, #0x820000
str r0, [sp, #SP_8AC] @ SP_8AC = 0x00820000
ldr r0, _060069D0 @ =sub_03000408
str r0, [sp, #SP_9B4] @ SP_9B4 = sub_03000408
ldr r0, _060069D0 @ =EmulatorAudio_WriteToApu
str r0, [sp, #SP_9B4] @ SP_9B4 = EmulatorAudio_WriteToApu
mov r0, #0xef
str r0, [sp, #SP_8B4] @ SP_8B4 = 0x000000EF
ldr r0, _060069D4 @ =0x03020100
Expand Down Expand Up @@ -525,7 +525,7 @@ _060069C0: .4byte 0x0203C000
_060069C4: .4byte _03002E68
_060069C8: .4byte 0x44444444
_060069CC: .4byte sub_06006000
_060069D0: .4byte sub_03000408
_060069D0: .4byte EmulatorAudio_WriteToApu
_060069D4: .4byte 0x03020100
_060069D8: .4byte 0x07060504
_060069DC: .4byte sub_03005568
Expand Down
114 changes: 57 additions & 57 deletions nes_metroid/emulator/asm/part2/part2_2.s
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ sub_03000634: @ 0x03000634
arm_func_start sub_03000638
sub_03000638: @ 0x03000638
push {r4, r5}
ldr r2, _03000978 @ =gUnk_03005A80
ldr r2, _03000978 @ =gEmuAudio_Pulse1_BufferPtr
ldr r2, [r2]
ldr r3, _0300097C @ =gUnk_03005A84
ldr r3, _0300097C @ =gEmuAudio_Pulse2_BufferPtr
ldr r3, [r3]
ldr r4, _03000980 @ =gUnk_03005A88
ldr r4, _03000980 @ =gEmuAudio_Triangle_BufferPtr
ldr r4, [r4]
ldr r5, _03000984 @ =gUnk_03005A8C
ldr r5, _03000984 @ =gEmuAudio_Noise_BufferPtr
ldr r5, [r5]
mov ip, #0
_03000660:
Expand Down Expand Up @@ -178,13 +178,13 @@ sub_03000704: @ 0x03000704
arm_func_start sub_03000708
sub_03000708: @ 0x03000708
push {r4, r5, r6, r7, r8, sb}
ldr r2, _03000990 @ =gUnk_03005A80
ldr r2, _03000990 @ =gEmuAudio_Pulse1_BufferPtr
ldr r2, [r2]
ldr r3, _03000994 @ =gUnk_03005A84
ldr r3, _03000994 @ =gEmuAudio_Pulse2_BufferPtr
ldr r3, [r3]
ldr r4, _03000998 @ =gUnk_03005A88
ldr r4, _03000998 @ =gEmuAudio_Triangle_BufferPtr
ldr r4, [r4]
ldr r5, _0300099C @ =gUnk_03005A8C
ldr r5, _0300099C @ =gEmuAudio_Noise_BufferPtr
ldr r5, [r5]
mov r8, #0x80
orr r8, r8, r8, lsl #8
Expand Down Expand Up @@ -220,13 +220,13 @@ sub_03000778: @ 0x03000778
.align 2, 0
_03000780: .4byte gUnk_03005A90

thumb_func_start sub_03000784
sub_03000784: @ 0x03000784
ldr r1, _0300078C @ =gUnk_03005AA8
thumb_func_start EmulatorAudio_Pulse1_SetLengthCounter
EmulatorAudio_Pulse1_SetLengthCounter: @ 0x03000784
ldr r1, _0300078C @ =gEmuAudio_Pulse1_LengthCounter
strh r0, [r1]
bx lr
.align 2, 0
_0300078C: .4byte gUnk_03005AA8
_0300078C: .4byte gEmuAudio_Pulse1_LengthCounter

thumb_func_start sub_03000790
sub_03000790: @ 0x03000790
Expand All @@ -244,7 +244,7 @@ _030007A4: .4byte gUnk_03005AA6
_030007A8:
ldr r0, _030007C0 @ =gUnk_03005AA6
strh r1, [r0]
ldr r0, _030007C4 @ =gUnk_03005A98
ldr r0, _030007C4 @ =gEmuAudio_Pulse1_Vol
ldrh r2, [r0]
movs r0, #0x10
ands r0, r2
Expand All @@ -256,7 +256,7 @@ _030007A8:
b _030007D0
.align 2, 0
_030007C0: .4byte gUnk_03005AA6
_030007C4: .4byte gUnk_03005A98
_030007C4: .4byte gEmuAudio_Pulse1_Vol
_030007C8: .4byte gUnk_03005A94
_030007CC:
ldr r1, _03000808 @ =gUnk_03005A94
Expand All @@ -266,22 +266,22 @@ _030007D0:
ldr r1, _0300080C @ =gUnk_03005AA2
movs r0, #0xf
strh r0, [r1]
ldr r1, _03000810 @ =sUnk_030023DC
ldr r0, _03000814 @ =gUnk_03005A9E
ldr r1, _03000810 @ =sEmulatorAudio_LengthCounterTable
ldr r0, _03000814 @ =gEmuAudio_Pulse1_Hi
ldrh r0, [r0]
lsrs r0, r0, #3
adds r0, r0, r1
ldrb r0, [r0]
lsls r0, r0, #2
bl sub_03000784
ldr r0, _03000818 @ =gUnk_03005A7A
bl EmulatorAudio_Pulse1_SetLengthCounter
ldr r0, _03000818 @ =gEmuAudio_SndChn
ldrh r1, [r0]
movs r2, #1
adds r0, r2, #0
ands r0, r1
cmp r0, #0
beq _03000802
ldr r0, _0300081C @ =gUnk_03005FCC
ldr r0, _0300081C @ =gEmuAudio_Pulse1_Enable
strh r2, [r0]
ldr r1, _03000820 @ =gUnk_03005AA4
movs r0, #0
Expand All @@ -293,16 +293,16 @@ _03000802:
.align 2, 0
_03000808: .4byte gUnk_03005A94
_0300080C: .4byte gUnk_03005AA2
_03000810: .4byte sUnk_030023DC
_03000814: .4byte gUnk_03005A9E
_03000818: .4byte gUnk_03005A7A
_0300081C: .4byte gUnk_03005FCC
_03000810: .4byte sEmulatorAudio_LengthCounterTable
_03000814: .4byte gEmuAudio_Pulse1_Hi
_03000818: .4byte gEmuAudio_SndChn
_0300081C: .4byte gEmuAudio_Pulse1_Enable
_03000820: .4byte gUnk_03005AA4

thumb_func_start sub_03000824
sub_03000824: @ 0x03000824
push {lr}
ldr r0, _03000840 @ =gUnk_03005FCC
ldr r0, _03000840 @ =gEmuAudio_Pulse1_Enable
ldrh r0, [r0]
cmp r0, #0
beq _0300083A
Expand All @@ -316,7 +316,7 @@ _0300083A:
pop {r0}
bx r0
.align 2, 0
_03000840: .4byte gUnk_03005FCC
_03000840: .4byte gEmuAudio_Pulse1_Enable
_03000844: .4byte gUnk_03005AA4

thumb_func_start sub_03000848
Expand All @@ -327,7 +327,7 @@ sub_03000848: @ 0x03000848
ldr r1, _03000864 @ =gUnk_03005AAC
movs r0, #0
strb r0, [r1]
ldr r0, _03000868 @ =gUnk_03005AA0
ldr r0, _03000868 @ =gEmuAudio_Pulse1_Timer
strh r2, [r0]
cmp r2, #0
bne _03000870
Expand All @@ -336,15 +336,15 @@ sub_03000848: @ 0x03000848
b _03000888
.align 2, 0
_03000864: .4byte gUnk_03005AAC
_03000868: .4byte gUnk_03005AA0
_03000868: .4byte gEmuAudio_Pulse1_Timer
_0300086C: .4byte gUnk_03005A94
_03000870:
ldr r4, _03000890 @ =gUnk_03005FD0
ldr r4, _03000890 @ =gEmuAudio_Pulse1_Frequency
adds r1, r2, #1
ldr r0, _03000894 @ =0x001B4F4D
bl __udivsi3
str r0, [r4]
ldr r2, _03000898 @ =gUnk_03005FC4
ldr r2, _03000898 @ =gEmuAudio_Pulse2_Frequency
ldr r1, [r2]
cmp r0, r1
bne _03000888
Expand All @@ -355,9 +355,9 @@ _03000888:
pop {r0}
bx r0
.align 2, 0
_03000890: .4byte gUnk_03005FD0
_03000890: .4byte gEmuAudio_Pulse1_Frequency
_03000894: .4byte 0x001B4F4D
_03000898: .4byte gUnk_03005FC4
_03000898: .4byte gEmuAudio_Pulse2_Frequency

thumb_func_start sub_0300089C
sub_0300089C: @ 0x0300089C
Expand All @@ -373,12 +373,12 @@ sub_0300089C: @ 0x0300089C
_030008AC: .4byte gUnk_03005A94
_030008B0: .4byte gUnk_03005AA2

thumb_func_start sub_030008B4
sub_030008B4: @ 0x030008B4
thumb_func_start EmulatorAudio_Pulse1_WriteVolume
EmulatorAudio_Pulse1_WriteVolume: @ 0x030008B4
push {r4, r5, lr}
lsls r0, r0, #0x18
lsrs r3, r0, #0x18
ldr r4, _03000908 @ =gUnk_03005A98
ldr r4, _03000908 @ =gEmuAudio_Pulse1_Vol
ldrb r1, [r4]
movs r2, #0x10
adds r0, r2, #0
Expand All @@ -405,7 +405,7 @@ _030008E6:
beq _03000900
cmp r1, #0
bne _03000900
ldr r0, _03000910 @ =gUnk_03005FCC
ldr r0, _03000910 @ =gEmuAudio_Pulse1_Enable
ldrh r0, [r0]
cmp r0, #0
beq _03000900
Expand All @@ -419,37 +419,37 @@ _03000900:
pop {r0}
bx r0
.align 2, 0
_03000908: .4byte gUnk_03005A98
_03000908: .4byte gEmuAudio_Pulse1_Vol
_0300090C: .4byte gUnk_03005AAD
_03000910: .4byte gUnk_03005FCC
_03000910: .4byte gEmuAudio_Pulse1_Enable
_03000914: .4byte gUnk_03005AA2

thumb_func_start sub_03000918
sub_03000918: @ 0x03000918
thumb_func_start EmulatorAudio_Pulse1_WriteSweep
EmulatorAudio_Pulse1_WriteSweep: @ 0x03000918
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
ldr r1, _03000928 @ =gUnk_03005A9A
ldr r1, _03000928 @ =gEmuAudio_Pulse1_Sweep
strh r0, [r1]
ldr r1, _0300092C @ =gUnk_03005AAA
movs r0, #1
strh r0, [r1]
bx lr
.align 2, 0
_03000928: .4byte gUnk_03005A9A
_03000928: .4byte gEmuAudio_Pulse1_Sweep
_0300092C: .4byte gUnk_03005AAA

thumb_func_start sub_03000930
sub_03000930: @ 0x03000930
thumb_func_start EmulatorAudio_Pulse1_WriteLo
EmulatorAudio_Pulse1_WriteLo: @ 0x03000930
lsls r0, r0, #0x18
lsrs r0, r0, #0x18
ldr r1, _03000940 @ =gUnk_03005A9C
ldr r1, _03000940 @ =gEmuAudio_Pulse1_Lo
strh r0, [r1]
ldr r1, _03000944 @ =gUnk_03005AAC
movs r0, #1
strb r0, [r1]
bx lr
.align 2, 0
_03000940: .4byte gUnk_03005A9C
_03000940: .4byte gEmuAudio_Pulse1_Lo
_03000944: .4byte gUnk_03005AAC

thumb_func_start sub_03000948
Expand All @@ -459,12 +459,12 @@ sub_03000948: @ 0x03000948
ldrb r0, [r0]
cmp r0, #0
beq _03000966
ldr r0, _03000970 @ =gUnk_03005AA0
ldr r0, _03000970 @ =gEmuAudio_Pulse1_Timer
ldrh r1, [r0]
movs r0, #0xf0
lsls r0, r0, #4
ands r0, r1
ldr r1, _03000974 @ =gUnk_03005A9C
ldr r1, _03000974 @ =gEmuAudio_Pulse1_Lo
ldrh r1, [r1]
orrs r0, r1
bl sub_03000848
Expand All @@ -473,18 +473,18 @@ _03000966:
bx r0
.align 2, 0
_0300096C: .4byte gUnk_03005AAC
_03000970: .4byte gUnk_03005AA0
_03000974: .4byte gUnk_03005A9C
_03000970: .4byte gEmuAudio_Pulse1_Timer
_03000974: .4byte gEmuAudio_Pulse1_Lo

_03000978: .4byte gUnk_03005A80
_0300097C: .4byte gUnk_03005A84
_03000980: .4byte gUnk_03005A88
_03000984: .4byte gUnk_03005A8C
_03000978: .4byte gEmuAudio_Pulse1_BufferPtr
_0300097C: .4byte gEmuAudio_Pulse2_BufferPtr
_03000980: .4byte gEmuAudio_Triangle_BufferPtr
_03000984: .4byte gEmuAudio_Noise_BufferPtr

_03000988: .4byte 0x03005FE0
_0300098C: .4byte 0x03005FE0

_03000990: .4byte gUnk_03005A80
_03000994: .4byte gUnk_03005A84
_03000998: .4byte gUnk_03005A88
_0300099C: .4byte gUnk_03005A8C
_03000990: .4byte gEmuAudio_Pulse1_BufferPtr
_03000994: .4byte gEmuAudio_Pulse2_BufferPtr
_03000998: .4byte gEmuAudio_Triangle_BufferPtr
_0300099C: .4byte gEmuAudio_Noise_BufferPtr
Loading