diff --git a/.DS_Store b/.DS_Store index f2b2ade4d..e167dfc25 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 71336e1f0..a900929a9 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 2c3a12d33..a505dc4f9 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map265.rxdata b/Data/Map265.rxdata index 509ab0d95..99ff40596 100644 Binary files a/Data/Map265.rxdata and b/Data/Map265.rxdata differ diff --git a/Data/Map647.rxdata b/Data/Map647.rxdata index 18f701862..2517d7217 100644 Binary files a/Data/Map647.rxdata and b/Data/Map647.rxdata differ diff --git a/Data/Map670.rxdata b/Data/Map670.rxdata index b4a806ada..e351f763b 100644 Binary files a/Data/Map670.rxdata and b/Data/Map670.rxdata differ diff --git a/Data/Map834.rxdata b/Data/Map834.rxdata index 16bade450..144750fae 100644 Binary files a/Data/Map834.rxdata and b/Data/Map834.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 4b2ecf29e..40f511aa0 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb b/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb index 066110f7c..14605f311 100644 --- a/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb +++ b/Data/Scripts/050_Outfits/utils/OutfitsGameplayUtils.rb @@ -331,17 +331,19 @@ def generate_appearance_from_name(name) hairstyles_list = $PokemonGlobal.hairstyles_data.keys hat = hats_list[convert_letter_to_number(seed[0],hats_list.length)] - hat_color = convert_letter_to_number(seed[1],255) + hat_color = convert_letter_to_number(seed[1],100) hat_color = 0 if convert_letter_to_number(seed[2]) % 2 == 0 #1/2 chance of no dyed hat clothes = clothes_list[convert_letter_to_number(seed[3],clothes_list.length)] - clothes_color = convert_letter_to_number(seed[4],255) + clothes_color = convert_letter_to_number(seed[4],100) clothes_color = 0 if convert_letter_to_number(seed[5]) % 2 == 0 #1/2 chance of no dyed clothes hair_base = hairstyles_list[convert_letter_to_number(seed[6],hairstyles_list.length)] hair_number = [1,2,3,4][convert_letter_to_number(seed[7],3)] hair=getFullHairId(hair_base,hair_number) - hair_color = convert_letter_to_number(seed[8],255) + hair_color = convert_letter_to_number(seed[8],100) + echoln hair_color + hair_color = 0 if convert_letter_to_number(seed[9]) % 2 == 0 #1/2 chance of no dyed hair skin_tone = [1,2,3,4,5,6][convert_letter_to_number(seed[10],5)] diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index c0fa494d7..9ee951e69 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 81118b37b..6fd4dee80 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/Data/messages.dat b/Data/messages.dat index 05b606fb1..0419a4231 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log index a69f0a93d..dfe6aa083 100644 --- a/Data/sprites/sprites_rate_limit.log +++ b/Data/sprites/sprites_rate_limit.log @@ -1,5 +1,2 @@ -1740584547 -1740584552 -1740584599 -1740584599 -1740584604 \ No newline at end of file +1740846646 +1740846668 \ No newline at end of file diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache index 80ba84862..4125c87ed 100644 --- a/Data/sprites/updated_spritesheets_cache +++ b/Data/sprites/updated_spritesheets_cache @@ -616,3 +616,21 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/27/27.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/252/252.png Graphics/CustomBattlers/spritesheets/spritesheets_base/331.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/299/299a.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/117.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/174/174.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/146/146.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/174/174a.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/470/470a.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/213.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/8.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/8/8.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/303.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/439.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/382/382a.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/169/169.png +Graphics/CustomBattlers/spritesheets/spritesheets_base/281.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/428/428.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/428/428b.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/428/428a.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/30/30.png +Graphics/CustomBattlers/spritesheets/spritesheets_custom/187/187.png diff --git a/Data/trainers.dat b/Data/trainers.dat index 716efd506..7ebd61271 100644 Binary files a/Data/trainers.dat and b/Data/trainers.dat differ diff --git a/Graphics/.DS_Store b/Graphics/.DS_Store index 96c105112..8f7cb045b 100644 Binary files a/Graphics/.DS_Store and b/Graphics/.DS_Store differ diff --git a/Graphics/Characters/.DS_Store b/Graphics/Characters/.DS_Store index da042c40a..509581d1d 100644 Binary files a/Graphics/Characters/.DS_Store and b/Graphics/Characters/.DS_Store differ diff --git a/Graphics/Characters/hockeyGoaler.png b/Graphics/Characters/hockeyGoaler.png new file mode 100644 index 000000000..603a3784e Binary files /dev/null and b/Graphics/Characters/hockeyGoaler.png differ diff --git a/Graphics/Characters/hockeyPlayer.png b/Graphics/Characters/hockeyPlayer.png new file mode 100644 index 000000000..5f79d5367 Binary files /dev/null and b/Graphics/Characters/hockeyPlayer.png differ diff --git a/PBS/trainers.txt b/PBS/trainers.txt index bfb6f9f26..2bc26d612 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -1709,23 +1709,26 @@ Pokemon = B93H328,57 #DOUTLER ################## [PLAYER,Martin] -Pokemon = B37H272,56 -Pokemon = B38H272,59 - Moves = AURORABEAM,FAIRYWIND,WILLOWISP,CONFUSERAY - AbilityIndex = 0 -######################### +Pokemon = B54H428,51 #psyduck glalie +Pokemon = B86H428,51 #seel glalie +Pokemon = B55H428,55 #golduck glalie +Pokemon = B87H428,55 #dewgong glalie +######################### [PLAYER,Sidney] -Pokemon = B208H221,62 #pilolix +Pokemon = B318H428,58 #torterra glalie +Pokemon = B358H428,58 #rotom glalie + ######################### [PLAYER,Maurice] -Pokemon = B241H124,57 #MILNX -Pokemon = B128H124,57 #TAUNX +Pokemon = B336H428,60 #salamence glalie ######################### [PLAYER,Wayne] -Pokemon = B332H272,62 #MILNX +Pokemon = B195H428,56 #quagsire glalie +Pokemon = B80H428,56 #raichu glalie +Pokemon = B26H428,56 #slowbro glalie ######################### #################