diff options
| author | RoastVeg <RoastVeg@users.noreply.github.com> | 2020-06-20 17:57:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 17:57:41 +0100 |
| commit | 6298426d9ad4c59a875b0a90a0facfa1a3a513cc (patch) | |
| tree | 542386bd071b5b5b5b87ec9ad65668745eabc0c4 /arm9/modules/43 | |
| parent | 53ac396de4098e38a6916e0cc86cbd278a960c4c (diff) | |
| parent | 16b091058e6135f9b7875fcf074d812d610df380 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'arm9/modules/43')
| -rw-r--r-- | arm9/modules/43/asm/module_43.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index b8533f00..517cdaac 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -645,7 +645,7 @@ MOD43_02254CD0: ; 0x02254CD0 lsl r1, r1, #2 mov r2, #0 mov r3, #8 - bl FUN_0200A738 + bl ReadMsgData_NewNarc_NewString add r6, r0, #0 beq _02254D44 mov r0, #0x14 @@ -685,7 +685,7 @@ MOD43_02254CD0: ; 0x02254CD0 add r0, sp, #0x14 bl FUN_02019178 add r0, r6, #0 - bl FUN_02021A20 + bl String_dtor _02254D44: add sp, #0x24 pop {r3, r4, r5, r6, pc} |