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

1 files changed, 28 insertions, 28 deletions

diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index c41fcdcc5..81fa2fde2 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -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