Fixed crash upon gaining a Pokémon after starting a new game, fixed default player's potentially being longer than allowed

This commit is contained in:
Maruno17
2021-04-27 21:34:07 +01:00
parent 853ce8e9e5
commit e1ae094ff4
2 changed files with 8 additions and 4 deletions

View File

@@ -247,18 +247,20 @@ end
def pbSuggestTrainerName(gender)
userName = pbGetUserName()
userName = userName.gsub(/\s+.*$/,"")
if userName.length>0 && userName.length<7
if userName.length>0 && userName.length<Settings::MAX_PLAYER_NAME_SIZE
userName[0,1] = userName[0,1].upcase
return userName
end
userName = userName.gsub(/\d+$/,"")
if userName.length>0 && userName.length<7
if userName.length>0 && userName.length<Settings::MAX_PLAYER_NAME_SIZE
userName[0,1] = userName[0,1].upcase
return userName
end
return System.user_name.capitalize
userName = System.user_name.capitalize
userName = userName[0, Settings::MAX_PLAYER_NAME_SIZE]
return userName
# Unreachable
#return getRandomNameEx(gender, nil, 1, Settings::MAX_PLAYER_NAME_SIZE)
# return getRandomNameEx(gender, nil, 1, Settings::MAX_PLAYER_NAME_SIZE)
end
def pbGetUserName