diff --git a/asm/bigGoron.s b/asm/bigGoron.s index 208b1c9f..0d3de49b 100644 --- a/asm/bigGoron.s +++ b/asm/bigGoron.s @@ -95,7 +95,7 @@ sub_0806D0B0: @ 0x0806D0B0 movs r1, #0x80 lsls r1, r1, #6 adds r0, r5, #0 - bl sub_0801D630 + bl _DmaZero cmp r4, #0 beq _0806D0DA adds r0, r4, #0 diff --git a/asm/code_08016DF8.s b/asm/code_08016DF8.s index 312d0bdd..7b4a1a12 100644 --- a/asm/code_08016DF8.s +++ b/asm/code_08016DF8.s @@ -601,7 +601,7 @@ _08017268: strb r5, [r0] ldr r0, _080172EC @ =gUnk_03003BE0 movs r1, #0x8c - bl sub_0801D630 + bl _DmaZero adds r2, r4, #0 adds r2, #0x3f ldrb r0, [r2] @@ -1080,7 +1080,7 @@ sub_08017640: @ 0x08017640 movs r1, #0x80 lsls r1, r1, #1 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08017664 @ =gUnk_02018EA0 str r4, [r0] str r4, [r4] diff --git a/asm/code_08018500.s b/asm/code_08018500.s index 4d58f260..79dad55e 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -58,7 +58,7 @@ sub_0801855C: @ 0x0801855C ldr r4, _08018570 @ =gUnk_02033AB8 adds r0, r4, #0 movs r1, #0x14 - bl sub_0801D630 + bl _DmaZero adds r5, r4, #0 ldr r4, _08018574 @ =gUnk_080B3D20 movs r6, #0 diff --git a/asm/code_08019444.s b/asm/code_08019444.s index f544c3a3..b2456684 100644 --- a/asm/code_08019444.s +++ b/asm/code_08019444.s @@ -3466,7 +3466,7 @@ _0801AE70: movs r2, #0x80 lsls r2, r2, #4 movs r0, #0xf - bl sub_0801D5EC + bl _DmaFill16 movs r0, #1 rsbs r0, r0, #0 bl sub_0805BB74 diff --git a/asm/code_0801C370.s b/asm/code_0801C370.s index c7600459..49e57eb3 100644 --- a/asm/code_0801C370.s +++ b/asm/code_0801C370.s @@ -32,7 +32,7 @@ _0801C398: movs r1, #0xcd lsls r1, r1, #2 adds r0, r5, #0 - bl sub_0801D630 + bl _DmaZero strb r6, [r5, #3] strh r4, [r5, #0xe] ldr r0, _0801C474 @ =gUnk_02002A40 @@ -48,7 +48,7 @@ _0801C398: movs r1, #0x80 lsls r1, r1, #4 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r1, _0801C47C @ =gScreen str r4, [r1, #0x10] ldr r0, _0801C480 @ =0x00001F0C @@ -93,7 +93,7 @@ _0801C398: adds r0, #0x34 movs r1, #0xc0 lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero movs r0, #5 movs r1, #9 bl sub_0801CA6C diff --git a/asm/code_0801C85C.s b/asm/code_0801C85C.s index d7dcbc9e..598c3b14 100644 --- a/asm/code_0801C85C.s +++ b/asm/code_0801C85C.s @@ -996,7 +996,7 @@ sub_0801CFA8: @ 0x0801CFA8 adds r5, r0, #0 ldr r0, _0801CFCC @ =gUnk_02001A00 movs r1, #0x40 - bl sub_0801D630 + bl _DmaZero movs r4, #0 _0801CFB6: adds r0, r4, #0 @@ -1451,7 +1451,7 @@ sub_0801D2C8: @ 0x0801D2C8 lsls r1, r4, #5 adds r1, r1, r2 movs r2, #0x20 - bl sub_0801D5EC + bl _DmaFill16 b _0801D33C .align 2, 0 _0801D2F8: .4byte gUnk_0200B644 diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index 2c808e0e..776ee624 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -339,7 +339,7 @@ _0801D9D8: strh r0, [r3] adds r0, r4, #0 mov r1, ip - bl sub_0801D630 + bl _DmaZero adds r0, r4, #0 b _0801DA02 .align 2, 0 @@ -418,7 +418,7 @@ sub_0801DA7C: @ 0x0801DA7C ldr r0, _0801DA8C @ =gUnk_02035540 movs r1, #0x80 lsls r1, r1, #5 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _0801DA8C: .4byte gUnk_02035540 @@ -459,11 +459,11 @@ sub_0801DA90: @ 0x0801DA90 bl sub_0801DB34 ldr r0, _0801DB08 @ =0x0600C000 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero ldr r0, _0801DB0C @ =gUnk_02034CB0 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero strh r4, [r5, #0xe] pop {r4, r5, pc} .align 2, 0 @@ -505,7 +505,7 @@ sub_0801DB34: @ 0x0801DB34 ldr r4, _0801DB6C @ =gScreen adds r0, r4, #0 movs r1, #0x7c - bl sub_0801D630 + bl _DmaZero ldr r0, _0801DB70 @ =gUnk_02034CB0 str r0, [r4, #0x10] ldr r0, _0801DB74 @ =0x00001F0C @@ -560,7 +560,7 @@ sub_0801DBA0: @ 0x0801DBA0 adds r5, r1, #0 adds r1, r2, #0 adds r0, r5, #0 - bl sub_0801D630 + bl _DmaZero movs r0, #1 strb r0, [r5] ldr r2, _0801DBE4 @ =gUnk_030010A0 @@ -835,7 +835,7 @@ _0801DDB8: ldr r0, _0801DDE0 @ =gUnk_02019EE0 movs r1, #0x80 lsls r1, r1, #8 - bl sub_0801D630 + bl _DmaZero b _0801DEE2 .align 2, 0 _0801DDD8: .4byte gUnk_080C9C50 @@ -1104,7 +1104,7 @@ sub_0801DFB4: @ 0x0801DFB4 ldr r7, _0801E004 @ =gUnk_02022740 adds r0, r7, #0 movs r1, #0x10 - bl sub_0801D630 + bl _DmaZero strh r4, [r7, #6] strh r5, [r7, #8] strh r6, [r7, #0xa] @@ -1345,7 +1345,7 @@ sub_0801E160: @ 0x0801E160 adds r0, r0, r4 movs r1, #0xa0 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero adds r0, r6, #0 mov r1, r8 mov r2, sb @@ -1415,7 +1415,7 @@ sub_0801E1EC: @ 0x0801E1EC adds r0, r0, r5 movs r1, #0xa0 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero adds r0, r4, #0 movs r1, #0 bl sub_0801E24C @@ -1579,7 +1579,7 @@ sub_0801E31C: @ 0x0801E31C adds r0, r0, r1 movs r1, #0xa0 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero cmp sl, sb bge _0801E3DC movs r6, #0 @@ -1764,7 +1764,7 @@ sub_0801E49C: @ 0x0801E49C movs r2, #0xf0 lsls r2, r2, #3 ldr r1, _0801E5E8 @ =gUnk_02018EE0 - bl sub_0801D5EC + bl _DmaFill16 adds r3, r5, #0 subs r3, #0x40 movs r2, #0xff @@ -1874,7 +1874,7 @@ sub_0801E49C: @ 0x0801E49C adds r0, r0, r6 movs r1, #0xa0 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r2, _0801E5E8 @ =gUnk_02018EE0 ldrb r1, [r5] lsls r0, r1, #2 diff --git a/asm/code_0804AA84.s b/asm/code_0804AA84.s index e0e7dea7..73e93d4e 100644 --- a/asm/code_0804AA84.s +++ b/asm/code_0804AA84.s @@ -54,7 +54,7 @@ sub_0804AAD4: @ 0x0804AAD4 ldr r4, _0804AAFC @ =gUnk_02018EB0 adds r0, r4, #0 movs r1, #0x28 - bl sub_0801D630 + bl _DmaZero movs r0, #0 str r0, [r4, #0x14] bl sub_0805E60C diff --git a/asm/code_0804B9F8.s b/asm/code_0804B9F8.s index acde102d..d5601372 100644 --- a/asm/code_0804B9F8.s +++ b/asm/code_0804B9F8.s @@ -11466,10 +11466,10 @@ sub_0804FFE4: @ 0x0804FFE4 ldr r4, _08050000 @ =gUnk_03000FD0 adds r0, r4, #0 movs r1, #0x1c - bl sub_0801D630 + bl _DmaZero ldr r0, _08050004 @ =gUnk_020354C0 movs r1, #0x80 - bl sub_0801D630 + bl _DmaZero movs r0, #1 rsbs r0, r0, #0 str r0, [r4, #4] diff --git a/asm/code_08050038.s b/asm/code_08050038.s index 924795b8..e9e1723f 100644 --- a/asm/code_08050038.s +++ b/asm/code_08050038.s @@ -460,7 +460,7 @@ sub_08050384: @ 0x08050384 ldr r0, _080503A0 @ =gUnk_02034CB0 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r1, _080503A4 @ =gScreen movs r0, #1 strh r0, [r1, #0xe] @@ -490,10 +490,10 @@ sub_080503BC: @ 0x080503BC movs r4, #0x80 lsls r4, r4, #4 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080503E0 @ =gUnk_02021F30 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero pop {r4, pc} .align 2, 0 _080503D8: .4byte gUnk_02032EC0 @@ -583,7 +583,7 @@ sub_08050450: @ 0x08050450 strh r0, [r1, #0x24] ldr r0, _080504E8 @ =gUnk_02000080 movs r1, #0x30 - bl sub_0801D630 + bl _DmaZero _0805048A: bl sub_080507FC ldr r1, _080504EC @ =gUnk_080FC8B0 @@ -632,7 +632,7 @@ sub_080504F4: @ 0x080504F4 movs r0, #0xc0 lsls r0, r0, #0x13 movs r1, #0x80 - bl sub_0801D630 + bl _DmaZero bl sub_08056418 bl sub_0805E60C bl sub_08080668 @@ -642,11 +642,11 @@ sub_080504F4: @ 0x080504F4 ldr r0, _080505DC @ =gUnk_0200AF00 movs r1, #0xcd lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero ldr r4, _080505E0 @ =gUnk_02019EE0 ldr r1, _080505E4 @ =0x00000E28 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero movs r0, #7 strb r0, [r4, #3] movs r0, #0x80 @@ -662,7 +662,7 @@ _08050546: movs r1, #0xed lsls r1, r1, #2 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero movs r0, #8 strb r0, [r4, #2] movs r0, #0 @@ -887,7 +887,7 @@ _08050732: ldr r0, [r5, #8] movs r1, #0x80 lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero ldr r0, _08050784 @ =0x000004B4 adds r1, r6, #0 muls r1, r0, r1 @@ -1387,7 +1387,7 @@ sub_08050AFC: @ 0x08050AFC movs r1, #0x80 lsls r1, r1, #4 adds r0, r5, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08050B34 @ =gUnk_02019EE0 adds r0, #8 adds r4, r4, r0 @@ -1717,7 +1717,7 @@ sub_08050DB8: @ 0x08050DB8 ldr r0, _08050DDC @ =gUnk_020344B0 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero movs r0, #0xc bl sub_080503A8 ldr r1, _08050DE0 @ =gUnk_02000080 @@ -3240,7 +3240,7 @@ sub_0805194C: @ 0x0805194C adds r3, #0xc adds r4, r4, r3 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero movs r0, #1 strb r0, [r4, #2] strb r0, [r4, #3] @@ -3291,7 +3291,7 @@ sub_080519B0: @ 0x080519B0 ldr r4, _08051A08 @ =gUnk_030010A0 adds r0, r4, #0 movs r1, #0xb0 - bl sub_0801D630 + bl _DmaZero bl sub_08049CD4 bl sub_080300AC bl sub_0807CA18 @@ -3326,11 +3326,11 @@ sub_08051A14: @ 0x08051A14 str r0, [r1, #4] ldr r0, _08051A74 @ =gUnk_03000000 ldr r1, _08051A78 @ =0x00000B74 - bl sub_0801D630 + bl _DmaZero ldr r0, _08051A7C @ =gUnk_02032EC0 movs r1, #0xed lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero bl sub_0805E60C bl sub_080197AC bl sub_08080668 @@ -3984,10 +3984,10 @@ sub_08052010: @ 0x08052010 movs r4, #0x80 lsls r4, r4, #4 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08052080 @ =gUnk_020344B0 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero bl sub_080A4D34 movs r0, #0xa bl LoadPalettesByPaletteGroupIndex @@ -3999,10 +3999,10 @@ sub_08052010: @ 0x08052010 movs r0, #0xc0 lsls r0, r0, #0x13 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero ldr r0, _08052084 @ =gUnk_02000080 movs r1, #0x30 - bl sub_0801D630 + bl _DmaZero ldr r1, _08052088 @ =gScreen ldrh r2, [r1] movs r3, #0x80 diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 958ca623..02c10ab6 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -791,7 +791,7 @@ sub_08052CFC: @ 0x08052CFC ldr r4, _08052D44 @ =gArea ldr r1, _08052D48 @ =0x00000894 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08052D4C @ =gRoomControls ldrb r1, [r0, #4] lsls r1, r1, #2 @@ -996,7 +996,7 @@ sub_08052EA0: @ 0x08052EA0 ldr r4, _08052EE4 @ =gRoomVars adds r0, r4, #0 movs r1, #0xcc - bl sub_0801D630 + bl _DmaZero movs r0, #0xff strb r0, [r4, #0x10] strb r0, [r4, #0x11] @@ -1178,7 +1178,7 @@ sub_08052FF4: @ 0x08052FF4 ldr r5, _08053074 @ =gUnk_020342CC adds r0, r5, #0 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero str r5, [r5, #0x20] ldr r0, _08053078 @ =gUnk_0811E214 lsls r6, r6, #2 @@ -1570,17 +1570,17 @@ sub_08053320: @ 0x08053320 movs r4, #0x80 lsls r4, r4, #4 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08053380 @ =gUnk_02021F30 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08053384 @ =gUnk_020344B0 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08053388 @ =gUnk_02001A40 movs r1, #0x80 lsls r1, r1, #5 - bl sub_0801D630 + bl _DmaZero movs r0, #0x10 bl sub_0801D7EC movs r0, #0x17 @@ -2222,7 +2222,7 @@ sub_08053800: @ 0x08053800 ldr r0, _08053888 @ =gUnk_02021F30 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805388C @ =0x00000F01 adds r5, r5, r0 ldr r1, [r4] diff --git a/asm/code_08055FF4.s b/asm/code_08055FF4.s index 40a852d4..2be77ac1 100644 --- a/asm/code_08055FF4.s +++ b/asm/code_08055FF4.s @@ -156,7 +156,7 @@ _08056112: ldr r4, _0805612C @ =gUnk_02000010 adds r0, r4, #0 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero ldr r0, _08056130 @ =0x4D435A33 str r0, [r4] _08056124: diff --git a/asm/code_08056418.s b/asm/code_08056418.s index 1bb89be1..78e1d68d 100644 --- a/asm/code_08056418.s +++ b/asm/code_08056418.s @@ -16,7 +16,7 @@ sub_08056458: @ 0x08056458 bne _08056470 ldr r0, _08056488 @ =gUnk_02022780 movs r1, #0xa8 - bl sub_0801D630 + bl _DmaZero movs r0, #1 bl sub_080564C8 _08056470: @@ -91,14 +91,14 @@ sub_080564EC: @ 0x080564EC push {r4, lr} ldr r0, _08056598 @ =gUnk_02036A40 movs r1, #8 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805659C @ =gUnk_02024030 movs r1, #0x18 - bl sub_0801D630 + bl _DmaZero ldr r4, _080565A0 @ =gUnk_02022780 adds r0, r4, #0 movs r1, #0xa8 - bl sub_0801D630 + bl _DmaZero ldr r0, _080565A4 @ =gTextBox adds r1, r4, #0 movs r2, #0x20 @@ -572,11 +572,11 @@ _080568B2: beq _080568D2 adds r0, r6, #0 movs r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r4, _08056910 @ =gUnk_02024030 adds r0, r4, #0 movs r1, #0x18 - bl sub_0801D630 + bl _DmaZero movs r0, #1 strb r0, [r4] strb r0, [r6] @@ -777,7 +777,7 @@ _08056A30: movs r1, #3 strb r1, [r2] movs r1, #0x18 - bl sub_0801D630 + bl _DmaZero movs r0, #0x6a bl PlaySFX adds r1, r6, #0 diff --git a/asm/code_0805E3B0.s b/asm/code_0805E3B0.s index a269d7ca..a39b6514 100644 --- a/asm/code_0805E3B0.s +++ b/asm/code_0805E3B0.s @@ -360,15 +360,15 @@ sub_0805E60C: @ 0x0805E60C bl sub_0805E89C ldr r0, _0805E654 @ =gUnk_03003DC0 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero ldr r0, _0805E658 @ =gLinkEntity movs r1, #0xaa lsls r1, r1, #6 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805E65C @ =gUnk_02033290 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero bl sub_0805E98C ldr r0, _0805E660 @ =gUnk_03003DBC movs r1, #0 diff --git a/asm/code_0805E744.s b/asm/code_0805E744.s index ffa1ec47..c6194d3e 100644 --- a/asm/code_0805E744.s +++ b/asm/code_0805E744.s @@ -252,7 +252,7 @@ sub_0805E900: @ 0x0805E900 bl sub_0805EA98 adds r0, r4, #0 movs r1, #0x40 - bl sub_0801D630 + bl _DmaZero ldr r1, _0805E928 @ =gUnk_020354B4 ldrb r0, [r1] subs r0, #1 @@ -1594,7 +1594,7 @@ _0805F2D0: bne _0805F2F0 adds r0, r5, #0 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero ldrb r0, [r4] movs r1, #1 orrs r0, r1 @@ -1624,7 +1624,7 @@ _0805F308: cmp r0, r2 bne _0805F318 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero b _0805F320 .align 2, 0 _0805F314: .4byte gUnk_02036540 @@ -1787,7 +1787,7 @@ sub_0805F440: @ 0x0805F440 adds r4, r0, #0 adds r5, r1, #0 movs r1, #0x30 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805F45C @ =0x0000FFFF cmp r5, r0 bls _0805F460 @@ -1965,7 +1965,7 @@ _0805F596: _0805F59E: ldr r0, _0805F5C8 @ =gUnk_02034330 movs r1, #0x18 - bl sub_0801D630 + bl _DmaZero _0805F5A6: mov r0, sb mov r1, sp @@ -2562,11 +2562,11 @@ sub_0805FA04: @ 0x0805FA04 ldr r0, _0805FA78 @ =gUnk_02034CB0 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805FA7C @ =gUnk_02001A40 movs r1, #0x80 lsls r1, r1, #5 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805FA80 @ =gScreen movs r2, #0 movs r1, #0x94 @@ -2585,11 +2585,11 @@ sub_0805FA04: @ 0x0805FA04 ldr r0, _0805FA88 @ =gUnk_02032EC0 movs r1, #0xed lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero ldr r4, _0805FA8C @ =gUnk_02000080 adds r0, r4, #0 movs r1, #0x30 - bl sub_0801D630 + bl _DmaZero movs r0, #0x80 lsls r0, r0, #0x12 ldrb r0, [r0, #7] diff --git a/asm/code_0806ED78.s b/asm/code_0806ED78.s index b3d78b6c..6efd6e68 100644 --- a/asm/code_0806ED78.s +++ b/asm/code_0806ED78.s @@ -842,7 +842,7 @@ sub_0806F364: @ 0x0806F364 adds r1, r2, r3 adds r0, r0, r1 movs r1, #0x10 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _0806F384: .4byte gArea diff --git a/asm/code_0806FA6C.s b/asm/code_0806FA6C.s index 09bac7ac..893ae0f3 100644 --- a/asm/code_0806FA6C.s +++ b/asm/code_0806FA6C.s @@ -385,7 +385,7 @@ sub_0806FD8C: @ 0x0806FD8C ldr r0, _0806FD9C @ =gUnk_020000C0 movs r1, #0xc0 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _0806FD9C: .4byte gUnk_020000C0 @@ -534,7 +534,7 @@ _0806FE9E: bls _0806FE9E adds r0, r6, #0 movs r1, #0x40 - bl sub_0801D630 + bl _DmaZero _0806FEB4: pop {r4, r5, r6, pc} .align 2, 0 @@ -1454,7 +1454,7 @@ sub_0807059C: @ 0x0807059C push {lr} ldr r0, _080705A8 @ =gUnk_02034490 movs r1, #0x18 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _080705A8: .4byte gUnk_02034490 diff --git a/asm/code_080732D0.s b/asm/code_080732D0.s index 2974abfd..9a98dc36 100644 --- a/asm/code_080732D0.s +++ b/asm/code_080732D0.s @@ -4198,7 +4198,7 @@ sub_080751E8: @ 0x080751E8 ldr r4, _08075230 @ =gUnk_02022750 adds r0, r4, #0 movs r1, #0x24 - bl sub_0801D630 + bl _DmaZero str r6, [r4] ldr r0, _08075234 @ =gLinkEntity adds r0, #0x84 diff --git a/asm/code_08077B98.s b/asm/code_08077B98.s index da1b72eb..2b863d36 100644 --- a/asm/code_08077B98.s +++ b/asm/code_08077B98.s @@ -642,7 +642,7 @@ sub_080784C8: @ 0x080784C8 movs r1, #0xc4 lsls r1, r1, #1 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080784E0 @ =gUnk_0811C000 str r0, [r4, #4] pop {r4, pc} diff --git a/asm/code_08078778.s b/asm/code_08078778.s index eab905d0..56747830 100644 --- a/asm/code_08078778.s +++ b/asm/code_08078778.s @@ -70,7 +70,7 @@ sub_080788E0: @ 0x080788E0 ldr r1, _08078900 @ =gUnk_03003DF8 adds r0, r0, r1 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero _080788FC: pop {pc} .align 2, 0 @@ -542,7 +542,7 @@ sub_08078C24: @ 0x08078C24 ldr r0, _08078CB0 @ =gUnk_03003DF0 movs r1, #0xc4 lsls r1, r1, #1 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _08078CAC: .4byte gLinkState diff --git a/asm/code_0807B9B8.s b/asm/code_0807B9B8.s index 9a17aa0a..24a845bd 100644 --- a/asm/code_0807B9B8.s +++ b/asm/code_0807B9B8.s @@ -822,14 +822,14 @@ sub_0807BFD0: @ 0x0807BFD0 adds r0, r7, #0 adds r1, r6, #0 mov r2, r8 - bl sub_0801D5EC + bl _DmaFill16 movs r5, #0 strh r5, [r6] ldr r4, _0807C0C0 @ =gUnk_02010654 adds r0, r7, #0 adds r1, r4, #0 mov r2, r8 - bl sub_0801D5EC + bl _DmaFill16 strh r5, [r4] ldr r2, _0807C0C4 @ =gRoomControls ldr r0, _0807C0C8 @ =gArea @@ -873,7 +873,7 @@ _0807C04E: adds r0, r7, #0 adds r1, r6, #0 mov r2, r8 - bl sub_0801D5EC + bl _DmaFill16 movs r2, #0 ldr r3, _0807C0D8 @ =0x000007FF adds r4, r7, #0 @@ -899,7 +899,7 @@ _0807C078: ldr r4, _0807C0B8 @ =0x0000FFFF adds r0, r4, #0 adds r1, r6, #0 - bl sub_0801D5EC + bl _DmaFill16 movs r2, #0 ldr r3, _0807C0D8 @ =0x000007FF _0807C096: @@ -948,19 +948,19 @@ sub_0807C0DC: @ 0x0807C0DC lsls r6, r6, #6 adds r0, r5, #0 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero adds r0, r5, r6 movs r1, #0x80 lsls r1, r1, #5 - bl sub_0801D630 + bl _DmaZero ldr r0, _0807C160 @ =gUnk_02019EE0 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _0807C164 @ =gUnk_02002F00 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _0807C168 @ =gArea ldr r1, _0807C16C @ =0x0000085C adds r0, r0, r1 @@ -999,7 +999,7 @@ _0807C174: .4byte 0x0000FFFF _0807C178: adds r0, r2, #4 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero movs r3, #1 mov sb, r3 _0807C184: @@ -1167,7 +1167,7 @@ _0807C2E4: bl sub_0807C5F4 adds r0, r5, #0 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero ldr r4, _0807C350 @ =gUnk_02002F00 adds r5, r4, r6 adds r0, r4, #0 @@ -1179,7 +1179,7 @@ _0807C2E4: bl sub_0807C5F4 adds r0, r5, #0 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero _0807C326: mov r1, sb cmp r1, #0 @@ -1406,10 +1406,10 @@ sub_0807C4F8: @ 0x0807C4F8 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _0807C59C @ =gUnk_02002F00 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r5, _0807C5A0 @ =gUnk_02022830 ldr r0, _0807C5A4 @ =gArea ldr r1, _0807C5A8 @ =0x0000085C @@ -1455,7 +1455,7 @@ _0807C54A: bl sub_0807C5F4 adds r0, r5, #0 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero ldr r4, _0807C59C @ =gUnk_02002F00 adds r5, r4, r6 adds r0, r4, #0 @@ -1467,7 +1467,7 @@ _0807C54A: bl sub_0807C5F4 adds r0, r5, #0 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero _0807C592: pop {r4, r5, r6, pc} .align 2, 0 @@ -1694,7 +1694,7 @@ _0807C710: _0807C726: adds r0, r4, #0 movs r1, #0x40 - bl sub_0801D630 + bl _DmaZero adds r4, #0x40 adds r5, #1 cmp r5, r7 @@ -1984,7 +1984,7 @@ _0807C92E: _0807C946: adds r0, r4, #0 movs r1, #0x80 - bl sub_0801D630 + bl _DmaZero adds r4, #0x80 adds r5, #1 cmp r5, r6 diff --git a/asm/code_0807CC3C.s b/asm/code_0807CC3C.s index fa29b577..fc5fa1d1 100644 --- a/asm/code_0807CC3C.s +++ b/asm/code_0807CC3C.s @@ -1773,14 +1773,14 @@ sub_0807DA70: @ 0x0807DA70 ldr r4, _0807DA94 @ =gUnk_02033280 adds r0, r4, #0 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero ldr r0, _0807DA98 @ =gUnk_02036570 movs r1, #0x90 lsls r1, r1, #3 - bl sub_0801D630 + bl _DmaZero ldr r0, _0807DA9C @ =gUnk_02022750 movs r1, #0x24 - bl sub_0801D630 + bl _DmaZero movs r0, #8 strb r0, [r4, #8] pop {r4, pc} @@ -1816,7 +1816,7 @@ _0807DAC2: sub_0807DAC4: @ 0x0807DAC4 push {lr} movs r1, #0x24 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 @@ -1880,7 +1880,7 @@ StartPlayerScript: @ 0x0807DB2C ldr r4, _0807DB5C @ =gUnk_02022750 adds r0, r4, #0 movs r1, #0x24 - bl sub_0801D630 + bl _DmaZero str r5, [r4] ldr r0, _0807DB60 @ =gLinkEntity adds r0, #0x84 @@ -1927,7 +1927,7 @@ sub_0807DB88: @ 0x0807DB88 adds r4, r0, #0 adds r5, r1, #0 movs r1, #0x24 - bl sub_0801D630 + bl _DmaZero str r5, [r4] pop {r4, r5, pc} @@ -7919,11 +7919,11 @@ sub_08080668: @ 0x08080668 ldr r5, _080806A4 @ =gRoomControls adds r0, r5, #0 movs r1, #0x38 - bl sub_0801D630 + bl _DmaZero ldr r4, _080806A8 @ =gUnk_03004030 adds r0, r4, #0 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero ldr r0, _080806AC @ =0x0000FFFF strh r0, [r5, #0x22] movs r0, #0xff @@ -7935,10 +7935,10 @@ sub_08080668: @ 0x08080668 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080806B8 @ =gUnk_02002F00 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero pop {r4, r5, pc} .align 2, 0 _080806A4: .4byte gRoomControls diff --git a/asm/code_080A29BC.s b/asm/code_080A29BC.s index 88c1490b..a7eab04d 100644 --- a/asm/code_080A29BC.s +++ b/asm/code_080A29BC.s @@ -995,7 +995,7 @@ sub_080A3210: @ 0x080A3210 ldr r4, _080A3230 @ =gUnk_02021EE0 adds r0, r4, #0 movs r1, #0x18 - bl sub_0801D630 + bl _DmaZero bl sub_080A35C8 movs r0, #0x80 lsls r0, r0, #1 diff --git a/asm/code_080A3480.s b/asm/code_080A3480.s index b95cc3b4..0e29f5f1 100644 --- a/asm/code_080A3480.s +++ b/asm/code_080A3480.s @@ -354,7 +354,7 @@ sub_080A36F8: @ 0x080A36F8 ldr r0, _080A3760 @ =gUnk_02021F30 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r1, _080A3764 @ =gScreen movs r2, #0 movs r0, #1 @@ -410,7 +410,7 @@ _080A378A: ldr r0, _080A37B8 @ =gUnk_02021F30 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero movs r1, #0x10 ldrsh r0, [r4, r1] ldr r2, _080A37BC @ =gUnk_081272E0 @@ -580,7 +580,7 @@ sub_080A38D0: @ 0x080A38D0 movs r6, #0x80 lsls r6, r6, #4 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero ldr r4, _080A3924 @ =gScreen movs r0, #0 mov r8, r0 @@ -588,7 +588,7 @@ sub_080A38D0: @ 0x080A38D0 strh r5, [r4, #0x1a] ldr r0, _080A3928 @ =gUnk_020344B0 adds r1, r6, #0 - bl sub_0801D630 + bl _DmaZero strh r5, [r4, #0x26] adds r4, #0x68 movs r0, #0x80 @@ -712,7 +712,7 @@ _080A39C8: movs r0, #0xc0 lsls r0, r0, #0x13 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero movs r0, #0 movs r1, #0 bl sub_08052418 diff --git a/asm/code_080A3BD0.s b/asm/code_080A3BD0.s index 622d80ca..59aecd61 100644 --- a/asm/code_080A3BD0.s +++ b/asm/code_080A3BD0.s @@ -1003,7 +1003,7 @@ sub_080A4398: @ 0x080A4398 push {lr} ldr r0, _080A43A4 @ =gUnk_02019EE0 movs r1, #0x40 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _080A43A4: .4byte gUnk_02019EE0 @@ -1187,7 +1187,7 @@ sub_080A44E0: @ 0x080A44E0 mov r8, r0 ldr r0, [r4, #8] mov r1, r8 - bl sub_0801D630 + bl _DmaZero adds r0, r6, #0 adds r1, r4, #0 bl sub_0805F76C @@ -1337,11 +1337,11 @@ sub_080A4608: @ 0x080A4608 ldr r0, _080A46A4 @ =gUnk_02034CB0 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A46A8 @ =gUnk_02001A40 movs r1, #0x80 lsls r1, r1, #5 - bl sub_0801D630 + bl _DmaZero ldr r2, _080A46AC @ =gScreen adds r1, r2, #0 adds r1, #0x58 @@ -2044,7 +2044,7 @@ sub_080A4BA0: @ 0x080A4BA0 adds r6, r1, #0 add r0, sp, #0x18 movs r1, #0x30 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A4C08 @ =gUnk_0812816C mov r1, sp movs r2, #0x18 @@ -2130,7 +2130,7 @@ _080A4C3E: _080A4C56: ldr r1, [sp] movs r2, #0x80 - bl sub_0801D5EC + bl _DmaFill16 cmp r5, #0 ble _080A4CAC ldr r0, _080A4C9C @ =0x00007FFF @@ -2191,7 +2191,7 @@ sub_080A4CBC: @ 0x080A4CBC lsls r5, r5, #4 adds r0, r4, #0 adds r1, r5, #0 - bl sub_0801D630 + bl _DmaZero ldr r1, _080A4D14 @ =0x0600E000 adds r0, r4, #0 adds r2, r5, #0 @@ -2285,7 +2285,7 @@ sub_080A4D88: @ 0x080A4D88 push {lr} ldr r0, _080A4DA4 @ =gUnk_020344A0 movs r1, #8 - bl sub_0801D630 + bl _DmaZero movs r0, #1 movs r1, #0 bl sub_080A7138 @@ -2313,21 +2313,21 @@ sub_080A4DB8: @ 0x080A4DB8 movs r4, #0x80 lsls r4, r4, #4 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A4E5C @ =gUnk_02021F30 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A4E60 @ =gUnk_020344B0 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A4E64 @ =gUnk_0200AF34 movs r1, #0xc0 lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero ldr r4, _080A4E68 @ =gUnk_02000080 adds r0, r4, #0 movs r1, #0x30 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A4E6C @ =0x0000FFFF strh r0, [r4, #0x2e] ldr r0, _080A4E70 @ =gUnk_02034490 @@ -2648,7 +2648,7 @@ _080A5080: ldr r0, _080A5098 @ =gUnk_02034CB0 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r1, _080A509C @ =gScreen movs r0, #1 strh r0, [r1, #0xe] diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index 239efe6b..93865266 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -2458,7 +2458,7 @@ _080A6886: ldr r0, _080A68D0 @ =gUnk_02019EE0 movs r1, #0x80 lsls r1, r1, #3 - bl sub_0801D630 + bl _DmaZero pop {r4, r5, r6, r7, pc} .align 2, 0 _080A68AC: .4byte gUnk_02032EC0 @@ -2806,7 +2806,7 @@ sub_080A6B04: @ 0x080A6B04 ldr r1, _080A6C08 @ =gUnk_02001A40 movs r2, #0x80 lsls r2, r2, #5 - bl sub_0801D5EC + bl _DmaFill16 ldr r0, _080A6C0C @ =gLinkState ldr r0, [r0, #0x30] movs r1, #8 @@ -3323,7 +3323,7 @@ sub_080A6F6C: @ 0x080A6F6C ldr r0, _080A6FA8 @ =gUnk_020350F0 movs r1, #0x80 lsls r1, r1, #1 - bl sub_0801D630 + bl _DmaZero movs r0, #0xff ands r0, r4 cmp r0, #0 @@ -3392,7 +3392,7 @@ _080A6FFA: ldr r0, _080A7038 @ =gUnk_020350F0 movs r1, #0x80 lsls r1, r1, #1 - bl sub_0801D630 + bl _DmaZero movs r0, #0xff ands r0, r4 cmp r0, #0 @@ -3429,7 +3429,7 @@ sub_080A7040: @ 0x080A7040 movs r1, #0xc0 lsls r1, r1, #2 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A7098 @ =0xFFFFFE00 adds r4, r4, r0 ldr r1, _080A709C @ =0x0600E000 @@ -3472,7 +3472,7 @@ sub_080A70AC: @ 0x080A70AC movs r1, #0xc0 lsls r1, r1, #2 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero adds r2, r4, #0 subs r2, #0x34 movs r0, #0x7f @@ -3535,7 +3535,7 @@ sub_080A7124: @ 0x080A7124 ldr r0, _080A7134 @ =gUnk_02032EC0 movs r1, #0xed lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _080A7134: .4byte gUnk_02032EC0 @@ -3552,7 +3552,7 @@ sub_080A7138: @ 0x080A7138 movs r1, #0xed lsls r1, r1, #2 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero strb r5, [r4, #2] strb r6, [r4, #3] ldr r0, _080A7160 @ =gUnk_03001000 @@ -3783,18 +3783,18 @@ sub_080A7328: @ 0x080A7328 bl sub_0805E89C ldr r0, _080A738C @ =gUnk_02000080 movs r1, #0x30 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A7390 @ =gRoomControls movs r1, #0x38 - bl sub_0801D630 + bl _DmaZero ldr r0, _080A7394 @ =gUnk_03000420 movs r1, #0x80 lsls r1, r1, #1 - bl sub_0801D630 + bl _DmaZero ldr r4, _080A7398 @ =gUnk_02033280 adds r0, r4, #0 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero movs r0, #8 strb r0, [r4, #8] movs r0, #1 @@ -4959,7 +4959,7 @@ sub_080A7C7C: @ 0x080A7C7C push {lr} ldr r0, _080A7C88 @ =gUnk_02017660 movs r1, #0x40 - bl sub_0801D630 + bl _DmaZero pop {pc} .align 2, 0 _080A7C88: .4byte gUnk_02017660 diff --git a/asm/code_080AD90C.s b/asm/code_080AD90C.s index 194d7acc..a2259a48 100644 --- a/asm/code_080AD90C.s +++ b/asm/code_080AD90C.s @@ -567,7 +567,7 @@ sub_080ADD30: @ 0x080ADD30 movs r1, #0x85 lsls r1, r1, #2 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero movs r5, #0 adds r4, #4 movs r0, #0x10 @@ -718,7 +718,7 @@ _080ADE54: .4byte gUnk_02024494 _080ADE58: adds r0, r1, #0 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero _080ADE60: adds r5, #0xc adds r4, #1 @@ -1084,7 +1084,7 @@ sub_080AE104: @ 0x080AE104 adds r1, r1, r5 lsls r1, r1, #2 adds r0, r4, #0 - bl sub_0801D630 + bl _DmaZero strb r5, [r4, #1] strh r6, [r4, #4] adds r0, r4, #0 @@ -1396,7 +1396,7 @@ _080AE350: stm r0!, {r2, r3, r7} adds r0, r6, #0 movs r1, #0xc - bl sub_0801D630 + bl _DmaZero adds r6, #0xc adds r5, #0xc movs r0, #0xc diff --git a/asm/gyorgFemale.s b/asm/gyorgFemale.s index 20c48072..cae9b128 100644 --- a/asm/gyorgFemale.s +++ b/asm/gyorgFemale.s @@ -112,10 +112,10 @@ sub_0804614C: @ 0x0804614C movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08046250 @ =gUnk_02002F00 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero adds r0, r6, #0 movs r1, #0 bl sub_0804660C @@ -445,10 +445,10 @@ sub_08046498: @ 0x08046498 movs r4, #0x80 lsls r4, r4, #8 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _080464BC @ =gUnk_02002F00 adds r1, r4, #0 - bl sub_0801D630 + bl _DmaZero adds r0, r5, #0 bl sub_080464C0 pop {r4, r5, pc} @@ -486,7 +486,7 @@ _080464DE: ldr r0, _0804650C @ =gUnk_02019EE0 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r1, _08046514 @ =gUnk_02000070 movs r0, #1 strb r0, [r1] diff --git a/asm/initializeLink.s b/asm/initializeLink.s index ef69d458..b219c8dd 100644 --- a/asm/initializeLink.s +++ b/asm/initializeLink.s @@ -8,11 +8,11 @@ InitializeLink: @ 0x080524A8 bl sub_080784C8 ldr r0, _08052510 @ =gUnk_03000B80 movs r1, #0x70 - bl sub_0801D630 + bl _DmaZero ldr r6, _08052514 @ =gLinkState adds r0, r6, #0 movs r1, #0xb0 - bl sub_0801D630 + bl _DmaZero movs r0, #1 rsbs r0, r0, #0 adds r1, r6, #0 @@ -22,7 +22,7 @@ InitializeLink: @ 0x080524A8 ldr r4, _08052518 @ =gLinkEntity adds r0, r4, #0 movs r1, #0x88 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805251C @ =gRoomControls str r4, [r0, #0x30] ldr r1, _08052520 @ =gUnk_080FCAC8 diff --git a/asm/manager10.s b/asm/manager10.s index 88b7358d..c618ca61 100644 --- a/asm/manager10.s +++ b/asm/manager10.s @@ -338,7 +338,7 @@ _08059800: lsls r5, r5, #4 adds r0, r4, #0 adds r1, r5, #0 - bl sub_0801D630 + bl _DmaZero ldr r1, _08059820 @ =0x0600E800 adds r0, r4, #0 adds r2, r5, #0 diff --git a/asm/manager1A.s b/asm/manager1A.s index dedc4bb6..446763f8 100644 --- a/asm/manager1A.s +++ b/asm/manager1A.s @@ -28,7 +28,7 @@ sub_0805B048: @ 0x0805B048 adds r0, r4, #0 adds r0, #0x20 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero movs r0, #1 strb r0, [r4, #0xc] ldr r2, _0805B08C @ =gRoomControls diff --git a/asm/manager22.s b/asm/manager22.s index 9d18ceba..8cd27864 100644 --- a/asm/manager22.s +++ b/asm/manager22.s @@ -297,7 +297,7 @@ _0805BB28: movs r2, #0x80 lsls r2, r2, #4 movs r0, #0xf - bl sub_0801D5EC + bl _DmaFill16 ldr r0, _0805BB58 @ =gScreen ldr r1, _0805BB5C @ =0x00001E0C strh r1, [r0, #0x2c] diff --git a/asm/manager2C.s b/asm/manager2C.s index b588419f..6b3b92a3 100644 --- a/asm/manager2C.s +++ b/asm/manager2C.s @@ -44,7 +44,7 @@ _0805D184: ldr r4, _0805D1F8 @ =gUnk_030010AC adds r0, r4, #0 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero subs r4, #0xc movs r1, #0 movs r0, #1 diff --git a/asm/manager39.s b/asm/manager39.s index aae17671..26dd0847 100644 --- a/asm/manager39.s +++ b/asm/manager39.s @@ -120,7 +120,7 @@ sub_0805E1D8: @ 0x0805E1D8 push {lr} ldr r0, _0805E1F0 @ =gUnk_02034DF0 movs r1, #0x80 - bl sub_0801D630 + bl _DmaZero ldr r1, _0805E1F4 @ =gScreen movs r0, #1 strh r0, [r1, #0xe] @@ -138,7 +138,7 @@ sub_0805E1F8: @ 0x0805E1F8 adds r5, r1, #0 ldr r0, _0805E234 @ =gUnk_02034DF0 movs r1, #0x80 - bl sub_0801D630 + bl _DmaZero ldr r0, _0805E238 @ =gUnk_08108E60 mov r1, sp movs r2, #9 diff --git a/asm/managerB.s b/asm/managerB.s index 13d574b2..6e6d4cd0 100644 --- a/asm/managerB.s +++ b/asm/managerB.s @@ -216,7 +216,7 @@ sub_08058760: @ 0x08058760 adds r0, r4, #0 adds r0, #0x20 movs r1, #0x20 - bl sub_0801D630 + bl _DmaZero adds r0, r4, #0 movs r1, #8 bl sub_0805EA2C diff --git a/asm/non_matching/mainLoop.inc b/asm/non_matching/mainLoop.inc index 651625a1..24e3f299 100644 --- a/asm/non_matching/mainLoop.inc +++ b/asm/non_matching/mainLoop.inc @@ -35,7 +35,7 @@ ldr r4, _08055F04 @ =gUnk_03001000 adds r0, r4, #0 movs r1, #0x10 - bl sub_0801D630 + bl _DmaZero movs r0, #0 bl sub_08056010 adds r6, r4, #0 diff --git a/asm/object3D.s b/asm/object3D.s index d7a2278d..fd19ab4f 100644 --- a/asm/object3D.s +++ b/asm/object3D.s @@ -170,7 +170,7 @@ sub_0808D030: @ 0x0808D030 adds r0, r4, #0 subs r0, #0x20 ldr r1, _0808D05C @ =0x00000B74 - bl sub_0801D630 + bl _DmaZero movs r1, #0xa8 lsls r1, r1, #2 adds r0, r1, #0 diff --git a/asm/sub_0801D630.s b/asm/sub_0801D630.s index a17d5907..20bb693c 100644 --- a/asm/sub_0801D630.s +++ b/asm/sub_0801D630.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_0801D630 -sub_0801D630: @ 0x0801D630 + thumb_func_start _DmaZero +_DmaZero: @ 0x0801D630 push {r4, lr} adds r3, r0, #0 adds r2, r1, #0 @@ -28,7 +28,7 @@ _0801D64A: _0801D654: movs r0, #0 adds r1, r3, #0 - bl sub_0801D5EC + bl _DmaFill16 b _0801D668 _0801D65E: strb r4, [r3] diff --git a/asm/sub_08052418.s b/asm/sub_08052418.s index 96c92a71..f7bd8bd3 100644 --- a/asm/sub_08052418.s +++ b/asm/sub_08052418.s @@ -14,7 +14,7 @@ sub_08052418: @ 0x08052418 ldr r0, _08052494 @ =gUnk_02021F30 movs r1, #0x80 lsls r1, r1, #4 - bl sub_0801D630 + bl _DmaZero ldr r0, _08052498 @ =gUnk_020227E8 movs r1, #0xf str r1, [r0] diff --git a/asm/sub_08055F70.s b/asm/sub_08055F70.s index 0bda6107..5cb4e821 100644 --- a/asm/sub_08055F70.s +++ b/asm/sub_08055F70.s @@ -23,7 +23,7 @@ sub_08055F70: @ 0x08055F70 ldr r2, _08055FD4 @ =0x0003FFD0 ldr r0, _08055FD8 @ =gUnk_02000030 adds r1, r2, #0 - bl sub_0801D630 + bl _DmaZero ldr r0, _08055FDC @ =gUnk_080B2CD8 ldr r3, _08055FE0 @ =sub_080B197C subs r2, r0, r3 diff --git a/asm/sub_080AD380.s b/asm/sub_080AD380.s index db8f0890..56400499 100644 --- a/asm/sub_080AD380.s +++ b/asm/sub_080AD380.s @@ -30,7 +30,7 @@ _080AD3A2: ldr r0, _080AD3B8 @ =gUnk_02032EC0 movs r1, #0xed lsls r1, r1, #2 - bl sub_0801D630 + bl _DmaZero movs r0, #0 bl IntroSetTransition b _080AD3EA diff --git a/asm/wizzrobeIce.s b/asm/wizzrobeIce.s index 82fc0f89..46e0ab6a 100644 --- a/asm/wizzrobeIce.s +++ b/asm/wizzrobeIce.s @@ -383,7 +383,7 @@ sub_080300AC: @ 0x080300AC ldr r4, _080300C0 @ =gUnk_0300110C adds r0, r4, #0 movs r1, #0x44 - bl sub_0801D630 + bl _DmaZero adds r4, #0x42 movs r0, #0xff strh r0, [r4] @@ -406,7 +406,7 @@ sub_080300C4: @ 0x080300C4 strh r1, [r0] subs r0, #0x40 movs r1, #0x40 - bl sub_0801D630 + bl _DmaZero _080300E2: pop {pc} .align 2, 0 diff --git a/include/functions.h b/include/functions.h index c2cf2e88..e9460e9e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -89,7 +89,7 @@ extern Entity *sub_0804A98C(Entity *, u32, u32); extern u32 sub_080544DC(u8); extern void sub_08077E54(Entity*); extern void sub_080042BA(Entity*); -extern void sub_0801D630(void*, u32); +extern void _DmaZero(void*, u32); extern void sub_08077F24(ItemBehavior*, u32); extern void sub_08079184(); extern void sub_08077F50(ItemBehavior *beh, u32 arg1); diff --git a/include/main.h b/include/main.h index d9c8719c..c1ef4b5b 100644 --- a/include/main.h +++ b/include/main.h @@ -24,7 +24,7 @@ extern void sub_0804FFE4(); extern s32 sub_0804FF84(s32); extern s32 sub_08056418(s32); extern void sub_080ADD30(s32); -extern s32 sub_0801D630(s32, u32, u32); +extern s32 _DmaZero(s32, u32, u32); extern s32 sub_08056010(s32); extern s32 sub_08016E78(s32); extern s32 ReadKeyInput(); diff --git a/linker.ld b/linker.ld index 58006a85..d68ed689 100644 --- a/linker.ld +++ b/linker.ld @@ -315,9 +315,9 @@ SECTIONS { asm/drawHealth.o(.text); asm/sub_0801C824.o(.text); asm/code_0801C85C.o(.text); - src/sub_0801D5EC.o(.text); + src/_dmaFill16.o(.text); src/_dmaFill32.o(.text); - asm/sub_0801D630.o(.text); + src/_dmaZero.o(.text); asm/sub_0801D66C.o(.text); src/input.o(.text); asm/code_0801D714.o(.text); diff --git a/src/sub_0801D5EC.c b/src/_dmaFill16.c similarity index 54% rename from src/sub_0801D5EC.c rename to src/_dmaFill16.c index a660e4f0..1befefc7 100644 --- a/src/sub_0801D5EC.c +++ b/src/_dmaFill16.c @@ -1,4 +1,4 @@ #include "global.h" -void sub_0801D5EC(u32 a1, u32 a2, u32 a3) { +void _DmaFill16(u32 a1, u32 a2, u32 a3) { DmaFill16(3, a1, a2, a3); } diff --git a/src/_dmaZero.c b/src/_dmaZero.c new file mode 100644 index 00000000..97bbba4c --- /dev/null +++ b/src/_dmaZero.c @@ -0,0 +1,24 @@ +#include "global.h" + +void _DmaFill32(u32, void*, u32); +void _DmaFill16(u32, void*, u32); + +void _DmaZero(u8 *src, u32 count) +{ + u32 zero = 0; + + switch (((u32)src | count) & 3) { + case 0: + _DmaFill32(0,src, count); + break; + case 2: + _DmaFill16(0, src, count); + break; + default: + do { + *src = zero; + src++; + count--; + } while (count != 0); + } +} \ No newline at end of file diff --git a/src/code_08077DF4.c b/src/code_08077DF4.c index 3897a273..0b849819 100644 --- a/src/code_08077DF4.c +++ b/src/code_08077DF4.c @@ -63,7 +63,7 @@ void sub_08077E78(void* arg0, u32 bits) not = ~not; gLinkState.field_0xa &= not; gLinkState.keepFacing &= not; - sub_0801D630(arg0, 0x1c); + _DmaZero(arg0, 0x1c); } u32 sub_08077EC8(Unk_struct* arg0) diff --git a/src/introSetTransition.c b/src/introSetTransition.c index 81ce484c..ff9e54c3 100644 --- a/src/introSetTransition.c +++ b/src/introSetTransition.c @@ -13,7 +13,7 @@ typedef struct { } TransitionStruct; extern u32 DoFade(u32, u32); -extern void sub_0801D630(u32*, u32, u32); +extern void _DmaZero(u32*, u32, u32); extern u32 gUnk_02000080; extern TransitionStruct gUnk_03001000; extern Menu gUnk_02032EC0; @@ -23,6 +23,6 @@ u32 IntroSetTransition(u8 transition, u32 param_2, u32 param_3) { gUnk_02032EC0.transitionType = transition; gUnk_03001000.functionIndex = 2; - sub_0801D630(&gUnk_02000080, 48, param_3); + _DmaZero(&gUnk_02000080, 48, param_3); return DoFade(7, 8); } diff --git a/src/mainLoop.c b/src/mainLoop.c index dcc0ebbf..4e07b882 100644 --- a/src/mainLoop.c +++ b/src/mainLoop.c @@ -30,7 +30,7 @@ extern void sub_0804FFE4(void); extern void sub_0804FF84(u32); extern void sub_08056418(void); extern void sub_080ADD30(void); -extern void sub_0801D630(void*, u32); +extern void _DmaZero(void*, u32); extern void sub_08056010(u32); extern void ReadKeyInput(); extern u32 sub_08055FF4(); @@ -68,7 +68,7 @@ void MainLoop(void) { sub_080ADD30(); gRand = 0x1234567; s = &gUnk_03001000; - sub_0801D630(s, 16); + _DmaZero(s, 16); sub_08056010(0); while (1) { ReadKeyInput(); diff --git a/src/sub_08050008.c b/src/sub_08050008.c index 7ed85c26..8e370727 100644 --- a/src/sub_08050008.c +++ b/src/sub_08050008.c @@ -2,12 +2,12 @@ extern u32 gUnk_020354C0; extern s32 gUnk_03000FD0; -extern void sub_0801D630(u32, u32, u32); +extern void _DmaZero(u32, u32, u32); void sub_08050008(u32 param_1, u32 param_2, u32 param_3) { s32* unk; - sub_0801D630((u32)&gUnk_020354C0, 128, param_3); + _DmaZero((u32)&gUnk_020354C0, 128, param_3); unk = &gUnk_03000FD0; *(unk + 1) = -1; diff --git a/src/textbox.c b/src/textbox.c index b8b82940..f426e392 100644 --- a/src/textbox.c +++ b/src/textbox.c @@ -3,7 +3,7 @@ #include "entity.h" #include "textbox.h" -void sub_0801D630(); +void _DmaZero(); void ShowTextbox(); void TextboxAtPosition(); @@ -62,7 +62,7 @@ void TextboxAtPosition(u32 index, u32 x, u32 y) { } void ShowTextbox(u32 index, u32 param_2, u32* dest) { - sub_0801D630(&gTextBox, 32, dest); + _DmaZero(&gTextBox, 32, dest); gTextBox.textIndex = index; gTextBox.textSpeed = 99; gTextBox.textWindowWidth = 26; @@ -75,10 +75,10 @@ void ShowTextbox(u32 index, u32 param_2, u32* dest) { void sub_08056418(void) { - sub_0801D630(&gTextBox, 32); - sub_0801D630(&gUnk_02022780, 168); - sub_0801D630(&gUnk_02036A40, 8); - sub_0801D630(&gUnk_02036A38, 8); - sub_0801D630(&gUnk_02000040, 4); + _DmaZero(&gTextBox, 32); + _DmaZero(&gUnk_02022780, 168); + _DmaZero(&gUnk_02036A40, 8); + _DmaZero(&gUnk_02036A38, 8); + _DmaZero(&gUnk_02000040, 4); return; }