summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/06/asm/module_06.s2
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s4
-rw-r--r--arm9/modules/16/asm/module_16.s12
-rw-r--r--arm9/modules/76/asm/module_76.s2
-rw-r--r--arm9/modules/81/asm/module_81.s2
5 files changed, 11 insertions, 11 deletions
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index 5afae6a8..6fbee88b 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/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s
index 4fb65b68..9417b6bd 100644
--- a/arm9/modules/16/asm/module_16.s
+++ b/arm9/modules/16/asm/module_16.s
@@ -9944,9 +9944,9 @@ _021DBD82:
add r0, sp, #8
str r0, [sp, #4]
.ifdef DIAMOND
- mov r0, #0x8b
+ mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND
.else
- mov r0, #0x8c
+ mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL
.endif
add r1, r5, r1
bl GfGfxLoader_LoadFromNarc_GetSizeOut
@@ -9999,9 +9999,9 @@ MOD16_021DBDE4: ; 0x021DBDE4
add r0, sp, #8
str r0, [sp, #4]
.ifdef DIAMOND
- mov r0, #0x8b
+ mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND
.else
- mov r0, #0x8c
+ mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL
.endif
add r2, r1, #0
bl GfGfxLoader_LoadFromNarc_GetSizeOut
@@ -10027,9 +10027,9 @@ MOD16_021DBE0C: ; 0x021DBE0C
add r0, sp, #8
str r0, [sp, #4]
.ifdef DIAMOND
- mov r0, #0x8b
+ mov r0, #0x8b ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_DIAMOND
.else
- mov r0, #0x8c
+ mov r0, #0x8c ; NARC_APPLICATION_ZUKANLIST_ZKN_DATA_ZUKAN_ENC_PEARL
.endif
mov r1, #2
bl GfGfxLoader_LoadFromNarc_GetSizeOut
diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s
index 38055b90..06e6303e 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 01caab99..599ede77 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