diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-09 20:06:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-09 20:06:14 -0400 |
| commit | 45a2675c9de2644b546e59240d8482a7dfc5c9d7 (patch) | |
| tree | 8c045e88ce39b04e132ad055c6bdcda6aac7e490 /src/battle/battle_party_menu.c | |
| parent | 4987b746365ec09af10bc2a1ce11dbffaa284b50 (diff) | |
| parent | 1f60ac0f857da06bd8a678f7150c42cc94940f3f (diff) | |
Merge branch 'master' into nohara
Diffstat (limited to 'src/battle/battle_party_menu.c')
| -rw-r--r-- | src/battle/battle_party_menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c index be376a9f1..923cf05a4 100644 --- a/src/battle/battle_party_menu.c +++ b/src/battle/battle_party_menu.c @@ -232,16 +232,16 @@ void sub_8094B6C(u8 a, u8 b, u8 c) } } -u8 sub_8094C20(u8 a) +u8 sub_8094C20(u8 monIndex) { u8 retVal; - u8 val = a & 1; + u8 val = monIndex & 1; - a /= 2; + monIndex /= 2; if (val) - retVal = gUnknown_02038470[a] & 0xF; + retVal = gUnknown_02038470[monIndex] & 0xF; else - retVal = gUnknown_02038470[a] >> 4; + retVal = gUnknown_02038470[monIndex] >> 4; return retVal; } |