diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 10:50:18 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-12 10:50:18 -0400 |
| commit | ca2af0a5d0cf80c38995dde9e4d05246c11128e7 (patch) | |
| tree | d3365b2f7624564e1f702c7a533b781f35bf98a8 /arm9/modules | |
| parent | d5446788d822324d58b5a814fe6ca7aaaf6fa6d2 (diff) | |
more scrcmd names
Diffstat (limited to 'arm9/modules')
| -rw-r--r-- | arm9/modules/05/asm/mod05_021E1374.s | 4 | ||||
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 4 | ||||
| -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 |
6 files changed, 9 insertions, 9 deletions
diff --git a/arm9/modules/05/asm/mod05_021E1374.s b/arm9/modules/05/asm/mod05_021E1374.s index fe98e120..018f4d8c 100644 --- a/arm9/modules/05/asm/mod05_021E1374.s +++ b/arm9/modules/05/asm/mod05_021E1374.s @@ -568,7 +568,7 @@ _021E17BE: bl MOD05_021E1848 add r1, r0, #0 ldr r0, [r5, #4] - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0 bne _021E17DE ldr r1, [r4, #0x10] @@ -712,7 +712,7 @@ _021E18DC: cmp r1, r7 beq _021E18F0 add r0, r6, #0 - bl FUN_02039640 + bl TrainerFlagCheck cmp r0, #0 bne _021E18F0 lsl r0, r4, #0x10 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 36dd0461..1172f733 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -93,8 +93,8 @@ _021E2C16: add sp, #0x20 pop {r3, r4, r5, r6, r7, pc} - thumb_func_start MOD05_021E2C24 -MOD05_021E2C24: ; 0x021E2C24 + thumb_func_start MOD05_ShowMessageInField +MOD05_ShowMessageInField: ; 0x021E2C24 push {r4, r5, r6, lr} sub sp, #0x18 add r5, r0, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index cdc23ba3..561761c1 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -38773,7 +38773,7 @@ _0224C476: mov r2, #0 bl MOD05_021DA4EC ldr r0, _0224C51C ; =0x0000048E - bl FUN_02005C28 + bl PlayBGM 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 b22fc761..92756469 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 FUN_02005C28 + bl PlayBGM b _02232252 _02232244: ldr r0, _0223225C ; =0x000005E6 @@ -6266,7 +6266,7 @@ _02232244: b _02232252 _0223224C: ldr r0, _02232260 ; =0x00000483 - bl FUN_02005C28 + bl PlayBGM _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 da9aff3b..3a079284 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 FUN_02005C28 + bl PlayBGM 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 8ebe39e5..6b04578f 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 FUN_020191D0 ldr r0, _0223CA90 ; =0x00000484 - bl FUN_02005C28 + bl PlayBGM mov r0, #0 str r0, [r4, #8] mov r0, #1 |