summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_8012A18.s12
-rw-r--r--asm/code_8027C84.s2
-rw-r--r--asm/code_803D110.s2
-rw-r--r--asm/code_80428A0.s6
-rw-r--r--asm/code_80521D0.s58
-rw-r--r--asm/code_808DAB4.s16
-rw-r--r--asm/code_809017C.s4
-rw-r--r--asm/code_809D148.s26
-rw-r--r--asm/code_80A26CC.s2
-rw-r--r--asm/pokemon.s12
-rw-r--r--asm/pokemon_1.s92
11 files changed, 70 insertions, 162 deletions
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index 3f42c7a..d2e8663 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -30418,7 +30418,7 @@ _08021A8E:
asrs r5, r0, 16
ldr r4, [r7]
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
ldrb r1, [r4, 0xC]
lsls r0, 24
lsrs r0, 24
@@ -31931,7 +31931,7 @@ sub_8022684:
strh r0, [r1, 0x12]
movs r2, 0x12
ldrsh r0, [r1, r2]
- bl sub_808DBA8
+ bl GetFriendArea
ldr r1, [r4]
strb r0, [r1, 0x10]
movs r0, 0x18
@@ -33761,7 +33761,7 @@ _08023532:
movs r6, 0
ldrsh r5, [r1, r6]
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
add r4, sp, 0x16C
@@ -35339,7 +35339,7 @@ sub_8024184:
lsrs r4, 24
movs r1, 0x8
ldrsh r0, [r0, r1]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -38164,7 +38164,7 @@ _080257E0:
ldr r0, [r4, 0x1C]
movs r2, 0x8
ldrsh r0, [r0, r2]
- bl sub_808DBA8
+ bl GetFriendArea
ldrb r1, [r4, 0xC]
lsls r0, 24
lsrs r0, 24
@@ -38550,7 +38550,7 @@ _08025AFC:
ldr r0, [r0, 0x1C]
movs r1, 0x8
ldrsh r0, [r0, r1]
- bl sub_808DBA8
+ bl GetFriendArea
ldr r1, [r4]
strb r0, [r1, 0xD]
bl sub_8023C60
diff --git a/asm/code_8027C84.s b/asm/code_8027C84.s
index e8823f2..b5b058a 100644
--- a/asm/code_8027C84.s
+++ b/asm/code_8027C84.s
@@ -37884,7 +37884,7 @@ _0803ABCE:
ldr r4, [r0]
movs r1, 0x8
ldrsh r0, [r2, r1]
- bl sub_808DBA8
+ bl GetFriendArea
ldrb r1, [r4, 0x4]
lsls r0, 24
lsrs r0, 24
diff --git a/asm/code_803D110.s b/asm/code_803D110.s
index 6792896..7e74795 100644
--- a/asm/code_803D110.s
+++ b/asm/code_803D110.s
@@ -997,7 +997,7 @@ sub_803D870:
mov r9, r1
b _0803D8B8
_0803D884:
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
index 861a75c..85b2ec5 100644
--- a/asm/code_80428A0.s
+++ b/asm/code_80428A0.s
@@ -4212,7 +4212,7 @@ sub_8044CA0:
adds r4, r0, 0
lsls r0, r1, 16
asrs r0, 16
- bl sub_808DB48
+ bl GetIsMoving
lsls r0, 24
cmp r0, 0
beq _08044CB6
@@ -5222,7 +5222,7 @@ sub_80453AC:
negs r0, r0
mov r9, r0
mov r0, r8
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -5404,7 +5404,7 @@ sub_804550C:
negs r0, r0
mov r9, r0
mov r0, r8
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r7, r0, 24
movs r5, 0
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index ac93e6b..0860a72 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -7837,7 +7837,7 @@ _0805658C:
mov r2, r8
movs r1, 0x4
ldrsh r0, [r2, r1]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -12629,7 +12629,7 @@ sub_80588F4:
ldr r0, [r5, 0x70]
movs r1, 0x4
ldrsh r0, [r0, r1]
- bl sub_808DB78
+ bl GetLowKickDmg
adds r3, r0, 0
str r4, [sp]
adds r0, r6, 0
@@ -19679,10 +19679,10 @@ _0805BDDE:
cmp r8, r5
beq _0805BDDC
mov r0, r8
- bl sub_808DACC
+ bl GetPokemonSize
adds r4, r0, 0
adds r0, r5, 0
- bl sub_808DACC
+ bl GetPokemonSize
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -20241,7 +20241,7 @@ sub_805C208:
ldr r0, [r1, 0x70]
movs r1, 0x4
ldrsh r0, [r0, r1]
- bl sub_808DB90
+ bl GetSizeOrbDmg
mov r10, r0
adds r0, r6, 0
bl sub_8092B00
@@ -44620,7 +44620,7 @@ _08068A8E:
beq _08068AB2
movs r1, 0xE
ldrsh r0, [r2, r1]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
adds r4, r0
@@ -44630,7 +44630,7 @@ _08068AB2:
ble _08068A8E
movs r1, 0x8
ldrsh r0, [r6, r1]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
adds r4, r0
@@ -44902,7 +44902,7 @@ _08068CE8:
beq _08068CFE
movs r1, 0xE
ldrsh r0, [r4, r1]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
add r0, sp
@@ -44985,7 +44985,7 @@ _08068D6A:
beq _08068DD6
movs r1, 0xE
ldrsh r0, [r5, r1]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
cmp r0, r8
@@ -48189,7 +48189,7 @@ _0806A5CE:
_0806A608:
movs r1, 0x2
ldrsh r0, [r4, r1]
- bl sub_808DB14
+ bl GetWalkableTiles
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -50621,7 +50621,7 @@ _0806B838:
adds r4, r0, 0
movs r1, 0
ldrsh r0, [r6, r1]
- bl sub_808DB60
+ bl GetUnk1D
lsls r0, 24
lsrs r0, 24
cmp r0, r4
@@ -52135,7 +52135,7 @@ sub_806C444:
lsls r0, 16
asrs r6, r0, 16
adds r0, r6, 0
- bl sub_808DBC0
+ bl GetBaseHP
adds r5, r0, 0
movs r4, 0x2
cmp r4, r7
@@ -52519,7 +52519,7 @@ _0806C714:
mov r7, r8
movs r1, 0x4
ldrsh r0, [r7, r1]
- bl sub_808DB14
+ bl GetWalkableTiles
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -53649,7 +53649,7 @@ sub_806CF98:
ldr r7, [r4, 0x70]
movs r1, 0x4
ldrsh r0, [r7, r1]
- bl sub_808DAE4
+ bl GetShadowSize
lsls r0, 24
lsrs r4, r0, 24
cmp r5, 0x3
@@ -58516,7 +58516,7 @@ sub_806F660:
mov r9, r1
movs r2, 0x4
ldrsh r0, [r4, r2]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0806F6C0
@@ -58882,7 +58882,7 @@ _0806F91C:
ldr r0, [r4, 0x70]
movs r2, 0x4
ldrsh r0, [r0, r2]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r1, r0, 24
adds r0, r4, 0
@@ -58993,12 +58993,12 @@ _0806F9F2:
cmp r4, r0
beq _0806FA3C
adds r0, r4, 0
- bl sub_808DBF4
+ bl GetUnk12
lsls r0, 24
cmp r0, 0
bne _0806FA50
adds r0, r4, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -59046,7 +59046,7 @@ sub_806FA5C:
mov r10, r0
movs r1, 0
ldrsh r0, [r6, r1]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -59357,7 +59357,7 @@ sub_806FD18:
negs r6, r6
movs r1, 0x4
ldrsh r0, [r4, r1]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r5, r0, 24
movs r2, 0x2
@@ -59524,7 +59524,7 @@ _0806FE58:
add r0, sp, 0xC
movs r1, 0
ldrsh r0, [r0, r1]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _0806FF74
@@ -60142,7 +60142,7 @@ sub_8070328:
push {lr}
lsls r0, 16
asrs r0, 16
- bl sub_808DB14
+ bl GetWalkableTiles
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x3
@@ -60770,7 +60770,7 @@ _08070794:
_080707A8:
movs r1, 0x2
ldrsh r0, [r5, r1]
- bl sub_808DAFC
+ bl GetMoveSpeed
adds r4, r0
adds r0, r6, 0
movs r1, 0x6
@@ -63348,7 +63348,7 @@ sub_8071A70:
push {lr}
movs r1, 0x2
ldrsh r0, [r0, r1]
- bl sub_808DBD8
+ bl GetUnk33
lsls r0, 24
cmp r0, 0
beq _08071A84
@@ -69549,7 +69549,7 @@ _08074B7A:
bne _08074BAE
movs r2, 0x2
ldrsh r0, [r6, r2]
- bl sub_808DB2C
+ bl GetUnk1B
lsls r0, 24
lsrs r4, r0, 24
_08074BAE:
@@ -71491,7 +71491,7 @@ _08075AF4:
beq _08075B46
movs r1, 0x2
ldrsh r0, [r5, r1]
- bl sub_808DB48
+ bl GetIsMoving
lsls r0, 24
cmp r0, 0
beq _08075B92
@@ -71514,7 +71514,7 @@ _08075B46:
_08075B52:
movs r1, 0x2
ldrsh r0, [r5, r1]
- bl sub_808DB48
+ bl GetIsMoving
lsls r0, 24
cmp r0, 0
beq _08075B68
@@ -97089,7 +97089,7 @@ sub_80828E0:
movs r4, 0x1
negs r4, r4
mov r0, r8
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r6, r0, 24
movs r3, 0
@@ -97245,7 +97245,7 @@ sub_8082A08:
negs r0, r0
mov r8, r0
mov r0, r9
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r6, r0, 24
movs r3, 0
diff --git a/asm/code_808DAB4.s b/asm/code_808DAB4.s
index a619239..5880b5c 100644
--- a/asm/code_808DAB4.s
+++ b/asm/code_808DAB4.s
@@ -819,10 +819,10 @@ _0808E426:
cmp r0, 0
bne _0808E456
mov r0, r9
- bl sub_808DACC
+ bl GetPokemonSize
adds r4, r0, 0
adds r0, r5, 0
- bl sub_808DACC
+ bl GetPokemonSize
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -1109,7 +1109,7 @@ sub_808E668:
cmp r0, 0x1
bls _0808E6D6
adds r0, r1, 0
- bl sub_808DAE4
+ bl GetShadowSize
lsls r0, 24
lsrs r0, 24
movs r3, 0
@@ -3068,13 +3068,13 @@ _0808F4FA:
b _0808F6DE
_0808F50A:
ldr r0, [sp, 0x1C]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r5, r0, 24
mov r3, r8
movs r1, 0x8
ldrsh r0, [r3, r1]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r6, r0, 24
adds r0, r5, 0
@@ -4187,7 +4187,7 @@ _0808FDB0:
mov r1, r10
movs r2, 0
ldrsh r0, [r1, r2]
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_8092524
@@ -4239,7 +4239,7 @@ _0808FDB0:
mov r3, r10
movs r1, 0
ldrsh r0, [r3, r1]
- bl sub_808DAB4
+ bl GetCategoryString
adds r1, r0, 0
adds r0, r6, 0
movs r2, 0x14
@@ -4257,7 +4257,7 @@ _0808FDB0:
mov r3, r10
movs r1, 0
ldrsh r0, [r3, r1]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 22
adds r0, r4
diff --git a/asm/code_809017C.s b/asm/code_809017C.s
index 7784ab0..26cdabc 100644
--- a/asm/code_809017C.s
+++ b/asm/code_809017C.s
@@ -459,7 +459,7 @@ _080904BA:
mov r8, r1
_080904D2:
ldr r0, [sp, 0xE0]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -484,7 +484,7 @@ _080904E4:
beq _08090510
movs r1, 0x8
ldrsh r0, [r2, r1]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
adds r5, r0
diff --git a/asm/code_809D148.s b/asm/code_809D148.s
index 513ef0f..b03391b 100644
--- a/asm/code_809D148.s
+++ b/asm/code_809D148.s
@@ -8416,7 +8416,7 @@ _080A184C:
bl sub_80A8BFC
lsls r0, 16
asrs r0, 16
- bl sub_808DB48
+ bl GetIsMoving
b _080A171E
_080A185E:
lsls r0, r5, 16
@@ -8500,7 +8500,7 @@ _080A18F6:
_080A1900: .4byte gUnknown_2039D98
_080A1904:
movs r0, 0x51
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_80925EC
@@ -8562,7 +8562,7 @@ _080A197C:
_080A1984: .4byte gUnknown_2039D98
_080A1988:
ldr r0, _080A19D4
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_80925EC
@@ -8781,7 +8781,7 @@ _080A1B60: .4byte gUnknown_2039D98
_080A1B64:
ldr r4, _080A1BCC
adds r0, r4, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_8092600
@@ -8789,7 +8789,7 @@ _080A1B64:
cmp r0, 0
bne _080A1B88
adds r0, r4, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_80925EC
@@ -9036,7 +9036,7 @@ _080A1CCC:
cmp r0, 0
beq _080A1CA4
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_8092600
@@ -9065,7 +9065,7 @@ _080A1DA8:
bl sub_80018D8
ldr r4, _080A1DE8
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9073,7 +9073,7 @@ _080A1DA8:
movs r2, 0
bl sub_8092578
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_8092600
@@ -9093,7 +9093,7 @@ _080A1DEC:
asrs r5, r0, 16
ldr r4, _080A1E2C
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9105,7 +9105,7 @@ _080A1DEC:
b _080A236A
_080A1E14:
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_8092600
@@ -9134,7 +9134,7 @@ _080A1E42:
adds r6, r5, 0
ldr r4, _080A1EC4
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9146,7 +9146,7 @@ _080A1E42:
b _080A236A
_080A1E6C:
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_8092600
@@ -9154,7 +9154,7 @@ _080A1E6C:
cmp r0, 0
bne _080A1E8E
adds r0, r5, 0
- bl sub_808DBA8
+ bl GetFriendArea
lsls r0, 24
lsrs r0, 24
bl sub_80925EC
diff --git a/asm/code_80A26CC.s b/asm/code_80A26CC.s
index 4492890..76736c8 100644
--- a/asm/code_80A26CC.s
+++ b/asm/code_80A26CC.s
@@ -10416,7 +10416,7 @@ sub_80A7428:
movs r1, 0
bl GetFileDataPtr
adds r0, r4, 0
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
ldr r1, _080A7488
diff --git a/asm/pokemon.s b/asm/pokemon.s
index 2f1c454..587e47c 100644
--- a/asm/pokemon.s
+++ b/asm/pokemon.s
@@ -96,7 +96,7 @@ _0808CEA4:
movs r5, 0x1
strb r5, [r0, 0x3]
adds r0, r7, 0
- bl sub_808DBC0
+ bl GetBaseHP
mov r1, sp
movs r4, 0
strh r0, [r1, 0x16]
@@ -260,7 +260,7 @@ sub_808CFD0:
strb r5, [r7, 0x2]
strb r0, [r7, 0x3]
mov r0, r9
- bl sub_808DBC0
+ bl GetBaseHP
strh r0, [r7, 0x16]
mov r0, r9
movs r1, 0
@@ -377,7 +377,7 @@ sub_808D0D8:
strb r4, [r7, 0x3]
movs r1, 0x8
ldrsh r0, [r7, r1]
- bl sub_808DBC0
+ bl GetBaseHP
movs r5, 0
strh r0, [r7, 0x16]
movs r2, 0x8
@@ -1269,7 +1269,7 @@ _0808D6FA:
beq _0808D728
movs r1, 0x8
ldrsh r0, [r2, r1]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
adds r5, r0
@@ -1331,7 +1331,7 @@ _0808D76A:
beq _0808D798
movs r2, 0x8
ldrsh r0, [r1, r2]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
adds r5, r0
@@ -1352,7 +1352,7 @@ _0808D798:
adds r1, r0, r1
movs r2, 0x8
ldrsh r0, [r1, r2]
- bl sub_808DACC
+ bl GetPokemonSize
lsls r0, 24
lsrs r0, 24
adds r5, r0
diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s
index 5537aa7..fababf5 100644
--- a/asm/pokemon_1.s
+++ b/asm/pokemon_1.s
@@ -200,96 +200,4 @@ sub_808DD48:
_0808DD64: .4byte gMonsterParameters
thumb_func_end sub_808DD48
- thumb_func_start sub_808DD68
-sub_808DD68:
- push {lr}
- lsls r0, 16
- asrs r2, r0, 16
- cmp r1, 0
- bne _0808DD88
- ldr r0, _0808DD84
- ldr r1, [r0]
- lsls r0, r2, 3
- adds r0, r2
- lsls r0, 3
- adds r0, r1
- ldrb r0, [r0, 0x8]
- b _0808DD8A
- .align 2, 0
-_0808DD84: .4byte gMonsterParameters
-_0808DD88:
- movs r0, 0xA
-_0808DD8A:
- pop {r1}
- bx r1
- thumb_func_end sub_808DD68
-
- thumb_func_start sub_808DD90
-sub_808DD90:
- push {lr}
- sub sp, 0xC
- lsls r0, 16
- asrs r2, r0, 16
- ldr r0, _0808DDBC
- ldr r1, [r0]
- lsls r0, r2, 3
- adds r0, r2
- lsls r0, 3
- adds r0, r1
- ldrh r0, [r0, 0x10]
- cmp r0, 0
- beq _0808DDC8
- ldr r1, _0808DDC0
- mov r0, sp
- bl sprintf
- ldr r1, _0808DDC4
- mov r0, sp
- bl OpenFile
- b _0808DDCA
- .align 2, 0
-_0808DDBC: .4byte gMonsterParameters
-_0808DDC0: .4byte gUnknown_8107684
-_0808DDC4: .4byte gUnknown_8510000
-_0808DDC8:
- movs r0, 0
-_0808DDCA:
- add sp, 0xC
- pop {r1}
- bx r1
- thumb_func_end sub_808DD90
-
- thumb_func_start sub_808DDD0
-sub_808DDD0:
- push {lr}
- sub sp, 0xC
- lsls r0, 16
- asrs r2, r0, 16
- ldr r0, _0808DDFC
- ldr r1, [r0]
- lsls r0, r2, 3
- adds r0, r2
- lsls r0, 3
- adds r0, r1
- ldrh r0, [r0, 0x10]
- cmp r0, 0
- beq _0808DE08
- ldr r1, _0808DE00
- mov r0, sp
- bl sprintf
- ldr r1, _0808DE04
- mov r0, sp
- bl OpenFileAndGetFileDataPtr
- b _0808DE0A
- .align 2, 0
-_0808DDFC: .4byte gMonsterParameters
-_0808DE00: .4byte gUnknown_8107684
-_0808DE04: .4byte gUnknown_8510000
-_0808DE08:
- movs r0, 0
-_0808DE0A:
- add sp, 0xC
- pop {r1}
- bx r1
- thumb_func_end sub_808DDD0
-
.align 2,0 @ don't pad with nop
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 05:04:35 +0000