From 0b8f47af6ee55672dbd33a71708170ed12e14cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Fri, 29 Dec 2017 11:28:14 +0800 Subject: [PATCH] =?UTF-8?q?*=20Trimmed=20the=20names=20of=20the=20Hoenn=20?= =?UTF-8?q?region=20Pok=C3=A9mons.=20*=20Updated=20the=20dialog=20xba=20fi?= =?UTF-8?q?le=20that=20was=20missed=20when=20updating=20the=20dialog=20las?= =?UTF-8?q?t=20time.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PokemonGoIV/3Data.vb | 18 +++++++++--------- oxt/PokemonGoIV/1Dialog.xba | 18 +++++++++--------- oxt/PokemonGoIV/3Data.xba | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/PokemonGoIV/3Data.vb b/PokemonGoIV/3Data.vb index b3cc263..fee0873 100644 --- a/PokemonGoIV/3Data.vb +++ b/PokemonGoIV/3Data.vb @@ -272,15 +272,15 @@ Function fnGetBaseStatsData As Variant Array ("Lugia", "249", 212, 193, 323, Array ()), _ Array ("HoOh", "250", 193, 239, 274, Array ()), _ Array ("Celebi", "251", 200, 210, 210, Array ()), _ - Array ("Treecko ", "252", 80, 124, 104, Array ("Grovyle ", "Sceptile ")), _ - Array ("Grovyle ", "253", 100, 172, 130, Array ("Sceptile ")), _ - Array ("Sceptile ", "254", 140, 223, 180, Array ()), _ - Array ("Torchic ", "255", 90, 130, 92, Array ("Combusken ", "Blaziken ")), _ - Array ("Combusken ", "256", 120, 163, 115, Array ("Blaziken ")), _ - Array ("Blaziken ", "257", 160, 240, 141, Array ()), _ - Array ("Mudkip ", "258", 100, 126, 93, Array ("Marshtomp ", "Swampert ")), _ - Array ("Marshtomp ", "259", 140, 156, 133, Array ("Swampert ")), _ - Array ("Swampert ", "260", 200, 208, 175, Array ()), _ + Array ("Treecko", "252", 80, 124, 104, Array ("Grovyle", "Sceptile")), _ + Array ("Grovyle", "253", 100, 172, 130, Array ("Sceptile")), _ + Array ("Sceptile", "254", 140, 223, 180, Array ()), _ + Array ("Torchic", "255", 90, 130, 92, Array ("Combusken", "Blaziken")), _ + Array ("Combusken", "256", 120, 163, 115, Array ("Blaziken")), _ + Array ("Blaziken", "257", 160, 240, 141, Array ()), _ + Array ("Mudkip", "258", 100, 126, 93, Array ("Marshtomp", "Swampert")), _ + Array ("Marshtomp", "259", 140, 156, 133, Array ("Swampert")), _ + Array ("Swampert", "260", 200, 208, 175, Array ()), _ Array ("Poochyena", "261", 70, 96, 63, Array ("Mightyena")), _ Array ("Mightyena", "262", 140, 171, 137, Array ()), _ Array ("Zigzagoon", "263", 76, 58, 80, Array ("Linoone")), _ diff --git a/oxt/PokemonGoIV/1Dialog.xba b/oxt/PokemonGoIV/1Dialog.xba index eb9b2b4..8df8386 100644 --- a/oxt/PokemonGoIV/1Dialog.xba +++ b/oxt/PokemonGoIV/1Dialog.xba @@ -20,9 +20,9 @@ Option Explicit ' Remembers the selected Pokémon for the next run. -Global sLastSelected As String +Global sLastPokemon As String ' Remembers the selected trainer level for the next run. -Global sLastLevel As Integer +Global sLastTrainerLevel As Integer ' The parameters to find the individual values. Type aFindIVParam @@ -76,18 +76,18 @@ Function fnAskParam As aFindIVParam "ImageURL", fnGetImageUrl ("Unknown")) ' Remembers the previously-selected Pokémon. - oDialog.getControl ("lstPokemon").selectItem (sLastSelected, True) - oDialog.getControl ("lstTrainerLevel").selectItem (sLastLevel, True) + oDialog.getControl ("lstPokemon").selectItem (sLastPokemon, True) + oDialog.getControl ("lstTrainerLevel").selectItem (sLastTrainerLevel, True) If oDialog.execute = 0 Then aQuery.bIsCancelled = True - sLastLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem + sLastTrainerLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem fnAskParam = aQuery Exit Function End If subReadBaseStats - sLastLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem + sLastTrainerLevel = oDialog.getControl ("lstTrainerLevel").getSelectedItem nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos With aQuery .sPokemonId = maBaseStats (nSelected).sPokemonId @@ -182,9 +182,9 @@ Sub subLstPokemonSelected (oEvent As object) oDialog = oEvent.Source.getContext ' Checks which Pokémon was selected. - sLastSelected = oDialog.getControl ("lstPokemon").getSelectedItem + sLastPokemon = oDialog.getControl ("lstPokemon").getSelectedItem nSelected = oDialog.getControl ("lstPokemon").getSelectedItemPos - ' This happens at the beginning where sLastSelected is "". + ' This happens at the beginning where sLastPokemon is "". If nSelected = -1 Then Exit Sub End If @@ -538,4 +538,4 @@ Sub subUpdateTotalAppraisal ( _ End If oList.setVisible (True) End Sub - + \ No newline at end of file diff --git a/oxt/PokemonGoIV/3Data.xba b/oxt/PokemonGoIV/3Data.xba index 42ad32b..6affdec 100644 --- a/oxt/PokemonGoIV/3Data.xba +++ b/oxt/PokemonGoIV/3Data.xba @@ -274,15 +274,15 @@ Function fnGetBaseStatsData As Variant Array ("Lugia", "249", 212, 193, 323, Array ()), _ Array ("HoOh", "250", 193, 239, 274, Array ()), _ Array ("Celebi", "251", 200, 210, 210, Array ()), _ - Array ("Treecko ", "252", 80, 124, 104, Array ("Grovyle ", "Sceptile ")), _ - Array ("Grovyle ", "253", 100, 172, 130, Array ("Sceptile ")), _ - Array ("Sceptile ", "254", 140, 223, 180, Array ()), _ - Array ("Torchic ", "255", 90, 130, 92, Array ("Combusken ", "Blaziken ")), _ - Array ("Combusken ", "256", 120, 163, 115, Array ("Blaziken ")), _ - Array ("Blaziken ", "257", 160, 240, 141, Array ()), _ - Array ("Mudkip ", "258", 100, 126, 93, Array ("Marshtomp ", "Swampert ")), _ - Array ("Marshtomp ", "259", 140, 156, 133, Array ("Swampert ")), _ - Array ("Swampert ", "260", 200, 208, 175, Array ()), _ + Array ("Treecko", "252", 80, 124, 104, Array ("Grovyle", "Sceptile")), _ + Array ("Grovyle", "253", 100, 172, 130, Array ("Sceptile")), _ + Array ("Sceptile", "254", 140, 223, 180, Array ()), _ + Array ("Torchic", "255", 90, 130, 92, Array ("Combusken", "Blaziken")), _ + Array ("Combusken", "256", 120, 163, 115, Array ("Blaziken")), _ + Array ("Blaziken", "257", 160, 240, 141, Array ()), _ + Array ("Mudkip", "258", 100, 126, 93, Array ("Marshtomp", "Swampert")), _ + Array ("Marshtomp", "259", 140, 156, 133, Array ("Swampert")), _ + Array ("Swampert", "260", 200, 208, 175, Array ()), _ Array ("Poochyena", "261", 70, 96, 63, Array ("Mightyena")), _ Array ("Mightyena", "262", 140, 171, 137, Array ()), _ Array ("Zigzagoon", "263", 76, 58, 80, Array ("Linoone")), _