From 002ee032c7853b3c6672830c2645e92b96341e2c Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sun, 24 Apr 2022 17:08:57 -0400 Subject: [PATCH] egg sprites --- Data/Map244.rxdata | Bin 12524 -> 12524 bytes Data/MapInfos.rxdata | Bin 36404 -> 36404 bytes Data/Scripts/001_Settings.rb | 2 +- .../002_PBS data/009_Species_Files.rb | 19 ++++++++++++++++-- .../005_Player_Pokedex.rb | 4 ++++ .../003_UI_EggHatching.rb | 4 ++-- Data/Scripts/016_UI/006_UI_Summary.rb | 8 ++++++++ Data/Scripts/050_AddOns/GeneralUtils.rb | 4 ++++ Data/Scripts/050_AddOns/QuestLogScript.rb | 5 +++-- Data/System.rxdata | Bin 27483 -> 27482 bytes PBS/items.txt | 1 + 11 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Data/Map244.rxdata b/Data/Map244.rxdata index 36dff24020e0a3c230f0d82addc5f59f90c86b60..dd191de4288801195fc75b0bb0f97cc9aaf81849 100644 GIT binary patch literal 12524 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 diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 924a03e77499ccfdececa1db9fa43ad55abf43a6..b8c474ba1bfb9b6f79a7a9a70dde4bc4857e8d95 100644 GIT binary patch delta 44 wcmdlohiS_krVV_Yj3Jx(IVUO*>jo^0C#T? An*aa+ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 6f7c8c9e9..d8e9520ec 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -23,7 +23,7 @@ module Settings FRONTSPRITE_POSITION_OFFSET = 15 FRONTSPRITE_SCALE = 0.6666666 BACKRPSPRITE_SCALE = 1 - + EGGSPRITE_SCALE = 1 BACKSPRITE_POSITION_OFFSET = 20 RIVAL_STARTER_PLACEHOLDER_SPECIES = :MEW #(MEW) diff --git a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb index e3b0f8c1c..a937969d9 100644 --- a/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb +++ b/Data/Scripts/010_Data/002_PBS data/009_Species_Files.rb @@ -57,9 +57,24 @@ module GameData return self.check_graphic_file("Graphics/Pokemon/", species, form, gender, shiny, shadow, "Back") end + # def self.egg_sprite_filename(species, form) + # ret = self.check_egg_graphic_file("Graphics/Pokemon/Eggs/", species, form) + # return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Eggs/000") + # end def self.egg_sprite_filename(species, form) - ret = self.check_egg_graphic_file("Graphics/Pokemon/Eggs/", species, form) - return (ret) ? ret : pbResolveBitmap("Graphics/Pokemon/Eggs/000") + dexNum = getDexNumberForSpecies(species) + bitmapFileName = sprintf("Graphics/Battlers/Eggs/%03d", dexNum) rescue nil + if !pbResolveBitmap(bitmapFileName) + if isTripleFusion?(dexNum) + bitmapFileName = "Graphics/Battlers/Eggs/egg_base" + else + bitmapFileName = sprintf("Graphics/Battlers/Eggs/%03d", dexNum) + if !pbResolveBitmap(bitmapFileName) + bitmapFileName = sprintf("Graphics/Battlers/Eggs/000") + end + end + end + return bitmapFileName end def self.sprite_filename(species, form = 0, gender = 0, shiny = false, shadow = false, back = false, egg = false) diff --git a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb index 3938107e6..5e6834783 100644 --- a/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb +++ b/Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb @@ -68,6 +68,10 @@ class Player < Trainer end def isTripleFusion(num) + return isTripleFusion?(num) + end + + def isTripleFusion?(num) return num >= Settings::ZAPMOLCUNO_NB end diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb b/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb index 3a9cac03e..3857dbfb4 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/003_UI_EggHatching.rb @@ -28,8 +28,8 @@ class PokemonEggHatch_Scene @pokemon.form, @pokemon.shiny?, false, false, true) # Egg sprite # Load egg cracks bitmap - crackfilename = sprintf("Graphics/Pokemon/Eggs/%s_cracks", @pokemon.species) - crackfilename = sprintf("Graphics/Pokemon/Eggs/000_cracks") if !pbResolveBitmap(crackfilename) + crackfilename = sprintf("Graphics/Battlers/Eggs/%s_cracks", @pokemon.species) + crackfilename = sprintf("Graphics/Battlers/Eggs/000_cracks") if !pbResolveBitmap(crackfilename) crackfilename=pbResolveBitmap(crackfilename) @hatchSheet=AnimatedBitmap.new(crackfilename) # Create egg cracks sprite diff --git a/Data/Scripts/016_UI/006_UI_Summary.rb b/Data/Scripts/016_UI/006_UI_Summary.rb index 6afdf2ba0..9f2ff1600 100644 --- a/Data/Scripts/016_UI/006_UI_Summary.rb +++ b/Data/Scripts/016_UI/006_UI_Summary.rb @@ -913,6 +913,14 @@ class PokemonSummary_Scene def pbChangePokemon @pokemon = @party[@partyindex] @sprites["pokemon"].setPokemonBitmap(@pokemon) + if @pokemon.egg? + @sprites["pokemon"].zoom_x = Settings::EGGSPRITE_SCALE + @sprites["pokemon"].zoom_y = Settings::EGGSPRITE_SCALE + else + @sprites["pokemon"].zoom_x = Settings::FRONTSPRITE_SCALE + @sprites["pokemon"].zoom_y = Settings::FRONTSPRITE_SCALE + end + @sprites["itemicon"].item = @pokemon.item_id pbSEStop @pokemon.play_cry diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb index 77b582969..82437bd68 100644 --- a/Data/Scripts/050_AddOns/GeneralUtils.rb +++ b/Data/Scripts/050_AddOns/GeneralUtils.rb @@ -123,6 +123,10 @@ def dexNum(species) return getDexNumberForSpecies(species) end +def isTripleFusion?(num) + return num >= Settings::ZAPMOLCUNO_NB +end + def getRandomCustomFusion(returnRandomPokemonIfNoneFound = true, customPokeList = [], maxPoke = -1, recursionLimit = 3) if customPokeList.length == 0 customPokeList = getCustomSpeciesList() diff --git a/Data/Scripts/050_AddOns/QuestLogScript.rb b/Data/Scripts/050_AddOns/QuestLogScript.rb index 3d75aa54f..2fb14caa4 100644 --- a/Data/Scripts/050_AddOns/QuestLogScript.rb +++ b/Data/Scripts/050_AddOns/QuestLogScript.rb @@ -121,7 +121,6 @@ QUESTS = [ #Cinnabar Island Quest.new(29, "Powder metallurgy", "The scientist at the hotel wants you to find some Metal Powder.", questBranchHotels, "BW (82)","Cinnabar Island", defaultQuestColor), Quest.new(30, "Diamonds and Pearls", "Find a Diamond Necklace to save the man's marriage.", questBranchHotels, "BW (71)","Cinnabar Island", defaultQuestColor), - Quest.new(42, "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", questBranchHotels, "BW (21)","Cinnabar Island", defaultQuestColor), #Goldenrod City Quest.new(31, "Hoenn Pokémon", "A woman wants you to show her a Pokémon native to the Hoenn region.", questBranchHotels, "BW (37)","Goldenrod City", defaultQuestColor), @@ -142,11 +141,13 @@ QUESTS = [ #Kin Island Quest.new(40, "Banana Slamma!", "Collect 30 bananas", questBranchHotels, "BW029","Kin Island", defaultQuestColor), - Quest.new(41, "Unova Pokémon", "A woman wants you to show her a Pokémon native to the Unova region.", questBranchHotels, "BW (37)","Kin Island", defaultQuestColor), + Quest.new(41, "Unova Pokémon", "A woman wants you to show her a Pokémon native to the Unova region.", questBranchHotels, "BW (37)","Kin Island", defaultQuestColor), + Quest.new(42, "Stolen artifact", "Recover a stolen vase from a burglar in the Pokémon Mansion", questBranchHotels, "BW (21)","Cinnabar Island", defaultQuestColor), Quest.new(43, "Fallen Meteor", "Investigate a crater near Bond Bridge.", questBranchHotels, "BW009","Kin Island", defaultQuestColor), Quest.new(44, "First Contact", "Find the missing pieces of a fallen alien spaceship", questBranchHotels, "BW (92)","Bond Bridge", questBranchField), Quest.new(45, "First Contact (Part 2)", "Ask the sailor at Cinnabar Island's harbour to take you to the uncharted island where the spaceship might be located", questBranchHotels, "BW (92)","Bond Bridge", questBranchField), + # attention: c'est un array et non un hash... l'id est en fait l'index, donc il est important de garder l'ordre #out of order quests #42 (cinnabar) diff --git a/Data/System.rxdata b/Data/System.rxdata index fc89aa2625ec9273a47e3d44cea9cae13141b4c0..7df92c19a8e367d1f55d94afb6509e383c5217f4 100644 GIT binary patch delta 40 wcmcb8jq%ns#tnzWcx5h`GFtIFq!uS97NkxN$dugtLd-LeiSf&3lMHoc08)|skmL15