diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-02-03 21:34:56 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-02-03 18:34:56 -0800 |
| commit | 689df5cff8386d85f1f1da1fc332db18d282f928 (patch) | |
| tree | 0c8b3264268315422064aa8960c0007f5f5d9341 /asm/field_poison.s | |
| parent | e2b834d21d96332c5bcf788b390a09e285c7a5cb (diff) | |
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
Diffstat (limited to 'asm/field_poison.s')
| -rw-r--r-- | asm/field_poison.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/field_poison.s b/asm/field_poison.s index 23900cb0b..d1405ce30 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -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 |