diff options
author | Louis Hampton <roastveg@hotmail.co.uk> | 2020-06-20 19:01:00 +0100 |
---|---|---|
committer | Louis Hampton <roastveg@hotmail.co.uk> | 2020-06-20 19:01:00 +0100 |
commit | 3cf5ef0a661c62a94766e2c08025bb7ecb785b2a (patch) | |
tree | 7fa9fc230a0517f65876613318f043f3c14b8f63 /arm9/modules/43 | |
parent | 59f6bdfa9a7645d3e2e9d1ac0bde5af3ad77e8b2 (diff) | |
parent | 6298426d9ad4c59a875b0a90a0facfa1a3a513cc (diff) |
Merge branch 'master' of https://github.com/roastveg/pokediamond
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} |