diff options
| author | red031000 <rubenru09@aol.com> | 2020-06-23 23:18:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 23:18:29 +0100 |
| commit | c82f923bb095740ec58c389deb08083dbeddc769 (patch) | |
| tree | 88f3668e52db0815504875cb1d08e78ef902a03b /arm9/modules/05 | |
| parent | 64595272f97d0ada42b69e442c7f52766ed60d63 (diff) | |
| parent | 291f2d27d36b5c437c6c1908d5217bb954799402 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'arm9/modules/05')
| -rw-r--r-- | arm9/modules/05/asm/module_05.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 91493195..0279b0fc 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -43106,7 +43106,7 @@ MOD05_021EC4DC: ; 0x021EC4DC bl GetBoxMonData lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_0206EA98 + bl ItemIdIsMail pop {r3, pc} thumb_func_start MOD05_021EC4F0 @@ -44043,7 +44043,7 @@ _021ECC60: add r0, r5, r0 lsl r0, r0, #0x10 lsr r0, r0, #0x10 - bl FUN_0206EA30 + bl TMHMGetMove ldr r1, [r4, r6] cmp r1, r0 bne _021ECCA2 |