diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/bard_music.s | 62 | ||||
| -rw-r--r-- | asm/easy_chat.s | 6 | ||||
| -rw-r--r-- | asm/mauville_old_man.s | 4 |
3 files changed, 5 insertions, 67 deletions
diff --git a/asm/bard_music.s b/asm/bard_music.s deleted file mode 100644 index 671697bb9..000000000 --- a/asm/bard_music.s +++ /dev/null @@ -1,62 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_817C858 -sub_817C858: @ 817C858 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r5, r0, 0 - lsls r1, 16 - lsrs r7, r1, 16 - movs r0, 0 - strh r0, [r5, 0x4] - movs r6, 0 - ldr r0, =gUnknown_0860A3DC - mov r8, r0 - adds r4, r5, 0 - adds r4, 0x18 -_0817C872: - lsls r0, r6, 3 - ldr r1, [r5, 0x30] - adds r2, r1, r0 - ldrb r0, [r2] - cmp r0, 0xFF - beq _0817C8A0 - movs r1, 0x1 - ldrsb r1, [r2, r1] - lsls r0, 2 - add r0, r8 - ldr r0, [r0] - adds r1, r0 - strh r1, [r4] - adds r0, r7, 0 - adds r0, 0x1E - adds r1, r6, 0 - bl sub_817C7DC - strh r0, [r4, 0x2] - ldrh r0, [r4] - ldrh r1, [r5, 0x4] - adds r0, r1 - strh r0, [r5, 0x4] -_0817C8A0: - adds r4, 0x4 - adds r6, 0x1 - cmp r6, 0x5 - ble _0817C872 - movs r0, 0 - strb r0, [r5, 0x1] - strh r0, [r5, 0xA] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .pool - thumb_func_end sub_817C858 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/easy_chat.s b/asm/easy_chat.s index a85169b61..7a4024fab 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -9335,8 +9335,8 @@ _0811EB0A: bx r1 thumb_func_end sub_811EAA4 - thumb_func_start sub_811EB10 -sub_811EB10: @ 811EB10 + thumb_func_start IsECWordInValidRange +IsECWordInValidRange: @ 811EB10 push {lr} lsls r0, 16 lsrs r2, r0, 25 @@ -9380,7 +9380,7 @@ _0811EB5C: _0811EB5E: pop {r1} bx r1 - thumb_func_end sub_811EB10 + thumb_func_end IsECWordInValidRange thumb_func_start GetEasyChatWord @ char *GetEasyChatWord(u8 groupId, u16 wordId) diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s index 4972d4096..bfcf8742a 100644 --- a/asm/mauville_old_man.s +++ b/asm/mauville_old_man.s @@ -883,7 +883,7 @@ _081207BC: adds r0, r1 ldrh r4, [r0] adds r0, r4, 0 - bl sub_817C7F4 + bl GetWordSounds str r0, [r6, 0x30] movs r1, 0x3 ands r1, r4 @@ -892,7 +892,7 @@ _081207BC: ands r4, r0 adds r1, r4 adds r0, r6, 0 - bl sub_817C858 + bl GetWordPhonemes ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] |