diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js index 7fbfdfcb5..6d7b6ecf9 100644 --- a/js/client-teambuilder.js +++ b/js/client-teambuilder.js @@ -1047,7 +1047,7 @@ }; buf += '' + (set.level || 100) + ''; if (this.curTeam.gen > 1) { - buf += '' + GenderChart[template.gender || set.gender || 'N'] + ''; + buf += '' + GenderChart[set.gender || template.gender || 'N'] + ''; buf += '' + (typeof set.happiness === 'number' ? set.happiness : 255) + ''; buf += '' + (set.shiny ? 'Yes' : 'No') + ''; } @@ -2062,13 +2062,17 @@ if (this.curTeam.gen > 1) { buf += '
'; - if (template.gender) { + if (template.gender && this.curTeam.format !== 'balancedhackmons') { var genderTable = {'M': "Male", 'F': "Female", 'N': "Genderless"}; buf += genderTable[template.gender]; } else { buf += ' '; buf += ' '; - buf += ''; + if (this.curTeam.format !== 'balancedhackmons') { + buf += ''; + } else { + buf += ''; + } } buf += '
';