12991 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
15adbc8368
Pret merge Friday (#2998) 2023-05-14 18:38:33 -04:00
Frank DeBlasio
d09072fd0d
Updated Esper Wing's accuracy if B_UPDATED_MOVE_DATA is Gen9 (#3004) 2023-05-14 12:55:08 -04:00
AgustinGDLV
e47eca1c5a mid converting script commands to callnative 2023-05-13 22:07:04 -07:00
Bassoonian
fd8570640c Implement Repeated Medicine 2023-05-12 15:29:03 +02:00
Bassoonian
292d460810 Fix ability select in debug givemon 2023-05-12 14:02:14 +02:00
Bassoonian
c05404e772 Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge 2023-05-12 13:48:52 +02:00
AgustinGDLV
3b6389ec21 updated tests 2023-05-11 22:13:43 -07:00
AgustinGDLV
aec51b5b04 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-11 20:02:06 -07:00
GriffinR
6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04:00
ghoulslash
0585123da9 merge w pret 2023-05-11 10:44:57 -04:00
ghoulslash
5657f8369e merge w pret 2023-05-11 10:44:18 -04:00
ghoulslash
ee0652416d merge w pret 2023-05-11 10:27:41 -04:00
ghoulslash
b227d4c637 Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2023-05-11 10:03:46 -04:00
Salem
8fc4aa9dcd
Remove duplicate CanBePoisoned condition (#2988) 2023-05-10 18:16:57 -04:00
GriffinR
8c537ccd72 Colorize bag select button 2023-05-10 00:33:43 -04:00
GriffinR
8b37b4292a Document DrawFootprint 2023-05-09 22:43:25 -04:00
Ultimate Bob
64c2eb39c0 Ignore Illusion if the pokemon is the last slot in the party. 2023-05-09 02:33:12 +10:00
Ultimate Bob
ebc8edd5a6 Fix shiny animation not respecting illusion mon. 2023-05-09 00:58:38 +10:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-07 17:27:58 +02:00
Martin Griffin
9cd13cc520 Fix USE_ITEM explicit targets 2023-05-07 07:50:41 +01:00
Eduardo Quezada D'Ottone
3cee3b18c8
Fix healthbox reappearing from B_ANIM_SWITCH_OUT_OPPONENT_MON (#2849) 2023-05-06 21:25:04 -04:00
Eduardo Quezada D'Ottone
c530eb2445
Add mirror herb (#2873) 2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone
84aed50c5b
Manually port daycare expansion to modern standards (#2963) 2023-05-06 21:03:05 -04:00
Eduardo Quezada D'Ottone
42445512ad
Battle Item Tests + critical fixes + new test macro (#2940) 2023-05-06 20:43:32 -04:00
CallmeEchoo
488cc410a0 update ability descriptions 2023-05-05 10:24:12 +02:00
GriffinR
dd65eddbdd
Merge pull request #1883 from GriffinRichards/doc-mod
Add some missing ARRAY_COUNT, make TV_SHOWS_COUNT depend on NUM_NORMAL_TVSHOW_SLOTS
2023-05-05 02:38:30 -04:00
GriffinR
f91abdf765
Merge pull request #1882 from GriffinRichards/ambient
Add time ranges to UpdateAmbientCry
2023-05-05 02:16:57 -04:00
AgustinGDLV
a5f28afe42 fixed Forecast and Flower Gift 2023-05-04 17:04:54 -07:00
CallmeEchoo
eb5b81684c refactored snow into damaging weather
this is necessary for ice body to properly work.
doesnt actually do any damage
2023-05-05 01:38:12 +02:00
CallmeEchoo
74f074f5f3 ai scoring for snow and hail relation
we generally dont want to ecourage to use snow when hail is up and vice versa to avoid looping between the two weathers if score adds up. so we return false in the ShouldSetX functions if either weather is up
We also reduce score by a little as further disincentive to loop and since both effect are so similar that switching between them is usually not a good idea
2023-05-03 16:26:41 +02:00
Bassoonian
1068ec5d9f Fix Plus/Minus to only work with special moves 2023-05-03 13:03:40 +02:00
Salem
a877266400
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-02 21:19:01 +02:00
CallmeEchoo
c5a73f59a4 ad suggested changes 2023-05-02 21:17:14 +02:00
Alex
dd43d62a12
Fixes Triple Dive effect (#2947) 2023-05-02 15:06:21 -04:00
CallmeEchoo
095422c0c0 small ai logic fix 2023-05-02 19:48:03 +02:00
CallmeEchoo
c6fbde6d5c remove stupidity
for some reason I added the 50% def increase in snow check twice? this removes that
2023-05-02 16:25:26 +02:00
CallmeEchoo
76721b16f8 add snow weather 2023-05-02 16:25:26 +02:00
CallmeEchoo
15ce9eb71c fix dire hit message mismatch 2023-05-01 18:53:06 +02:00
ghoulslash
445e9c4b8b merge w upcoming 2023-05-01 12:05:07 -04:00
ghoulslash
8cce130643
Add Frostbite status (#2942) 2023-05-01 09:45:47 -04:00
Bassoonian
dd96ac0c4f Add Comatose check to AI "can be Xed" status checks 2023-05-01 15:35:05 +02:00
Bassoonian
39b50d09dd Add missing CanGetFrostbite 2023-05-01 11:19:10 +02:00
Ultimate_Bob
32e63d8cc7
Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-30 21:15:03 -04:00
Bassoonian
f1d60a4a04 Fixed wrong generation in check 2023-04-30 22:52:37 +02:00
ghoulslash
62ca66bc6b
Refactoring Battle Form changes into the form change tables (#2411) 2023-04-30 08:41:54 -04:00
Bassoonian
8f75844ece Add Ability inheritance 2023-04-30 12:58:18 +02:00
Bassoonian
21fa91b80b Add ClearHatchedEggMoves per SBird's suggestion
Co-Authored-By: Philipp AUER <SBird1337@users.noreply.github.com>
2023-04-30 11:45:24 +02:00
Bassoonian
acf4529d8b Allow Egg Move transfer for non-eggs 2023-04-30 11:25:48 +02:00
ghoulslash
b30dad3e7a
Fix anger shell activating when fainted (#2945)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-04-29 21:56:23 -04:00
Bassoonian
c7d39e561d Clarify weather function 2023-04-29 20:41:54 +02:00