diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/learn_move.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/learn_move.s')
| -rw-r--r-- | asm/learn_move.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/learn_move.s b/asm/learn_move.s index eba23b712..743067bfe 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -744,7 +744,7 @@ _080E4C7E: lsls r2, 2 adds r1, r5, r2 ldrb r1, [r1] - ldr r2, _080E4CDC @ =gUnknown_2024029 + ldr r2, _080E4CDC @ =gPlayerPartyCount ldrb r2, [r2] subs r2, 0x1 lsls r2, 24 @@ -768,7 +768,7 @@ _080E4CCC: .4byte 0x00000263 _080E4CD0: .4byte 0x00000a68 _080E4CD4: .4byte 0x00000a6a _080E4CD8: .4byte gPlayerParty -_080E4CDC: .4byte gUnknown_2024029 +_080E4CDC: .4byte gPlayerPartyCount _080E4CE0: .4byte sub_80E4800 _080E4CE4: ldr r1, [r7] |