Browse Source

Use toUint16 shortened function name

Andrew Swistak 6 years ago
parent
commit
96501513ff
1 changed files with 12 additions and 12 deletions
  1. 12 12
      pokemon-parsing/gen7/parse.go

+ 12 - 12
pokemon-parsing/gen7/parse.go

@@ -22,10 +22,10 @@ func Parse(rawPokemon p.RawPokemon) (*p.Pokemon, error) {
 	pkmn.RawPokemon = &rawPokemon
 
 	pkmn.EncryptionConstant = binary.LittleEndian.Uint32(rawPokemon[0x00:0x08])
-	pkmn.PokedexNumber = binary.LittleEndian.Uint16(rawPokemon[0x08:0x0a])
-	pkmn.HeldItemID = binary.LittleEndian.Uint16(rawPokemon[0x0a:0x0c])
-	pkmn.TrainerID = binary.LittleEndian.Uint16(rawPokemon[0x0c:0x0e])
-	pkmn.SecretID = binary.LittleEndian.Uint16(rawPokemon[0x0e:0x10])
+	pkmn.PokedexNumber = toUint16(rawPokemon[0x08:0x0a])
+	pkmn.HeldItemID = toUint16(rawPokemon[0x0a:0x0c])
+	pkmn.TrainerID = toUint16(rawPokemon[0x0c:0x0e])
+	pkmn.SecretID = toUint16(rawPokemon[0x0e:0x10])
 	pkmn.FullTrainerID = binary.LittleEndian.Uint32(rawPokemon[0x0c:0x10])
 	pkmn.Experience = binary.LittleEndian.Uint32(rawPokemon[0x10:0x15])
 	pkmn.AbilityID = rawPokemon[0x14]
@@ -58,10 +58,10 @@ func Parse(rawPokemon p.RawPokemon) (*p.Pokemon, error) {
 	pkmn.RawNickname = rawPokemon[0x40:0x58]
 	pkmn.Nickname = binaryToUTF16leString(pkmn.RawNickname)
 
-	pkmn.Move1ID = binary.LittleEndian.Uint16(rawPokemon[0x5a:0x5c])
-	pkmn.Move2ID = binary.LittleEndian.Uint16(rawPokemon[0x5c:0x5e])
-	pkmn.Move3ID = binary.LittleEndian.Uint16(rawPokemon[0x5e:0x60])
-	pkmn.Move4ID = binary.LittleEndian.Uint16(rawPokemon[0x60:0x62])
+	pkmn.Move1ID = toUint16(rawPokemon[0x5a:0x5c])
+	pkmn.Move2ID = toUint16(rawPokemon[0x5c:0x5e])
+	pkmn.Move3ID = toUint16(rawPokemon[0x5e:0x60])
+	pkmn.Move4ID = toUint16(rawPokemon[0x60:0x62])
 	pkmn.Move1PP = rawPokemon[0x62]
 	pkmn.Move2PP = rawPokemon[0x63]
 	pkmn.Move3PP = rawPokemon[0x64]
@@ -70,10 +70,10 @@ func Parse(rawPokemon p.RawPokemon) (*p.Pokemon, error) {
 	pkmn.Move2PPUsed = rawPokemon[0x67]
 	pkmn.Move3PPUsed = rawPokemon[0x68]
 	pkmn.Move4PPUsed = rawPokemon[0x69]
-	pkmn.EggMove1ID = binary.LittleEndian.Uint16(rawPokemon[0x6a:0x6c])
-	pkmn.EggMove2ID = binary.LittleEndian.Uint16(rawPokemon[0x6c:0x6e])
-	pkmn.EggMove3ID = binary.LittleEndian.Uint16(rawPokemon[0x6e:0x70])
-	pkmn.EggMove4ID = binary.LittleEndian.Uint16(rawPokemon[0x70:0x72])
+	pkmn.EggMove1ID = toUint16(rawPokemon[0x6a:0x6c])
+	pkmn.EggMove2ID = toUint16(rawPokemon[0x6c:0x6e])
+	pkmn.EggMove3ID = toUint16(rawPokemon[0x6e:0x70])
+	pkmn.EggMove4ID = toUint16(rawPokemon[0x70:0x72])
 
 	ivBytes := binary.LittleEndian.Uint32(rawPokemon[0x74:0x78])
 	pkmn.HPIV = ivBytes & 0x1f