diff options
Diffstat (limited to 'arm9/modules/05/asm')
-rw-r--r-- | arm9/modules/05/asm/mod05_021D80E8.s | 8 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021D9A48.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021DA5B8.s | 4 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021DC0B8.s | 6 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E1374.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E1AD8.s | 10 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E5AB4.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E5FD8.s | 16 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E7504.s | 4 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E779C.s | 4 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 12 |
11 files changed, 35 insertions, 35 deletions
diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index e228ee0a..bda94277 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -575,7 +575,7 @@ _021D856A: cmp r0, #1 bne _021D858E ldr r0, _021D8598 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FUN_02035080 add sp, #8 @@ -770,7 +770,7 @@ _021D8710: lsr r0, r0, #0x1f beq _021D8726 ldr r0, _021D8730 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl FUN_0203515C mov r0, #1 @@ -881,7 +881,7 @@ _021D87F4: lsr r0, r0, #0x1f beq _021D8816 ldr r0, _021D881C ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 bl FUN_02035118 mov r0, #4 @@ -1027,7 +1027,7 @@ _021D892C: lsr r0, r0, #0x1f beq _021D8946 ldr r0, _021D8950 ; =0x000005FD - bl FUN_020054C8 + bl PlaySE add r0, r4, #0 bl FUN_02035080 add sp, #4 diff --git a/arm9/modules/05/asm/mod05_021D9A48.s b/arm9/modules/05/asm/mod05_021D9A48.s index 4cd22924..442bfb26 100644 --- a/arm9/modules/05/asm/mod05_021D9A48.s +++ b/arm9/modules/05/asm/mod05_021D9A48.s @@ -1564,7 +1564,7 @@ _021DA526: beq _021DA542 lsl r0, r4, #0x10 lsr r0, r0, #0x10 - bl FUN_020054C8 + bl PlaySE _021DA542: add r0, r5, #0 mov r1, #0 diff --git a/arm9/modules/05/asm/mod05_021DA5B8.s b/arm9/modules/05/asm/mod05_021DA5B8.s index b4648ab3..eb8560b0 100644 --- a/arm9/modules/05/asm/mod05_021DA5B8.s +++ b/arm9/modules/05/asm/mod05_021DA5B8.s @@ -1489,7 +1489,7 @@ _021DB164: str r0, [r5, #8] strb r0, [r5, #4] ldr r0, _021DB1C8 ; =0x00000603 - bl FUN_020054C8 + bl PlaySE mov r0, #6 str r0, [sp] mov r0, #1 @@ -1552,7 +1552,7 @@ _021DB1F0: str r0, [r4, #8] strb r0, [r4, #4] ldr r0, _021DB24C ; =0x00000603 - bl FUN_020054C8 + bl PlaySE mov r1, #0 str r1, [sp] mov r0, #6 diff --git a/arm9/modules/05/asm/mod05_021DC0B8.s b/arm9/modules/05/asm/mod05_021DC0B8.s index 7e1d3287..0e77cb4b 100644 --- a/arm9/modules/05/asm/mod05_021DC0B8.s +++ b/arm9/modules/05/asm/mod05_021DC0B8.s @@ -8960,13 +8960,13 @@ _021E060E: mov r0, #0x24 str r0, [r4, #8] ldr r0, _021E06F4 ; =0x0000063D - bl FUN_020054C8 + bl PlaySE b _021E06CC _021E0644: mov r0, #0xc8 str r0, [r4, #8] ldr r0, _021E06F8 ; =0x0000063C - bl FUN_020054C8 + bl PlaySE b _021E06CC _021E0650: ldr r0, [r4, #0x14] @@ -10156,7 +10156,7 @@ _021E0FB6: lsr r0, r0, #0x10 add r1, r1, #4 strh r0, [r5, r1] - bl FUN_020054C8 + bl PlaySE pop {r3, r4, r5, pc} nop _021E0FCC: .word 0x00000F5C diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index 0e1a6b44..f3c8709a 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -118,7 +118,7 @@ _021E1442: _021E1456: mov r0, #0x62 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #8] mov r1, #0 bl FUN_0205F42C diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index dee569a9..79954077 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -531,7 +531,7 @@ MOD05_021E1ECC: ; 0x021E1ECC push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _021E1F30 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r6, #0 add r0, #0xb0 ldr r0, [r0] @@ -1061,7 +1061,7 @@ _021E22B8: cmp r6, r0 beq _021E22EE ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021E22EE: ldr r0, _021E2360 ; =gMain mov r1, #0x40 @@ -1098,7 +1098,7 @@ _021E2320: cmp r0, #1 bne _021E235A ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xa0 ldr r1, _021E2364 ; =0x0000FFFE @@ -1109,7 +1109,7 @@ _021E2320: pop {r4, r5, r6, pc} _021E2346: ldr r0, _021E235C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0xa0 ldr r0, [r0] @@ -1128,7 +1128,7 @@ MOD05_021E2368: ; 0x021E2368 push {r4, r5, r6, lr} add r6, r0, #0 ldr r0, _021E23CC ; =0x000005DC - bl FUN_020054C8 + bl PlaySE mov r0, #0x6d lsl r0, r0, #2 mov r1, #0 diff --git a/arm9/modules/05/asm/mod05_021E5AB4.s b/arm9/modules/05/asm/mod05_021E5AB4.s index 3b0d6a5f..eebf0d96 100644 --- a/arm9/modules/05/asm/mod05_021E5AB4.s +++ b/arm9/modules/05/asm/mod05_021E5AB4.s @@ -99,7 +99,7 @@ MOD05_021E5B30: ; 0x021E5B30 mov r3, #0 bl MOD05_021E4DC4 ldr r0, _021E5B7C ; =0x00000609 - bl FUN_020054C8 + bl PlaySE add sp, #0x1c pop {r4, r5, pc} nop diff --git a/arm9/modules/05/asm/mod05_021E5FD8.s b/arm9/modules/05/asm/mod05_021E5FD8.s index f341dfd8..6064c13b 100644 --- a/arm9/modules/05/asm/mod05_021E5FD8.s +++ b/arm9/modules/05/asm/mod05_021E5FD8.s @@ -92,7 +92,7 @@ _021E6088: mov r1, #0 bl FUN_02055450 ldr r0, _021E6098 ; =0x00000618 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} .balign 4, 0 _021E6098: .word 0x00000618 @@ -474,7 +474,7 @@ _021E636C: add r0, r6, #0 bl FUN_0205ADDC ldr r0, _021E63D0 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1011,7 +1011,7 @@ MOD05_021E67C0: ; 0x021E67C0 b _021E68C6 _021E67E4: ldr r0, _021E68CC ; =0x00000651 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1029,7 +1029,7 @@ _021E6804: cmp r0, #5 blt _021E6824 ldr r0, _021E68D0 ; =0x00000652 - bl FUN_020054C8 + bl PlaySE ldr r0, [r4, #0xc] mov r1, #1 bl FUN_0205574C @@ -1177,7 +1177,7 @@ _021E6938: add r0, r4, #0 bl FUN_02057654 ldr r0, _021E6950 ; =0x0000065B - bl FUN_020054C8 + bl PlaySE mov r0, #0 pop {r4, pc} nop @@ -1352,7 +1352,7 @@ MOD05_021E6A58: ; 0x021E6A58 bl MOD06_0224F0BC str r0, [r5, #0x2c] ldr r0, _021E6AA8 ; =0x00000627 - bl FUN_020054C8 + bl PlaySE ldr r0, [r5] add r0, r0, #1 str r0, [r5] @@ -1631,7 +1631,7 @@ MOD05_021E6CA0: ; 0x021E6CA0 cmp r0, #1 bne _021E6CBA ldr r0, _021E6CC0 ; =0x0000064D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] @@ -1862,7 +1862,7 @@ MOD05_021E6E6C: ; 0x021E6E6C cmp r0, #1 bne _021E6E86 ldr r0, _021E6E8C ; =0x0000064D - bl FUN_020054C8 + bl PlaySE ldr r0, [r4] add r0, r0, #1 str r0, [r4] diff --git a/arm9/modules/05/asm/mod05_021E7504.s b/arm9/modules/05/asm/mod05_021E7504.s index d7f960b2..dc029b32 100644 --- a/arm9/modules/05/asm/mod05_021E7504.s +++ b/arm9/modules/05/asm/mod05_021E7504.s @@ -65,7 +65,7 @@ _021E7564: mov r0, #1 str r0, [r5, #8] ldr r0, _021E760C ; =0x0000064F - bl FUN_020054C8 + bl PlaySE _021E756E: ldr r0, [r5, #0xc] lsr r2, r0, #0x1f @@ -192,7 +192,7 @@ _021E763C: add r0, r4, #0 bl MOD05_021F1D8C ldr r0, _021E774C ; =0x0000064F - bl FUN_020054C8 + bl PlaySE mov r0, #1 str r0, [r5, #8] _021E7694: diff --git a/arm9/modules/05/asm/mod05_021E779C.s b/arm9/modules/05/asm/mod05_021E779C.s index 7c09387c..012dbb1d 100644 --- a/arm9/modules/05/asm/mod05_021E779C.s +++ b/arm9/modules/05/asm/mod05_021E779C.s @@ -340,7 +340,7 @@ MOD05_021E79A8: ; 0x021E79A8 cmp r0, #1 bne _021E79FC ldr r0, _021E7A04 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E79FC: mov r0, #1 add sp, #0xc @@ -523,7 +523,7 @@ MOD05_021E7B08: ; 0x021E7B08 cmp r0, #1 bne _021E7B6C ldr r0, _021E7B74 ; =0x000005DD - bl FUN_020054C8 + bl PlaySE _021E7B6C: mov r0, #1 add sp, #0xc diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 95a0e6ca..0157aedb 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -15311,7 +15311,7 @@ MOD05_021EFFC8: ; 0x021EFFC8 pop {r3, r4, r5, r6, r7, pc} _021EFFE6: ldr r0, _021F007C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x8c ldr r0, [r0] @@ -15328,7 +15328,7 @@ _021EFFE6: b _021F0056 _021F000E: ldr r0, _021F007C ; =0x000005DC - bl FUN_020054C8 + bl PlaySE add r0, r5, #0 add r0, #0x90 str r4, [r0] @@ -15695,7 +15695,7 @@ MOD05_021F0304: ; 0x021F0304 cmp r2, #0 bne _021F0310 ldr r0, _021F0314 ; =0x000005DC - bl FUN_020054C8 + bl PlaySE _021F0310: pop {r3, pc} nop @@ -24673,7 +24673,7 @@ _021F4732: str r0, [r4, #8] mov r0, #0x61 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE pop {r4, pc} .balign 4, 0 _021F47A4: .word MOD05_021F48CC @@ -26511,7 +26511,7 @@ MOD05_021F5518: ; 0x021F5518 mov r1, #1 bl GX_EngineAToggleLayers ldr r0, _021F5560 ; =0x00000648 - bl FUN_020054C8 + bl PlaySE add sp, #4 pop {r3, r4, pc} .balign 4, 0 @@ -27686,7 +27686,7 @@ MOD05_021F5DF8: ; 0x021F5DF8 bne _021F5E0E mov r0, #0x65 lsl r0, r0, #4 - bl FUN_020054C8 + bl PlaySE _021F5E0E: ldr r0, [r4, #0x10] cmp r0, #0x22 |