From d5c7b8cc15de6abc0dda845e22e7d809f11dc09b Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Tue, 12 Dec 2023 20:32:16 +0000 Subject: [PATCH 1/2] Updated core translation text files --- Data/messages_core.dat | Bin 963286 -> 963270 bytes Text_english_core/SCRIPT_TEXTS.txt | 260 +++++++++++++++-------------- 2 files changed, 136 insertions(+), 124 deletions(-) diff --git a/Data/messages_core.dat b/Data/messages_core.dat index 2ad382efa4c54e7723bf706197b13ad88e932758..b65ab5b2a1418d6f32a4bc17c067d91fcf14deb6 100644 GIT binary patch delta 2683 zcmbW3T})g>6vw?(7rN{{O|gO&Scg(sKDN6HwqTc!T_`Lcbt#{=#8$k(6mDSe(!F;< zgG6mM8efcks3&b~jE^-j_+WCQPZ|>+eCm^lNz-7`YKV!J7ZdfxS?*kz%PuMPWi!8X z&i~BJIWu$jrw8F59)#b?NST7nfy|Scr!uZgVWuc^@GE!keQCq&yYIf?kxpXyraMp+ zaJ4=$)_=?*De!)L({08#i}g?Oz%`H0WIw@i{PrVHh1vA0=gU;s+f5g!L5VS^>cmJX zszy`9cyp0PtVDbJKc0~5@r@~2#y>B}WoG?^+~g`J`O-}(hOt2L+6DQ@A$tnT7QweB zWxsiKQZDh-mx@}|pb5T&T)X+GsrEHC1t1I@^Fd7}(n*X5{L`-S}82a=ATwLq{S;Kuc4XfL#i z=rrQZ7Pu=N$MwJ5Ub|lwJi>Y*BhWJ(*SABT+G&Jn#xWpCJf`YJ4YDt4A8c{Wa z&eGK51T_emFdBxV_S`v+UY@o}P;Af5i@To?d>Dob90;x8R=oW-dTIK|`g z+0Ntb$X31|BSOAh+XO06sAl;x(d{^gt;9P0$#IR>fEf5mCwQ6Un@)&6!i}U0YR#H1 zxF|_AxON7r_?jIsh{0~?$F<+wE=e5s;hk>ivP-m^Dtkm4Q#QWe242-F`@Lj|FdA%{|kzlw3$}9rgq@=8`jnJzDG~ zy^>Z_R3{2qR8k7_(3GD{r44o?G)k5goy@9BRO4IxKS@e*vJiZJ0Lu9y9dHs?2jE$+ zZ>4F~mwlnOkK?jBP5B!36Z0beF#rKRg9A=&J^S`ya8fhgItz_l<$xG2y$tQeY+3f{ z+ieJ7aUANn)&Y$ei9>@uqmx4TJM(ds0|Hnz2z7XGlU)~a+=Sl^!U?W$Kn?yqC|tcP zC|2tm#`xcbW!0D?{oU60ip;U*YDqGbod5oIB5Akyv4TUmc1~Eo01daX z;}`JG5D>opUGT5y5g>rW!$NHZsKu{`p_*s2fIn9LSCoY`kMV!N)zjAT4?XXv2+BXyF7fa5XZZehO&5vh!%oq2rrHslf(&$of6{2@y1Q#80W+Ja8PLwIL#8QIBUr^ zq*9c&hn1?fYSj}X#DNoDfkj9Jl~2AR$pz>7kV>RQkM|&A#m0Kyq2h zzxRJL^JeDF^X(_$dr!h&YJ#>+dsEx4y`@!XJG8g8oj-~3$HMRWz+>@}N9e%)D`Lwo zaj|WwqU()`gx3Vy%iyc{im1m|b``H+UGl>(T+8esW(63n&ait3dGE zV-R5i*obG#`Xl(?F}N!D@#WuQ4c!!6joJk7+91-ORdO?go&sNVLes`8C+t1GwLK(T zBx=4yGAhZcC1qAAY*iJ&;eW(BCPEX8+jhLXH=>@OpJsh+M$=|^swDXWX|=7p(bz%gEem2i{3S`R%d7;y|bIMo@*-3mgbzeh}IiR~$Hv4+bIP z^HVSW0GXvz-Alvw(xFr=DVdoTaj|`MENxyH#QYF6FkU&(iOWOKR2eSMKl_00v>j)M zp^3=@2ZDHM*zjj%iUUWnc?6o7h&a%QnGxe|TDdeq)=qBoL?J^bcY!QqOXoqBBxRh^>KzVzh&NIYX3oHY23$!Q)7rA(0-~c1g#!ff zyHQ6j9Uy>zjKcc2y9}7g-!f^vZ8$gv)f=xcMGfKIv2~Y_1FiUS4E)R%7x2lrL*W22 v>f_KsZCF+2KtC=_toy^ofl1t*h9SlV2f}zc?YMPiK;MJVl71%*|4#i6t-Iim diff --git a/Text_english_core/SCRIPT_TEXTS.txt b/Text_english_core/SCRIPT_TEXTS.txt index 6a15db167..aacc40330 100644 --- a/Text_english_core/SCRIPT_TEXTS.txt +++ b/Text_english_core/SCRIPT_TEXTS.txt @@ -96,8 +96,8 @@ Section {1} has an odd number of entries (section was recognized as a hash becau Section {1} has an odd number of entries (section was recognized as a hash because its first line is not a number). Expected a number in section {1}, got {2} instead Expected a number in section {1}, got {2} instead -Bad line syntax (expected syntax like XXX=YYY)<>{1} -Bad line syntax (expected syntax like XXX=YYY)<>{1} +Bad line syntax (expected syntax like XXX=YYY). +Bad line syntax (expected syntax like XXX=YYY). The method is slated to be removed in Essentials {1}. The method is slated to be removed in Essentials {1}. Use "{1}" instead. @@ -2990,8 +2990,6 @@ The player is not on a map, so the region could not be determined. The player is not on a map, so the region could not be determined. The current map has no region set. Please set the MapPosition metadata setting for this map. The current map has no region set. Please set the MapPosition metadata setting for this map. -{1} {2} -{1} {2} Please enter the first Pokémon. Please enter the first Pokémon. Add another Pokémon? @@ -3856,6 +3854,8 @@ Accessed {1}'s PC. Accessed {1}'s PC. Log off Log off +{1} {2} +{1} {2} $ {1} $ {1} Quit shopping. @@ -4734,6 +4734,8 @@ Delete this encounter slot? Delete this encounter slot? Trainer Types Trainer Types +Delete this trainer type? +Delete this trainer type? The Trainer type was deleted. The Trainer type was deleted. Please enter the trainer type's name. @@ -4776,6 +4778,8 @@ An item used by the Trainer during battle. An item used by the Trainer during battle. Trainer Battles Trainer Battles +Delete this trainer battle? +Delete this trainer battle? The Trainer battle was deleted. The Trainer battle was deleted. Can't save. No trainer type was chosen. @@ -4866,6 +4870,8 @@ Global Metadata Global Metadata Metadata for player character {1} was not found. Metadata for player character {1} was not found. +Delete this item? +Delete this item? The item was deleted. The item was deleted. Please enter the item's name. @@ -4882,6 +4888,8 @@ Put the item's graphic ({1}.png) in Graphics/Items, or it will be blank. Put the item's graphic ({1}.png) in Graphics/Items, or it will be blank. Pokémon species Pokémon species +Delete this species? +Delete this species? The species was deleted. The species was deleted. Data saved. @@ -5268,8 +5276,8 @@ Lower level wild Pokémon Lower level wild Pokémon Higher level wild Pokémon Higher level wild Pokémon -Set the Pokémon's level. -Set the Pokémon's level. +Set the number of steps remaining. +Set the number of steps remaining. You're not in a dark map! You're not in a dark map! Refresh map @@ -5408,6 +5416,8 @@ Add Pokémon Add Pokémon Give yourself a Pokémon of a chosen species/level. Goes to PC if party is full. Give yourself a Pokémon of a chosen species/level. Goes to PC if party is full. +Set the Pokémon's level. +Set the Pokémon's level. Added {1} to party. Added {1} to party. Added {1} to Pokémon storage. @@ -6444,50 +6454,50 @@ File {1}, section {2}, key {3}<>{4} File {1}, section {2}, key {3}<>{4} File {1}, line {2}<>{3} File {1}, line {2}<>{3} -Expected a section at the beginning of the file. This error may also occur if the file was not saved in UTF-8.<>{1} -Expected a section at the beginning of the file. This error may also occur if the file was not saved in UTF-8.<>{1} +Expected a section at the beginning of the file.<>This error may also occur if the file was not saved in UTF-8. +Expected a section at the beginning of the file.<>This error may also occur if the file was not saved in UTF-8. Expected a section at the beginning of the file (line {1}). Sections begin with '[name of section]'. Expected a section at the beginning of the file (line {1}). Sections begin with '[name of section]'. -Invalid quoted field (in: {1})<>{2} -Invalid quoted field (in: {1})<>{2} -Field {1} is not a Boolean value (true, false, 1, 0)<>{2} -Field {1} is not a Boolean value (true, false, 1, 0)<>{2} -Field {1} is not an integer<>{2} -Field {1} is not an integer<>{2} -Field {1} is not a positive integer<>{2} -Field {1} is not a positive integer<>{2} -Field {1} is not a number<>{2} -Field {1} is not a number<>{2} -Field {1} is not a positive integer or 0<>{2} -Field {1} is not a positive integer or 0<>{2} -Field '{1}' must be greater than 0<>{2} -Field '{1}' must be greater than 0<>{2} -Field '{1}' is not a hexadecimal number<>{2} -Field '{1}' is not a hexadecimal number<>{2} -Field '{1}' must contain only letters, digits, and<>underscores and can't begin with a number.<>{2} -Field '{1}' must contain only letters, digits, and<>underscores and can't begin with a number.<>{2} -Undefined value {1} in {2}<>{3} -Undefined value {1} in {2}<>{3} -Incorrect value {1} in {2}<>{3} -Incorrect value {1} in {2}<>{3} -Undefined value {1} (expected one of: {2})<>{3} -Undefined value {1} (expected one of: {2})<>{3} -Enumeration not defined<>{1} -Enumeration not defined<>{1} -Field '{1}' must be 0 or greater<>{2} -Field '{1}' must be 0 or greater<>{2} -Field {1} is not a floating point number<>{2} -Field {1} is not a floating point number<>{2} -Undefined item constant name: {1}<>Make sure the item is defined in PBS/items.txt.<>{2} -Undefined item constant name: {1}<>Make sure the item is defined in PBS/items.txt.<>{2} -Undefined species constant name: {1}<>Make sure the species is defined in PBS/pokemon.txt.<>{2} -Undefined species constant name: {1}<>Make sure the species is defined in PBS/pokemon.txt.<>{2} -Undefined move constant name: {1}<>Make sure the move is defined in PBS/moves.txt.<>{2} -Undefined move constant name: {1}<>Make sure the move is defined in PBS/moves.txt.<>{2} -Undefined nature constant name: {1}<>Make sure the nature is defined in the scripts.<>{2} -Undefined nature constant name: {1}<>Make sure the nature is defined in the scripts.<>{2} -Undefined Trainer type constant name: {1}<>Make sure the trainer type is defined in PBS/trainer_types.txt.<>{2} -Undefined Trainer type constant name: {1}<>Make sure the trainer type is defined in PBS/trainer_types.txt.<>{2} +Invalid quoted field (in: {1}). +Invalid quoted field (in: {1}). +Field '{1}' is not a Boolean value (true, false, 1, 0). +Field '{1}' is not a Boolean value (true, false, 1, 0). +Field '{1}' is not an integer. +Field '{1}' is not an integer. +Field '{1}' is not a positive integer. +Field '{1}' is not a positive integer. +Field '{1}' is not a number. +Field '{1}' is not a number. +Field '{1}' is not a positive integer or 0. +Field '{1}' is not a positive integer or 0. +Field '{1}' must be greater than 0. +Field '{1}' must be greater than 0. +Field '{1}' is not a hexadecimal number. +Field '{1}' is not a hexadecimal number. +Field '{1}' must contain only letters, digits, and<>underscores and can't begin with a number. +Field '{1}' must contain only letters, digits, and<>underscores and can't begin with a number. +Undefined value {1} in {2}. +Undefined value {1} in {2}. +Incorrect value {1} in {2}. +Incorrect value {1} in {2}. +Undefined value {1} (expected one of: {2}). +Undefined value {1} (expected one of: {2}). +Enumeration not defined. +Enumeration not defined. +Field '{1}' must be 0 or greater. +Field '{1}' must be 0 or greater. +Field '{1}' is not a floating point number. +Field '{1}' is not a floating point number. +Undefined item constant name: {1}.<>Make sure the item is defined in PBS/items.txt. +Undefined item constant name: {1}.<>Make sure the item is defined in PBS/items.txt. +Undefined species constant name: {1}.<>Make sure the species is defined in PBS/pokemon.txt. +Undefined species constant name: {1}.<>Make sure the species is defined in PBS/pokemon.txt. +Undefined move constant name: {1}.<>Make sure the move is defined in PBS/moves.txt. +Undefined move constant name: {1}.<>Make sure the move is defined in PBS/moves.txt. +Undefined nature constant name: {1}.<>Make sure the nature is defined in the scripts. +Undefined nature constant name: {1}.<>Make sure the nature is defined in the scripts. +Undefined trainer type constant name: {1}.<>Make sure the trainer type is defined in PBS/trainer_types.txt. +Undefined trainer type constant name: {1}.<>Make sure the trainer type is defined in PBS/trainer_types.txt. Compiling PBS file `{1}`... Compiling PBS file `{1}`... Writing PBS file `{1}`... @@ -6500,82 +6510,84 @@ Saving messages... Saving messages... Successfully compiled all game data Successfully compiled all game data -Section name '{1}' is used twice.<>{2} -Section name '{1}' is used twice.<>{2} -Warning: Map {1}, as mentioned in the map connection data, was not found.<>{2} -Warning: Map {1}, as mentioned in the map connection data, was not found.<>{2} -North side of first map must connect with south side of second map<>{1} -North side of first map must connect with south side of second map<>{1} -South side of first map must connect with north side of second map<>{1} -South side of first map must connect with north side of second map<>{1} -East side of first map must connect with west side of second map<>{1} -East side of first map must connect with west side of second map<>{1} -West side of first map must connect with east side of second map<>{1} -West side of first map must connect with east side of second map<>{1} -'{1}' is not a defined type ({2}, section {3}, Weaknesses). -'{1}' is not a defined type ({2}, section {3}, Weaknesses). -'{1}' is not a defined type ({2}, section {3}, Resistances). -'{1}' is not a defined type ({2}, section {3}, Resistances). -'{1}' is not a defined type ({2}, section {3}, Immunities). -'{1}' is not a defined type ({2}, section {3}, Immunities). -Move {1} is defined as a Status move with a non-zero base damage.<>{2} -Move {1} is defined as a Status move with a non-zero base damage.<>{2} -Warning: Move {1} is defined as Physical or Special but has a base damage of 0. Changing it to a Status move.<>{2} -Warning: Move {1} is defined as Physical or Special but has a base damage of 0. Changing it to a Status move.<>{2} -Undefined species ID '{1}'.<>{3} -Undefined species ID '{1}'.<>{3} -Form {1} for species ID {2} is defined twice.<>{3} -Form {1} for species ID {2} is defined twice.<>{3} -Dex list number {1} is defined at least twice.<>{2} -Dex list number {1} is defined at least twice.<>{2} -Expected a section at the beginning of the file.<>{1} -Expected a section at the beginning of the file.<>{1} -Dex list number {1} has species {2} listed twice.<>{3} -Dex list number {1} has species {2} listed twice.<>{3} -Expected a species entry line for encounter type {1} for map '{2}', got "{3}" instead.<>{4} -Expected a species entry line for encounter type {1} for map '{2}', got "{3}" instead.<>{4} -Level number {1} is not valid (max. {2}).<>{3} -Level number {1} is not valid (max. {2}).<>{3} -Minimum level is greater than maximum level: {1}<>{2} -Minimum level is greater than maximum level: {1}<>{2} -Encounters for map '{1}' are defined twice.<>{2} -Encounters for map '{1}' are defined twice.<>{2} -Expected a map number, got "{1}" instead.<>{2} -Expected a map number, got "{1}" instead.<>{2} -Undefined encounter type "{1}" for map '{2}'.<>{3} -Undefined encounter type "{1}" for map '{2}'.<>{3} -Pokémon hasn't been defined yet!<>{1} -Pokémon hasn't been defined yet!<>{1} -Trainer with ID {1} has no Pokémon.<>{2} -Trainer with ID {1} has no Pokémon.<>{2} -Invalid Pokémon level {1} (must be 1-{2}).<>{3} -Invalid Pokémon level {1} (must be 1-{2}).<>{3} -Invalid Pokémon nickname: {1} (must be 1-{2} characters).<>{3} -Invalid Pokémon nickname: {1} (must be 1-{2} characters).<>{3} -Invalid IV: {1} (must be 0-{2}).<>{3} -Invalid IV: {1} (must be 0-{2}).<>{3} -Invalid EV: {1} (must be 0-{2}).<>{3} -Invalid EV: {1} (must be 0-{2}).<>{3} -Invalid EV set (must sum to {1} or less).<>{2} -Invalid EV set (must sum to {1} or less).<>{2} -Bad happiness: {1} (must be 0-255).<>{2} -Bad happiness: {1} (must be 0-255).<>{2} -Value {1} isn't a defined Poké Ball.<>{2} -Value {1} isn't a defined Poké Ball.<>{2} -No trainer data file given in section {1}.<>{2} -No trainer data file given in section {1}.<>{2} -Global metadata ID '{1}' is used twice.<>{2} -Global metadata ID '{1}' is used twice.<>{2} -Player metadata ID '{1}' is used twice.<>{2} -Player metadata ID '{1}' is used twice.<>{2} -The entry 'Home' is required in metadata.txt section 0.<>{1} -The entry 'Home' is required in metadata.txt section 0.<>{1} -Global metadata is not defined in metadata.txt but should be.<>{1} -Global metadata is not defined in metadata.txt but should be.<>{1} -Metadata for player character 1 is not defined in metadata.txt but should be.<>{1} -Metadata for player character 1 is not defined in metadata.txt but should be.<>{1} -Version {1} of dungeon area {2} is defined twice.<>{3} -Version {1} of dungeon area {2} is defined twice.<>{3} +Section name '{1}' is used twice. +Section name '{1}' is used twice. +Warning: Map {1}, as mentioned in the map connection data, was not found. +Warning: Map {1}, as mentioned in the map connection data, was not found. +North side of first map must connect with south side of second map. +North side of first map must connect with south side of second map. +South side of first map must connect with north side of second map. +South side of first map must connect with north side of second map. +East side of first map must connect with west side of second map. +East side of first map must connect with west side of second map. +West side of first map must connect with east side of second map. +West side of first map must connect with east side of second map. +'{1}' is not a defined type (type {2}, Weaknesses). +'{1}' is not a defined type (type {2}, Weaknesses). +'{1}' is not a defined type (type {2}, Resistances). +'{1}' is not a defined type (type {2}, Resistances). +'{1}' is not a defined type (type {2}, Immunities). +'{1}' is not a defined type (type {2}, Immunities). +Move {1} is defined as a Status move with a non-zero base damage. +Move {1} is defined as a Status move with a non-zero base damage. +Warning: Move {1} is defined as Physical or Special but has a base damage of 0. Changing it to a Status move. +Warning: Move {1} is defined as Physical or Special but has a base damage of 0. Changing it to a Status move. +Evolution method {1} requires a parameter, but none was given. +Evolution method {1} requires a parameter, but none was given. +Undefined species ID '{1}'. +Undefined species ID '{1}'. +Form {1} for species ID '{2}' is defined twice. +Form {1} for species ID '{2}' is defined twice. +Dex list number {1} is defined at least twice. +Dex list number {1} is defined at least twice. +Expected a section at the beginning of the file. +Expected a section at the beginning of the file. +Dex list number {1} has species {2} listed twice. +Dex list number {1} has species {2} listed twice. +Expected a species entry line for encounter type {1} for map {2}. +Expected a species entry line for encounter type {1} for map {2}. +Level number {1} is not valid (max. {2}). +Level number {1} is not valid (max. {2}). +Minimum level is greater than maximum level. +Minimum level is greater than maximum level. +Encounters for map '{1}' are defined twice. +Encounters for map '{1}' are defined twice. +Expected a map number, got "{1}" instead. +Expected a map number, got "{1}" instead. +Undefined encounter type "{1}" for map '{2}'. +Undefined encounter type "{1}" for map '{2}'. +Pokémon hasn't been defined yet! +Pokémon hasn't been defined yet! +Trainer with ID '{1}' has no Pokémon. +Trainer with ID '{1}' has no Pokémon. +Invalid Pokémon level {1} (must be 1-{2}). +Invalid Pokémon level {1} (must be 1-{2}). +Invalid Pokémon nickname: {1} (must be 1-{2} characters). +Invalid Pokémon nickname: {1} (must be 1-{2} characters). +Invalid IV: {1} (must be 0-{2}). +Invalid IV: {1} (must be 0-{2}). +Invalid EV: {1} (must be 0-{2}). +Invalid EV: {1} (must be 0-{2}). +Invalid EV set (must sum to {1} or less). +Invalid EV set (must sum to {1} or less). +Bad happiness: {1} (must be 0-255). +Bad happiness: {1} (must be 0-255). +Value '{1}' isn't a defined Poké Ball. +Value '{1}' isn't a defined Poké Ball. +No trainer data file given in section {1}. +No trainer data file given in section {1}. +Global metadata ID '{1}' is used twice. +Global metadata ID '{1}' is used twice. +Player metadata ID '{1}' is used twice. +Player metadata ID '{1}' is used twice. +The entry 'Home' is required in metadata.txt section 0. +The entry 'Home' is required in metadata.txt section 0. +Global metadata is not defined in metadata.txt but should be. +Global metadata is not defined in metadata.txt but should be. +Metadata for player character 1 is not defined in metadata.txt but should be. +Metadata for player character 1 is not defined in metadata.txt but should be. +Version {1} of dungeon area {2} is defined twice. +Version {1} of dungeon area {2} is defined twice. Compiling animations... Compiling animations... See the documentation on the wiki to learn how to edit this file. From 8c5911e4a4b07b07e832e4bb0d5d8859e88b4a9b Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Mon, 1 Jan 2024 20:35:28 +0000 Subject: [PATCH 2/2] Fixed being able to bypass a caught mon being forced into the party, fixed Rotom Catalog, fixed incorrect writing of some enums to PBS files, fixed Jukebox's awareness of audio files, fixed bug when battle default weather is primordial, disabled path cache to add speed --- Data/Scripts/002_BattleSettings.rb | 2 +- Data/Scripts/011_Battle/001_Battle/001_Battle.rb | 1 + .../011_Battle/003_Move/006_MoveEffects_BattlerStats.rb | 2 +- .../007_Other battle code/005_Battle_CatchAndStoreMixin.rb | 3 ++- Data/Scripts/013_Items/002_Item_Effects.rb | 2 +- Data/Scripts/013_Items/004_Item_Phone.rb | 6 +++--- Data/Scripts/016_UI/011_UI_Jukebox.rb | 6 ++++-- Data/Scripts/021_Compiler/001_Compiler.rb | 4 ++-- Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb | 2 +- mkxp.json | 2 +- 10 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Data/Scripts/002_BattleSettings.rb b/Data/Scripts/002_BattleSettings.rb index ba84e8f3b..550a35875 100644 --- a/Data/Scripts/002_BattleSettings.rb +++ b/Data/Scripts/002_BattleSettings.rb @@ -120,7 +120,7 @@ module Settings # End of battle #----------------------------------------------------------------------------- - # The Game Switch which, whie ON, prevents the player from losing money if + # The Game Switch which, while ON, prevents the player from losing money if # they lose a battle (they can still gain money from trainers for winning). NO_MONEY_LOSS = 33 # Whether party Pokémon check whether they can evolve after all battles diff --git a/Data/Scripts/011_Battle/001_Battle/001_Battle.rb b/Data/Scripts/011_Battle/001_Battle/001_Battle.rb index a2b875816..ce89d4307 100644 --- a/Data/Scripts/011_Battle/001_Battle/001_Battle.rb +++ b/Data/Scripts/011_Battle/001_Battle/001_Battle.rb @@ -732,6 +732,7 @@ class Battle end def pbEndPrimordialWeather + return if @field.weather == @field.defaultWeather oldWeather = @field.weather # End Primordial Sea, Desolate Land, Delta Stream case @field.weather diff --git a/Data/Scripts/011_Battle/003_Move/006_MoveEffects_BattlerStats.rb b/Data/Scripts/011_Battle/003_Move/006_MoveEffects_BattlerStats.rb index 14cc022b6..ec09b37ec 100644 --- a/Data/Scripts/011_Battle/003_Move/006_MoveEffects_BattlerStats.rb +++ b/Data/Scripts/011_Battle/003_Move/006_MoveEffects_BattlerStats.rb @@ -970,7 +970,7 @@ class Battle::Move::LowerTargetDefense1 < Battle::Move::TargetStatDownMove end #=============================================================================== -# Decreases the target's Defense by 1 stage. Power is mutliplied by 1.5 if +# Decreases the target's Defense by 1 stage. Power is multiplied by 1.5 if # Gravity is in effect. (Grav Apple) #=============================================================================== class Battle::Move::LowerTargetDefense1PowersUpInGravity < Battle::Move::LowerTargetDefense1 diff --git a/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb b/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb index 5d9c5f596..4466b0d90 100644 --- a/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb +++ b/Data/Scripts/011_Battle/007_Other battle code/005_Battle_CatchAndStoreMixin.rb @@ -17,9 +17,10 @@ module Battle::CatchAndStoreMixin _INTL("Send to a Box"), _INTL("See {1}'s summary", pkmn.name), _INTL("Check party")] - cmds.delete_at(1) if @sendToBoxes == 2 + cmds.delete_at(1) if @sendToBoxes == 2 # Remove "Send to a Box" option loop do cmd = pbShowCommands(_INTL("Where do you want to send {1} to?", pkmn.name), cmds, 99) + next if cmd == 99 && @sendToBoxes == 2 # Can't cancel if must add to party break if cmd == 99 # Cancelling = send to a Box cmd += 1 if cmd >= 1 && @sendToBoxes == 2 case cmd diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb index 79e3d50e5..cad2fc8d5 100644 --- a/Data/Scripts/013_Items/002_Item_Effects.rb +++ b/Data/Scripts/013_Items/002_Item_Effects.rb @@ -1250,7 +1250,7 @@ ItemHandlers::UseOnPokemon.add(:ROTOMCATALOG, proc { |item, qty, pkmn, scene| if new_form == pkmn.form scene.pbDisplay(_INTL("It won't have any effect.")) next false - elsif new_form > 0 && new_form < choices.length - 1 + elsif new_form >= 0 && new_form < choices.length - 1 pkmn.setForm(new_form) do scene.pbRefresh scene.pbDisplay(_INTL("{1} transformed!", pkmn.name)) diff --git a/Data/Scripts/013_Items/004_Item_Phone.rb b/Data/Scripts/013_Items/004_Item_Phone.rb index e4d4e9a7e..f98163636 100644 --- a/Data/Scripts/013_Items/004_Item_Phone.rb +++ b/Data/Scripts/013_Items/004_Item_Phone.rb @@ -179,7 +179,7 @@ class Phone else contact = $PokemonGlobal.phone.get(false, args[1]) end - pbMessage(_INTL("\\me[Register phone]Registered {1} in the Pokégear!", contact.display_name) + "\\wtnp[60]") + pbMessage("\\me[Register phone]" + _INTL("Registered {1} in the Pokégear!", contact.display_name) + "\\wtnp[60]") end return ret end @@ -408,7 +408,7 @@ class Phone end def start_message(contact = nil) - pbMessage(_INTL("......\\wt[5] ......") + "\1") + pbMessage("......\\wt[5] ......\1") end def play(dialogue, contact) @@ -439,7 +439,7 @@ class Phone end def end_message(contact = nil) - pbMessage(_INTL("Click!\\wt[10]\n......\\wt[5] ......") + "\1") + pbMessage(_INTL("Click!") + "\\wt[10]\n......\\wt[5] ......\1") end #=========================================================================== diff --git a/Data/Scripts/016_UI/011_UI_Jukebox.rb b/Data/Scripts/016_UI/011_UI_Jukebox.rb index 58da901c4..bf50dee8d 100644 --- a/Data/Scripts/016_UI/011_UI_Jukebox.rb +++ b/Data/Scripts/016_UI/011_UI_Jukebox.rb @@ -106,10 +106,12 @@ class PokemonJukeboxScreen pbPlayDecisionSE files = [] Dir.chdir("Audio/BGM/") do - Dir.glob("*.ogg") { |f| files.push(f) } Dir.glob("*.wav") { |f| files.push(f) } - Dir.glob("*.mid") { |f| files.push(f) } + Dir.glob("*.ogg") { |f| files.push(f) } + Dir.glob("*.mp3") { |f| files.push(f) } Dir.glob("*.midi") { |f| files.push(f) } + Dir.glob("*.mid") { |f| files.push(f) } + Dir.glob("*.wma") { |f| files.push(f) } end files.map! { |f| File.basename(f, ".*") } files.uniq! diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb index 7f77ea716..1dd5f3747 100644 --- a/Data/Scripts/021_Compiler/001_Compiler.rb +++ b/Data/Scripts/021_Compiler/001_Compiler.rb @@ -766,7 +766,7 @@ module Compiler enumer = schema[2 + i - start] case enumer when Array - file.write((value.is_a?(Integer) && enumer[value].nil?) ? enumer[value] : value) + file.write((value.is_a?(Integer) && !enumer[value].nil?) ? enumer[value] : value) when Symbol, String if GameData.const_defined?(enumer.to_sym) mod = GameData.const_get(enumer.to_sym) @@ -792,7 +792,7 @@ module Compiler enumer = schema[2 + i - start] case enumer when Array - file.write((value.is_a?(Integer) && enumer[value].nil?) ? enumer[value] : value) + file.write((value.is_a?(Integer) && !enumer[value].nil?) ? enumer[value] : value) when Symbol, String if !Kernel.const_defined?(enumer.to_sym) && GameData.const_defined?(enumer.to_sym) mod = GameData.const_get(enumer.to_sym) diff --git a/Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb b/Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb index 282501333..cb302adb0 100644 --- a/Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb +++ b/Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb @@ -309,7 +309,7 @@ module Compiler end def mapFilename(mapID) - return sprintf("Data/map%03d.rxdata", mapID) + return sprintf("Data/Map%03d.rxdata", mapID) end def getMap(mapID) diff --git a/mkxp.json b/mkxp.json index b50725fb1..dc6ad09e3 100644 --- a/mkxp.json +++ b/mkxp.json @@ -80,7 +80,7 @@ // Index all accessible assets via their lower case path (emulates Windows // case insensitivity). // - // "pathCache": true, + "pathCache": false, //========================================================================== // Window size, scaling, rendering and frame rate.