Commit Graph

12799 Commits

Author SHA1 Message Date
ghoulslash
60710f823e merge w upcoming 2023-05-15 13:13:28 -04:00
Eduardo Quezada D'Ottone
c42552a107
Fix Mega Evolution issues related to battlers and turn order (#2810) 2023-05-14 22:43:21 -04:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues 2023-05-14 22:33:01 -04:00
Eduardo Quezada D'Ottone
447739d005
Fix shiny animation not respecting Illusion mon target and Imposter revealing opponent ability (#2985) 2023-05-14 22:16:58 -04:00
Eclipse
76379661d0
Fixed mons mot disobeying with Gen8 mechanics disabled (#2990) 2023-05-14 22:09:45 -04:00
Frank DeBlasio
2420134e45
Updated Ability Patch for Gen 9 functionality (#2989) 2023-05-14 19:30:30 -04:00
Alex
f6f0e5fa33
Fix for wrong mon position for scripted wild doubles (#2996) 2023-05-14 19:03:14 -04:00
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
ghoulslash
d71465d26a
Fix ability select in debug givemon (#2999) 2023-05-12 09:57:37 -04:00
AaghatIsLive
a89288e30e
Fix Illumise pallete (#2995) 2023-05-12 08:24:47 -04: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
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
1497719f8c
Merge pull request #1884 from GriffinRichards/mapjson-err
Fix mapjson misreporting errors when processing map_groups.json
2023-05-09 10:48:29 -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
f985eefaa1 Show Imposter abilty in popup instead of opponent's ability. 2023-05-09 01:40:28 +10:00
Ultimate Bob
ebc8edd5a6 Fix shiny animation not respecting illusion mon. 2023-05-09 00:58:38 +10:00
Eduardo Quezada D'Ottone
9081f74546
Add Snow Battle Weather (#2970) 2023-05-07 22:39:48 -04:00
Salem
fe5e59c910
Merge branch 'upcoming' into RHH/content/gen9SnowWeather 2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone
b6722ad5b1
Detect more invalid test cases (#2955) 2023-05-07 11:04:07 -04:00
Martin Griffin
e52e8ce7e1 Cleanup Compound Eyes tests 2023-05-07 07:50:41 +01:00
Martin Griffin
a2ca2aa7d9 Report errors in estimateCost 2023-05-07 07:50:41 +01:00
Martin Griffin
efab893c47 INVALID if results without PARAMETRIZE 2023-05-07 07:50:41 +01:00
Martin Griffin
29fa6ba574 INVALID if PASSES_RANDOMLY and results 2023-05-07 07:50:41 +01:00
Martin Griffin
9cd13cc520 Fix USE_ITEM explicit targets 2023-05-07 07:50:41 +01:00
Martin Griffin
e0bed6776b INVALID if FINALLY without PARAMETRIZE 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
220b60f315
Detect memory leaks in tests (#2698) 2023-05-06 21:22:47 -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
Martin Griffin
bffa18191b
Fix incorrect HP_BAR documentation (#2982) 2023-05-06 20:22:18 +01:00
CallmeEchoo
7e7384ee02 tiny test doc fix 2023-05-06 19:12:49 +02: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
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
ghoulslash
ef348e7e65
Fix Plus/Minus to only work with special moves (#2974) 2023-05-03 13:20:17 -04:00
Martin Griffin
3a82994ea4
Hydra OSX support (#2975) 2023-05-03 15:30:50 +01: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
069627a7fc Hydra OSX support 2023-05-03 15:36:17 +02:00
Bassoonian
1068ec5d9f Fix Plus/Minus to only work with special moves 2023-05-03 13:03:40 +02:00
Alex
957ee36c75
Fix for Ceaseless Edge/Axe Kick visual glitch (#2969) 2023-05-02 17:25:44 -04: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
Shae
ae2d5f7d1e
Weather related Ability tests, fix for Leaf Guard not preventing Rest. (#2957) 2023-05-02 14:08:05 -04:00
CallmeEchoo
095422c0c0 small ai logic fix 2023-05-02 19:48:03 +02:00