summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_801B3C0.s8
-rw-r--r--asm/code_801EE10.s4
-rw-r--r--asm/code_803D110.s2
-rw-r--r--asm/code_80450F8.s83
-rw-r--r--asm/code_8048480.s2
-rw-r--r--asm/code_80521D0.s4
-rw-r--r--asm/code_8057824.s44
-rw-r--r--asm/code_807001C.s10
-rw-r--r--asm/code_8070D04.s16
-rw-r--r--asm/code_8071858.s26
-rw-r--r--asm/code_80718D8.s57
-rw-r--r--asm/code_80739DC.s16
-rw-r--r--asm/code_8075BA4.s44
-rw-r--r--asm/debug_menu_1.s203
-rw-r--r--asm/pokemon.s8
-rw-r--r--asm/pokemon_3.s4
16 files changed, 101 insertions, 430 deletions
diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s
index 7194473..278f49f 100644
--- a/asm/code_801B3C0.s
+++ b/asm/code_801B3C0.s
@@ -1131,7 +1131,7 @@ sub_801BEEC:
adds r0, 0xC
movs r2, 0x14
ldrsh r1, [r1, r2]
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
ldr r1, [r4]
str r0, [r1, 0x2C]
movs r0, 0
@@ -1570,7 +1570,7 @@ _0801C270:
adds r0, 0x8
movs r2, 0x14
ldrsh r1, [r1, r2]
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
adds r1, r0, 0
ldr r0, [r5]
str r1, [r0, 0x20]
@@ -1941,7 +1941,7 @@ _0801C53C:
adds r0, 0x20
movs r1, 0x1
lsls r1, r4
- bl sub_808ECD0
+ bl IsIQSkillSet
lsls r0, 24
cmp r0, 0
beq _0801C5A4
@@ -2006,7 +2006,7 @@ sub_801C5F0:
movs r2, 0x14
ldrsh r1, [r0, r2]
mov r0, sp
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
cmp r0, 0
beq _0801C618
movs r0, 0
diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s
index 7998909..2fbb943 100644
--- a/asm/code_801EE10.s
+++ b/asm/code_801EE10.s
@@ -8185,7 +8185,7 @@ _08022F68:
ldr r1, [r1, 0x48]
movs r2, 0x14
ldrsh r1, [r1, r2]
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
ldr r3, [r4]
str r0, [r3, 0x38]
ldr r0, [r3, 0x48]
@@ -8201,7 +8201,7 @@ _08022F68:
ldr r1, [r1, 0x48]
movs r2, 0x14
ldrsh r1, [r1, r2]
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
ldr r1, [r4]
str r0, [r1, 0x3C]
movs r0, 0x1
diff --git a/asm/code_803D110.s b/asm/code_803D110.s
index 7dfdfba..d2ff740 100644
--- a/asm/code_803D110.s
+++ b/asm/code_803D110.s
@@ -4701,7 +4701,7 @@ _0803F5D4:
strh r0, [r5, 0xA]
adds r0, r6, 0
movs r1, 0x11
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0803F610
diff --git a/asm/code_80450F8.s b/asm/code_80450F8.s
index cf230c1..e6d0d2f 100644
--- a/asm/code_80450F8.s
+++ b/asm/code_80450F8.s
@@ -5,69 +5,6 @@
.text
- thumb_func_start GetEntityType
-GetEntityType:
- ldr r0, [r0]
- bx lr
- thumb_func_end GetEntityType
-
- thumb_func_start sub_80450FC
-sub_80450FC:
- adds r0, 0x25
- ldrb r0, [r0]
- bx lr
- thumb_func_end sub_80450FC
-
- thumb_func_start sub_8045104
-sub_8045104:
- ldr r0, [r0, 0x70]
- bx lr
- thumb_func_end sub_8045104
-
- thumb_func_start GetItemData
-GetItemData:
- ldr r0, [r0, 0x70]
- bx lr
- thumb_func_end GetItemData
-
- thumb_func_start sub_804510C
-sub_804510C:
- ldr r0, [r0, 0x70]
- bx lr
- thumb_func_end sub_804510C
-
- thumb_func_start sub_8045110
-sub_8045110:
- ldr r0, [r0, 0x70]
- bx lr
- thumb_func_end sub_8045110
-
- thumb_func_start sub_8045114
-sub_8045114:
- push {lr}
- movs r1, 0x4
- ldrsh r2, [r0, r1]
- movs r3, 0x6
- ldrsh r1, [r0, r3]
- adds r0, r2, 0
- bl GetMapTileAtPosition
- pop {r1}
- bx r1
- thumb_func_end sub_8045114
-
- thumb_func_start sub_8045128
-sub_8045128:
- push {lr}
- movs r1, 0x4
- ldrsh r2, [r0, r1]
- movs r3, 0x6
- ldrsh r1, [r0, r3]
- adds r0, r2, 0
- bl sub_8049590
- pop {r1}
- bx r1
- thumb_func_end sub_8045128
-
thumb_func_start sub_804513C
sub_804513C:
push {r4-r7,lr}
@@ -3647,8 +3584,8 @@ _08046CA8: .4byte 0x0000052c
_08046CAC: .4byte 0x0000048c
thumb_func_end sub_804687C
- thumb_func_start sub_8046CB0
-sub_8046CB0:
+ thumb_func_start HasItem
+HasItem:
push {lr}
lsls r1, 24
lsrs r1, 24
@@ -3676,7 +3613,7 @@ _08046CDC:
_08046CDE:
pop {r1}
bx r1
- thumb_func_end sub_8046CB0
+ thumb_func_end HasItem
thumb_func_start sub_8046CE4
sub_8046CE4:
@@ -4346,7 +4283,7 @@ sub_8047190:
bne _08047214
mov r0, r9
movs r1, 0x2A
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -4568,7 +4505,7 @@ _080473A2:
bne _080473CE
ldr r0, [r5, 0x10]
movs r1, 0x26
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -4887,7 +4824,7 @@ sub_80475C4:
bne _0804765E
ldr r0, [sp, 0x10]
movs r1, 0x2A
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -5112,7 +5049,7 @@ _080477FA:
bne _08047834
ldr r0, [r4, 0x10]
movs r1, 0x26
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -5284,7 +5221,7 @@ _08047964:
bne _08047994
adds r0, r4, 0
movs r1, 0x28
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08047984
@@ -5295,7 +5232,7 @@ _08047980: .4byte gUnknown_80F4FA2
_08047984:
adds r0, r4, 0
movs r1, 0x2A
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08047994
@@ -5307,7 +5244,7 @@ _08047994:
bne _080479AE
adds r0, r5, 0
movs r1, 0x25
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _080479AE
diff --git a/asm/code_8048480.s b/asm/code_8048480.s
index 849283d..42844ac 100644
--- a/asm/code_8048480.s
+++ b/asm/code_8048480.s
@@ -19970,7 +19970,7 @@ _08051EC8:
orrs r0, r1
str r0, [sp, 0x4]
mov r0, r9
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0xC]
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index d8af8aa..7cc0940 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -2582,7 +2582,7 @@ _08053850: .4byte gUnknown_80FCD0C
_08053854:
adds r0, r5, 0
movs r1, 0x2C
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _08053864
@@ -8506,7 +8506,7 @@ _08056B9C:
_08056BA2:
adds r0, r6, 0
movs r1, 0x23
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08056BB6
diff --git a/asm/code_8057824.s b/asm/code_8057824.s
index c225611..2b983be 100644
--- a/asm/code_8057824.s
+++ b/asm/code_8057824.s
@@ -5273,7 +5273,7 @@ _0805A170: .4byte gUnknown_80FCCE4
_0805A174:
adds r0, r5, 0
movs r1, 0x24
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0805A18C
@@ -6043,7 +6043,7 @@ _0805A70C: .4byte gUnknown_80FCCE8
_0805A710:
adds r0, r5, 0
movs r1, 0x24
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -8637,7 +8637,7 @@ _0805BAC0: .4byte gAvailablePokemonNames
_0805BAC4:
adds r0, r5, 0
movs r1, 0x24
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0805BADC
@@ -14678,7 +14678,7 @@ _0805EE4E:
beq _0805EE82
adds r0, r5, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _0805EE82
@@ -31040,7 +31040,7 @@ _080672F0:
_080672F6:
adds r0, r6, 0
movs r1, 0x29
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08067310
@@ -31144,7 +31144,7 @@ _080673C6:
bl sub_8042208
adds r0, r6, 0
movs r1, 0x27
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08067400
@@ -31216,7 +31216,7 @@ _0806745E:
_08067462:
adds r0, r6, 0
movs r1, 0xF
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08067486
@@ -37833,13 +37833,13 @@ sub_806A7E8:
sub sp, 0x30
adds r5, r0, 0
mov r0, sp
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
mov r9, r0
add r4, sp, 0x18
movs r0, 0xC
ldrsh r1, [r5, r0]
adds r0, r4, 0
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
adds r6, r0, 0
ldr r0, _0806A828
adds r1, r5, 0
@@ -40669,7 +40669,7 @@ _0806BDA6:
adds r0, r6, 0
adds r0, 0x8C
movs r1, 0
- bl sub_808EC94
+ bl SetDefaultIQSkills
adds r0, r6, 0
adds r0, 0x3C
bl sub_808E6F4
@@ -44287,7 +44287,7 @@ _0806D978:
_0806D98E:
adds r0, r7, 0
movs r1, 0x10
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806D9B2
@@ -46757,7 +46757,7 @@ _0806ED0E:
bne _0806EDC8
ldr r0, [sp, 0x70]
movs r1, 0x13
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806ED4A
@@ -46778,7 +46778,7 @@ _0806ED0E:
_0806ED4A:
ldr r0, [sp, 0x70]
movs r1, 0x2B
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806ED74
@@ -46802,7 +46802,7 @@ _0806ED74:
beq _0806EE4A
mov r0, r9
movs r1, 0x1E
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806EE4A
@@ -46836,7 +46836,7 @@ _0806EDC8:
beq _0806EDF6
mov r0, r9
movs r1, 0x22
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806EDF6
@@ -46856,7 +46856,7 @@ _0806EDC8:
_0806EDF6:
ldr r0, [sp, 0x70]
movs r1, 0x21
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806EE20
@@ -46877,7 +46877,7 @@ _0806EDF6:
_0806EE20:
ldr r0, [sp, 0x70]
movs r1, 0x2B
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806EE4A
@@ -47260,7 +47260,7 @@ _0806F16C: .4byte 0x000003e7
_0806F170:
ldr r0, [sp, 0x70]
movs r1, 0xC
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806F194
@@ -47278,7 +47278,7 @@ _0806F170:
_0806F194:
mov r0, r9
movs r1, 0xD
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806F1B6
@@ -48114,7 +48114,7 @@ _0806F7DE:
_0806F800:
adds r0, r6, 0
movs r1, 0x2E
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0806F816
@@ -48562,7 +48562,7 @@ _0806FB4E:
adds r0, r5, 0
adds r0, 0x4C
movs r1, 0
- bl sub_808EC94
+ bl SetDefaultIQSkills
ldr r0, [r6, 0x44]
str r0, [r5, 0x54]
adds r0, r5, 0
@@ -48945,7 +48945,7 @@ _0806FE58:
adds r0, r5, 0
adds r0, 0x4C
movs r1, 0
- bl sub_808EC94
+ bl SetDefaultIQSkills
ldr r0, [sp, 0x50]
str r0, [r5, 0x54]
adds r0, r5, 0
diff --git a/asm/code_807001C.s b/asm/code_807001C.s
index 9ce2c3f..27c2707 100644
--- a/asm/code_807001C.s
+++ b/asm/code_807001C.s
@@ -530,7 +530,7 @@ sub_80703A0:
beq _0807044E
adds r0, r6, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _0807044E
@@ -602,7 +602,7 @@ sub_8070460:
beq _08070492
adds r0, r1, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _08070492
@@ -670,7 +670,7 @@ _080704E2:
beq _08070552
adds r0, r6, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _08070552
@@ -854,7 +854,7 @@ _08070636:
beq _08070696
adds r0, r6, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _08070696
@@ -951,7 +951,7 @@ _080706F2:
beq _08070762
adds r0, r7, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _08070762
diff --git a/asm/code_8070D04.s b/asm/code_8070D04.s
index 8263469..43fc95e 100644
--- a/asm/code_8070D04.s
+++ b/asm/code_8070D04.s
@@ -107,7 +107,7 @@ sub_8070D6C:
beq _08070DD2
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08070DDC
@@ -217,7 +217,7 @@ _08070E8A:
beq _08070EAC
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08070EB4
@@ -382,7 +382,7 @@ _08070FCC:
beq _08070FEE
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08070FF8
@@ -496,7 +496,7 @@ _080710AE:
beq _080710D0
adds r0, r5, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _080710D8
@@ -609,7 +609,7 @@ _0807118A:
beq _080711AC
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _080711B4
@@ -785,7 +785,7 @@ _080712E6:
beq _08071308
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08071320
@@ -877,7 +877,7 @@ sub_807138C:
beq _080713E0
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _080713E0
@@ -994,4 +994,4 @@ _0807148C:
bx r1
thumb_func_end sub_8071470
- .align 2, 0 \ No newline at end of file
+ .align 2, 0
diff --git a/asm/code_8071858.s b/asm/code_8071858.s
index 7cee579..098dcc8 100644
--- a/asm/code_8071858.s
+++ b/asm/code_8071858.s
@@ -34,28 +34,4 @@ _08071880:
bx r1
thumb_func_end sub_8071858
- thumb_func_start sub_8071884
-sub_8071884:
- push {lr}
- adds r1, r0, 0
- ldr r0, [r1, 0x70]
- adds r0, 0xE8
- ldrb r0, [r0]
- cmp r0, 0x3
- beq _080718A4
- adds r0, r1, 0
- movs r1, 0x1A
- bl sub_8046CB0
- lsls r0, 24
- cmp r0, 0
- bne _080718A4
- movs r0, 0
- b _080718A6
-_080718A4:
- movs r0, 0x1
-_080718A6:
- pop {r1}
- bx r1
- thumb_func_end sub_8071884
-
- .align 2, 0 \ No newline at end of file
+ .align 2, 0
diff --git a/asm/code_80718D8.s b/asm/code_80718D8.s
index e387988..c1062f4 100644
--- a/asm/code_80718D8.s
+++ b/asm/code_80718D8.s
@@ -5,45 +5,6 @@
.text
- thumb_func_start HasIQSkill
-HasIQSkill:
- push {lr}
- lsls r2, r1, 24
- lsrs r2, 24
- ldr r0, [r0, 0x70]
- adds r0, 0x90
- movs r1, 0x1
- lsls r1, r2
- bl sub_808ECD0
- lsls r0, 24
- lsrs r0, 24
- pop {r1}
- bx r1
- thumb_func_end HasIQSkill
-
- thumb_func_start sub_80718F4
-sub_80718F4:
- push {r4,lr}
- adds r4, r1, 0
- lsls r4, 24
- lsrs r4, 24
- lsls r2, 24
- lsrs r2, 24
- ldr r0, [r0, 0x70]
- adds r0, 0x90
- movs r3, 0x1
- adds r1, r3, 0
- lsls r1, r4
- lsls r3, r2
- orrs r1, r3
- bl sub_808ECD0
- lsls r0, 24
- lsrs r0, 24
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_80718F4
-
thumb_func_start sub_807191C
sub_807191C:
push {r4-r6,lr}
@@ -55,13 +16,13 @@ sub_807191C:
adds r4, 0x90
adds r0, r4, 0
movs r1, 0x8
- bl sub_808EC30
+ bl SetIQSkill
adds r0, r4, 0
movs r1, 0x6
- bl sub_808EC30
+ bl SetIQSkill
adds r0, r4, 0
movs r1, 0x2
- bl sub_808EC30
+ bl SetIQSkill
adds r0, r5, 0
adds r0, 0xF7
ldrb r0, [r0]
@@ -69,7 +30,7 @@ sub_807191C:
beq _08071954
adds r0, r4, 0
movs r1, 0x12
- bl sub_808EC30
+ bl SetIQSkill
_08071954:
ldrb r0, [r5, 0x9]
ldr r1, _08071974
@@ -79,7 +40,7 @@ _08071954:
blt _08071968
adds r0, r4, 0
movs r1, 0x16
- bl sub_808EC30
+ bl SetIQSkill
_08071968:
adds r1, r5, 0
adds r1, 0x94
@@ -104,7 +65,7 @@ _0807198C:
ldrsh r0, [r5, r1]
lsls r1, r4, 24
lsrs r1, 24
- bl sub_808EB7C
+ bl HasIQForSkill
lsls r0, 24
cmp r0, 0
beq _080719B8
@@ -112,13 +73,13 @@ _0807198C:
lsls r1, r4
adds r0, r5, 0
adds r0, 0x8C
- bl sub_808ECD0
+ bl IsIQSkillSet
lsls r0, 24
cmp r0, 0
beq _080719B8
adds r0, r6, 0
adds r1, r4, 0
- bl sub_808EC30
+ bl SetIQSkill
_080719B8:
adds r4, 0x1
cmp r4, 0x17
@@ -2985,7 +2946,7 @@ _08072FE8:
beq _08073038
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _08073038
diff --git a/asm/code_80739DC.s b/asm/code_80739DC.s
index cedbff8..86a68d1 100644
--- a/asm/code_80739DC.s
+++ b/asm/code_80739DC.s
@@ -920,7 +920,7 @@ _080740C8:
bl sub_807E8F0
adds r0, r5, 0
movs r1, 0x16
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08074170
@@ -998,7 +998,7 @@ _0807417A:
movs r4, 0xA
adds r0, r5, 0
movs r1, 0x17
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08074190
@@ -1006,7 +1006,7 @@ _0807417A:
_08074190:
adds r0, r5, 0
movs r1, 0x1F
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _080741A0
@@ -1022,7 +1022,7 @@ _080741A0:
_080741B0:
adds r0, r5, 0
movs r1, 0x1B
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _080741C0
@@ -1030,7 +1030,7 @@ _080741B0:
_080741C0:
adds r0, r5, 0
movs r1, 0xA
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _080741D0
@@ -1038,7 +1038,7 @@ _080741C0:
_080741D0:
adds r0, r5, 0
movs r1, 0x2B
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _080741E0
@@ -2219,7 +2219,7 @@ _08074BAE:
beq _08074C48
adds r0, r7, 0
movs r1, 0xA
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08074BC8
@@ -3666,7 +3666,7 @@ sub_8075708:
beq _08075752
adds r0, r4, 0
movs r1, 0x9
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _08075752
diff --git a/asm/code_8075BA4.s b/asm/code_8075BA4.s
index 3d58752..f925cc2 100644
--- a/asm/code_8075BA4.s
+++ b/asm/code_8075BA4.s
@@ -256,7 +256,7 @@ _08075D88: .4byte gUnknown_80FCD88
_08075D8C:
adds r0, r4, 0
movs r1, 0x15
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08075DB4
@@ -1101,7 +1101,7 @@ _0807642C:
bl sub_80708B4
adds r0, r5, 0
movs r1, 0x14
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0807645C
@@ -1335,7 +1335,7 @@ _08076614:
bl sub_80708B4
adds r0, r5, 0
movs r1, 0x14
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08076644
@@ -2364,7 +2364,7 @@ _08076E6E:
bne _08076F6E
adds r0, r4, 0
movs r1, 0xB
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08076EB0
@@ -2926,7 +2926,7 @@ _0807730A:
_08077320:
adds r0, r5, 0
movs r1, 0xB
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08077350
@@ -3904,7 +3904,7 @@ sub_8077AE4:
bl SetMessageArgument
adds r0, r4, 0
movs r1, 0x12
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08077B34
@@ -5932,7 +5932,7 @@ _08078B86:
bne _08078BB8
adds r0, r6, 0
movs r1, 0x1B
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08078BB8
@@ -9761,7 +9761,7 @@ _0807AA3C:
mov r9, r0
mov r8, r0
adds r0, r5, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r0, 24
lsrs r7, r0, 24
movs r6, 0
@@ -9780,7 +9780,7 @@ _0807AA82:
beq _0807AB00
adds r0, r4, 0
movs r1, 0x18
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
bne _0807AB00
@@ -9816,12 +9816,12 @@ _0807AAE0: .4byte 0x0001357c
_0807AAE4:
adds r0, r4, 0
movs r1, 0x1D
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0807AB00
adds r0, r4, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r0, 24
lsrs r0, 24
cmp r7, r0
@@ -11280,7 +11280,7 @@ sub_807B5E0:
ldr r1, [r7, 0x70]
str r1, [sp, 0x10]
adds r0, r7, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -11366,7 +11366,7 @@ _0807B69A:
str r0, [sp, 0x8]
str r4, [sp, 0xC]
adds r0, r4, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -11706,7 +11706,7 @@ sub_807B920:
sub sp, 0x10
adds r6, r0, 0
ldr r7, [r6, 0x70]
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -15172,7 +15172,7 @@ sub_807D3CC:
_0807D3E8:
mov r0, r8
str r2, [sp]
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r0, 24
lsrs r1, r0, 24
ldr r2, [sp]
@@ -17339,7 +17339,7 @@ sub_807E580:
cmp r0, 0
beq _0807E596
movs r1, 0x2D
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0807E596
@@ -18286,10 +18286,10 @@ _0807ECC6:
cmp r0, 0
beq _0807ED0E
adds r0, r7, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
adds r4, r0, 0
adds r0, r5, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -18392,10 +18392,10 @@ _0807EDB8:
b _0807EEC4
_0807EDC6:
adds r0, r7, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
adds r4, r0, 0
adds r0, r5, 0
- bl sub_80450FC
+ bl GetEntityRoomIndex
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -20604,7 +20604,7 @@ _0807FEFE:
movs r6, 0
adds r0, r4, 0
movs r1, 0x1C
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _0807FF3C
@@ -20987,7 +20987,7 @@ sub_808024C:
mov r8, r0
mov r0, r10
movs r1, 0xE
- bl sub_8046CB0
+ bl HasItem
lsls r0, 24
cmp r0, 0
beq _08080278
diff --git a/asm/debug_menu_1.s b/asm/debug_menu_1.s
index fac3a58..08a2888 100644
--- a/asm/debug_menu_1.s
+++ b/asm/debug_menu_1.s
@@ -5,209 +5,6 @@
.text
- thumb_func_start sub_803AA34
-sub_803AA34:
- push {r4,r5,lr}
- movs r4, 0
- ldr r0, _0803AA64
- ldr r1, [r0]
- ldr r2, _0803AA68
- ldr r3, [r2]
- ldrb r0, [r3, 0x4]
- adds r1, r0
- ldrb r0, [r1]
- adds r5, r2, 0
- cmp r0, 0
- beq _0803AA7A
- ldr r0, _0803AA6C
- str r0, [r3, 0xC]
- bl sub_803ABC8
- lsls r0, 24
- cmp r0, 0
- beq _0803AA70
- ldr r1, [r5]
- movs r0, 0x3
- str r0, [r1, 0x10]
- b _0803AA82
- .align 2, 0
-_0803AA64: .4byte gFriendAreas
-_0803AA68: .4byte gUnknown_203B3F4
-_0803AA6C: .4byte gDebug_CloseText
-_0803AA70:
- ldr r1, [r5]
- movs r0, 0x1
- negs r0, r0
- str r0, [r1, 0x10]
- b _0803AA82
-_0803AA7A:
- ldr r0, _0803AABC
- str r0, [r3, 0xC]
- movs r0, 0x2
- str r0, [r3, 0x10]
-_0803AA82:
- adds r4, 0x1
- ldr r5, [r5]
- mov r12, r5
- lsls r1, r4, 3
- mov r3, r12
- adds r3, 0xC
- adds r2, r3, r1
- ldr r0, _0803AAC0
- ldr r0, [r0]
- str r0, [r2]
- mov r2, r12
- adds r2, 0x10
- adds r1, r2, r1
- movs r0, 0x4
- str r0, [r1]
- adds r4, 0x1
- lsls r1, r4, 3
- adds r3, r1
- movs r0, 0
- str r0, [r3]
- adds r2, r1
- movs r0, 0x1
- str r0, [r2]
- mov r1, r12
- ldr r0, [r1, 0x10]
- str r0, [r1, 0x8]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0803AABC: .4byte gDebug_OpenText
-_0803AAC0: .4byte gUnknown_80D4970
- thumb_func_end sub_803AA34
-
- thumb_func_start sub_803AAC4
-sub_803AAC4:
- push {lr}
- movs r0, 0x1
- bl sub_8021274
- cmp r0, 0x4
- bhi _0803AB2E
- lsls r0, 2
- ldr r1, _0803AADC
- adds r0, r1
- ldr r0, [r0]
- mov pc, r0
- .align 2, 0
-_0803AADC: .4byte _0803AAE0
- .align 2, 0
-_0803AAE0:
- .4byte _0803AB2E
- .4byte _0803AB2E
- .4byte _0803AB24
- .4byte _0803AAF4
- .4byte _0803AB0C
-_0803AAF4:
- bl sub_802132C
- ldr r1, _0803AB08
- ldr r1, [r1]
- strb r0, [r1, 0x4]
- movs r0, 0x2
- bl sub_803A924
- b _0803AB2E
- .align 2, 0
-_0803AB08: .4byte gUnknown_203B3F4
-_0803AB0C:
- bl sub_802132C
- ldr r1, _0803AB20
- ldr r1, [r1]
- strb r0, [r1, 0x4]
- movs r0, 0x3
- bl sub_803A924
- b _0803AB2E
- .align 2, 0
-_0803AB20: .4byte gUnknown_203B3F4
-_0803AB24:
- bl sub_80213A0
- movs r0, 0x4
- bl sub_803A924
-_0803AB2E:
- pop {r0}
- bx r0
- thumb_func_end sub_803AAC4
-
- thumb_func_start sub_803AB34
-sub_803AB34:
- push {r4,lr}
- sub sp, 0x4
- movs r0, 0
- str r0, [sp]
- bl sub_8021274
- ldr r4, _0803AB6C
- ldr r0, [r4]
- adds r0, 0x4C
- bl sub_8012FD8
- lsls r0, 24
- cmp r0, 0
- bne _0803AB5A
- ldr r0, [r4]
- adds r0, 0x4C
- mov r1, sp
- bl sub_8013114
-_0803AB5A:
- ldr r0, [sp]
- cmp r0, 0x2
- beq _0803AB7A
- cmp r0, 0x2
- bgt _0803AB70
- cmp r0, 0x1
- beq _0803AB9E
- b _0803ABA4
- .align 2, 0
-_0803AB6C: .4byte gUnknown_203B3F4
-_0803AB70:
- cmp r0, 0x3
- beq _0803AB84
- cmp r0, 0x4
- beq _0803AB96
- b _0803ABA4
-_0803AB7A:
- ldr r0, [r4]
- ldrb r0, [r0, 0x4]
- bl UnlockFriendArea
- b _0803AB8E
-_0803AB84:
- ldr r0, [r4]
- ldrb r0, [r0, 0x4]
- movs r1, 0x1
- bl sub_809249C
-_0803AB8E:
- movs r0, 0x1
- bl sub_803A924
- b _0803ABA4
-_0803AB96:
- movs r0, 0x3
- bl sub_803A924
- b _0803ABA4
-_0803AB9E:
- movs r0, 0x1
- bl sub_803A924
-_0803ABA4:
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_803AB34
-
- thumb_func_start sub_803ABAC
-sub_803ABAC:
- push {lr}
- bl sub_80217EC
- cmp r0, 0x1
- bls _0803ABC4
- cmp r0, 0x3
- bhi _0803ABC4
- bl sub_8021830
- movs r0, 0x1
- bl sub_803A924
-_0803ABC4:
- pop {r0}
- bx r0
- thumb_func_end sub_803ABAC
-
thumb_func_start sub_803ABC8
sub_803ABC8:
push {r4-r6,lr}
diff --git a/asm/pokemon.s b/asm/pokemon.s
index 7715475..3682c14 100644
--- a/asm/pokemon.s
+++ b/asm/pokemon.s
@@ -69,7 +69,7 @@ _0808CEA4:
strb r4, [r0, 0x10]
add r0, sp, 0x20
movs r1, 0
- bl sub_808EC94
+ bl SetDefaultIQSkills
mov r0, sp
strh r7, [r0, 0x8]
add r0, sp, 0x28
@@ -241,7 +241,7 @@ sub_808CFD0:
adds r0, r7, 0
adds r0, 0x20
movs r1, 0
- bl sub_808EC94
+ bl SetDefaultIQSkills
ldr r4, [sp, 0x38]
cmp r4, 0
beq _0808D08C
@@ -350,7 +350,7 @@ sub_808D0D8:
strh r4, [r7, 0x14]
subs r0, 0x4
movs r1, 0
- bl sub_808EC94
+ bl SetDefaultIQSkills
adds r0, r7, 0
adds r0, 0x2C
movs r2, 0x8
@@ -402,7 +402,7 @@ sub_808D144:
adds r0, r5, 0
adds r0, 0x20
movs r1, 0
- bl sub_808EC94
+ bl SetDefaultIQSkills
movs r6, 0
adds r4, r5, 0
adds r4, 0x2C
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index db8b773..41f99c6 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -1070,7 +1070,7 @@ _0808FCB0:
movs r2, 0x3E
ldrsh r1, [r0, r2]
adds r0, r4, 0
- bl sub_808EBA8
+ bl GetNumAvailableIQSkills
mov r0, r10
adds r0, 0x40
movs r3, 0
@@ -1112,7 +1112,7 @@ _0808FCFC:
adds r1, r4, 0
ldrb r5, [r5]
lsls r1, r5
- bl sub_808ECD0
+ bl IsIQSkillSet
lsls r0, 24
cmp r0, 0
beq _0808FD44
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 06:48:29 +0000