finish decompiling battle_ai.c (#16)

* 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
+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