diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-11 11:56:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 11:56:24 -0500 |
| commit | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (patch) | |
| tree | d45390654cd3f80ffccd4af95760133ef77366bd /asm/field_poison.s | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
| parent | 05d03f7f3256b143a01506421c19964bcceaea5c (diff) | |
Merge pull request #18 from ProjectRevoTPP/pokemon
almost finish decompiling pokemon.c
Diffstat (limited to 'asm/field_poison.s')
| -rw-r--r-- | asm/field_poison.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_poison.s b/asm/field_poison.s index 348812b06..930f5b403 100644 --- a/asm/field_poison.s +++ b/asm/field_poison.s @@ -74,11 +74,11 @@ MonFaintFromPoisonOnField: @ 80A04B8 str r0, [sp] adds r0, r4, 0 movs r1, 0x8 - bl sub_80436F8 + bl AdjustFriendship adds r0, r4, 0 movs r1, 0x37 mov r2, sp - bl sub_804037C + bl SetMonData ldr r5, _080A0500 @ =gStringVar1 adds r0, r4, 0 movs r1, 0x2 @@ -279,7 +279,7 @@ _080A065C: adds r0, r4, 0 movs r1, 0x39 mov r2, sp - bl sub_804037C + bl SetMonData adds r7, 0x1 _080A0668: adds r4, 0x64 |