dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

finish decompiling battle_ai.c (#16)

Browse Source 
* partially decompile battle_ai.c up to tai60_unk

* nonmatching tai60_unk

* decompile more of battle_ai.c

* formatting

* finish porting battle_ai.c

* formatting
This commit is contained in:
ProjectRevoTPP
2017-02-03 21:34:56 -05:00
committed by YamaArashi
parent e2b834d21d
commit 689df5cff8
57 changed files with 6958 additions and 9128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_814AEAC.s
+172 -172
View File
File diff suppressed because it is too large Load Diff
asm/battle_ai.s
-5080
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim.s
+4 -4
View File
@@ -97,7 +97,7 @@ move_anim_start_t1: @ 80A3A10
ldrb r0, [r0]
strb r0, [r2]
ldr r2, =gUnknown_02038437
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
strb r0, [r2]
ldr r0, =gUnknown_082C8D6C
@@ -146,17 +146,17 @@ _080A3A84:
beq _080A3AA8
ldrh r0, [r6]
muls r0, r7
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _080A3AAE
.pool
_080A3AA8:
ldrh r0, [r6]
muls r0, r7
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_080A3AAE:
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
strh r0, [r5]
adds r6, 0x2
adds r5, 0x2
asm/battle_anim_80FE840.s
+18 -18
View File
@@ -19291,7 +19291,7 @@ sub_8108384: @ 8108384
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
b _081083C8
.pool
_081083B4:
@@ -19305,17 +19305,17 @@ _081083B8:
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
_081083C8:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
adds r0, r5, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
lsrs r4, 18
@@ -43263,7 +43263,7 @@ _08114614:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _08114650
.pool
_08114640:
@@ -43274,11 +43274,11 @@ _08114640:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_08114650:
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
_0811465C:
@@ -47933,7 +47933,7 @@ _08116C64:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _08116CA0
.pool
_08116C90:
@@ -47944,11 +47944,11 @@ _08116C90:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_08116CA0:
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
_08116CAC:
@@ -48370,7 +48370,7 @@ _08117078:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _081170BA
.pool
_081170A8:
@@ -48382,11 +48382,11 @@ _081170A8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_081170BA:
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
ldr r1, [r4]
_081170C4:
strh r0, [r1, 0x14]
@@ -49429,7 +49429,7 @@ _08117964:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _08117996
.pool
_08117988:
@@ -49439,11 +49439,11 @@ _08117988:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_08117996:
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
_081179A2:
@@ -50053,7 +50053,7 @@ sub_8117E94: @ 8117E94
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02038436
ldr r1, =gUnknown_0202420C
ldr r1, =gEnemyMonIndex
ldrb r1, [r1]
strb r1, [r2]
ldr r2, =gUnknown_02038437
@@ -50105,7 +50105,7 @@ sub_8117F10: @ 8117F10
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02038437
ldr r1, =gUnknown_0202420C
ldr r1, =gEnemyMonIndex
ldrb r1, [r1]
strb r1, [r2]
bl move_anim_task_del
asm/battle_anim_8170478.s
+5 -5
View File
@@ -868,7 +868,7 @@ sub_8170BB0: @ 8170BB0
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
b _08170C08
.pool
_08170BF8:
@@ -879,11 +879,11 @@ _08170BF8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
_08170C08:
adds r0, r1
movs r1, 0x26
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl ball_number_to_ball_processing_index
@@ -5101,11 +5101,11 @@ sub_8172EF0: @ 8172EF0
strb r1, [r0]
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
adds r0, r6, 0
bl b_side_obj__get_some_boolean
asm/battle_message.s
+61 -61
View File
@@ -932,11 +932,11 @@ _0814E92C:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -951,11 +951,11 @@ _0814E960:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -970,11 +970,11 @@ _0814E994:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -989,11 +989,11 @@ _0814E9C8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -1011,11 +1011,11 @@ _0814E9FC:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -1035,11 +1035,11 @@ _0814EA38:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -1059,11 +1059,11 @@ _0814EA78:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -1083,11 +1083,11 @@ _0814EAB8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
@@ -1134,11 +1134,11 @@ _0814EB36:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814EB9E
.pool
_0814EB74:
@@ -1155,11 +1155,11 @@ _0814EB74:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814EB9E:
mov r0, sp
bl StringGetEnd10
@@ -1186,11 +1186,11 @@ _0814EBB0:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814EC24
.pool
_0814EBF8:
@@ -1208,11 +1208,11 @@ _0814EBF8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814EC24:
mov r0, sp
bl StringGetEnd10
@@ -1237,7 +1237,7 @@ _0814EC56:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
cmp r0, 0xFF
@@ -1262,7 +1262,7 @@ _0814EC78:
add r0, r12
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814ECC2
.pool
_0814ECA8:
@@ -1273,18 +1273,18 @@ _0814ECA8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814ECC2:
mov r0, sp
bl StringGetEnd10
bl _0814F5BE
.pool
_0814ECD4:
ldr r5, =gUnknown_0202420C
ldr r5, =gEnemyMonIndex
ldrb r0, [r5]
bl battle_side_get_owner
lsls r0, 24
@@ -1302,7 +1302,7 @@ _0814ECF2:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
cmp r0, 0xFF
@@ -1327,7 +1327,7 @@ _0814ED14:
add r0, r12
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814ED5E
.pool
_0814ED44:
@@ -1338,11 +1338,11 @@ _0814ED44:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814ED5E:
mov r0, sp
bl StringGetEnd10
@@ -1367,7 +1367,7 @@ _0814ED8E:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
cmp r0, 0xFF
@@ -1392,7 +1392,7 @@ _0814EDB0:
add r0, r12
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814EDFA
.pool
_0814EDE0:
@@ -1403,11 +1403,11 @@ _0814EDE0:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814EDFA:
mov r0, sp
bl StringGetEnd10
@@ -1432,7 +1432,7 @@ _0814EE2A:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
cmp r0, 0xFF
@@ -1457,7 +1457,7 @@ _0814EE4C:
add r0, r12
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814EE96
.pool
_0814EE7C:
@@ -1468,11 +1468,11 @@ _0814EE7C:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814EE96:
mov r0, sp
bl StringGetEnd10
@@ -1497,7 +1497,7 @@ _0814EEC6:
ldrb r1, [r4]
adds r0, r1, 0
ldr r3, =gUnknown_0202406E
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
mov r12, r2
adds r2, r5, 0
cmp r0, 0xFF
@@ -1522,7 +1522,7 @@ _0814EEE8:
add r0, r12
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814EF32
.pool
_0814EF18:
@@ -1533,11 +1533,11 @@ _0814EF18:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814EF32:
mov r0, sp
bl StringGetEnd10
@@ -1684,7 +1684,7 @@ _0814F088:
.pool
_0814F098:
ldr r1, =gUnknown_0203ABA4
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
b _0814F0BC
.pool
_0814F0A8:
@@ -2003,7 +2003,7 @@ _0814F330:
_0814F34E:
ldrb r1, [r4]
adds r0, r1, 0
ldr r5, =gUnknown_02024744
ldr r5, =gEnemyParty
mov r12, r5
ldr r2, =gUnknown_0202449C
cmp r0, 0xFF
@@ -2027,7 +2027,7 @@ _0814F36E:
add r0, r12
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814F3B4
.pool
_0814F39C:
@@ -2037,11 +2037,11 @@ _0814F39C:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814F3B4:
mov r0, sp
bl StringGetEnd10
@@ -2064,7 +2064,7 @@ _0814F3E4:
b _0814F3EE
.pool
_0814F3EC:
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
_0814F3EE:
ldrb r0, [r0]
bl battle_side_get_owner
@@ -2082,7 +2082,7 @@ _0814F410:
b _0814F41A
.pool
_0814F418:
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
_0814F41A:
ldrb r0, [r0]
bl battle_side_get_owner
@@ -2100,7 +2100,7 @@ _0814F43C:
b _0814F446
.pool
_0814F444:
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
_0814F446:
ldrb r0, [r0]
bl battle_side_get_owner
@@ -2471,11 +2471,11 @@ _0814F744:
ldrb r1, [r4, 0x2]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _0814F7A4
.pool
_0814F768:
@@ -2499,11 +2499,11 @@ _0814F790:
ldrb r1, [r0, 0x2]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_0814F7A4:
mov r0, sp
bl StringGetEnd10
@@ -2540,22 +2540,22 @@ _0814F7E2:
ldrb r1, [r4, 0x2]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
adds r2, r6, 0
bl pokemon_getattr
bl GetMonData
b _0814F81A
.pool
_0814F808:
ldrb r1, [r4, 0x2]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
adds r2, r6, 0
bl pokemon_getattr
bl GetMonData
_0814F81A:
adds r0, r6, 0
bl StringGetEnd10
asm/battle_setup.s
+13 -13
View File
@@ -278,7 +278,7 @@ _080B0856:
thumb_func_start sub_80B086C
sub_80B086C: @ 80B086C
push {lr}
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r1, 0xC4
lsls r1, 1
movs r2, 0x5
@@ -363,10 +363,10 @@ sub_80B0934: @ 80B0934
movs r0, 0x80
lsls r0, 6
str r0, [r4]
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
movs r0, 0xCA
lsls r0, 1
@@ -502,9 +502,9 @@ sub_80B0A74: @ 80B0A74
movs r0, 0xC0
lsls r0, 7
str r0, [r1]
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
adds r2, r1, 0
@@ -862,11 +862,11 @@ _080B0D92:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
movs r0, 0xCE
lsls r0, 1
@@ -876,12 +876,12 @@ _080B0D92:
beq _080B0DD6
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080B0DD6
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
adds r0, r7, r0
lsls r0, 24
lsrs r7, r0, 24
@@ -1034,9 +1034,9 @@ sub_80B0EC8: @ 80B0EC8
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1195,9 +1195,9 @@ _080B1000:
sub_80B100C: @ 80B100C
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
asm/big_shroomish_barboach.s
+13 -13
View File
@@ -15,45 +15,45 @@ sub_80F97C8: @ 80F97C8
sub sp, 0x8
adds r5, r0, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
str r0, [sp, 0x4]
lsrs r0, 16
str r0, [sp]
adds r0, r5, 0
movs r1, 0x27
bl pokemon_getattr
bl GetMonData
adds r7, r0, 0
movs r6, 0xF
ands r7, r6
adds r0, r5, 0
movs r1, 0x28
bl pokemon_getattr
bl GetMonData
mov r8, r0
mov r1, r8
ands r1, r6
mov r8, r1
adds r0, r5, 0
movs r1, 0x29
bl pokemon_getattr
bl GetMonData
mov r9, r0
mov r3, r9
ands r3, r6
mov r9, r3
adds r0, r5, 0
movs r1, 0x2A
bl pokemon_getattr
bl GetMonData
mov r10, r0
ands r0, r6
mov r10, r0
adds r0, r5, 0
movs r1, 0x2B
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
ands r4, r6
adds r0, r5, 0
movs r1, 0x2C
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
ands r2, r6
mov r1, r8
@@ -236,16 +236,16 @@ _080F99A0:
ldrh r1, [r1]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0x1
beq _080F99C2
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, r6
beq _080F99CC
_080F99C2:
@@ -449,16 +449,16 @@ _080F9B6A:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080F9B9C
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080F9B9C
mov r1, sp
asm/braille_puzzles.s
+3 -3
View File
@@ -82,11 +82,11 @@ sub_817963C: @ 817963C
thumb_func_start sub_81796AC
sub_81796AC: @ 81796AC
push {r4,lr}
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0x9D
lsls r1, 1
cmp r0, r1
@@ -101,7 +101,7 @@ sub_81796AC: @ 81796AC
adds r0, r1
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, =0x0000017d
cmp r0, r1
bne _081796F4
asm/cable_club.s
+4 -4
View File
@@ -755,7 +755,7 @@ _080B2994:
adds r0, r5
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r4, 0
adds r1, 0x54
strh r0, [r1]
@@ -765,7 +765,7 @@ _080B2994:
adds r0, r5
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, 0x56
strh r0, [r4]
ldr r0, =sub_80B2C30
@@ -845,7 +845,7 @@ _080B2A6C:
adds r0, r5
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r4, 0
adds r1, 0x54
strh r0, [r1]
@@ -855,7 +855,7 @@ _080B2A6C:
adds r0, r5
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, 0x56
strh r0, [r4]
ldr r1, =gTasks
asm/calculate_base_damage.s
+3 -3
View File
@@ -621,7 +621,7 @@ _08069A58:
bls _08069A60
b _08069BC2
_08069A60:
ldr r0, =gUnknown_02024211
ldr r0, =gCritMultiplier
ldrb r1, [r0]
adds r4, r0, 0
cmp r1, 0x2
@@ -789,7 +789,7 @@ _08069BCA:
bhi _08069BD2
b _08069DD4
_08069BD2:
ldr r0, =gUnknown_02024211
ldr r0, =gCritMultiplier
ldrb r1, [r0]
adds r4, r0, 0
cmp r1, 0x2
@@ -947,7 +947,7 @@ _08069CFC:
lsls r0, 24
cmp r0, 0
bne _08069DAC
ldr r2, =gUnknown_020243CC
ldr r2, =gBattleWeather
ldrh r1, [r2]
movs r0, 0x1
ands r0, r1
asm/contest.s
+24 -24
View File
@@ -1060,7 +1060,7 @@ _080D8004:
str r4, [r0]
ldr r4, =gUnknown_0202420B
strb r2, [r4]
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
strb r3, [r0]
bl sub_80DB0C4
ldr r2, =gUnknown_020241E4
@@ -5706,11 +5706,11 @@ _080DA930:
movs r0, 0x64
mov r1, r8
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
@@ -5718,7 +5718,7 @@ _080DA930:
adds r0, r5, 0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
bl StringGetEnd10
ldr r0, =gUnknown_02039F2A
@@ -5729,7 +5729,7 @@ _080DA930:
beq _080DA994
adds r0, r5, 0
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
mov r0, sp
bl sub_80DF9E0
@@ -5748,7 +5748,7 @@ _080DA994:
bl StringCopy
adds r0, r5, 0
movs r1, 0x16
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
@@ -5756,7 +5756,7 @@ _080DA994:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x17
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
@@ -5764,7 +5764,7 @@ _080DA994:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x18
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
@@ -5772,7 +5772,7 @@ _080DA994:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x21
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
@@ -5780,7 +5780,7 @@ _080DA994:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x2F
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
@@ -5788,7 +5788,7 @@ _080DA994:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x30
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
@@ -5796,35 +5796,35 @@ _080DA994:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0xD
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
strh r0, [r1, 0x1E]
adds r0, r5, 0
movs r1, 0xE
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
strh r0, [r1, 0x20]
adds r0, r5, 0
movs r1, 0xF
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
strh r0, [r1, 0x22]
adds r0, r5, 0
movs r1, 0x10
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r1, r7
strh r0, [r1, 0x24]
adds r0, r5, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r2, r7, 0
@@ -5833,7 +5833,7 @@ _080DA994:
str r0, [r1]
adds r0, r5, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
ldrb r1, [r6]
lsls r1, 6
adds r2, r7, 0
@@ -5842,7 +5842,7 @@ _080DA994:
str r0, [r1]
adds r0, r5, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r2, r0, 16
ldrb r0, [r6]
@@ -6299,7 +6299,7 @@ sub_80DAE0C: @ 80DAE0C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080DAE1E
movs r0, 0x3
@@ -6307,7 +6307,7 @@ sub_80DAE0C: @ 80DAE0C
_080DAE1E:
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080DAE2E
movs r0, 0x4
@@ -6350,7 +6350,7 @@ _080DAE74:
adds r0, r4, 0
movs r1, 0x36
_080DAE78:
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
b _080DAE86
@@ -13798,7 +13798,7 @@ sub_80DEA20: @ 80DEA20
bl CreateInvisibleSpriteWithCallback
ldr r1, =gUnknown_020241E4
strb r0, [r1, 0x3]
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -13905,12 +13905,12 @@ _080DEAD0:
.4byte _080DEB60
.4byte _080DEB60
_080DEB54:
ldr r1, =gUnknown_0202420C
ldr r1, =gEnemyMonIndex
movs r0, 0x2
b _080DEB64
.pool
_080DEB60:
ldr r1, =gUnknown_0202420C
ldr r1, =gEnemyMonIndex
movs r0, 0x3
_080DEB64:
strb r0, [r1]
asm/contest_link_80F57C4.s
+13 -13
View File
@@ -4632,7 +4632,7 @@ sub_80F7F30: @ 80F7F30
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl sub_80DAE0C
lsls r0, 24
@@ -4664,7 +4664,7 @@ sub_80F7F7C: @ 80F7F7C
ldrb r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r2, r1, r0
ldr r0, =gUnknown_02039F2C
ldrh r0, [r0]
@@ -4703,7 +4703,7 @@ _080F7FDC:
adds r0, r2, 0
movs r1, 0x36
_080F7FE0:
bl pokemon_getattr
bl GetMonData
ldr r1, =gUnknown_02039F2E
ldrh r1, [r1]
cmp r0, r1
@@ -4754,10 +4754,10 @@ _080F8048:
ldrb r0, [r6]
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x32
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
mov r0, sp
@@ -4805,10 +4805,10 @@ _080F80B8:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x33
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -4854,10 +4854,10 @@ _080F8124:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x34
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -4901,10 +4901,10 @@ _080F8190:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x35
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
@@ -4944,10 +4944,10 @@ _080F81F8:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x36
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
mov r0, sp
ldrb r2, [r0]
asm/daycare.s
+15 -15
View File
@@ -12,7 +12,7 @@ pokemon_get_nick: @ 806FA2C
adds r4, r1, 0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
mov r1, sp
bl StringCopy10
@@ -190,7 +190,7 @@ sub_806FB38: @ 806FB38
strb r0, [r4]
adds r0, r6, 0
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
lsls r0, 4
ldrb r2, [r4]
movs r1, 0xF
@@ -199,7 +199,7 @@ sub_806FB38: @ 806FB38
strb r1, [r4]
adds r0, r6, 0
movs r1, 0x40
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
ldr r1, =gSaveBlock1Ptr
@@ -270,7 +270,7 @@ daycare_send_selected_pokemon: @ 806FC18
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gSaveBlock1Ptr
ldr r1, [r1]
@@ -387,12 +387,12 @@ sub_806FCF8: @ 806FCF8
bl sub_8069004
mov r0, sp
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
cmp r0, 0x64
beq _0806FD46
mov r0, sp
movs r1, 0x19
bl pokemon_getattr
bl GetMonData
adds r1, r5, 0
adds r1, 0x88
ldr r1, [r1]
@@ -405,7 +405,7 @@ sub_806FCF8: @ 806FCF8
mov r0, sp
bl sub_806FCA4
_0806FD46:
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
movs r1, 0xFA
lsls r1, 1
adds r6, r0, r1
@@ -1245,7 +1245,7 @@ pokemon_get_eggmoves: @ 80703C8
movs r6, 0
movs r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
movs r2, 0
@@ -1376,7 +1376,7 @@ _080704C4:
bls _080704C4
adds r0, r7, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_020249C4
@@ -1920,7 +1920,7 @@ _08070918:
mov r0, sp
movs r1, 0x2D
bl pokemon_setattr
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
movs r1, 0xFA
lsls r1, 1
adds r0, r1
@@ -2183,21 +2183,21 @@ _08070B34:
ldrb r0, [r0]
cmp r5, r0
bcs _08070BC0
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
_08070B5C:
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08070BB4
adds r0, r4, 0
movs r1, 0x4
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _08070BB4
adds r0, r4, 0
movs r1, 0x20
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
str r1, [sp]
cmp r0, 0
@@ -2314,7 +2314,7 @@ sub_8070C58: @ 8070C58
lsrs r0, 24
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
ldr r1, =gStringVar1
bl pokemon_get_nick_
asm/egg_hatch.s
+28 -28
View File
@@ -16,7 +16,7 @@ sub_8071348: @ 8071348
adds r5, r0, 0
adds r6, r1, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x3C]
@@ -41,7 +41,7 @@ _08071386:
adds r1, r4, 0
adds r1, 0xD
adds r0, r5, 0
bl pokemon_getattr
bl GetMonData
lsls r1, r4, 1
add r1, sp
adds r1, 0x10
@@ -53,14 +53,14 @@ _08071386:
bls _08071386
adds r0, r5, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
mov r9, r0
movs r4, 0
_080713AE:
adds r1, r4, 0
adds r1, 0x27
adds r0, r5, 0
bl pokemon_getattr
bl GetMonData
lsls r1, r4, 2
adds r1, r7, r1
str r0, [r1]
@@ -71,26 +71,26 @@ _080713AE:
bls _080713AE
adds r0, r5, 0
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
mov r1, r8
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x25
bl pokemon_getattr
bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x8
bl pokemon_getattr
bl GetMonData
ldr r1, [sp, 0x40]
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x22
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x38]
adds r0, r5, 0
movs r1, 0x50
bl pokemon_getattr
bl GetMonData
ldr r1, [sp, 0x48]
strb r0, [r1]
movs r0, 0x1
@@ -189,9 +189,9 @@ sub_80714B8: @ 80714B8
movs r1, 0x64
adds r5, r0, 0
muls r5, r1
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r0
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r5, 0
bl sub_8071348
adds r0, r5, 0
@@ -200,7 +200,7 @@ sub_80714B8: @ 80714B8
bl pokemon_setattr
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -366,7 +366,7 @@ sub_807163C: @ 807163C
bne _0807166A
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r1, r0
movs r4, 0x1
_0807166A:
@@ -375,7 +375,7 @@ _0807166A:
movs r0, 0x64
adds r1, r2, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r1, r0
movs r4, 0x3
_0807167A:
@@ -388,13 +388,13 @@ _0807167A:
_08071688:
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r3, r0, 0
lsls r0, r4, 3
ldr r1, =gMonFrontPicTable
@@ -732,7 +732,7 @@ sub_80719FC: @ 80719FC
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r2, =gStringVar3
movs r1, 0x2
@@ -922,10 +922,10 @@ _08071BBC:
ldrb r1, [r2, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r0, [r5]
@@ -966,7 +966,7 @@ _08071C24:
ldrb r1, [r0, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gStringVar1
bl pokemon_get_nick
@@ -1018,7 +1018,7 @@ _08071CA4:
ldrb r1, [r0, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gStringVar1
bl pokemon_get_nick
@@ -1085,7 +1085,7 @@ _08071D3C:
ldrb r0, [r0, 0x4]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
ldr r1, =gStringVar3
mov r9, r1
@@ -1096,7 +1096,7 @@ _08071D3C:
muls r0, r6
adds r0, r5
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
mov r1, r8
@@ -1115,7 +1115,7 @@ _08071D3C:
adds r0, r5
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
ldr r0, =sub_80719FC
str r0, [sp, 0x4]
@@ -1301,10 +1301,10 @@ sub_8071EF0: @ 8071EF0
ldrb r1, [r0, 0x4]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
ldr r3, =gUnknown_02020630
ldr r2, [r4]
ldrb r1, [r2, 0x1]
@@ -1745,11 +1745,11 @@ _0807229C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080722CC
adds r0, r4, 0
asm/evolution_scene.s
+29 -29
View File
@@ -57,7 +57,7 @@ _0813DA00:
ldrsh r1, [r6, r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r7, r1, r0
ldrh r4, [r6, 0xC]
ldrb r5, [r6, 0xE]
@@ -206,7 +206,7 @@ evolution_cutscene: @ 813DA8C
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
ldr r0, =gStringVar1
mov r1, sp
bl StringCopy10
@@ -220,17 +220,17 @@ evolution_cutscene: @ 813DA8C
bl StringCopy
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x20]
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
mov r9, r0
lsls r0, r5, 3
ldr r1, =gMonFrontPicTable
@@ -416,16 +416,16 @@ sub_813DD7C: @ 813DD7C
movs r1, 0x64
adds r4, r2, 0
muls r4, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r4, r1
ldrh r5, [r0, 0xC]
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
mov r9, r0
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r6, r0, 0
movs r0, 0
bl SetHBlankCallback
@@ -588,7 +588,7 @@ sub_813DF70: @ 813DF70
ldrsh r2, [r0, r1]
movs r1, 0x64
muls r2, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r4, r2, r1
ldrh r6, [r0, 0xC]
ldr r0, =gMain
@@ -688,11 +688,11 @@ _0813E07E:
_0813E0A8:
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r0, r6, 3
ldr r1, =gMonFrontPicTable
@@ -828,7 +828,7 @@ sub_813E1D4: @ 813E1D4
str r3, [sp, 0x14]
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
ldr r0, =gStringVar1
mov r1, sp
bl StringCopy10
@@ -843,18 +843,18 @@ sub_813E1D4: @ 813E1D4
strb r0, [r1]
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r7, r0, 0
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
mov r10, r0
ldr r1, =gUnknown_0203AB80
mov r9, r1
@@ -1039,7 +1039,7 @@ _0813E40C:
_0813E416:
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
mov r9, r0
ldr r1, [sp, 0x4]
@@ -1090,7 +1090,7 @@ _0813E484:
ldrb r1, [r5]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
adds r1, r4, 0
mov r2, sp
@@ -1104,7 +1104,7 @@ _0813E4A0:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
adds r1, r4, 0
mov r2, sp
@@ -1151,18 +1151,18 @@ _0813E4A0:
bl pokedex_flag_operation
mov r0, r9
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
ldr r1, =0x0000012f
cmp r0, r1
bne _0813E546
mov r0, r9
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
cmp r0, 0x1
bne _0813E546
ldr r0, [sp, 0x4]
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
movs r1, 0x97
lsls r1, 1
cmp r0, r1
@@ -1201,7 +1201,7 @@ evovle_mon_maybe: @ 813E570
ldrsh r1, [r3, r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r1, r0
mov r9, r1
ldr r0, =gMain
@@ -1705,7 +1705,7 @@ _0813EA5E:
mov r0, r9
movs r1, 0x2
add r2, sp, 0x4
bl pokemon_getattr
bl GetMonData
ldr r0, =gUnknown_02022F58
add r1, sp, 0x4
bl StringCopy10
@@ -2224,7 +2224,7 @@ _0813EF30:
b _0813F1A4
_0813EF3E:
bl FreeAllWindowBuffers
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
ldr r1, =gTasks
mov r3, r8
adds r5, r3, r7
@@ -2278,7 +2278,7 @@ _0813EFC8:
adds r1, r6, 0
adds r1, 0xD
mov r0, r9
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
@@ -2492,7 +2492,7 @@ sub_813F1B8: @ 813F1B8
ldrsh r2, [r0, r1]
movs r1, 0x64
muls r2, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r2, r1
mov r9, r2
movs r2, 0x8
@@ -2889,7 +2889,7 @@ _0813F58C:
mov r0, r9
movs r1, 0x2
add r2, sp, 0x4
bl pokemon_getattr
bl GetMonData
ldr r0, =gUnknown_02022F58
add r1, sp, 0x4
bl StringCopy10
@@ -3375,7 +3375,7 @@ _0813FA3E:
bl GetBgTilemapBuffer
bl Free
bl FreeAllWindowBuffers
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
ldr r1, =gTasks
mov r2, r8
adds r5, r2, r7
@@ -3430,7 +3430,7 @@ _0813FAEC:
adds r1, r6, 0
adds r1, 0xD
mov r0, r9
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
asm/field_control_avatar.s
+1 -1
View File
@@ -1514,7 +1514,7 @@ happiness_algorithm_step: @ 809CB44
strh r1, [r0]
cmp r1, 0
bne _0809CB72
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
movs r4, 0x5
_0809CB62:
adds r0, r5, 0
asm/field_effect.s
+4 -4
View File
@@ -5262,19 +5262,19 @@ sub_80B84F8: @ 80B84F8
movs r1, 0x64
adds r4, r0, 0
muls r4, r1
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
str r0, [r5]
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
str r0, [r5, 0x4]
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
str r0, [r5, 0x8]
ldr r0, [r5]
orrs r0, r6
asm/field_player_avatar.s
+4 -4
View File
@@ -2760,11 +2760,11 @@ _0808BE2A:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0808BE12
_0808BE44:
@@ -4324,10 +4324,10 @@ fish5: @ 808CABC
strh r0, [r5, 0x8]
b _0808CB5C
_0808CADC:
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0808CB14
adds r0, r4, 0
asm/field_poison.s
+12 -12
View File
@@ -9,7 +9,7 @@
sub_80F9568: @ 80F9568
push {lr}
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -31,7 +31,7 @@ _080F9586:
thumb_func_start sub_80F958C
sub_80F958C: @ 80F958C
push {r4,r5,lr}
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
movs r5, 0
_080F9592:
adds r0, r4, 0
@@ -40,7 +40,7 @@ _080F9592:
beq _080F95B0
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080F95B0
movs r0, 0
@@ -67,7 +67,7 @@ sub_80F95C0: @ 80F95C0
movs r1, 0x64
adds r4, r0, 0
muls r4, r1
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
movs r0, 0
str r0, [sp]
@@ -82,7 +82,7 @@ sub_80F95C0: @ 80F95C0
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
bl pokemon_getattr
bl GetMonData
adds r0, r5, 0
bl StringGetEnd10
add sp, 0x4
@@ -99,7 +99,7 @@ sub_80F960C: @ 80F960C
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
bl sub_80F9568
@@ -107,12 +107,12 @@ sub_80F960C: @ 80F960C
beq _080F964C
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080F964C
adds r0, r4, 0
movs r1, 0x37
bl pokemon_getattr
bl GetMonData
bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
@@ -253,19 +253,19 @@ sub_80F972C: @ 80F972C
overworld_poison: @ 80F9744
push {r4-r7,lr}
sub sp, 0x4
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
movs r7, 0
movs r6, 0
movs r5, 0x5
_080F9750:
adds r0, r4, 0
movs r1, 0x5
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080F9794
adds r0, r4, 0
movs r1, 0x37
bl pokemon_getattr
bl GetMonData
bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
@@ -273,7 +273,7 @@ _080F9750:
bne _080F9794
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
str r0, [sp]
cmp r0, 0
beq _080F9786
asm/fldeff_strength.s
+1 -1
View File
@@ -70,7 +70,7 @@ sub_8145E2C: @ 8145E2C
ldr r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gStringVar1
bl GetMonNickname
asm/front_pic_anim.s
+1 -1
View File
@@ -157,7 +157,7 @@ sub_817F594: @ 817F594
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl GetNature
lsls r0, 24
asm/hall_of_fame.s
+7 -7
View File
@@ -224,17 +224,17 @@ _08173740:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
cmp r5, 0
beq _0817380C
adds r0, r6, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
mov r1, r9
ldr r3, [r1]
lsls r4, r7, 2
@@ -252,14 +252,14 @@ _08173740:
strh r1, [r3, 0x8]
adds r0, r6, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
mov r2, r9
ldr r1, [r2]
adds r1, r4
str r0, [r1]
adds r0, r6, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
mov r5, r9
ldr r1, [r5]
adds r1, 0x4
@@ -267,7 +267,7 @@ _08173740:
str r0, [r1]
adds r0, r6, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
ldr r2, [r5]
adds r2, r4
lsls r0, 1
@@ -279,7 +279,7 @@ _08173740:
adds r0, r6, 0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
movs r2, 0
mov r6, r8
lsls r5, r6, 2
asm/item_use.s
+1 -1
View File
@@ -2494,7 +2494,7 @@ ItemUseInBattle_StatIncrease: @ 80FE4B8
ldrh r2, [r0]
movs r0, 0x64
muls r0, r2
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_0203CE7C
ldrh r1, [r1]
asm/link.s
+38 -38
View File
@@ -20802,7 +20802,7 @@ _08013FDE:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r1, r0
movs r0, 0
movs r2, 0x64
@@ -20817,7 +20817,7 @@ _08013FFC:
bne _080140BC
bl link_get_multiplayer_id
adds r1, r0, 0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r2, 0x1
eors r1, r2
lsls r1, 24
@@ -21648,7 +21648,7 @@ _08014854:
ldr r4, =gUnknown_02024488
adds r0, r4
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
mov r1, r9
strh r0, [r1]
ldrb r0, [r6, 0x1]
@@ -21656,7 +21656,7 @@ _08014854:
adds r0, r4
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r2, r9
strh r0, [r2, 0x2]
ldr r0, =gMain
@@ -27708,10 +27708,10 @@ sub_8017D04: @ 8017D04
_08017D14:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
movs r0, 0xCE
lsls r0, 1
@@ -27736,10 +27736,10 @@ _08017D44:
_08017D50:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r0, r1, 3
subs r0, r1
@@ -28098,16 +28098,16 @@ _08018032:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
cmp r0, 0x1E
bhi _0801805A
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -28164,19 +28164,19 @@ sub_80180A0: @ 80180A0
movs r1, 0x64
adds r4, r0, 0
muls r4, r1
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
strh r0, [r5, 0xA]
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
strh r0, [r5, 0xC]
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
str r0, [r5, 0x4]
ldrh r1, [r5, 0xA]
movs r0, 0xCE
@@ -28201,19 +28201,19 @@ sub_80180E8: @ 80180E8
movs r1, 0x64
adds r4, r0, 0
muls r4, r1
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
strh r0, [r5, 0xE]
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
strh r0, [r5, 0x10]
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
str r0, [r5, 0x14]
pop {r4,r5}
pop {r0}
@@ -28249,16 +28249,16 @@ _08018146:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
cmp r0, r6
bne _0801816C
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, r7
@@ -33368,8 +33368,8 @@ sub_801AAD4: @ 801AAD4
bl sub_8014210
movs r4, 0
movs r7, 0x64
ldr r6, =gUnknown_020244EC
ldr r5, =gUnknown_02024744
ldr r6, =gPlayerParty
ldr r5, =gEnemyParty
_0801AAE4:
ldr r0, =gUnknown_0203CEF8
adds r0, r4, r0
@@ -33385,7 +33385,7 @@ _0801AAE4:
adds r4, 0x1
cmp r4, 0x1
ble _0801AAE4
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
movs r0, 0xFA
lsls r0, 1
adds r5, r4, r0
@@ -33395,12 +33395,12 @@ _0801AB0A:
adds r4, 0x64
cmp r4, r5
ble _0801AB0A
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
movs r5, 0
adds r6, r4, 0
adds r6, 0x64
_0801AB1E:
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r1, r5, r1
adds r0, r4, 0
movs r2, 0x64
@@ -53066,7 +53066,7 @@ sub_802493C: @ 802493C
adds r0, r1
movs r1, 0x64
muls r1, r6
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
adds r1, r2
bl sub_80261F8
ldr r0, =sub_8024BC8
@@ -59195,16 +59195,16 @@ _08027A62:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08027A94
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
cmp r0, 0x55
bne _08027A94
movs r0, 0x1
@@ -64853,7 +64853,7 @@ sub_802A9A8: @ 802A9A8
adds r0, r1
movs r1, 0x64
muls r1, r7
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
adds r1, r2
bl sub_802AC2C
ldr r0, [r5]
@@ -65119,15 +65119,15 @@ sub_802AC2C: @ 802AC2C
adds r4, r1, 0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
str r0, [r5, 0x4]
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
str r0, [r5, 0x8]
pop {r4,r5}
pop {r0}
@@ -68847,16 +68847,16 @@ _0802C924:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0802C95C
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_802C908
asm/load_save.s
+2 -2
View File
@@ -274,7 +274,7 @@ _08076DA0:
movs r2, 0x8E
lsls r2, 2
adds r0, r2
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0x64
bl memcpy
@@ -299,7 +299,7 @@ copy_player_party_from_sav1: @ 8076DD4
ldrb r0, [r0]
strb r0, [r1]
movs r4, 0
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
_08076DEA:
movs r0, 0x64
adds r2, r4, 0
asm/lottery_corner.s
+6 -6
View File
@@ -91,21 +91,21 @@ _081775FC:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08177658
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817764E
adds r0, r4, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
ldr r0, =gUnknown_020375F0
ldrh r0, [r0]
@@ -222,11 +222,11 @@ _081776D2:
movs r0, 0x64
ldr r1, [sp, 0x4]
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r2, =gStringVar1
movs r1, 0x2
bl pokemon_getattr
bl GetMonData
b _08177768
.pool
_0817773C:
asm/mystery_event_script.s
+2 -2
View File
@@ -661,7 +661,7 @@ sub_8153CC8: @ 8153CC8
bl memcpy
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0xCE
@@ -718,7 +718,7 @@ _08153D4C:
_08153D86:
adds r0, r7, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl itemid_is_mail
asm/pokeblock_feed.s
+9 -9
View File
@@ -118,7 +118,7 @@ _08179C78:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl sub_8179DF4
lsls r0, 24
@@ -140,7 +140,7 @@ _08179CB0:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl sub_817A358
ldr r1, =gUnknown_0203BD18
@@ -312,12 +312,12 @@ _08179E24:
_08179E48:
adds r0, r6, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r6, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r0, r5, 3
ldr r1, =gMonFrontPicTable
@@ -335,16 +335,16 @@ _08179E48:
_08179E84:
adds r0, r6, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r6, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
adds r0, r6, 0
movs r1, 0x1
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
adds r0, r5, 0
adds r2, r4, 0
@@ -689,7 +689,7 @@ sub_817A1C4: @ 817A1C4
movs r0, 0x64
adds r5, r1, 0
muls r5, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r0
ldr r1, =gSaveBlock1Ptr
ldr r0, =gUnknown_0203CE7C
@@ -841,7 +841,7 @@ sub_817A358: @ 817A358
push {r6,r7}
adds r5, r0, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
asm/pokemon_1.s
+57 -57
View File
@@ -83,7 +83,7 @@ zero_pokemon_struct: @ 8067A8C
@ void zero_player_party_data()
zero_player_party_data: @ 8067B0C
push {r4,r5,lr}
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
movs r0, 0xFA
lsls r0, 1
adds r5, r4, r0
@@ -102,7 +102,7 @@ _08067B16:
thumb_func_start zero_enemy_party_data
zero_enemy_party_data: @ 8067B2C
push {r4,r5,lr}
ldr r4, =gUnknown_02024744
ldr r4, =gEnemyParty
movs r0, 0xFA
lsls r0, 1
adds r5, r4, r0
@@ -1538,12 +1538,12 @@ sub_80686FC: @ 80686FC
adds r6, r1, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r6]
adds r0, r7, 0
movs r1, 0xC
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -1564,7 +1564,7 @@ _08068738:
adds r1, 0xD
adds r0, r7, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r4]
adds r4, 0x2
adds r5, 0x1
@@ -1573,58 +1573,58 @@ _08068738:
adds r0, r7, 0
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0xC]
adds r0, r7, 0
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0xD]
adds r0, r7, 0
movs r1, 0x1
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [r6, 0x14]
adds r0, r7, 0
movs r1, 0x1A
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0xE]
adds r0, r7, 0
movs r1, 0x1B
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0xF]
adds r0, r7, 0
movs r1, 0x1C
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0x10]
adds r0, r7, 0
movs r1, 0x1D
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0x11]
adds r0, r7, 0
movs r1, 0x1E
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0x12]
adds r0, r7, 0
movs r1, 0x1F
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r6, 0x13]
adds r0, r7, 0
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, r8
strb r0, [r1]
adds r0, r7, 0
movs r1, 0x27
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r4, 0x1F
ands r0, r4
ldrb r2, [r6, 0x18]
@@ -1636,7 +1636,7 @@ _08068738:
adds r0, r7, 0
movs r1, 0x28
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r5, 0x1F
ands r0, r5
lsls r0, 5
@@ -1648,7 +1648,7 @@ _08068738:
adds r0, r7, 0
movs r1, 0x29
movs r2, 0
bl pokemon_getattr
bl GetMonData
ands r0, r4
lsls r0, 2
ldrb r2, [r6, 0x19]
@@ -1660,7 +1660,7 @@ _08068738:
adds r0, r7, 0
movs r1, 0x2A
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -1672,7 +1672,7 @@ _08068738:
adds r0, r7, 0
movs r1, 0x2B
movs r2, 0
bl pokemon_getattr
bl GetMonData
ands r0, r5
lsls r0, 4
ldrh r2, [r6, 0x1A]
@@ -1683,7 +1683,7 @@ _08068738:
adds r0, r7, 0
movs r1, 0x2C
movs r2, 0
bl pokemon_getattr
bl GetMonData
ands r0, r4
lsls r0, 1
ldrb r2, [r6, 0x1B]
@@ -1695,7 +1695,7 @@ _08068738:
adds r0, r7, 0
movs r1, 0x2E
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 7
ldrb r2, [r6, 0x1B]
movs r1, 0x7F
@@ -1705,12 +1705,12 @@ _08068738:
adds r0, r7, 0
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [r6, 0x1C]
adds r0, r7, 0
movs r1, 0x2
mov r2, r9
bl pokemon_getattr
bl GetMonData
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -1898,7 +1898,7 @@ get_pokemon_data_3: @ 8068A10
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xCD
lsls r1, 1
cmp r0, r1
@@ -1912,13 +1912,13 @@ _08068A3C:
adds r1, 0x27
adds r0, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
adds r1, r6, 0
adds r1, 0x1A
adds r0, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r2, =gUnknown_08329D48
lsls r1, r6, 1
adds r1, r2
@@ -1967,12 +1967,12 @@ _08068AAA:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xCD
lsls r1, 1
cmp r0, r1
@@ -1980,7 +1980,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3B
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3B
@@ -1989,7 +1989,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3C
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3C
@@ -1998,7 +1998,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3D
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3D
@@ -2007,7 +2007,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3E
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3E
@@ -2016,7 +2016,7 @@ _08068AAA:
adds r0, r4, 0
movs r1, 0x3F
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3F
@@ -2140,7 +2140,7 @@ DoScriptedWildBattle: @ 8068C18
ldr r0, =gUnknown_020375E4
ldrh r6, [r0]
bl zero_enemy_party_data
ldr r7, =gUnknown_02024744
ldr r7, =gEnemyParty
lsls r4, 24
lsrs r4, 24
movs r0, 0
@@ -2261,77 +2261,77 @@ pokemon_calc_effective_stats: @ 8068D0C
adds r5, r0, 0
movs r1, 0x3A
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r8, r0
adds r0, r5, 0
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x1C]
adds r0, r5, 0
movs r1, 0x27
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r6, r0, 0
adds r0, r5, 0
movs r1, 0x1A
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0x28
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r10, r0
adds r0, r5, 0
movs r1, 0x1B
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r9, r0
adds r0, r5, 0
movs r1, 0x29
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x20]
adds r0, r5, 0
movs r1, 0x1C
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x24]
adds r0, r5, 0
movs r1, 0x2A
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x28]
adds r0, r5, 0
movs r1, 0x1D
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x2C]
adds r0, r5, 0
movs r1, 0x2B
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x30]
adds r0, r5, 0
movs r1, 0x1E
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x34]
adds r0, r5, 0
movs r1, 0x2C
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x38]
adds r0, r5, 0
movs r1, 0x1F
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x3C]
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r5, 0
@@ -2644,14 +2644,14 @@ level_by_exp: @ 8069054
adds r5, r0, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x19
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r3, r0, 0
movs r2, 0x1
ldr r6, =gExperienceTables
@@ -3020,14 +3020,14 @@ sub_8069318: @ 8069318
mov r0, r8
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r9, r0
mov r0, r8
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -3154,13 +3154,13 @@ _08069440:
adds r1, 0xE
adds r0, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r5]
adds r1, r4, 0
adds r1, 0x12
adds r0, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r7, r4
strb r0, [r1]
adds r5, 0x2
@@ -3170,7 +3170,7 @@ _08069440:
adds r0, r6, 0
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, r9
strb r0, [r1]
ldrb r0, [r1]
asm/pokemon_2.s
+55 -55
View File
@@ -86,7 +86,7 @@ _08069E8A:
lsrs r0, 24
bl battle_side_get_owner
adds r4, r0, 0
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r4, 24
@@ -982,9 +982,9 @@ _0806A510:
bx r1
thumb_func_end pokemon_data_permutator
thumb_func_start pokemon_getattr
@ int pokemon_getattr(pokemon *mon, enum pokemon_data_request req, void *data)
pokemon_getattr: @ 806A518
thumb_func_start GetMonData
@ int GetMonData(pokemon *mon, enum pokemon_data_request req, void *data)
GetMonData: @ 806A518
push {r4,lr}
adds r4, r0, 0
adds r3, r1, 0
@@ -1137,7 +1137,7 @@ _0806A66E:
pop {r4}
pop {r1}
bx r1
thumb_func_end pokemon_getattr
thumb_func_end GetMonData
thumb_func_start pokemon_getattr_encrypted
@ int pokemon_getattr_encrypted(pokemon *mon, enum pokemon_data_request req, void *data)
@@ -2904,12 +2904,12 @@ _0806B446:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0806B444
adds r0, r4, 0
@@ -3032,11 +3032,11 @@ _0806B554:
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0806B54C
_0806B572:
@@ -3069,11 +3069,11 @@ _0806B598:
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0806B590
_0806B5B6:
@@ -3101,12 +3101,12 @@ _0806B5DC:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -3114,13 +3114,13 @@ _0806B5DC:
adds r0, r4, 0
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806B616
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806B616
adds r6, 0x1
@@ -3152,12 +3152,12 @@ _0806B63E:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
movs r0, 0xCE
lsls r0, 1
@@ -3168,7 +3168,7 @@ _0806B63E:
adds r0, r4, 0
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806B670
adds r6, 0x1
@@ -3233,14 +3233,14 @@ GetMonAbility: @ 806B6D8
adds r5, r0, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x2E
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3288,7 +3288,7 @@ _0806B730:
movs r0, 0x64
mov r6, r9
muls r6, r0
ldr r4, =gUnknown_02024744
ldr r4, =gEnemyParty
mov r8, r4
adds r5, r6, r4
ldrh r1, [r1]
@@ -3342,7 +3342,7 @@ _0806B7A0:
movs r3, 0x64
mov r0, r9
muls r0, r3
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r7, r0, r1
mov r4, r10
lsls r0, r4, 1
@@ -3459,11 +3459,11 @@ sub_806B8B0: @ 806B8B0
_0806B8B4:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0806B8D0
movs r0, 0
@@ -3604,7 +3604,7 @@ sub_806B9A8: @ 806B9A8
lsrs r4, 24
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -3658,12 +3658,12 @@ battle_data_fill: @ 806B9FC
movs r0, 0x64
mov r5, r9
muls r5, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r0
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, =gBattleMons
mov r8, r1
movs r1, 0x58
@@ -3676,7 +3676,7 @@ battle_data_fill: @ 806B9FC
adds r0, r5, 0
movs r1, 0xC
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r6, 0x2E]
movs r6, 0
mov r0, r8
@@ -3687,7 +3687,7 @@ _0806BA4E:
adds r1, 0xD
adds r0, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xC
add r1, r8
mov r10, r1
@@ -3697,7 +3697,7 @@ _0806BA4E:
adds r1, 0x11
adds r0, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
strb r0, [r7]
adds r7, 0x1
adds r4, 0x2
@@ -3707,12 +3707,12 @@ _0806BA4E:
movs r0, 0x64
mov r4, r9
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r2, 0xC
negs r2, r2
add r2, r10
@@ -3728,14 +3728,14 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r7, 0
adds r1, 0x2B
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x19
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, r10
adds r1, 0x38
adds r1, r5, r1
@@ -3743,7 +3743,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x27
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r6, 0x1F
ands r0, r6
ldrb r2, [r7, 0x14]
@@ -3755,7 +3755,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x28
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0x1F
mov r8, r1
mov r2, r8
@@ -3769,7 +3769,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x29
movs r2, 0
bl pokemon_getattr
bl GetMonData
ands r0, r6
lsls r0, 2
ldrb r2, [r7, 0x15]
@@ -3781,7 +3781,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x2A
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -3793,7 +3793,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x2B
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r3, r8
ands r0, r3
lsls r0, 4
@@ -3805,7 +3805,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x2C
movs r2, 0
bl pokemon_getattr
bl GetMonData
ands r0, r6
lsls r0, 1
ldrb r2, [r7, 0x17]
@@ -3817,7 +3817,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, r10
adds r1, 0x3C
adds r1, r5, r1
@@ -3825,7 +3825,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x37
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, r10
adds r1, 0x40
adds r1, r5, r1
@@ -3833,49 +3833,49 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r7, 0
adds r1, 0x2A
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x28]
adds r0, r4, 0
movs r1, 0x3A
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x3C
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x3D
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x6]
adds r0, r4, 0
movs r1, 0x3E
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x8]
adds r0, r4, 0
movs r1, 0x3F
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0xA]
adds r0, r4, 0
movs r1, 0x2D
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0x1
ands r0, r1
lsls r0, 6
@@ -3888,7 +3888,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x2E
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 7
ldrb r2, [r7, 0x17]
movs r1, 0x7F
@@ -3898,7 +3898,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, r10
adds r1, 0x48
adds r1, r5, r1
@@ -3932,7 +3932,7 @@ _0806BA4E:
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, r10
adds r0, 0x24
adds r0, r5, r0
@@ -3943,7 +3943,7 @@ _0806BA4E:
adds r2, r5, r2
adds r0, r4, 0
movs r1, 0x7
bl pokemon_getattr
bl GetMonData
ldr r0, [sp, 0x14]
bl battle_side_get_owner
ldr r1, =gUnknown_0202449C
asm/pokemon_3.s
+121 -121
View File
@@ -62,7 +62,7 @@ ExecuteTableBasedItemEffect: @ 806BD28
str r5, [sp, 0x3C]
mov r0, r8
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -538,19 +538,19 @@ _0806C168:
mov r0, r8
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0x64
beq _0806C1CA
ldr r5, =gExperienceTables
mov r0, r8
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, 0x1
lsls r4, 2
ldr r2, =gBaseStats
@@ -730,7 +730,7 @@ _0806C300:
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, =gUnknown_08329D22
ldr r3, [sp, 0x14]
adds r1, r3, r1
@@ -744,14 +744,14 @@ _0806C300:
mov r0, r8
adds r1, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -770,7 +770,7 @@ _0806C300:
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, =gUnknown_08329D2A
ldr r2, [sp, 0x14]
adds r1, r2, r1
@@ -784,7 +784,7 @@ _0806C300:
mov r0, r8
adds r1, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r1, [sp]
@@ -802,7 +802,7 @@ _0806C300:
mov r0, r8
adds r1, r4, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, [sp]
adds r0, r1
str r0, [sp]
@@ -863,7 +863,7 @@ _0806C430:
ldrb r1, [r0]
mov r0, r8
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
str r1, [sp, 0x4]
lsls r0, r5, 24
@@ -944,7 +944,7 @@ _0806C4DC:
mov r0, r8
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806C4FC
ldr r0, [sp, 0x28]
@@ -1016,7 +1016,7 @@ _0806C59C:
mov r0, r8
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0806C5B2
ldr r0, [sp, 0x28]
@@ -1047,12 +1047,12 @@ _0806C5D4:
mov r0, r8
movs r1, 0x3A
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
subs r4, r0
str r4, [sp]
b _0806C612
@@ -1060,7 +1060,7 @@ _0806C5F4:
mov r0, r8
movs r1, 0x3A
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsrs r0, 1
str r0, [sp]
cmp r0, 0
@@ -1077,12 +1077,12 @@ _0806C612:
mov r0, r8
movs r1, 0x3A
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r4, r0
beq _0806C6F0
ldr r0, [sp, 0x18]
@@ -1091,21 +1091,21 @@ _0806C612:
mov r0, r8
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, [sp]
adds r0, r1
str r0, [sp]
mov r0, r8
movs r1, 0x3A
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, [sp]
cmp r1, r0
bls _0806C65E
mov r0, r8
movs r1, 0x3A
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
_0806C65E:
mov r0, r8
@@ -1161,7 +1161,7 @@ _0806C6AE:
b _0806C6EC
.pool
_0806C6E4:
ldr r1, =gUnknown_020241F0
ldr r1, =gBattleMoveDamage
ldr r0, [sp]
negs r0, r0
str r0, [r1]
@@ -1194,21 +1194,21 @@ _0806C714:
mov r0, r8
mov r1, r9
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
adds r7, r5, 0
adds r7, 0xD
mov r0, r8
adds r1, r7, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1231,14 +1231,14 @@ _0806C714:
mov r0, r8
adds r1, r7, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1253,14 +1253,14 @@ _0806C714:
mov r0, r8
adds r1, r7, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1341,21 +1341,21 @@ _0806C858:
mov r0, r8
adds r1, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
ldr r5, [sp, 0x14]
adds r5, 0xD
mov r0, r8
adds r1, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1382,14 +1382,14 @@ _0806C8A0:
mov r0, r8
adds r1, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1404,14 +1404,14 @@ _0806C8A0:
mov r0, r8
adds r1, r5, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1555,7 +1555,7 @@ _0806CA18:
ldrb r1, [r0]
mov r0, r8
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
str r1, [sp, 0x4]
lsls r0, r5, 24
@@ -1624,7 +1624,7 @@ _0806CAB8:
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, =gUnknown_08329D22
ldr r5, [sp, 0x14]
adds r1, r5, r1
@@ -1638,14 +1638,14 @@ _0806CAB8:
mov r0, r8
adds r1, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1666,7 +1666,7 @@ _0806CB10:
mov r0, r8
movs r1, 0x15
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
ldr r1, =gUnknown_08329D26
ldr r2, [sp, 0x14]
@@ -1689,7 +1689,7 @@ _0806CB10:
mov r0, r8
adds r1, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r1, [sp]
@@ -1706,7 +1706,7 @@ _0806CB10:
mov r0, r8
adds r1, r4, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
ldr r1, [sp]
adds r0, r1
str r0, [sp]
@@ -1722,7 +1722,7 @@ _0806CB94:
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0x63
bls _0806CBA4
b _0806CD30
@@ -1754,7 +1754,7 @@ _0806CBC6:
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
str r5, [sp, 0x8]
ldr r0, [sp, 0x30]
@@ -1777,7 +1777,7 @@ _0806CC00:
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0x63
bhi _0806CC10
b _0806CD30
@@ -1785,7 +1785,7 @@ _0806CC10:
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _0806CC20
b _0806CD30
@@ -1813,7 +1813,7 @@ _0806CC2E:
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
str r4, [sp, 0x8]
ldr r0, [sp, 0x30]
@@ -1829,7 +1829,7 @@ _0806CC68:
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _0806CD30
ldr r0, [sp, 0x20]
@@ -1854,7 +1854,7 @@ _0806CC82:
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
str r4, [sp, 0x8]
ldr r0, [sp, 0x30]
@@ -1887,7 +1887,7 @@ _0806CCD8:
mov r0, r8
movs r1, 0x26
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0xB
bne _0806CCF0
ldr r0, [sp, 0x8]
@@ -1897,7 +1897,7 @@ _0806CCF0:
mov r0, r8
movs r1, 0x23
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
bl sav1_map_get_name
lsls r0, 24
@@ -1973,7 +1973,7 @@ HealStatusConditions: @ 806CD6C
lsrs r6, r3, 24
movs r1, 0x37
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
str r1, [sp]
ands r0, r4
@@ -2199,7 +2199,7 @@ _0806CF1C:
thumb_func_start sub_806CF24
sub_806CF24: @ 806CF24
push {lr}
ldr r2, =gUnknown_0202420C
ldr r2, =gEnemyMonIndex
ldr r1, =gUnknown_020244B8
ldrb r1, [r1]
strb r1, [r2]
@@ -2332,7 +2332,7 @@ GetNature: @ 806D070
push {lr}
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0x19
bl __umodsi3
lsls r0, 24
@@ -2372,24 +2372,24 @@ GetEvolutionTargetSpecies: @ 806D098
mov r0, r8
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
mov r0, r8
movs r1, 0xC
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, sp
strh r0, [r1]
mov r0, r8
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x17
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0xC]
@@ -2442,14 +2442,14 @@ _0806D144:
mov r0, r8
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r9, r0
mov r0, r8
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
@@ -2567,12 +2567,12 @@ _0806D248:
mov r0, r8
movs r1, 0x3B
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x3C
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r4, r0
bls _0806D332
b _0806D2C4
@@ -2587,12 +2587,12 @@ _0806D272:
mov r0, r8
movs r1, 0x3B
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x3C
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r4, r0
bne _0806D332
b _0806D2C4
@@ -2607,12 +2607,12 @@ _0806D29C:
mov r0, r8
movs r1, 0x3B
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x3C
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r4, r0
bcs _0806D332
_0806D2C4:
@@ -3287,12 +3287,12 @@ sub_806D778: @ 806D778
adds r0, r5, 0
movs r1, 0x2
mov r2, r9
bl pokemon_getattr
bl GetMonData
mov r4, sp
adds r0, r5, 0
movs r1, 0x3
mov r2, sp
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
lsls r0, 24
lsrs r0, 24
@@ -3530,13 +3530,13 @@ _0806D94A:
adds r0, r7, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r7, 0
movs r1, 0xC
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -3580,7 +3580,7 @@ _0806D9B8:
adds r0, r7, 0
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r1, sp
@@ -3662,7 +3662,7 @@ _0806DA46:
adds r0, r7, 0
movs r1, 0x26
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0xB
bne _0806DA74
mov r0, sp
@@ -3675,7 +3675,7 @@ _0806DA74:
adds r0, r7, 0
movs r1, 0x23
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
bl sav1_map_get_name
lsls r0, 24
@@ -3736,7 +3736,7 @@ _0806DAF0:
adds r1, 0x1A
mov r0, r8
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r2, sp
adds r1, r2, r6
strb r0, [r1]
@@ -3842,7 +3842,7 @@ _0806DBC8:
mov r0, r8
movs r1, 0xC
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -3943,7 +3943,7 @@ _0806DC94:
adds r1, 0x1A
adds r0, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r0, r5, r0
lsls r0, 16
lsrs r5, r0, 16
@@ -3990,13 +3990,13 @@ _0806DCDA:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806DCDA
adds r0, r4, 0
movs r1, 0x2D
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0806DCDA
ldr r1, =gBitTable
@@ -4078,7 +4078,7 @@ _0806DD90:
movs r1, 0x22
movs r2, 0
str r3, [sp]
bl pokemon_getattr
bl GetMonData
movs r1, 0xF
ands r1, r0
ldr r3, [sp]
@@ -4098,7 +4098,7 @@ _0806DDC4:
adds r0, r7, 0
movs r1, 0x22
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xF
ands r1, r0
cmp r1, 0
@@ -4135,7 +4135,7 @@ _0806DDF8:
movs r1, 0x22
movs r2, 0
str r3, [sp]
bl pokemon_getattr
bl GetMonData
ldr r3, [sp]
cmp r0, 0
beq _0806DE1C
@@ -4153,7 +4153,7 @@ _0806DE28:
adds r0, r7, 0
movs r1, 0x22
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806DE38
movs r5, 0x1
@@ -4177,18 +4177,18 @@ _0806DE50:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806DEB2
adds r0, r4, 0
movs r1, 0x22
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
strb r0, [r5]
@@ -4218,7 +4218,7 @@ _0806DE96:
_0806DEA2:
movs r0, 0x64
muls r0, r6
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x22
mov r2, sp
@@ -4256,13 +4256,13 @@ _0806DEE0:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0806DF64
adds r0, r4, 0
movs r1, 0x22
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
mov r0, sp
@@ -4281,7 +4281,7 @@ _0806DEE0:
adds r0, r4, 0
movs r1, 0x22
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xF0
ands r1, r0
cmp r1, 0
@@ -4300,7 +4300,7 @@ _0806DF3A:
adds r0, r4, 0
movs r1, 0x22
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xF0
ands r1, r0
cmp r1, 0
@@ -4328,21 +4328,21 @@ sub_806DF74: @ 806DF74
adds r5, r0, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r0, 0x1
mov r1, sp
strb r0, [r1]
adds r0, r5, 0
movs r1, 0x19
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x4]
ldr r6, =gExperienceTables
ldr r2, =gBaseStats
@@ -4404,7 +4404,7 @@ sub_806E00C: @ 806E00C
adds r5, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
adds r3, r1, 0
@@ -4504,13 +4504,13 @@ sub_806E0B4: @ 806E0B4
adds r0, r6, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r6, 0
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0xC]
@@ -4521,7 +4521,7 @@ _0806E0EA:
adds r1, 0xD
adds r0, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r4]
adds r4, 0x2
adds r5, 0x1
@@ -4719,13 +4719,13 @@ sub_806E25C: @ 806E25C
adds r0, r6, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r6, 0
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x30]
@@ -4745,7 +4745,7 @@ _0806E2A0:
adds r1, 0xD
adds r0, r6, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r4]
adds r4, 0x2
adds r5, 0x1
@@ -5252,19 +5252,19 @@ pokemon_get_pal: @ 806E708
adds r5, r0, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r6, r0, 0
adds r0, r5, 0
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
adds r0, r4, 0
adds r1, r6, 0
@@ -5323,19 +5323,19 @@ sub_806E794: @ 806E794
adds r5, r0, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r6, r0, 0
adds r0, r5, 0
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
adds r0, r4, 0
adds r1, r6, 0
@@ -5472,11 +5472,11 @@ sub_806E8A8: @ 806E8A8
adds r4, r0, 0
movs r1, 0x7
mov r2, sp
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
bl pokemon_getattr
bl GetMonData
mov r1, sp
bl sub_806E8D4
lsls r0, 24
@@ -5707,20 +5707,20 @@ _0806EA7C:
bl __umodsi3
lsls r0, 16
lsrs r6, r0, 16
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x2D
mov r8, r0
movs r7, 0x5F
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5, 0
movs r1, 0x6
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0806EAC6
adds r0, r5, 0
@@ -5746,7 +5746,7 @@ _0806EAC6:
beq _0806EB04
cmp r6, r7
bcc _0806EB90
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
lsls r2, 2
ldr r1, =gUnknown_08329EFE
b _0806EB6C
@@ -5756,12 +5756,12 @@ _0806EB04:
bcc _0806EB90
cmp r6, r7
bcs _0806EB18
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
lsls r2, r4, 3
b _0806EB66
.pool
_0806EB18:
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
lsls r2, r4, 3
subs r2, r4
lsls r2, 2
@@ -5783,7 +5783,7 @@ _0806EB2C:
bne _0806EB5C
cmp r3, 0
beq _0806EB5C
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
mov r2, r12
adds r2, 0xC
adds r2, r5, r2
@@ -5794,7 +5794,7 @@ _0806EB5C:
bcc _0806EB90
cmp r6, r7
bcs _0806EB80
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
_0806EB66:
subs r2, r4
lsls r2, 2
@@ -5807,7 +5807,7 @@ _0806EB6E:
b _0806EB90
.pool
_0806EB80:
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
subs r2, r4
lsls r2, 2
ldr r1, =gBaseStats + 0xe @ item 2 offset
@@ -5829,12 +5829,12 @@ sub_806EBA4: @ 806EBA4
adds r4, r0, 0
movs r1, 0x1
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
adds r0, r5, 0
bl sub_806EBD0
asm/rom3.s
+17 -17
View File
@@ -86,7 +86,7 @@ _080326B8:
cmp r0, 0
beq _08032728
bl zero_enemy_party_data
ldr r4, =gUnknown_02024744
ldr r4, =gEnemyParty
movs r1, 0x90
lsls r1, 1
str r5, [sp]
@@ -1160,33 +1160,33 @@ _08033088:
ands r0, r1
cmp r0, 0
bne _080330A8
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
b _080330AA
.pool
_080330A8:
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
_080330AA:
adds r4, r7, r0
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08033170
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08033170
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
beq _08033170
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _08033170
ldr r0, =gUnknown_0202406E
@@ -1201,11 +1201,11 @@ _080330F0:
ands r0, r1
cmp r0, 0
bne _08033118
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r7, r0
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08033170
adds r0, r4, 0
@@ -1213,29 +1213,29 @@ _080330F0:
b _0803312C
.pool
_08033118:
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r4, r7, r0
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08033170
adds r0, r4, 0
movs r1, 0x41
_0803312C:
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08033170
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
beq _08033170
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _08033170
ldr r1, =gUnknown_0202406E
@@ -1523,7 +1523,7 @@ _08033346:
ldrsh r1, [r0, r7]
ldr r0, [r4]
adds r1, r0
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
strb r0, [r1, 0x3]
ldrb r1, [r3]
@@ -2072,7 +2072,7 @@ _080337D2:
adds r0, r1
ldrb r0, [r0, 0x2]
strb r0, [r2]
ldr r2, =gUnknown_0202420C
ldr r2, =gEnemyMonIndex
movs r4, 0x26
ldrsh r0, [r5, r4]
adds r0, r1
@@ -2532,7 +2532,7 @@ dp01_build_cmdbuf_x0F_aa_b_cc_dddd_e_mlc_weather_00_x1Cbytes: @ 8033B0C
lsls r0, 24
cmp r0, 0
bne _08033BAC
ldr r0, =gUnknown_020243CC
ldr r0, =gBattleWeather
ldrh r0, [r0]
strb r0, [r7, 0xC]
ands r6, r0
asm/rom4.s
+2 -2
View File
@@ -2607,10 +2607,10 @@ _08085ABC:
bcs _08085AE4
movs r0, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _08085AB6
adds r0, r4, 0
asm/rom5.s
+20 -20
View File
@@ -233,10 +233,10 @@ _080A94F8:
ldrh r0, [r0]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_02024744
ldr r5, =gEnemyParty
adds r0, r5
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -257,7 +257,7 @@ _080A94F8:
muls r0, r6
adds r0, r5
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -364,7 +364,7 @@ sub_80A9614: @ 80A9614
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
adds r1, r4, 0
bl sub_805DC0C
@@ -420,7 +420,7 @@ _080A96B2:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
adds r1, r4, 0
bl sub_805DD7C
@@ -497,11 +497,11 @@ _080A9762:
mov r2, r10
muls r2, r0
adds r0, r2, 0
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
mov r9, r1
add r0, r9
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080A9786
b _080A9AA0
@@ -512,7 +512,7 @@ _080A9786:
adds r0, r2, 0
add r0, r9
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -575,7 +575,7 @@ _080A9786:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
@@ -714,11 +714,11 @@ _080A9968:
mov r1, r10
muls r1, r0
adds r0, r1, 0
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
mov r9, r2
add r0, r9
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080A998C
b _080A9AA0
@@ -729,7 +729,7 @@ _080A998C:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -792,7 +792,7 @@ _080A998C:
adds r0, r2, 0
add r0, r9
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
@@ -924,7 +924,7 @@ _080A9B24:
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
adds r1, r2
movs r2, 0
bl healthbar_draw_field_maybe
@@ -944,7 +944,7 @@ _080A9B6C:
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0xA
bl healthbar_draw_field_maybe
@@ -958,7 +958,7 @@ _080A9BA0:
ldrh r2, [r1]
movs r1, 0x64
muls r1, r2
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0
bl healthbar_draw_field_maybe
@@ -1000,10 +1000,10 @@ _080A9BFC:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080A9C5E
adds r0, r6, 0
@@ -1022,10 +1022,10 @@ _080A9C34:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080A9C5E
adds r0, r6, 0
asm/rom6.s
+57 -57
View File
@@ -2767,7 +2767,7 @@ sub_8136C8C: @ 8136C8C
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
bl GetNature
lsls r0, 24
lsrs r0, 24
@@ -4093,24 +4093,24 @@ _081377BC:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
movs r0, 0
strb r6, [r5]
strb r0, [r5, 0x1]
adds r0, r4, 0
movs r1, 0x5
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0813780A
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0813780A
adds r0, r4, 0
movs r1, 0x43
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0813780A
movs r0, 0x1
@@ -4160,7 +4160,7 @@ _08137838:
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x43
bl sub_80EE4DC
@@ -4283,16 +4283,16 @@ _08137946:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08137978
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldr r1, =0x0000ffff
ands r1, r0
cmp r1, r6
@@ -6542,11 +6542,11 @@ sub_8138C04: @ 8138C04
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x20
bl pokemon_getattr
bl GetMonData
cmp r0, 0xFF
bne _08138C2C
movs r0, 0x6
@@ -6555,7 +6555,7 @@ sub_8138C04: @ 8138C04
_08138C2C:
adds r0, r4, 0
movs r1, 0x20
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _08138C3C
movs r0, 0x5
@@ -6563,7 +6563,7 @@ _08138C2C:
_08138C3C:
adds r0, r4, 0
movs r1, 0x20
bl pokemon_getattr
bl GetMonData
cmp r0, 0x95
bls _08138C4C
movs r0, 0x4
@@ -6571,7 +6571,7 @@ _08138C3C:
_08138C4C:
adds r0, r4, 0
movs r1, 0x20
bl pokemon_getattr
bl GetMonData
cmp r0, 0x63
bls _08138C5C
movs r0, 0x3
@@ -6579,7 +6579,7 @@ _08138C4C:
_08138C5C:
adds r0, r4, 0
movs r1, 0x20
bl pokemon_getattr
bl GetMonData
cmp r0, 0x31
bls _08138C6C
movs r0, 0x2
@@ -6587,7 +6587,7 @@ _08138C5C:
_08138C6C:
adds r0, r4, 0
movs r1, 0x20
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _08138C7C
movs r0, 0
@@ -7065,10 +7065,10 @@ sub_8139004: @ 8139004
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x16
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _08139028
movs r0, 0x1
@@ -7089,10 +7089,10 @@ sub_8139030: @ 8139030
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x17
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _08139054
movs r0, 0x1
@@ -7113,10 +7113,10 @@ sub_813905C: @ 813905C
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x18
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _08139080
movs r0, 0x1
@@ -7137,10 +7137,10 @@ sub_8139088: @ 8139088
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x21
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _081390AC
movs r0, 0x1
@@ -7161,10 +7161,10 @@ sub_81390B4: @ 81390B4
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2F
bl pokemon_getattr
bl GetMonData
cmp r0, 0xC7
bls _081390D8
movs r0, 0x1
@@ -7186,21 +7186,21 @@ _081390E6:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0813913C
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0813913C
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 3
@@ -7300,7 +7300,7 @@ sub_81391D0: @ 81391D0
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl GetNature
lsls r0, 24
@@ -7484,11 +7484,11 @@ sub_8139348: @ 8139348
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x47
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -7512,7 +7512,7 @@ sub_8139370: @ 8139370
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x47
@@ -7543,7 +7543,7 @@ sub_81393C8: @ 81393C8
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl sub_806DC8C
lsls r0, 16
@@ -7619,7 +7619,7 @@ sub_813945C: @ 813945C
sub_813946C: @ 813946C
push {r4,r5,lr}
sub sp, 0x14
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
movs r1, 0x90
lsls r1, 1
movs r4, 0
@@ -7685,11 +7685,11 @@ sub_81394D8: @ 81394D8
_081394FA:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, r6
bne _0813951C
movs r0, 0x1
@@ -7722,7 +7722,7 @@ sub_8139530: @ 8139530
thumb_func_start sub_8139540
sub_8139540: @ 8139540
push {lr}
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
movs r1, 0x3F
bl sub_806DD7C
lsls r0, 24
@@ -7895,12 +7895,12 @@ _08139698:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -7908,7 +7908,7 @@ _08139698:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _081396CC
adds r0, r5, 0
@@ -7935,11 +7935,11 @@ sub_81396E0: @ 81396E0
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -8010,10 +8010,10 @@ sub_8139770: @ 8139770
ldrh r0, [r6]
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
cmp r0, 0x2
bne _081397A6
ldrh r0, [r6]
@@ -8022,7 +8022,7 @@ sub_8139770: @ 8139770
ldr r4, =gStringVar1
movs r1, 0x7
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
adds r1, r4, 0
@@ -8213,10 +8213,10 @@ sub_813990C: @ 813990C
_0813991C:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x4
bl pokemon_getattr
bl GetMonData
cmp r0, 0x1
bne _08139938
movs r0, 0x1
@@ -8773,40 +8773,40 @@ sub_8139D98: @ 8139D98
ldrh r0, [r6]
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x27
bl pokemon_getattr
bl GetMonData
str r0, [sp]
ldrh r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0x28
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x4]
ldrh r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0x29
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x8]
ldrh r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0x2A
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0xC]
ldrh r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0x2B
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x10]
ldrh r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0x2C
bl pokemon_getattr
bl GetMonData
str r0, [sp, 0x14]
ldr r1, =gUnknown_020375E2
movs r0, 0
@@ -9988,7 +9988,7 @@ _0813A7C6:
ldrh r1, [r1]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl GetNature
lsls r0, 24
asm/rom_8034C54.s
+1329 -1329
View File
File diff suppressed because it is too large Load Diff
asm/rom_8072304.s
+44 -44
View File
@@ -2078,10 +2078,10 @@ _080733DE:
ldrh r0, [r1]
movs r2, 0x64
muls r0, r2
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -2093,7 +2093,7 @@ _080733DE:
ldrh r0, [r2]
movs r1, 0x64
muls r0, r1
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
b _08073536
.pool
_08073468:
@@ -2104,7 +2104,7 @@ _08073468:
ldrh r1, [r2]
movs r2, 0x64
muls r1, r2
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
adds r1, r2
movs r2, 0x5
bl healthbar_draw_field_maybe
@@ -2138,7 +2138,7 @@ _080734B0:
ldrh r1, [r2]
movs r2, 0x64
muls r1, r2
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
adds r1, r2
bl sub_80730D4
b _08073592
@@ -2170,10 +2170,10 @@ _080734DC:
ldrh r0, [r1]
movs r2, 0x64
muls r0, r2
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -2185,11 +2185,11 @@ _080734DC:
ldrh r0, [r2]
movs r1, 0x64
muls r0, r1
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
_08073536:
adds r0, r2
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -2206,7 +2206,7 @@ _0807355C:
ldrh r1, [r2]
movs r5, 0x64
muls r1, r5
ldr r4, =gUnknown_02024744
ldr r4, =gEnemyParty
adds r1, r4
movs r2, 0x5
bl healthbar_draw_field_maybe
@@ -3766,7 +3766,7 @@ sub_80741E8: @ 80741E8
adds r0, r4, 0
movs r1, 0x2
add r2, sp, 0x4
bl pokemon_getattr
bl GetMonData
add r0, sp, 0x4
bl StringGetEnd10
adds r0, r5, 0
@@ -3779,7 +3779,7 @@ sub_80741E8: @ 80741E8
lsrs r6, r0, 24
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r0, 0
@@ -3912,10 +3912,10 @@ sub_8074310: @ 8074310
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl SpeciesToNationalPokedexNum
@@ -4008,10 +4008,10 @@ draw_status_ailment_maybe: @ 80743F8
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x37
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
bl battle_type_is_double
lsls r0, 24
@@ -4030,10 +4030,10 @@ _08074468:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x37
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
movs r1, 0x11
mov r8, r1
@@ -4520,7 +4520,7 @@ _080748B8:
_080748C0:
mov r0, r8
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4531,7 +4531,7 @@ _080748D4:
bhi _080748EE
mov r0, r8
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -4546,7 +4546,7 @@ _080748EE:
_080748F6:
mov r0, r8
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -4563,11 +4563,11 @@ _08074914:
bl load_gfxc_health_bar
mov r0, r8
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
adds r3, r0, 0
movs r0, 0
str r0, [sp]
@@ -4596,19 +4596,19 @@ _0807495E:
bl load_gfxc_health_bar
mov r0, r8
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
mov r0, r8
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
mov r0, r8
movs r1, 0x19
bl pokemon_getattr
bl GetMonData
adds r3, r0, 0
ldr r0, =gExperienceTables
mov r12, r0
@@ -4683,7 +4683,7 @@ _08074A18:
_08074A20:
mov r0, r8
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4699,11 +4699,11 @@ _08074A3C:
bl load_gfxc_health_bar
mov r0, r8
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
adds r3, r0, 0
movs r0, 0
str r0, [sp]
@@ -5017,10 +5017,10 @@ _08074CA0:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
adds r7, r5, 0
@@ -6026,7 +6026,7 @@ _08075488:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _080754C2
.pool
_080754B4:
@@ -6036,11 +6036,11 @@ _080754B4:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_080754C2:
adds r0, r1
movs r1, 0x26
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl ball_number_to_ball_processing_index
@@ -6077,7 +6077,7 @@ _080754C2:
beq _08075548
cmp r2, 0xFF
bne _08075584
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
strb r5, [r0]
movs r0, 0x18
strh r0, [r4, 0x20]
@@ -6104,7 +6104,7 @@ _08075548:
lsrs r0, 24
adds r0, 0x18
strh r0, [r4, 0x22]
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
strb r5, [r0]
movs r3, 0
strh r3, [r4, 0x2E]
@@ -6118,7 +6118,7 @@ _08075548:
_08075584:
movs r0, 0x1
bl battle_get_side_with_given_state
ldr r1, =gUnknown_0202420C
ldr r1, =gEnemyMonIndex
strb r0, [r1]
movs r0, 0x1
str r0, [sp]
@@ -6128,7 +6128,7 @@ _08075592:
adds r1, r7
lsls r1, 2
adds r4, r1, r0
ldr r5, =gUnknown_0202420C
ldr r5, =gEnemyMonIndex
ldrb r0, [r5]
strh r0, [r4, 0x3A]
ldr r2, [sp]
@@ -7105,7 +7105,7 @@ _08075D88:
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r7, r1, r0
movs r4, 0x19
mov r10, r4
@@ -7118,7 +7118,7 @@ _08075DC0:
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r7, r1, r0
movs r0, 0xE7
mov r10, r0
@@ -7126,7 +7126,7 @@ _08075DD4:
mov r8, r2
adds r0, r7, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r9, r0
@@ -8767,7 +8767,7 @@ sub_8076B14: @ 8076B14
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _08076B4E
.pool
_08076B40:
@@ -8777,11 +8777,11 @@ _08076B40:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_08076B4E:
adds r0, r1
movs r1, 0x26
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r4}
asm/rom_80A5C6C.s
+23 -23
View File
@@ -108,7 +108,7 @@ _080A5D28:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _080A5D7E
.pool
_080A5D60:
@@ -126,11 +126,11 @@ _080A5D60:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_080A5D7E:
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
b _080A5D9A
@@ -209,10 +209,10 @@ _080A5E04:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
b _080A5E42
.pool
@@ -299,10 +299,10 @@ _080A5EC8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
b _080A5F0A
.pool
@@ -668,7 +668,7 @@ sub_80A6190: @ 80A6190
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _080A6202
.pool
_080A61E4:
@@ -686,11 +686,11 @@ _080A61E4:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_080A6202:
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
b _080A621E
@@ -1899,7 +1899,7 @@ _080A6ABC:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
b _080A6AFE
.pool
_080A6AF0:
@@ -1909,11 +1909,11 @@ _080A6AF0:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
_080A6AFE:
adds r0, r1
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080A6B18
_080A6B0A:
@@ -4585,10 +4585,10 @@ _080A7F78:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r2, r0, 16
b _080A7FC2
@@ -4620,10 +4620,10 @@ _080A7FD8:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r2, r0, 16
b _080A8012
@@ -5506,17 +5506,17 @@ _080A86C4:
ldrh r0, [r4]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldrh r0, [r4]
muls r0, r6
adds r0, r5
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
b _080A8724
.pool
@@ -5596,17 +5596,17 @@ _080A8790:
ldrh r0, [r4]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_02024744
ldr r5, =gEnemyParty
adds r0, r5
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldrh r0, [r4]
muls r0, r6
adds r0, r5
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
b _080A87E4
.pool
asm/rom_80C6FA0.s
+63 -63
View File
@@ -76,16 +76,16 @@ _080C700E:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080C7036
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080C7036
adds r0, r6, 0x1
@@ -118,21 +118,21 @@ _080C705A:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080C7092
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080C7092
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080C7092
adds r0, r6, 0x1
@@ -173,10 +173,10 @@ sub_80C70C4: @ 80C70C4
_080C70CA:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080C70E2
adds r0, r5, 0x1
@@ -5473,7 +5473,7 @@ sub_80C9F6C: @ 80C9F6C
beq _080C9FAC
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xC
mov r2, sp
@@ -6714,10 +6714,10 @@ sub_80CAA74: @ 80CAA74
_080CAA78:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
negs r1, r0
orrs r1, r0
lsrs r1, 31
@@ -7351,12 +7351,12 @@ sub_80CAFC4: @ 80CAFC4
ldr r4, =0x000020a4
adds r0, r4
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r6, r0, 0
ldr r0, [r5]
adds r0, r4
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -8346,15 +8346,15 @@ sub_80CB7E8: @ 80CB7E8
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
movs r0, 0x1
str r0, [sp]
@@ -8376,18 +8376,18 @@ _080CB830:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _080CB894
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
subs r0, r6, 0x1
lsls r3, r0, 1
@@ -8482,10 +8482,10 @@ _080CB8FA:
beq _080CB932
movs r0, 0x64
muls r0, r6
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080CB932
ldr r0, [r7]
@@ -11910,10 +11910,10 @@ sub_80CD504: @ 80CD504
ldrsb r1, [r0, r1]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
b _080CD542
.pool
_080CD538:
@@ -13225,7 +13225,7 @@ sub_80CE018: @ 80CE018
ldr r0, [r0]
ldr r1, =0x000020a4
adds r0, r1
ldr r3, =gUnknown_020244EC
ldr r3, =gPlayerParty
ldr r1, =gUnknown_02039D79
movs r2, 0
ldrsb r2, [r1, r2]
@@ -13267,7 +13267,7 @@ diegohint2: @ 80CE08C
lsrs r7, r1, 24
cmp r6, 0xE
bne _080CE0C0
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
movs r0, 0x64
muls r0, r7
adds r0, r1
@@ -13308,7 +13308,7 @@ sub_80CE0E8: @ 80CE0E8
bne _080CE108
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl zero_pokemon_struct
b _080CE10C
@@ -13333,7 +13333,7 @@ diegohint1: @ 80CE110
ldr r0, [r0]
ldr r1, =0x00002108
adds r0, r1
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
movs r1, 0x64
muls r1, r7
adds r1, r2
@@ -13670,7 +13670,7 @@ _080CE418:
ldr r0, [r4]
ldr r2, =0x00002108
adds r0, r2
ldr r3, =gUnknown_020244EC
ldr r3, =gPlayerParty
ldr r1, =gUnknown_02039D79
movs r2, 0
ldrsb r2, [r1, r2]
@@ -13721,7 +13721,7 @@ _080CE494:
adds r0, r2, r1
adds r2, r4
movs r1, 0x51
bl pokemon_getattr
bl GetMonData
ldr r2, [r5]
ldr r3, =0x00002174
adds r1, r2, r3
@@ -13770,10 +13770,10 @@ sub_80CE51C: @ 80CE51C
_080CE52A:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x5
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080CE53E
adds r5, 0x1
@@ -13865,12 +13865,12 @@ _080CE5C6:
_080CE5E4:
movs r0, 0x64
muls r0, r6
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =0x00002176
adds r2, r1
movs r1, 0x51
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r1, [r5]
@@ -14120,7 +14120,7 @@ _080CE838:
ldr r1, [r4]
ldr r0, =0x0000218c
adds r2, r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
str r0, [r2]
ldr r0, =gUnknown_02039D79
ldrb r0, [r0]
@@ -14205,7 +14205,7 @@ party_compaction: @ 80CE90C
movs r5, 0
movs r0, 0x64
mov r9, r0
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
mov r8, r1
subs r0, 0x65
mov r10, r0
@@ -14216,7 +14216,7 @@ _080CE928:
adds r4, r0, r1
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
cmp r0, 0
beq _080CE960
@@ -14250,7 +14250,7 @@ _080CE96A:
cmp r5, 0x5
bhi _080CE992
movs r6, 0x64
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
_080CE97E:
adds r0, r5, 0
muls r0, r6
@@ -14309,7 +14309,7 @@ _080CE9E8:
ldrsb r1, [r0, r1]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x8
mov r2, sp
@@ -14390,7 +14390,7 @@ sub_80CEA6C: @ 80CEA6C
ldr r2, =0x000020a4
adds r0, r1, r2
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080CEAC8
_080CEAAC:
@@ -14515,7 +14515,7 @@ _080CEB8A:
adds r1, r0, 0
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0
bl sub_80CEC00
@@ -14586,7 +14586,7 @@ sub_80CEC00: @ 80CEC00
adds r6, r4, 0
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
mov r2, r8
ldr r1, [r2]
ldr r3, =0x00000ce4
@@ -14599,7 +14599,7 @@ sub_80CEC00: @ 80CEC00
_080CEC44:
adds r0, r4, 0
movs r1, 0x4
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -14616,7 +14616,7 @@ _080CEC44:
_080CEC74:
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
mov r3, r8
ldr r1, [r3]
ldr r2, =0x00000ced
@@ -14629,27 +14629,27 @@ _080CEC86:
adds r2, r5
adds r0, r6, 0
movs r1, 0x2
bl pokemon_getattr
bl GetMonData
ldr r0, [r4]
adds r0, r5
bl StringGetEnd10
adds r0, r6, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
ldr r1, [r4]
ldr r3, =0x00000cec
adds r1, r3
strb r0, [r1]
adds r0, r6, 0
movs r1, 0x8
bl pokemon_getattr
bl GetMonData
ldr r1, [r4]
ldr r2, =0x00000ceb
adds r1, r2
strb r0, [r1]
adds r0, r6, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldr r1, [r4]
movs r3, 0xCE
lsls r3, 4
@@ -14668,7 +14668,7 @@ _080CEC86:
mov r9, r0
adds r0, r6, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
ldr r1, [r4]
ldr r3, =0x00000ce6
adds r1, r3
@@ -18687,16 +18687,16 @@ _080D0DDA:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080D0E42
adds r0, r4, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
_080D0DFC:
lsls r0, 16
lsrs r4, r0, 16
@@ -18817,7 +18817,7 @@ sub_80D0E90: @ 80D0E90
_080D0EF8:
movs r0, 0x64
muls r0, r7
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xC
mov r2, sp
@@ -18946,11 +18946,11 @@ _080D101C:
movs r0, 0x64
adds r4, r7, 0
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
mov r0, r8
@@ -19035,7 +19035,7 @@ _080D10E0:
mov r1, r8
muls r1, r0
adds r0, r1, 0
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r2, [r6]
ldr r1, =0x00002234
@@ -19099,7 +19099,7 @@ sub_80D1114: @ 80D1114
_080D1170:
movs r0, 0x64
muls r0, r7
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xC
mov r2, sp
@@ -24096,7 +24096,7 @@ _080D3754:
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
bl GetMonAbility
lsls r0, 24
@@ -25620,7 +25620,7 @@ sub_80D43F0: @ 80D43F0
push {r4,lr}
adds r4, r0, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
bl itemid_is_mail
@@ -25629,7 +25629,7 @@ sub_80D43F0: @ 80D43F0
beq _080D4418
adds r0, r4, 0
movs r1, 0x40
bl pokemon_getattr
bl GetMonData
cmp r0, 0xFF
beq _080D4418
movs r0, 0x1
@@ -25957,7 +25957,7 @@ sub_80D4680: @ 80D4680
beq _080D46D2
adds r0, r4, 0
movs r1, 0x40
bl pokemon_getattr
bl GetMonData
add r2, sp, 0x4
strb r0, [r2]
ldr r0, =gSaveBlock1Ptr
@@ -26049,7 +26049,7 @@ _080D4724:
adds r0, r5, 0
movs r1, 0x40
str r3, [sp, 0x8]
bl pokemon_getattr
bl GetMonData
mov r1, r8
ldr r2, [r1]
lsls r1, r0, 3
@@ -26066,7 +26066,7 @@ _080D4724:
stm r4!, {r0,r2,r3}
adds r0, r5, 0
movs r1, 0x40
bl pokemon_getattr
bl GetMonData
mov r1, r8
ldr r2, [r1]
lsls r1, r0, 3
asm/rom_8158B30.s
+292 -292
View File
File diff suppressed because it is too large Load Diff
asm/rom_817C95C.s
+49 -49
View File
@@ -39,7 +39,7 @@ _0817C988:
bl battle_side_get_owner
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -66,7 +66,7 @@ _0817C988:
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
b _0817CA10
.pool
_0817CA00:
@@ -77,31 +77,31 @@ _0817CA00:
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
_0817CA10:
adds r1, r0
str r1, [sp, 0x8]
cmp r6, 0
bne _0817CA3C
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
b _0817CA4C
.pool
_0817CA3C:
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
lsls r0, 1
adds r0, r2
ldrh r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
_0817CA4C:
adds r1, r0
str r1, [sp, 0xC]
@@ -140,7 +140,7 @@ _0817CA9C:
lsls r0, 24
lsrs r0, 25
mov r8, r0
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
bl battle_get_per_side_status
lsls r0, 24
@@ -553,7 +553,7 @@ _0817D0B4:
ldr r0, [sp, 0xC]
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817D0C6
bl _0817E0A6
@@ -941,7 +941,7 @@ _0817D3F2:
bl _0817E0A6
_0817D3FE:
ldr r0, =gUnknown_0202420B
ldr r1, =gUnknown_0202420C
ldr r1, =gEnemyMonIndex
ldrb r0, [r0]
ldrb r1, [r1]
cmp r0, r1
@@ -1045,7 +1045,7 @@ _0817D4E0:
ldr r0, [sp, 0x8]
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817D4F2
bl _0817E0A6
@@ -1183,7 +1183,7 @@ _0817D608:
ldr r0, [sp, 0x8]
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817D61A
bl _0817E0A6
@@ -1251,7 +1251,7 @@ _0817D698:
ldr r0, [sp, 0x8]
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817D6AA
bl _0817E0A6
@@ -1348,7 +1348,7 @@ _0817D76C:
ldr r0, [sp, 0x8]
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817D77E
bl _0817E0A6
@@ -1491,7 +1491,7 @@ _0817D8A4:
ldr r0, [sp, 0x8]
movs r1, 0x39
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817D8B6
bl _0817E0A6
@@ -2564,7 +2564,7 @@ _0817E122:
lsls r0, 24
lsrs r0, 24
mov r9, r0
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -2934,11 +2934,11 @@ _0817E434:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r0, r4, r0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0817E454
mov r0, r8
@@ -2947,11 +2947,11 @@ _0817E434:
lsrs r0, 24
mov r8, r0
_0817E454:
ldr r5, =gUnknown_02024744
ldr r5, =gEnemyParty
adds r0, r4, r5
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _0817E46A
adds r0, r7, 0x1
@@ -2981,12 +2981,12 @@ _0817E484:
_0817E48E:
mov r1, r8
muls r1, r6
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r6, 0x1
@@ -2996,7 +2996,7 @@ _0817E48E:
adds r0, r4, 0
movs r1, 0x2D
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817E4EE
movs r4, 0
@@ -3029,12 +3029,12 @@ _0817E4C4:
_0817E4EE:
mov r0, r8
muls r0, r6
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
adds r4, r0, r2
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r3, [sp, 0x8]
@@ -3045,7 +3045,7 @@ _0817E4EE:
adds r0, r4, 0
movs r1, 0x2D
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0817E5A0
movs r4, 0
@@ -3078,20 +3078,20 @@ _0817E534:
bne _0817E590
mov r0, r8
muls r0, r6
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x19
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
ldr r2, [sp, 0x14]
mov r0, r8
muls r0, r2
ldr r3, =gUnknown_02024744
ldr r3, =gEnemyParty
adds r0, r3
movs r1, 0x19
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r4, r0
bls _0817E5A0
b _0817E594
@@ -3115,7 +3115,7 @@ _0817E5A8:
movs r4, 0
movs r6, 0
movs r3, 0
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
ldr r7, [sp, 0x10]
lsls r0, r7, 3
mov r1, r10
@@ -3141,7 +3141,7 @@ _0817E5C8:
adds r1, r6, 0
adds r1, 0xD
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r2, [sp, 0x1C]
@@ -3249,7 +3249,7 @@ sub_817E684: @ 817E684
bl battle_side_get_owner
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -3714,7 +3714,7 @@ sub_817EA80: @ 817EA80
bl battle_side_get_owner
lsls r0, 24
lsrs r4, r0, 24
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
bl battle_side_get_owner
lsls r0, 24
@@ -4291,7 +4291,7 @@ _0817EEF8:
bgt _0817EF10
b _0817F1FA
_0817EF10:
ldr r0, =gUnknown_0202420C
ldr r0, =gEnemyMonIndex
ldrb r0, [r0]
muls r0, r1
adds r0, r5
@@ -4375,7 +4375,7 @@ _0817EF98:
mov r1, sp
adds r1, r0
adds r1, 0x10
ldr r0, =gUnknown_020241F0
ldr r0, =gBattleMoveDamage
ldr r0, [r0]
str r0, [r1]
ldr r0, =gUnknown_020241EA
@@ -4386,7 +4386,7 @@ _0817EF98:
mov r10, r3
mov r8, r0
add r7, sp, 0x10
ldr r4, =gUnknown_0202420C
ldr r4, =gEnemyMonIndex
mov r9, r4
_0817EFC2:
lsls r1, r5, 1
@@ -4445,7 +4445,7 @@ _0817EFC2:
str r4, [sp, 0xC]
bl sub_806957C
adds r3, r0, 0
ldr r4, =gUnknown_020241F0
ldr r4, =gBattleMoveDamage
str r3, [r4]
ldr r1, =gUnknown_020242AC
ldr r2, =gUnknown_0202420B
@@ -4480,7 +4480,7 @@ _0817F06A:
lsls r0, 28
cmp r0, 0
bge _0817F08C
ldr r4, =gUnknown_020241F0
ldr r4, =gBattleMoveDamage
ldr r1, [r4]
lsls r0, r1, 4
subs r0, r1
@@ -4496,7 +4496,7 @@ _0817F08C:
bl move_effectiveness_something
lsls r0, 24
lsrs r1, r0, 24
ldr r0, =gUnknown_020241F0
ldr r0, =gBattleMoveDamage
ldr r0, [r0]
str r0, [r7]
cmp r0, 0
@@ -4545,8 +4545,8 @@ _0817F0D8:
movs r7, 0
_0817F0F6:
movs r5, 0
ldr r4, =gUnknown_0202420C
ldr r6, =gUnknown_02024744
ldr r4, =gEnemyMonIndex
ldr r6, =gEnemyParty
ldr r0, =gUnknown_0202420B
ldrb r0, [r0]
add r0, r10
@@ -4578,7 +4578,7 @@ _0817F11A:
adds r0, r6
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
@@ -4590,11 +4590,11 @@ _0817F11A:
mov r3, r9
muls r3, r0
adds r0, r3, 0
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -4623,7 +4623,7 @@ _0817F1D4:
bgt _0817F1DC
b _0817F0CC
_0817F1DC:
ldr r2, =gUnknown_020241F0
ldr r2, =gBattleMoveDamage
ldr r1, =gUnknown_020244B0
ldr r0, =gUnknown_0202420B
ldrb r0, [r0]
@@ -4803,10 +4803,10 @@ sub_817F33C: @ 817F33C
adds r0, r5, 0
bl battle_side_get_owner
lsls r0, 24
ldr r6, =gUnknown_02024744
ldr r6, =gEnemyParty
cmp r0, 0
bne _0817F356
ldr r6, =gUnknown_020244EC
ldr r6, =gPlayerParty
_0817F356:
movs r4, 0
ldr r1, =gUnknown_0202406E
@@ -4826,7 +4826,7 @@ _0817F36E:
adds r1, r4, 0
adds r1, 0xD
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r0, r7
bne _0817F36C
_0817F388:
asm/rom_8184DA4.s
+756 -756
View File
File diff suppressed because it is too large Load Diff
asm/rom_81BAD84.s
+298 -298
View File
File diff suppressed because it is too large Load Diff
asm/roulette.s
+2 -2
View File
@@ -353,10 +353,10 @@ _0814054E:
_0814056C:
movs r0, 0x64
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
movs r0, 0x98
lsls r0, 1
asm/scrcmd.s
+11 -11
View File
@@ -3846,11 +3846,11 @@ s7E_load_first_pokenames: @ 809AFFC
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xB
muls r1, r0
ldr r0, =gSpeciesNames
@@ -3879,7 +3879,7 @@ s7F_load_pokename_team: @ 809B048
lsrs r0, 16
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r1, =gUnknown_085102D4
lsls r4, 2
@@ -3887,7 +3887,7 @@ s7F_load_pokename_team: @ 809B048
ldr r4, [r4]
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
bl StringGetEnd10
movs r0, 0
@@ -4312,7 +4312,7 @@ sub_809B3DC: @ 809B3DC
_0809B3F4:
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0809B424
adds r0, r4, 0
@@ -4338,12 +4338,12 @@ _0809B42A:
movs r0, 0x64
adds r1, r6, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
@@ -5436,7 +5436,7 @@ sCD_set_obedient_bit: @ 809BC44
lsrs r0, 16
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x50
mov r2, sp
@@ -5460,11 +5460,11 @@ sCE_check_obedient_bit: @ 809BC7C
ldr r4, =gUnknown_020375F0
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x50
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r4]
movs r0, 0
pop {r4}
@@ -5584,7 +5584,7 @@ sub_809BD70: @ 809BD70
bhi _0809BDA6
movs r0, 0x64
muls r0, r3
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x23
mov r2, sp
asm/script_pokemon_util_80F87D8.s
+13 -13
View File
@@ -584,10 +584,10 @@ sub_80F8C7C: @ 80F8C7C
ldrb r0, [r6]
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x46
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -1188,7 +1188,7 @@ sp000_heal_pokemon: @ 80F9180
ldrb r0, [r0]
cmp r8, r0
bcs _080F922C
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
mov r10, r1
mov r6, sp
_080F919E:
@@ -1198,7 +1198,7 @@ _080F919E:
add r4, r10
adds r0, r4, 0
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
lsls r1, r0, 16
strb r0, [r6]
lsrs r1, 24
@@ -1209,7 +1209,7 @@ _080F919E:
bl pokemon_setattr
adds r0, r4, 0
movs r1, 0x15
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r7, r0, 24
movs r5, 0
@@ -1220,7 +1220,7 @@ _080F91D4:
adds r1, r5, 0
adds r1, 0xD
adds r0, r4, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r7, 0
@@ -1396,11 +1396,11 @@ _080F932C:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -1409,7 +1409,7 @@ _080F932C:
beq _080F9360
adds r0, r4, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
cmp r0, r6
bne _080F9360
movs r0, 0x1
@@ -1465,7 +1465,7 @@ sub_80F93A0: @ 80F93A0
lsls r7, r2, 16
lsrs r6, r7, 16
bl zero_enemy_party_data
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
mov r8, r0
movs r0, 0
str r0, [sp]
@@ -1517,7 +1517,7 @@ sub_80F9400: @ 80F9400
_080F941C:
movs r0, 0x64
muls r0, r3
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
adds r1, r4, 0
bl sub_80691F4
@@ -1618,7 +1618,7 @@ sub_80F94E8: @ 80F94E8
bl CpuSet
movs r5, 0
movs r7, 0x64
ldr r6, =gUnknown_020244EC
ldr r6, =gPlayerParty
mov r4, sp
_080F9502:
ldr r0, =gUnknown_0203CEF8
@@ -1641,7 +1641,7 @@ _080F951C:
add r0, sp, 0x194
movs r1, 0
str r1, [r0]
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
ldr r2, =0x05000096
adds r1, r4, 0
bl CpuSet
asm/secret_base.s
+16 -16
View File
@@ -1681,37 +1681,37 @@ sub_80E98AC: @ 80E98AC
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x1A
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1B
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1C
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1D
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1E
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1F
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 16
lsrs r4, 16
@@ -1768,7 +1768,7 @@ _080E995C:
movs r4, 0
lsls r5, r6, 2
lsls r3, r6, 1
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
mov r8, r0
adds r1, r6, 0x1
str r1, [sp, 0x4]
@@ -1810,12 +1810,12 @@ _080E996E:
adds r4, r5, r3
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080E9A54
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080E9A54
movs r4, 0
@@ -1826,13 +1826,13 @@ _080E996E:
lsls r7, r0, 1
adds r0, 0x1
str r0, [sp, 0x8]
ldr r2, =gUnknown_020244EC
ldr r2, =gPlayerParty
_080E99DA:
adds r1, r4, 0
adds r1, 0xD
adds r0, r5, r2
str r2, [sp, 0x20]
bl pokemon_getattr
bl GetMonData
mov r3, r8
adds r1, r3, r4
lsls r1, 1
@@ -1848,29 +1848,29 @@ _080E99DA:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
ldr r2, [sp, 0xC]
adds r1, r2, r7
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
ldr r3, [sp, 0x10]
adds r1, r3, r7
strh r0, [r1]
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
ldr r1, [sp, 0x18]
add r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldr r1, [sp]
add r1, r8
str r0, [r1]
asm/trade.s
+94 -94
View File
@@ -380,7 +380,7 @@ _080774A4:
_080774B2:
movs r0, 0x64
muls r0, r6
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
str r4, [sp]
str r4, [sp, 0x4]
@@ -616,17 +616,17 @@ _080776E2:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r1, 0xE0
@@ -673,18 +673,18 @@ _08077756:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r3, 0xE0
@@ -1233,18 +1233,18 @@ _08077CA8:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r1, 0xE0
@@ -1291,18 +1291,18 @@ _08077D1E:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r3, 0xE0
@@ -2143,7 +2143,7 @@ _08078484:
.4byte _08078720
_080784DC:
ldr r0, =gUnknown_020228C4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
movs r2, 0xC8
bl sub_8078438
ldr r3, =gUnknown_0203229C
@@ -2193,7 +2193,7 @@ _08078548:
beq _08078552
b _080787AA
_08078552:
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
movs r2, 0x1
adds r1, r5, 0
eors r1, r2
@@ -2369,13 +2369,13 @@ _080786F0:
b _080787A2
.pool
_08078720:
ldr r4, =gUnknown_02024744
ldr r4, =gEnemyParty
ldr r6, =0x0000012f
movs r5, 0x5
_08078726:
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -2384,13 +2384,13 @@ _08078726:
bne _08078766
adds r0, r4, 0
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
cmp r0, 0x1
beq _08078766
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
mov r0, sp
ldr r1, =gUnknown_0832DF94
bl StringCompareWithoutExtCtrlCodes
@@ -3381,7 +3381,7 @@ _08078F7E:
b _08079028
.pool
_08078F9C:
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
ldr r1, =gUnknown_020244E9
ldrb r1, [r1]
ldr r2, =gUnknown_0203229C
@@ -3488,7 +3488,7 @@ sub_807905C: @ 807905C
ldrb r2, [r3]
cmp r2, 0x5
bhi _080790A4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
ldrb r2, [r3]
adds r0, 0x36
ldrb r3, [r0]
@@ -3502,7 +3502,7 @@ sub_807905C: @ 807905C
b _080790C0
.pool
_080790A4:
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
subs r2, 0x6
lsls r2, 24
lsrs r2, 24
@@ -3536,7 +3536,7 @@ sub_80790D4: @ 80790D4
lsrs r6, r3, 24
movs r5, 0
movs r3, 0
ldr r7, =gUnknown_02024744
ldr r7, =gEnemyParty
cmp r5, r1
bge _08079102
_080790EE:
@@ -3562,7 +3562,7 @@ _08079102:
adds r7, r0, r7
adds r0, r7, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0xCD
@@ -3574,7 +3574,7 @@ _08079102:
_0807912C:
adds r0, r7, 0
movs r1, 0x50
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _08079158
_08079138:
@@ -4675,21 +4675,21 @@ sub_8079A3C: @ 8079A3C
bne _08079A64
movs r0, 0x64
muls r0, r2
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
b _08079A74
.pool
_08079A64:
movs r0, 0x64
muls r0, r2
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
_08079A74:
adds r0, r4, 0
mov r1, sp
@@ -4739,9 +4739,9 @@ sub_8079AA4: @ 8079AA4
movs r0, 0x64
adds r5, r2, 0
muls r5, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
mov r9, r0
ldr r2, =gUnknown_02024744
ldr r2, =gEnemyParty
mov r8, r2
_08079ADE:
cmp r7, 0
@@ -4758,7 +4758,7 @@ _08079AF8:
_08079AFE:
adds r0, r5, r2
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r1, r4, 1
add r1, sp
strh r0, [r1]
@@ -4865,10 +4865,10 @@ sub_8079BE0: @ 8079BE0
sub sp, 0x34
lsls r0, 24
lsrs r6, r0, 24
ldr r7, =gUnknown_02024744
ldr r7, =gEnemyParty
cmp r6, 0
bne _08079BF0
ldr r7, =gUnknown_020244EC
ldr r7, =gPlayerParty
_08079BF0:
movs r4, 0
ldr r0, =gUnknown_0203229C
@@ -4885,7 +4885,7 @@ _08079C02:
adds r0, r7, r0
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
adds r0, r5, 0
mov r1, sp
bl StringCopy10
@@ -4954,18 +4954,18 @@ sub_8079C4C: @ 8079C4C
bne _08079CB0
movs r0, 0x64
muls r0, r7
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
b _08079CB6
.pool
_08079CB0:
movs r0, 0x64
muls r0, r7
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
_08079CB6:
adds r0, r1
movs r1, 0x38
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r6, r0, 24
ldr r4, =gUnknown_0203229C
@@ -5075,7 +5075,7 @@ _08079D94:
movs r0, 0x64
adds r4, r7, 0
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
bl pokemon_get_gender
@@ -5084,14 +5084,14 @@ _08079D94:
adds r0, r4, 0
movs r1, 0x2
add r2, sp, 0xC
bl pokemon_getattr
bl GetMonData
b _08079DDE
.pool
_08079DC0:
movs r0, 0x64
adds r4, r7, 0
muls r4, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r4, r0
adds r0, r4, 0
bl pokemon_get_gender
@@ -5100,7 +5100,7 @@ _08079DC0:
adds r0, r4, 0
movs r1, 0x2
add r2, sp, 0xC
bl pokemon_getattr
bl GetMonData
_08079DDE:
cmp r5, 0
beq _08079DF0
@@ -5780,11 +5780,11 @@ _0807A34E:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
cmp r1, 0x1
bne _0807A380
@@ -5801,7 +5801,7 @@ _0807A34E:
_0807A380:
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
cmp r1, 0
bne _0807A39E
@@ -5852,11 +5852,11 @@ _0807A3E2:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
cmp r1, 0x1
bne _0807A414
@@ -5873,7 +5873,7 @@ _0807A3E2:
_0807A414:
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
cmp r1, 0
bne _0807A432
@@ -5939,16 +5939,16 @@ _0807A488:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r0, r5, 16
asrs r0, 16
@@ -5982,16 +5982,16 @@ _0807A4E8:
movs r0, 0x64
adds r4, r6, 0
muls r4, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r4, r0
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x3A
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
lsls r0, r5, 16
asrs r0, 16
@@ -6132,11 +6132,11 @@ _0807A60C:
add r4, r8
adds r0, r4, 0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
str r0, [r6, 0x18]
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
stm r6!, {r0}
adds r5, 0x1
cmp r5, r7
@@ -6219,7 +6219,7 @@ _0807A6BE:
adds r0, r1, 0
add r0, r8
movs r1, 0x50
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0807A6D6
_0807A6D2:
@@ -6567,7 +6567,7 @@ _0807A934:
muls r0, r5
adds r0, r6, r0
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
str r0, [r4]
movs r1, 0xCE
lsls r1, 1
@@ -7087,7 +7087,7 @@ sub_807ACFC: @ 807ACFC
ldrb r1, [r0]
movs r0, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r1, r0
mov r8, r1
movs r4, 0x1
@@ -7102,7 +7102,7 @@ _0807AD22:
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r1, r0
mov r8, r1
movs r4, 0x3
@@ -7116,12 +7116,12 @@ _0807AD40:
_0807AD58:
mov r0, r8
movs r1, 0x41
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
mov r0, r8
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r7, r0, 0
cmp r6, 0
bne _0807AD94
@@ -7705,11 +7705,11 @@ _0807B2D0:
ldr r1, [r0]
adds r0, r4, 0
bl StringCopy
ldr r5, =gUnknown_02024744
ldr r5, =gEnemyParty
adds r0, r5, 0
movs r1, 0x7
mov r2, sp
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
adds r0, 0x1C
mov r1, sp
@@ -7721,7 +7721,7 @@ _0807B2D0:
strh r0, [r4, 0x1A]
adds r0, r5, 0
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
strh r0, [r4, 0x36]
ldr r4, =gUnknown_020322A0
movs r5, 0x80
@@ -7859,24 +7859,24 @@ sub_807B464: @ 807B464
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0807B4B8
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
bl SpeciesToNationalPokedexNum
@@ -7921,20 +7921,20 @@ sub_807B4D0: @ 807B4D0
movs r5, 0x64
mov r1, r9
muls r1, r5
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x40
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r1, r4, 0
muls r1, r5
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x40
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -7968,7 +7968,7 @@ _0807B52A:
strb r1, [r0]
adds r0, r7, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0807B566
adds r0, r7, 0
@@ -8543,21 +8543,21 @@ sub_807BAD8: @ 807BAD8
lsrs r0, 24
movs r4, 0x64
muls r0, r4
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
ldr r0, =gStringVar3
mov r1, sp
bl StringCopy10
ldrb r0, [r5]
muls r0, r4
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
ldr r0, =gStringVar2
mov r1, sp
bl StringCopy10
@@ -8582,11 +8582,11 @@ _0807BB68:
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
ldr r0, =gStringVar2
mov r1, sp
bl StringCopy10
@@ -10597,7 +10597,7 @@ _0807CEDC:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x1
movs r2, 0
@@ -12702,7 +12702,7 @@ _0807E328:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x1
movs r2, 0
@@ -12818,7 +12818,7 @@ _0807E444:
ldrb r0, [r7]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0x1
movs r2, 0
@@ -13218,11 +13218,11 @@ sub_807E784: @ 807E784
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x2
mov r2, sp
bl pokemon_getattr
bl GetMonData
ldr r0, =gStringVar1
mov r1, sp
bl StringCopy10
@@ -13255,17 +13255,17 @@ sub_807E7E8: @ 807E7E8
adds r5, r2, r1
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
add r4, sp, 0x34
movs r0, 0xFE
strb r0, [r4]
ldr r6, =gUnknown_02024744
ldr r6, =gEnemyParty
ldrh r1, [r5, 0xC]
movs r3, 0x1
str r3, [sp]
@@ -13400,7 +13400,7 @@ _0807E954:
movs r1, 0xC
bl pokemon_setattr
_0807E960:
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
bl pokemon_calc_effective_stats
add sp, 0x38
pop {r4-r7}
@@ -13466,17 +13466,17 @@ sub_807E9D4: @ 807E9D4
ldrh r0, [r6]
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _0807EA08
ldrh r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r0, 16
b _0807EA0A
@@ -14221,11 +14221,11 @@ _0807F152:
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
adds r0, r1
adds r1, r4, 0
adds r1, 0x43
bl pokemon_getattr
bl GetMonData
adds r0, r5, r0
lsls r0, 24
lsrs r5, r0, 24
asm/tv.s
+82 -82
View File
@@ -1414,11 +1414,11 @@ sub_80ECA38: @ 80ECA38
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r4, 0x12]
ldrh r0, [r6, 0x2]
strh r0, [r4, 0x2]
@@ -2137,11 +2137,11 @@ sub_80ED090: @ 80ED090
ldrb r0, [r0]
movs r6, 0x64
muls r0, r6
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x2]
mov r1, r8
ldrb r0, [r1]
@@ -2151,7 +2151,7 @@ sub_80ED090: @ 80ED090
adds r4, r1
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
bl StripExtCtrlCodes
mov r1, r8
@@ -2159,7 +2159,7 @@ sub_80ED090: @ 80ED090
muls r0, r6
adds r0, r5
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
strb r0, [r7, 0x1F]
_080ED134:
pop {r3}
@@ -2370,12 +2370,12 @@ sub_80ED320: @ 80ED320
ldrh r0, [r0]
movs r7, 0x64
muls r0, r7
ldr r6, =gUnknown_020244EC
ldr r6, =gPlayerParty
adds r0, r6
ldr r4, =gStringVar1
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
ldr r1, =gSaveBlock2Ptr
mov r9, r1
ldr r0, [r1]
@@ -2411,7 +2411,7 @@ sub_80ED320: @ 80ED320
adds r0, r6
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r4, 0x2]
bl Random
lsls r0, 16
@@ -2439,7 +2439,7 @@ sub_80ED320: @ 80ED320
adds r5, r4, 0x4
movs r1, 0x2
adds r2, r5, 0
bl pokemon_getattr
bl GetMonData
adds r0, r5, 0
bl StripExtCtrlCodes
adds r0, r4, 0
@@ -2452,7 +2452,7 @@ sub_80ED320: @ 80ED320
muls r0, r7
adds r0, r6
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
strb r0, [r4, 0x1F]
_080ED400:
pop {r3,r4}
@@ -2614,11 +2614,11 @@ sub_80ED548: @ 80ED548
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r4, 0x2]
adds r0, r4, 0
bl sub_80ECA10
@@ -2694,11 +2694,11 @@ sub_80ED610: @ 80ED610
lsrs r0, 24
movs r7, 0x64
muls r0, r7
ldr r6, =gUnknown_020244EC
ldr r6, =gPlayerParty
adds r0, r6
movs r1, 0x20
movs r2, 0
bl pokemon_getattr
bl GetMonData
lsrs r0, 4
movs r1, 0xF
ands r0, r1
@@ -2728,7 +2728,7 @@ sub_80ED610: @ 80ED610
adds r4, 0x10
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
bl StripExtCtrlCodes
bl sub_8139688
@@ -2738,7 +2738,7 @@ sub_80ED610: @ 80ED610
adds r0, r6
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r5, 0x2]
adds r0, r5, 0
bl sub_80ECA10
@@ -2753,7 +2753,7 @@ sub_80ED610: @ 80ED610
muls r0, r7
adds r0, r6
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
cmp r0, 0x1
bne _080ED6F4
_080ED6D4:
@@ -2767,7 +2767,7 @@ _080ED6F4:
muls r0, r7
adds r0, r6
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
_080ED706:
strb r0, [r5, 0xE]
pop {r3}
@@ -3810,21 +3810,21 @@ _080EDFCA:
movs r0, 0x64
adds r1, r7, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080EE094
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080EE094
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
ldr r2, =gUnknown_030060E0
mov r3, r9
lsls r1, r3, 3
@@ -3832,12 +3832,12 @@ _080EDFCA:
strb r0, [r6]
adds r0, r4, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
strh r0, [r6, 0x2]
movs r5, 0
adds r0, r4, 0
movs r1, 0xD
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -3848,7 +3848,7 @@ _080EDFCA:
_080EE020:
adds r0, r4, 0
movs r1, 0xE
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -3862,7 +3862,7 @@ _080EE020:
_080EE03C:
adds r0, r4, 0
movs r1, 0xF
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -3876,7 +3876,7 @@ _080EE03C:
_080EE058:
adds r0, r4, 0
movs r1, 0x10
bl pokemon_getattr
bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -4450,7 +4450,7 @@ sub_80EE4DC: @ 80EE4DC
adds r0, r6, 0
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
bl StripExtCtrlCodes
adds r0, r6, 0
@@ -4468,7 +4468,7 @@ sub_80EE4DC: @ 80EE4DC
beq _080EE578
adds r0, r6, 0
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
cmp r0, 0x1
bne _080EE590
_080EE578:
@@ -4478,7 +4478,7 @@ _080EE578:
_080EE590:
adds r0, r6, 0
movs r1, 0x3
bl pokemon_getattr
bl GetMonData
_080EE598:
strb r0, [r5, 0x10]
_080EE59A:
@@ -4494,103 +4494,103 @@ sub_80EE5A4: @ 80EE5A4
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x32
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x33
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x34
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x35
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x36
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x43
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x44
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x45
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x46
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x47
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x48
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x49
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4A
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4B
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4C
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4D
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x4E
bl pokemon_getattr
bl GetMonData
adds r4, r0
lsls r4, 24
lsrs r4, 24
@@ -4949,60 +4949,60 @@ _080EE944:
.4byte _080EE978
.4byte _080EE978
_080EE978:
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x4]
adds r0, r4, 0
adds r0, 0x64
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x6]
adds r4, 0xC8
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x8]
b _080EEA46
.pool
_080EE9A8:
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x4]
adds r0, r4, 0
adds r0, 0x64
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x6]
adds r0, r4, 0
adds r0, 0xC8
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x8]
movs r1, 0x96
lsls r1, 1
adds r0, r4, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0xA]
b _080EEA46
.pool
_080EE9E8:
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x4]
adds r4, 0x64
adds r0, r4, 0
@@ -5026,7 +5026,7 @@ _080EEA00:
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x4]
ldr r0, [r6]
ldr r2, =0x00000cac
@@ -5041,7 +5041,7 @@ _080EEA00:
_080EEA3C:
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
strh r0, [r7, 0x6]
_080EEA46:
adds r0, r7, 0
@@ -6500,11 +6500,11 @@ sub_80EF64C: @ 80EF64C
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xB
muls r1, r0
ldr r0, =gSpeciesNames
@@ -6574,11 +6574,11 @@ sub_80EF704: @ 80EF704
lsrs r0, 24
movs r5, 0x64
muls r0, r5
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xB
muls r1, r0
ldr r0, =gSpeciesNames
@@ -6593,7 +6593,7 @@ sub_80EF704: @ 80EF704
ldr r4, =gStringVar2
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
bl StringGetEnd10
ldr r2, =gSaveBlock1Ptr
@@ -6744,18 +6744,18 @@ sub_80EF88C: @ 80EF88C
lsrs r0, 24
movs r1, 0x64
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r5, r1, r0
ldr r6, =gStringVar1
adds r0, r5, 0
movs r1, 0x2
adds r2, r6, 0
bl pokemon_getattr
bl GetMonData
mov r4, sp
adds r0, r5, 0
movs r1, 0x3
mov r2, sp
bl pokemon_getattr
bl GetMonData
strb r0, [r4]
lsls r0, 24
lsrs r0, 24
@@ -6764,7 +6764,7 @@ sub_80EF88C: @ 80EF88C
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
movs r1, 0xB
muls r0, r1
ldr r1, =gSpeciesNames
@@ -7437,12 +7437,12 @@ sub_80EFD98: @ 80EFD98
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r4, =gStringVar1
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
ldr r0, =gStringVar3
adds r1, r4, 0
bl StringCompare
@@ -7476,11 +7476,11 @@ sub_80EFDDC: @ 80EFDDC
mov r1, r8
muls r1, r0
adds r0, r1, 0
ldr r6, =gUnknown_020244EC
ldr r6, =gPlayerParty
adds r0, r6
ldr r2, =gStringVar3
movs r1, 0x2
bl pokemon_getattr
bl GetMonData
mov r1, r9
ldrh r0, [r1]
mov r1, r8
@@ -7491,7 +7491,7 @@ sub_80EFDDC: @ 80EFDDC
mov r10, r1
movs r1, 0x2
mov r2, r10
bl pokemon_getattr
bl GetMonData
mov r1, r9
ldrh r0, [r1]
mov r1, r8
@@ -7500,7 +7500,7 @@ sub_80EFDDC: @ 80EFDDC
adds r0, r6
movs r1, 0xB
movs r2, 0
bl pokemon_getattr
bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -7522,7 +7522,7 @@ sub_80EFDDC: @ 80EFDDC
adds r0, r6
movs r1, 0
movs r2, 0
bl pokemon_getattr
bl GetMonData
str r0, [sp]
ldr r0, =c2_080CC144
str r0, [sp, 0x4]
@@ -7549,7 +7549,7 @@ c2_080CC144: @ 80EFE98
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r2, =gStringVar2
movs r1, 0x2
@@ -7636,12 +7636,12 @@ sub_80EFF6C: @ 80EFF6C
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
ldr r4, =gStringVar1
movs r1, 0x2
adds r2, r4, 0
bl pokemon_getattr
bl GetMonData
adds r0, r4, 0
bl StringGetEnd10
pop {r4}
@@ -7659,11 +7659,11 @@ sub_80EFF9C: @ 80EFF9C
ldrh r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gUnknown_020244EC
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x1
movs r2, 0
bl pokemon_getattr
bl GetMonData
cmp r4, r0
bne _080EFFD0
ldr r1, =gUnknown_020375F0
asm/wild_encounter.s
+25 -25
View File
@@ -546,10 +546,10 @@ _080B4C8A:
bl __modsi3
lsls r0, 24
lsrs r4, r0, 24
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080B4CEA
adds r0, r5, 0
@@ -732,10 +732,10 @@ _080B4DF2:
cmp r5, 0x18
bls _080B4DF2
_080B4E0E:
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080B4E4C
adds r0, r4, 0
@@ -753,7 +753,7 @@ _080B4E0E:
bne _080B4E4C
adds r0, r4, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
b _080B4E54
.pool
_080B4E48:
@@ -804,10 +804,10 @@ _080B4E96:
_080B4E98:
cmp r2, 0
beq _080B4F28
ldr r5, =gUnknown_020244EC
ldr r5, =gPlayerParty
adds r0, r5, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080B4F28
adds r0, r5, 0
@@ -826,13 +826,13 @@ _080B4E98:
beq _080B4F28
adds r0, r5, 0
movs r1, 0xB
bl pokemon_getattr
bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0
bl pokemon_getattr
bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
bl pokemon_species_get_gender_info
@@ -849,7 +849,7 @@ _080B4F02:
bl sub_80B4D78
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
str r4, [sp]
str r0, [sp, 0x4]
movs r0, 0
@@ -865,7 +865,7 @@ _080B4F28:
bl sub_80B4D78
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_02024744
ldr r1, =gEnemyParty
str r0, [sp]
adds r0, r1, 0
adds r1, r6, 0
@@ -1062,7 +1062,7 @@ _080B50A2:
ldrh r1, [r0]
lsls r2, r4, 24
lsrs r2, 24
ldr r0, =gUnknown_02024744
ldr r0, =gEnemyParty
bl sub_80691F4
adds r0, r4, 0x1
lsls r0, 16
@@ -1179,10 +1179,10 @@ _080B519A:
bl ApplyCleanseTagWildEncounterRateReduction
cmp r4, 0
bne _080B5216
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080B5216
adds r0, r4, 0
@@ -2054,21 +2054,21 @@ _080B58E0:
movs r0, 0x64
adds r1, r5, 0
muls r1, r0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
bl pokemon_getattr
bl GetMonData
cmp r0, 0
beq _080B5920
adds r0, r4, 0
movs r1, 0x2D
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080B5920
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -2097,10 +2097,10 @@ DoKeenEyeIntimidateWildEncounterTest: @ 80B5934
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080B5988
adds r0, r4, 0
@@ -2114,7 +2114,7 @@ DoKeenEyeIntimidateWildEncounterTest: @ 80B5934
_080B595A:
adds r0, r4, 0
movs r1, 0x38
bl pokemon_getattr
bl GetMonData
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
@@ -2257,10 +2257,10 @@ TryGetAbilityInfluencedWildMonIndex: @ 80B5A50
lsrs r6, r1, 24
lsls r2, 24
lsrs r5, r2, 24
ldr r4, =gUnknown_020244EC
ldr r4, =gPlayerParty
adds r0, r4, 0
movs r1, 0x6
bl pokemon_getattr
bl GetMonData
cmp r0, 0
bne _080B5AA4
adds r0, r4, 0
@@ -2333,9 +2333,9 @@ _080B5AE4:
ApplyCleanseTagWildEncounterRateReduction: @ 80B5AF0
push {r4,lr}
adds r4, r0, 0
ldr r0, =gUnknown_020244EC
ldr r0, =gPlayerParty
movs r1, 0xC
bl pokemon_getattr
bl GetMonData
cmp r0, 0xBE
bne _080B5B0C
ldr r0, [r4]