From 935c54801624cd6653aaf087bf94dc5cfaa9405a Mon Sep 17 00:00:00 2001 From: chardub Date: Thu, 6 Feb 2025 21:14:19 -0500 Subject: [PATCH] fixes normal type expert team --- .../005_Debug_PokemonCommands.rb | 6 ++++-- Data/System.rxdata | Bin 31655 -> 31655 bytes Data/items.dat | Bin 124688 -> 124689 bytes Data/map_connections.dat | Bin 2365 -> 2424 bytes Data/map_metadata.dat | Bin 31224 -> 31298 bytes Data/messages.dat | Bin 30287453 -> 30288120 bytes Data/species.dat | Bin 416885 -> 416872 bytes Data/trainers.dat | Bin 88097 -> 88097 bytes 8 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb b/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb index 53a6de831..68658ec18 100644 --- a/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb +++ b/Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb @@ -851,7 +851,7 @@ PokemonDebugMenuCommands.register("speciesform", { "parent" => "main", "name" => _INTL("Species/form..."), "always_show" => true, - "effect" => proc { |pkmn, pkmnid, heldpoke, settingUpBattle, screen| + "effect" => proc { |pkmn,˚ pkmnid, heldpoke, settingUpBattle, screen| cmd = 0 loop do msg = [_INTL("Species {1}, form {2}.", pkmn.speciesName, pkmn.form), @@ -870,6 +870,7 @@ PokemonDebugMenuCommands.register("speciesform", { end pkmn.calc_stats $Trainer.pokedex.register(pkmn) if !settingUpBattle + $Trainer.pokedex.set_owned(pkmn.species) if !settingUpBattle screen.pbRefreshSingle(pkmnid) end when 1 # Set form @@ -880,7 +881,7 @@ PokemonDebugMenuCommands.register("speciesform", { pbMessage('Body species?') body_species = pbChooseSpeciesList(old_body_dex,NB_POKEMON) - fused_species_dex = getFusionSpecies(head_species.species, body_species.species) + fused_species_dex = getFusionSpecies(body_species.species,head_species.species) species = GameData::Species.get(fused_species_dex) if species && species != pkmn.species @@ -890,6 +891,7 @@ PokemonDebugMenuCommands.register("speciesform", { end pkmn.calc_stats $Trainer.pokedex.register(pkmn) if !settingUpBattle + $Trainer.pokedex.set_owned(pkmn.species) if !settingUpBattle screen.pbRefreshSingle(pkmnid) end diff --git a/Data/System.rxdata b/Data/System.rxdata index d8cb2464a7dd29b49223a31162b75e3edfcffb7b..abe266be3cc541f0bbd202b24feeba5e54ae9259 100644 GIT binary patch delta 19 bcmZ4fopJeh#tovfEIxDgFm9HV?TZ5dRGSB% delta 19 bcmZ4fopJeh#tovfETup9ux^%=?TZ5dSqum% diff --git a/Data/items.dat b/Data/items.dat index 50138acf473538277911b0d36069deecf786cc1a..0543004835ac9ef1d5cb8901fae7e053d42b21b6 100644 GIT binary patch delta 40 wcmbPmj(y@e_J%Et0Tp6tjtV*XWvL1|sU;<;MGA>2MXANbsoPU47+2>3073*0!2kdN delta 39 vcmbPuj(x&8_J%Et0TrUDjtV*XWvL1|sU;<;MGA>2DMhKp+tVr-SLXo$G2IVL diff --git a/Data/map_connections.dat b/Data/map_connections.dat index 138489e85ea5d6b2f3a88ecce066f68fd86671de..691cacef204d21c93a695eb38223a8530a9f1e0c 100644 GIT binary patch delta 149 zcmdlh^h1b+g(Es@Bg=Z`&2O3I87Fgc%53IlJ;XfuHHT~nW0$8ATR59FLrA7fCKDqw zkmm~KF+_7`W&nA9V4eb0E*LJybd(7$>wzje`7E=-{y delta 91 zcmew%v{#6Qg(Es*Bg=YbDJDi{PbD^2Hfx5EOomLxE+8iy%#oR_$f>Y-GqXJ7=JzZI anI}7O%1z$DAv^gZi>!nmvX-}SEerq+(iVOI diff --git a/Data/map_metadata.dat b/Data/map_metadata.dat index 034f7602584e9c06c1bbb076e4fcc54d7355f856..b71b58aea747ffdea8afa619aab5de15842e955d 100644 GIT binary patch delta 92 zcmezIneosUMphP%YNnEnti}SHCkW(oPG<5GXXefnoNUM~JV{%2v!~P>+sT#!;XF(t qO!?LfQr2vlOd^vPrV4Kkj(9G{a}+LklxdQm$Ygz4&CQni`?&xGE*kRy delta 64 zcmV-G0Kfmj^a1$u0R;pIdjfN@1v3zn+*eq$I1q0MlS3X7ldo|$v+o)1Jqr{9Z#w`Q WI|gY26qBK46SGrT=N7YsZ@vop!WSL@ diff --git a/Data/messages.dat b/Data/messages.dat index cdfc15e3b880da7621e2d1985c17fd721704cc28..d38cfcdd5f416fe672f97dd5d53951782141c244 100644 GIT binary patch delta 4627 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 delta 4046 zcmb`~i&s?T8prY8cQZ3MD#~zY6owJJav3j(pwRXPju3KFK~O*#1-T3$U}l+FYNmMu zdDJq=@@}YUzFH<)mY1VtR@%ul@^nreE3MPTvQC}fgY_Sr#rk{~Yi4iOe%`&`z4Yhz zj(A-=f5dA|V3+IF9-jH8e7W;Lm^C#$JI~!yfRm{tI<`*AKK;>SJ&HS)w!!|^<^&G?BXg{zqvMdO?|n$+E(SNZa5g5Iwnx= z6g1jwnsD%B$*(3&mlK;_tB7g3RWSs==QV{^)^^Dkx-1Y*dudZ;!N{f$DhG-gO@CBA zbnuZXyXc|IUBZ}P)+=1|=i(~YhGiZ6t@`Z5|M!(1KkC~^qa7kyOE8WnZ-;Qur5Mq_ z<&H6kwjI*Okgr47%r)gTuIT7!wWZar#+Dd4;Q`Yx8cG{H5tN4OFuSRTOQGT>GtQr!8p5!+FW7~eU~9( zEou4#db&PI&(JgVEIr$4PosCrL^3VR6h@E9PJ3ocvPkW2!vs0{R6SSE)2C5KrWk50 z(5E}?eQ8sLuo*hPCedN=7sceL7WuS4OBj9U=oNaUUZq#-ZoNjY)$91eZ`FvrdnYt) z`O#`Hjx^>!O7}a2lg8$WaN3nEx_7Q5)ntnx^8XY|nUW`>lr2~E6ADXrO``<`qCnN> z36rL-6kx#=7HoA-+EI+Pno#RyQLS}i`ZmuBzs^TBp9-U8U%pT3cA)GdX(sA#z_ApsQKg7vw z+Gm%?yLHcY+h)7nrD1%VZ^g@4S`jY8X>2@B`m&F#Rr|u_3_*3HWVrghuS}NIy|27L z8A0-FSy91<=ChraKZW$==N_{Zh9VknwXpmgxp^wrN>DC}Q zmSQ920&;ekyOASG<{CQh9PN*kwZ4<}DSzE2Jzp>2)y-EJKecn}q0*E?&qc|Vgkgi# zDTiFBsj0D;SYcv6K`QRvpv?;7c?-|KMx&eYayn1crcx3xjKVN;ByAgsIr{GnvZz~0 z@}|-AQb6Z|SJ3f7nb5g0?iR|)l#n7v(~a?RgyemYELYK`6gfdH^tbv88d4&MQ}#r; znT!)RgO@VK~`^rYRr^ov-&8+dQ8x$=`u}J@Y^97k8v!u_O-^)?>4KE z7H5bEe3VMjRWhNQExV!4g?CJO_3SY6T5cLnuYc9k)8A?LwWTz;%ff6a?%DV$<2#nK zW%MuS@eK1)bzb6yZ9X!~VR^_o;ciIe_A3%Fl_`1UpIXFh|j%b-`W9 zP>KW3ghs1i$8|P$G;sq^$jvvuR znX>g99nTDjqgowp9p@228;)wr&42D%r+pl?UD1-l?(KiF~I?n=Y?5oK!w54R306dW9hki)`3P9p2c6jvU|rYaq%%*%W=%4avXCu zy_df-&#^2i^|X6*?uP*S=8`2srSG$Blhpj4f8@0ZfM(PzXg(3^SnwO2GxQ zU^bLNIn03ysDvu01~=3|E!4qWsD}n{IhUZ`lw8HbS6<&ZBVH<3R z9k3I2!EV?Cd*LN$gMF|c4#3NB5DvjBa2OOEfury$yavbMbvO>~Z~{)k8}KHag16vp zI1OjuES!VC!Fjj<@4&lo5#EDK@IHJ1AHrq00w2NO;bXW8pTIS^4xd5?dQwP7KGv8O#~N8Oj;PiRBFE#BoM& z;yDSNk(^PSL{1XtevZx=%^AZP%NfTR&q?N_a3*k^oQa%NP8#O{PC922Cxes8$>L;l zayXMYQ#eyOxtu)CG)_LJfHR#lgHy;U;^5!Ac)@T=IHjD<8$XMGo6RZXlyl~ADmay# zDo!=W&8gwka_Ts9IrW?dP9tX?=RwYV&O@99oQFA&a29eNA7?-30Ow`SLCzu0E1bg|#W}(`%6XOZ z8s`}2bWQePIJz1&T`I)cD%{N_w9bJ(Y8u=qsvz5s;|fY axr<9n>s)hJmqwfy$OX|}8u5;3*8T^`&(zoe diff --git a/Data/species.dat b/Data/species.dat index 05da481bb63754b80f5ab8e592a6fdd5ccfee3cd..356bb9a35882f1760781f6cfb8b78f180c96654a 100644 GIT binary patch delta 417 zcmZ9^ze@sP9LI4U@18G;^h3P!SHV?7ONE+49%r5QTZuT6prNIp;)b9(uo?~uqZ%Zh zxv`~|;E~2Q|AK66i8iMiqfg~x+ZW!i@8_cte{aN3Jm&d4#Zw=6tHv_orN*yBqse>a z;W=+rV`VGivSTaiR;-xIF043?gv*XZx$O(fYJg5jPr^)rm>@Pp0U|3N!(_;8KkX}e z9$+3I2;cxX080{}uIiI$IkXwHESmNEobF*!agb2_!gywyypGYCqR)bsKvzMRK}$a~ z;vd}^q}#t$8#DO*o%CC{qq4c~=Ms S$Dp9RTqlRRLPYd!((X5Ba(43o delta 455 zcmZwB!7D^j6bA6_yZ0QU*_dXA8KVY^5lR>}O^;&Ai=M@s#Uqn2C7Bf)E0o1k8e$|) zS;@{`E`NboSSe(o+09O=*-*xjjfKTs-245`cW&h>TD^*Hdcre2>8T5NDvAMmF2cSv z`UO?`pq1_|18KOXeEMhyt~VmfW@AAdn@xoUGr}kOb7?M!6Ux3BLE3e|N2NQd^j1Bt zVYr`lnz6;$Vr;Rs=rV|Ls!m`?k2T=543DrHW#zJRS-GrS&FWAEQk+?T8>svxW36XzZEuDq_}>N>uu_JFk*E24((KXfjT|chEpnF z^QIg#o0-jQf%5ARq?IIeX_debga=uSvlwMD#3IB0%uqfFX}#Eut193ym}QV-kYzAQ zr5o8qP8kxqvlnmUb;b>th66Nz2K+81((5OLbccg|@K3nch<@$4=-@vgPx_B%aOoSh CbBDkH diff --git a/Data/trainers.dat b/Data/trainers.dat index 4e4d27d8df51b5aed054449cf9d12aba8cb69f5e..716efd506e6cd281d878445ad012cb411c494c3e 100644 GIT binary patch delta 34 qcmZ3ufpy^q)`l&N@4|&VOiT@}g))_^*{ubvc$|z3J*Gu4Dgpq`h6)4# delta 34 qcmZ3ufpy^q)`l&N@4|&LOiT@}g))_^*{ubvc$|z3Gp0o_Dgpq}<_bgr