diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-05-31 23:25:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 23:25:44 +0100 |
| commit | cf0a465d2cd604c0d44a64adfe938551ba5e3800 (patch) | |
| tree | fe0b64d8a1f4545690d5c9088b31c84553b61a91 /arm9/modules | |
| parent | 1c0c1476b404ba1c457875f8f7a51d2355067413 (diff) | |
| parent | 5fb5906a0eb46382ba540660da560fad4400988b (diff) | |
Merge branch 'master' into pikalax_work
Diffstat (limited to 'arm9/modules')
| -rw-r--r-- | arm9/modules/06/asm/module_06.s | 2 | ||||
| -rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 4 | ||||
| -rw-r--r-- | arm9/modules/76/asm/module_76.s | 2 | ||||
| -rw-r--r-- | arm9/modules/81/asm/module_81.s | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 9a618431..3b86cb19 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -38774,7 +38774,7 @@ _0224C476: mov r2, #0 bl MOD05_021DA4EC ldr r0, _0224C51C ; =0x0000048E - bl PlayBGM + bl PlaySound ldrb r0, [r4, #0xf] add r0, r0, #1 strb r0, [r4, #0xf] diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 88362b01..451daa87 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -6258,7 +6258,7 @@ _02232234: b _02232252 _0223223C: ldr r0, _02232258 ; =0x00000484 - bl PlayBGM + bl PlaySound b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 @@ -6266,7 +6266,7 @@ _02232244: b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 - bl PlayBGM + bl PlaySound _02232252: add r0, r4, #0 pop {r4, pc} diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 4f32e870..fc6dc5bd 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -2105,7 +2105,7 @@ _021D85BE: b _021D85D6 _021D85C6: ldr r0, _021D85E0 ; =0x00000483 - bl PlayBGM + bl PlaySound b _021D85D6 _021D85CE: ldr r0, _021D85DC ; =0x000005E6 diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 9505f17c..c8b46eb9 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -9611,7 +9611,7 @@ _0223C982: add r0, #0x48 bl CopyWindowToVram ldr r0, _0223CA90 ; =0x00000484 - bl PlayBGM + bl PlaySound mov r0, #0 str r0, [r4, #8] mov r0, #1 |