diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-31 13:04:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 13:04:52 -0500 |
| commit | 4cb8528d94216f69c4a37d470c1d5f3487a87239 (patch) | |
| tree | 32cba14641d7f357b07ae227459fd4b059e22267 /src/pokemon_3.c | |
| parent | 5ea2f463d71d0bc2663e70a553557de0ccf40eef (diff) | |
| parent | f724213a040f3c6a2f9685d52ae4e06d57aa0c41 (diff) | |
Merge pull request #94 from DizzyEggg/decompile_battle_controllers
Decompile ALL battle controllers
Diffstat (limited to 'src/pokemon_3.c')
| -rw-r--r-- | src/pokemon_3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pokemon_3.c b/src/pokemon_3.c index 5ff99aee2..73d23fe6f 100644 --- a/src/pokemon_3.c +++ b/src/pokemon_3.c @@ -618,7 +618,7 @@ bool16 sub_806D82C(u8 id) return retVal; } -s32 sub_806D864(u16 a1) +s32 GetBankMultiplayerId(u16 a1) { s32 id; for (id = 0; id < MAX_LINK_PLAYERS; id++) @@ -1477,7 +1477,7 @@ const u8* GetTrainerPartnerName(void) else { u8 id = GetMultiplayerId(); - return gLinkPlayers[sub_806D864(gLinkPlayers[id].lp_field_18 ^ 2)].name; + return gLinkPlayers[GetBankMultiplayerId(gLinkPlayers[id].lp_field_18 ^ 2)].name; } } @@ -1659,7 +1659,7 @@ u16 sub_806EFF0(u16 arg0) return gUnknown_0831F578[arg0]; } -u16 sub_806F000(u8 playerGender) +u16 PlayerGenderToFrontTrainerPicId(u8 playerGender) { if (playerGender) return sub_806EFF0(0x3F); |