From f17ae642a3cb517944f5bf1271cba4257fb37c82 Mon Sep 17 00:00:00 2001 From: infinitefusion Date: Sat, 18 Jun 2022 17:54:52 -0400 Subject: [PATCH] updates credits --- Data/CommonEvents.rxdata | Bin 117230 -> 117370 bytes Data/Map400.rxdata | Bin 7441 -> 7441 bytes .../001_Non-interactive UI/007_UI_Credits.rb | 97 +++++------------- .../050_AddOns/UI_Pokedex_SpritesPage.rb | 8 +- Data/System.rxdata | Bin 27316 -> 27316 bytes PBS/trainers.txt | 4 +- 6 files changed, 31 insertions(+), 78 deletions(-) diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index a5e69e49735bfb94009dd6437f26b043d3b61e30..e336ca025e736dcf0107aed0d09f8f94887dd5fa 100644 GIT binary patch delta 1664 zcmY*ZYfO|!6z#ddF1t{9EDx9Eu?rP^R9Pg^tlKEqV69pURY|KBtqSr~9s**jloW%u z>C34MO$$P`Q7gp7&ty`Y76eg`prjPjOe7h*?uQ_wh%$>RC-kD*h z{qIYyS`E=gzLz z;AdvN_!Z7G%jH-$da)Kaf(@8bgN8=8%7CFIUB z!nZ8cS2mWGI!7juLHk6D!6=VF8+n zPP(ZbZfd(HT8Q+)H$XPh?vOtg~%7v%me1*4Qer}Cb6k^=7^U07!08P zFm`p&$o=aO<|#875Wg=+u@<>JX*E_MPaT4J>uU6(hIhY7n1G|aH6O`v zs6)8$D^RWPc5yvUj!SMaU%Ci7wzSL4?`%RB9;iwXd$Z;zUR{V3nh+t~GVy^ztRO!X zPv^Ns$i!cwy9j~M%!`n<)9~aXgz_iFSfNRJMwobM2}-DL>}HQk@DXK3xUPA9i%jgh zEto`E<4hg4^NLa=(~bz~pM^O*bm~itX4V29ZYaYd?By9{uu-jZk4YRa!$ZOa-dZ8+ z+8x1rieM0TDbwTP;H!j&ydt zj5J4l@+maLlD2z^B{evsp|_))T}JOjJ-6nRHzx46IMT?^JYIbH-T3of$s$0^sDmbs zbTML98@9t&AEO#K{;}A^Kkdi|Ugwz|GQ~wP^1rmO?iY2nYoO!SUlAk*J8%vt630*B qHBj+$D}-EO1AQOkO1rWPYjK2M??Ndxk8ydYv6fn%+g1A;hW`gd&OjId delta 1525 zcmYjRdr(wW9QOOcK42|iS-=GscCiJ=bP%x|T*yVICLEQTGHnEf9ttM10%DrD70d;&Z>K~PqQIii$9@w+G$KzjZOrD??lREMTml zA(`2Yp+vh>XfTu*+_ZZv$7Vz;?)~F|JxW2tYoUl!jyDx2p^QC#;s|*nm}BU57I`78 zZetjm*q+SOD)A`m+LEd?pFC{9L}l^WSM~UkeRpv$PO_HEDQx4VJ@`rTcsAv-7dM+) zE=RzseE!E8!gGrK+9}X_Gh5o=&^EJyMcsIbd}f~Rhm{phH|h-~dN;kpKDd#IciEX6 z#l+2gAQQ1{?#)Vk#@cR{;vk#S*Cxx|?%RkCw(`~teW%$KUSi^dvyrO|-qI2IgOeWV zzfKX+?0K(+g%2!8BwHibijq$YYa4LF%GUUN)kO7ND6(XvSBgjCne=5RHimtORw?RuX?1@hwrVX3QOB z>>G@guSD!YR_@5F3J0jjraBmW!DQI7~RI zX+qO}Ohg#)r}#Yy%|Mi>b>L7$oNb(J(HONw|Dw!gG`hl;$Xt_nUOK*^>EoE=+H^i^ z8eBA6#go|7(s1574ZSE3bs5Oe)75c&u@5QuP4s6XjbIUpSx5t7#DZ-6O0?W6KTQYE zb3;cftZKr1r5lr}Si{XKE(u`K??x5I9k5PCKG^UqAvoHZxNA7b3$zg$e3~vGCq}JVQl6l3jovst%I0rLyj(5n|wP zF2xRFK_z~fw0CJlUS^b)PY@o~}f`t_)r16SF*s1%=vVQxceElbhFj5UF)ar;1Z}eFf}1wj596mdG!M z8F+&CR>(@*E3gnxs+eIXmz#*;+bXe*me{m|Pg*PYpC2Tv*20ep_2n2IUnPx7+yD1C ziXUr7vP{*)8>%puw%d442cr4?DmZC}HeY0}Lr4g9*dAUleWy)kWaQmDkt>u9sMf*7 z(`%4}EOi(!YHQ#D3RM!rV>V+liUL?H+KdN;{d|!Rsb~;hA0~v+f~3GFM0rU<=KBJP zq!00fohDE&CfecXbD7(8;21kt(v>uvHp^y#)$=fRVI7t3c NNz=$g-gp{6{|A)w5MuxU diff --git a/Data/Map400.rxdata b/Data/Map400.rxdata index 72aaae947551cf4b05b0bdf0aebb2e4ab6d293c8..9ab61b6bcc949c8874010fc7381e9d4d3cf3bc85 100644 GIT binary patch delta 1967 zcmd6o&u`LT7{|-TC=?1EFq}HvVABn!u29CdK06@Es&^MTG=>n@B~OBOGUA*jV)W=i z$r~?Tym{NfaP#EZlYfATe}jL4KE(o+;*Swyc4*qBZiaS_0Za2`pTiL}28vEk;$li}VlVZhc?Vx(N zU!e~Tb5CQN<1g6f@oOPbfUxc}ArgfId(5lM@NPAyO*kEfGa8&t`>w(a`XH&nIpkng zgE@LjX^^JdDGlaLSnz|S^Cq0Os@ zEtJY~z5p_P&eD}b9u&-Tkf)br4OX|IK)djzQQ!0aOekAv@8LW49*m&AV7c z7YqA3p}W^P`F}9ex)^)vyD@?cV(ZE13-ApUzzx*yDt*DKUD&!Q%UKd2l7J}^;KPtp z0DHneYLX~QuJ*Zyr2$FBRrXwXI6_Z28|=6PvZnMT=V$~JlwDoY z9gs;v4-&eFekb~g@Vw&mtk|9-1nbAJ6BZKG$&xOxtT)eIi?9Bp?a5MEtC8@7LOI1S$_dPqNQYD0LeBdMQ# Y(s3kN;b&#?Dbd))$!DZppL)Z82eS>a3IG5A delta 1971 zcmd6o&2AE56ovVn~c@ zm3(olJ9k|eZotHa-i3Sb!RP^@%s7xL3)979W->o{-uJxcoKC)ze^cu`&M8{qf&Ij) zwDuYn3Lp0~KJNE_(dP==*tG7q(0*8{;Zw%H`d{*UGq31DwZ2>3+o{llmfc|d`^=Uc zkwGy<8`LN-1fI7w48nN^$89*F!UBVnaq%XcLJ>|gID-N#GB`_j=NK%}DQ?4Z5OhF5vGpg^OWs`|qA@T^4*Q2rlS={}h27Lbxeu&L3*zq1aF%uN8zReqC^Blpd z1S=s0$N{UHA^uuQ^LO&IDYM}W+7wN)nHn0NrL=@6Hpwgr2$KK>gDwF_&h6B|ZH-`q zsJdWvQ|`OHue|;LBWbo+W_5elYHn4r3AYEM$Y7{fDKNxiwT?pRB`xsf!;Po3H>Mt*8}z0ktCwPUp^xQ&T!bN;>b3pvHF A?*IS* 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 dd405c216e232988bb1fbed430275545546f382d..4dfef54015376462a4822a825ed8a07edb7f8135 100644 GIT binary patch delta 19 bcmdmTm2t~e#tq8iEXVe|W8SPT-Wv=6Su+Sn delta 19 bcmdmTm2t~e#tq8iEK9c?W!ueV 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]