diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index a5e69e497..e336ca025 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Map400.rxdata b/Data/Map400.rxdata index 72aaae947..9ab61b6bc 100644 Binary files a/Data/Map400.rxdata and b/Data/Map400.rxdata differ diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb index 80880ecb2..a0ef4af6e 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/007_UI_Credits.rb @@ -63,35 +63,28 @@ http://japeal.com/pkm Special thanks to Aegide for helping to rip the sprites and to the owners of Japeal -for accepting to share their sprites. +for accepting to share their generated sprites. -Custom sprites by various -members of the Discord - -Compiler optimization -andracass (Pokémon Reborn) - Maps: Frogman Some of the maps were based on work by: BenGames, Zeak6464 -Gameplay planning / Story: +Gameplay / Story: Frogman The story and dialogues were based off Pokémon Red and Blue, as well as Pokémon Gold and Silver. Both games are made by Game Freak. -Custom legendary Pokémon sprites: -Universez, Milchik, magnuzone, mammuth89 - -Endgame challenge teams planning: -DemICE - -Social media: -ChippyYYZ, qt314xxx, Bizmythe, Terminaut +ALl of the custom fused Pokémon sprites +were madeby various members of the +Pokémon Infinite Fusion Discord +Other custom graphics: +calicorn, Doctor Miawoo, Frogman, Kiwi, +Knuckles, magnuzone, ,mammuth89, Miawoo, +Milchik, Rick1234, Universez, UnworthyPie, The following free ressources were also used @@ -101,44 +94,29 @@ Pokémon Sprites: The Smogon XY Sprite Project: Smogon Sun/Moon Sprite Project: -Overworld Sprites: -Rick1234, Hankiro, SailorVicious, OceansLugiaSpirit - -Battle sprites: -luckygirl88, Nalty +Other sprites: +Hankiro, luckygirl88, Nalty, +OceansLugiaSpirit,Pokemon-Diamond, +rekman, Rick1234, SailorVicious,WolfPP Tileset graphics: -Jorginho, ThatsSoWitty DirtyWiggles - -Including tiles by the following DeviantArt users: -kyle-dove, rayd12smitty, Speedialga, -Spacemotion, Alucus ,Pokemon-Diamond, -kizemaru-kurunosuke, EpicDay, -Thurpok, UltimoSpriter, iametrine, -Minorthreat0987 , TyranitarDark, -Heavy-Metal-Lover, KKKaito, -WesleyFG, BoOmxBiG, -EternalTakai, Hek-el-grande - -Other tiles: -Frogman, chimcharsfireworkd, -Rossay, Shiney570, -Phyromatical, Gallanty +Alucus BoOmxBiG, chimcharsfireworkd, +EpicDay, EternalTakai, Gallanty Heavy-Metal-Lover, +Hek-el-grande,DirtyWiggles, iametrine, Jorginho, +kizemaru-kurunosuke, KKKaito, kyle-dove, Minorthreat0987, + Phyromatical, Pokemon-Diamond, rayd12smitty, Rossay, +Shiney570, Spacemotion, Speedialga, ThatsSoWitty Thurpok, +TyranitarDark, UltimoSpriter, WesleyFG, Music: Pokeli, TailDoll666100 Kazune Sawatari, sentsinkantéun, Nanashima, CharizardTheMaster, The Zame Jack -Other graphics : -Pokemon-Diamond, WolfPP, -rekman (Pokecommunity) - RPG Maker Scripts: Luka S.J, shiney570, Erasus, Umbreon FL, KleinStudio, carmaniac, Wootius, andracass - {INSERTS_PLUGIN_CREDITS_DO_NOT_REMOVE} @@ -174,35 +152,6 @@ KitsuneKoutaxLeD Lisa Anthony and everyone else who helped out -"Pokémon Infinite Fusion" was made by: -Frogman - -Playtesting and Custom Sprites were made by -various members of the Discord channel. -Special thanks to all of you and to -everyone who has been involved in the -development of the game! - -"Pokémon Essentials" was created by: -Flameguru -Poccil (Peter O.) -Maruno - -With contributions from: -AvatarMonkeyKirbyMarin -BoushyMiDas Mike -Brother1440Near Fantastica -FL.PinkMan -Genzai KawakamiPopper -Golisopod UserRataime -help-14Savordez -IceGod64SoundSpawn -Jacob O. Wobbrockthe__end -KitsuneKoutaVenom12 -Lisa AnthonyWachunga -Luka S.J. -and everyone else who helped out - "mkxp-z" by: Roza Based on MKXP by Ancurio et al. @@ -218,6 +167,12 @@ All generated fusion sprites in this game come from the Pokémon Fusion Generator: https://japeal.com/pkm/ +Playtesting and Custom Sprites were made by +various members of the Discord channel. +Special thanks to all of you and to +everyone who has been involved in the +development of the game! + Pokémon is owned by: The Pokémon Company Nintendo diff --git a/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb b/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb index 260f92986..e5e7759b4 100644 --- a/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb +++ b/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb @@ -2,8 +2,8 @@ class PokemonPokedexInfo_Scene #todo add indicator to show which one is the main sprite - # also maybe add an indicator in main list for when a sprite has available alts - Y_POSITION_SMALL = 80 - Y_POSITION_BIG = 90 + Y_POSITION_SMALL = 40 + Y_POSITION_BIG = 50 X_POSITION_PREVIOUS=-20 X_POSITION_SELECTED=120 @@ -128,14 +128,14 @@ class PokemonPokedexInfo_Scene Graphics.update Input.update pbUpdate - if Input.trigger?(Input::LEFT) + if Input.trigger?(Input::RIGHT) pbPlayCursorSE @selected_index -=1#(index+@available.length-1)%@available.length if @selected_index < 0 @selected_index = @available.size-1 end update_displayed - elsif Input.trigger?(Input::RIGHT) + elsif Input.trigger?(Input::LEFT) pbPlayCursorSE @selected_index +=1#= (index+1)%@available.length if @selected_index > @available.size-1 diff --git a/Data/System.rxdata b/Data/System.rxdata index dd405c216..4dfef5401 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/PBS/trainers.txt b/PBS/trainers.txt index 0f5df3ba1..560856276 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -1412,9 +1412,7 @@ Pokemon = B19H46,13 #------------------ [SUPERNERD,Miguel] -Pokemon = B88H109,12 -Pokemon = B109H41,12 -Pokemon = B100H43,12 +Pokemon = B88H109,16 #########Route 6 ############ [TWINS,Day & Dani]