diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-24 09:33:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 09:33:28 +0300 |
| commit | d28df0e7c8399c90e97aee098e868de1858fa2f4 (patch) | |
| tree | a9355840a31817265dff3103491dbab35761bf5f /arm9/asm | |
| parent | b071ca4b3dd89b1508b1ed15896a7e113c87bd2c (diff) | |
| parent | e8b207b4a7fcdafab393fc50e4b307e3f28aea1e (diff) | |
Merge pull request #181 from red031000/master
module_05 fully shiftable
Diffstat (limited to 'arm9/asm')
| -rw-r--r-- | arm9/asm/unk_0205CE48.s | 28 | ||||
| -rw-r--r-- | arm9/asm/unk_02063948.s | 4 |
2 files changed, 16 insertions, 16 deletions
diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index 21fb0c6d..d69aacdd 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -1138,7 +1138,7 @@ FUN_0205D6BC: ; 0x0205D6BC add r7, r0, #0x0 bl memset mov r0, #0x72 - ldr r1, _0205D710 ; =0x021F57F1 + ldr r1, _0205D710 ; =MOD05_021F57F0 lsl r0, r0, #0x2 str r1, [r4, r0] add r0, #0x30 @@ -1153,7 +1153,7 @@ FUN_0205D6BC: ; 0x0205D6BC bl FUN_0206EDD4 pop {r3-r7, pc} .balign 4 -_0205D710: .word 0x021F57F1 +_0205D710: .word MOD05_021F57F0 thumb_func_start FUN_0205D714 FUN_0205D714: ; 0x0205D714 @@ -1202,7 +1202,7 @@ FUN_0205D74C: ; 0x0205D74C add r0, r5, #0x0 bl FUN_0204649C mov r0, #0x72 - ldr r1, _0205D784 ; =0x021F5C71 + ldr r1, _0205D784 ; =MOD05_021F5C70 lsl r0, r0, #0x2 str r1, [r4, r0] add r0, r5, #0x0 @@ -1216,7 +1216,7 @@ FUN_0205D74C: ; 0x0205D74C strh r0, [r4, #0x2a] pop {r3-r5, pc} .balign 4 -_0205D784: .word 0x021F5C71 +_0205D784: .word MOD05_021F5C70 thumb_func_start FUN_0205D788 FUN_0205D788: ; 0x0205D788 @@ -1228,12 +1228,12 @@ FUN_0205D788: ; 0x0205D788 bl MOD05_021F5C44 add r2, r0, #0x0 ldr r0, [r4, #0x0] - ldr r1, _0205D7A4 ; =0x021F5C71 + ldr r1, _0205D7A4 ; =MOD05_021F5C70 bl FUN_020463CC mov r0, #0x0 pop {r4, pc} .balign 4 -_0205D7A4: .word 0x021F5C71 +_0205D7A4: .word MOD05_021F5C70 thumb_func_start FUN_0205D7A8 FUN_0205D7A8: ; 0x0205D7A8 @@ -1248,7 +1248,7 @@ FUN_0205D7A8: ; 0x0205D7A8 add r0, r5, #0x0 bl FUN_0204649C mov r0, #0x72 - ldr r1, _0205D7E0 ; =0x021F5C71 + ldr r1, _0205D7E0 ; =MOD05_021F5C70 lsl r0, r0, #0x2 str r1, [r4, r0] add r0, r5, #0x0 @@ -1262,7 +1262,7 @@ FUN_0205D7A8: ; 0x0205D7A8 strh r0, [r4, #0x2a] pop {r3-r5, pc} .balign 4 -_0205D7E0: .word 0x021F5C71 +_0205D7E0: .word MOD05_021F5C70 thumb_func_start FUN_0205D7E4 FUN_0205D7E4: ; 0x0205D7E4 @@ -1274,12 +1274,12 @@ FUN_0205D7E4: ; 0x0205D7E4 bl MOD05_021F5C44 add r2, r0, #0x0 ldr r0, [r4, #0x0] - ldr r1, _0205D800 ; =0x021F5C71 + ldr r1, _0205D800 ; =MOD05_021F5C70 bl FUN_020463CC mov r0, #0x0 pop {r4, pc} .balign 4 -_0205D800: .word 0x021F5C71 +_0205D800: .word MOD05_021F5C70 thumb_func_start FUN_0205D804 FUN_0205D804: ; 0x0205D804 @@ -1294,7 +1294,7 @@ FUN_0205D804: ; 0x0205D804 add r0, r5, #0x0 bl FUN_0204649C mov r0, #0x72 - ldr r1, _0205D83C ; =0x021F5C71 + ldr r1, _0205D83C ; =MOD05_021F5C70 lsl r0, r0, #0x2 str r1, [r4, r0] add r0, r5, #0x0 @@ -1308,7 +1308,7 @@ FUN_0205D804: ; 0x0205D804 strh r0, [r4, #0x2a] pop {r3-r5, pc} .balign 4 -_0205D83C: .word 0x021F5C71 +_0205D83C: .word MOD05_021F5C70 thumb_func_start FUN_0205D840 FUN_0205D840: ; 0x0205D840 @@ -1320,12 +1320,12 @@ FUN_0205D840: ; 0x0205D840 bl MOD05_021F5C44 add r2, r0, #0x0 ldr r0, [r4, #0x0] - ldr r1, _0205D85C ; =0x021F5C71 + ldr r1, _0205D85C ; =MOD05_021F5C70 bl FUN_020463CC mov r0, #0x0 pop {r4, pc} .balign 4 -_0205D85C: .word 0x021F5C71 +_0205D85C: .word MOD05_021F5C70 thumb_func_start FUN_0205D860 FUN_0205D860: ; 0x0205D860 diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index fe93cc06..a81ecdce 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -1265,7 +1265,7 @@ FUN_020642B4: ; 0x020642B4 add r0, r5, #0x0 bl FUN_0204649C mov r0, #0x72 - ldr r1, _0206430C ; =0x021F6361 + ldr r1, _0206430C ; =MOD05_021F6360 lsl r0, r0, #0x2 str r1, [r4, r0] add r0, #0x30 @@ -1286,7 +1286,7 @@ FUN_020642B4: ; 0x020642B4 bl FUN_02028AD4 pop {r4-r6, pc} .balign 4 -_0206430C: .word 0x021F6361 +_0206430C: .word MOD05_021F6360 thumb_func_start FUN_02064310 FUN_02064310: ; 0x02064310 |