summaryrefslogtreecommitdiff
path: root/asm/code_801B3C0.s
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-12-01 16:33:06 -0600
committerGitHub <noreply@github.com>2021-12-01 14:33:06 -0800
commit4fc272fea6bc7332fae031ebeb12362cff1c35de (patch)
tree88092c6da3a6bb741caceab54f5372aee4ad5bae /asm/code_801B3C0.s
parentfd8720b75c56ef3f641e6c5abf6c446929c824b9 (diff)
No wifi + 2 days on train = more decomp (#80)
* No wifi + 2 days on train = more decomp * layin some more * one func, one file
Diffstat (limited to 'asm/code_801B3C0.s')
-rw-r--r--asm/code_801B3C0.s35
1 files changed, 3 insertions, 32 deletions
diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s
index 173e4d6..435b731 100644
--- a/asm/code_801B3C0.s
+++ b/asm/code_801B3C0.s
@@ -465,7 +465,7 @@ sub_801BEEC:
lsls r0, 16
asrs r5, r0, 16
adds r0, r5, 0
- bl sub_801C5F0
+ bl HasNoAvailIQSkills
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -854,7 +854,7 @@ _0801C1EA:
adds r0, 0x20
adds r1, 0x28
ldrb r1, [r1]
- bl sub_808EBF4
+ bl ToggleIQSkill
movs r0, 0x1
bl sub_801BFB4
b _0801C21E
@@ -899,7 +899,7 @@ sub_801C244:
lsls r0, 16
asrs r0, 16
adds r4, r0, 0
- bl sub_801C5F0
+ bl HasNoAvailIQSkills
lsls r0, 24
cmp r0, 0
beq _0801C25E
@@ -1349,33 +1349,4 @@ _0801C5E8: .4byte gUnknown_80DBE1C
_0801C5EC: .4byte gUnknown_203B23C
thumb_func_end sub_801C4C8
- thumb_func_start sub_801C5F0
-sub_801C5F0:
- push {lr}
- sub sp, 0x18
- lsls r0, 16
- asrs r0, 16
- ldr r2, _0801C614
- movs r1, 0x58
- muls r1, r0
- ldr r0, [r2]
- adds r0, r1
- movs r2, 0x14
- ldrsh r1, [r0, r2]
- mov r0, sp
- bl GetNumAvailableIQSkills
- cmp r0, 0
- beq _0801C618
- movs r0, 0
- b _0801C61A
- .align 2, 0
-_0801C614: .4byte gRecruitedPokemonRef
-_0801C618:
- movs r0, 0x1
-_0801C61A:
- add sp, 0x18
- pop {r1}
- bx r1
- thumb_func_end sub_801C5F0
-
.align 2,0