diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-20 14:59:56 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-05-20 14:59:56 -0400 |
| commit | d1d3fce4b6be10ed7186a6c36bc27fe575b593db (patch) | |
| tree | 4f31107f4446b69106acb0673a383dfdaf88473e /arm9/modules/13 | |
| parent | 6103ab0ca0962682095e58779079cb4c8c054b14 (diff) | |
| parent | de389305733545e2b6fac6c8dcb33d76a7446481 (diff) | |
Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work
Diffstat (limited to 'arm9/modules/13')
| -rw-r--r-- | arm9/modules/13/asm/module_13_arm1.s | 2 | ||||
| -rw-r--r-- | arm9/modules/13/asm/module_13_arm2.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/13/asm/module_13_arm1.s b/arm9/modules/13/asm/module_13_arm1.s index bd308915..6e644609 100644 --- a/arm9/modules/13/asm/module_13_arm1.s +++ b/arm9/modules/13/asm/module_13_arm1.s @@ -4826,7 +4826,7 @@ _02216228: ldr r1, _02216904 ; =0x0223F7A0 ldr r0, _02216900 ; =MOD13_02216098 ldr r1, [r1] - bl FUN_020D9564 + bl WMi_StartParentEx mov r1, r0 mov r0, #8 bl MOD13_02214B08 diff --git a/arm9/modules/13/asm/module_13_arm2.s b/arm9/modules/13/asm/module_13_arm2.s index 4a499200..6245d91c 100644 --- a/arm9/modules/13/asm/module_13_arm2.s +++ b/arm9/modules/13/asm/module_13_arm2.s @@ -30397,7 +30397,7 @@ MOD13_02238130: ; 0x02238130 ldr r2, [r2] ldr r0, _0223819C ; =MOD13_022380E8 add r2, r2, #0x13c0 - bl WM_SetWEPKeyEx2 + bl WM_SetWEPKey cmp r0, #2 addeq sp, sp, #4 moveq r0, #1 |