Commit Graph

12696 Commits

Author SHA1 Message Date
CallmeEchoo
c5a73f59a4 ad suggested changes 2023-05-02 21:17:14 +02:00
CallmeEchoo
095422c0c0 small ai logic fix 2023-05-02 19:48:03 +02:00
CallmeEchoo
c32d5f455b fix rebase issues 2023-05-02 16:44:42 +02:00
CallmeEchoo
f6e80b0ca7 Merge branch 'RHH/content/gen9SnowWeather' of https://github.com/CallmeEchoo/pokeemerald into RHH/content/gen9SnowWeather 2023-05-02 16:29:11 +02:00
CallmeEchoo
6758f6ebe7 add some snow related tests 2023-05-02 16:25:26 +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
0bf92943d4 spelling 2023-05-02 16:25:26 +02:00
CallmeEchoo
76721b16f8 add snow weather 2023-05-02 16:25:26 +02:00
CallmeEchoo
d6f15104a3 remove duplicate stringIDs 2023-05-02 16:23:31 +02:00
CallmeEchoo
52cc3bb45e add some snow related tests 2023-05-02 16:16:58 +02: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
Alex
2d6282fece
Fix for Burn Up/Double Shock (#2962) 2023-04-30 10:46:21 -04:00
Alex
176c6750aa
Set new animations as default (#2964) 2023-04-30 10:02:18 -04:00
CallmeEchoo
dc368727ea remove stupidity
for some reason I added the 50% def increase in snow check twice? this removes that
2023-04-30 15:11:35 +02:00
ghoulslash
62ca66bc6b
Refactoring Battle Form changes into the form change tables (#2411) 2023-04-30 08:41:54 -04: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
CallmeEchoo
62ec4989f2 spelling 2023-04-30 02:35:09 +02:00
Eduardo Quezada D'Ottone
9796984637
Merge pull request #20 from Bassoonian/formbattlechangefix
Integrate ghoul's review
2023-04-29 15:54:13 -04:00
Bassoonian
c7d39e561d Clarify weather function 2023-04-29 20:41:54 +02:00
CallmeEchoo
99cbd2af37 add snow weather 2023-04-29 20:35:58 +02:00
Bassoonian
c82c2c185e Integrate ghoul's review
Co-Authored-By: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
2023-04-29 18:29:50 +02:00
Alex
0cbb80dda7
Fix grassy terrain freezing the game (#2959) 2023-04-28 08:58:43 -04:00
Bassoonian
6a5947c3dd
Merge pull request #1 from AlexOn1ine/frostbite_tests
Frostbite tests
2023-04-28 13:30:22 +02:00
Alex
bfcddff3ca correct first test 2023-04-28 12:47:30 +02:00
Alex
a98da30ec7 frostbite tests 2023-04-28 12:38:34 +02:00
Bassoonian
854e9be325 Fix move defrosting for both Freeze and Frostbite 2023-04-28 11:26:31 +02:00
Eduardo Quezada D'Ottone
f87c5e793a
Merge pull request #19 from Bassoonian/formbattlechangecontribution 2023-04-27 07:59:42 -04:00
Bassoonian
c279830892 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution 2023-04-27 10:50:32 +02:00
Bassoonian
d5fb13ca17 Fix status icons 2023-04-26 23:33:22 +02:00
grunt-lucas
32dcea0cdb
Fix issue with Enamorus Therian cry define order (#2956) 2023-04-26 15:08:15 -04:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix 2023-04-26 14:25:36 -04:00
ghoulslash
5afe3f5e20
GetSideParty/GetBattlerParty (#2910) 2023-04-26 11:38:52 -04:00
Martin Griffin
4a0abc5129
Merge branch 'upcoming' into rhh-get-party 2023-04-26 12:12:03 +01:00
Bassoonian
0315f704c1 Fix thawing being triggered by every move 2023-04-25 23:01:58 +02:00
Salem
78c4d07b23
Add Berserk Gene Item (#2893)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-25 15:03:57 -04:00
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev 2023-04-25 19:50:26 +02:00
Bassoonian
2885ec2411 Fix move descriptions 2023-04-25 19:48:45 +02:00
Bassoonian
2aa4d2da38 Fix Ice Heal message 2023-04-25 19:38:47 +02:00
Frank DeBlasio
9562c7a37a
Added forbidden Metronome moves from PLA and SV (#2949) 2023-04-24 18:49:53 -04:00
ghoulslash
868838a87d
Add thunder cage case to trap anim IDs (#2941) 2023-04-24 14:35:42 -04:00
ghoulslash
19ec7e2a1a
Added new conditions for the trainer slide-in system (#2713) 2023-04-24 08:53:08 -04:00
LOuroboros
a128192bfe Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-04-24 09:36:09 -03:00
LOuroboros
330e85ba64 Updates
-Undeclared size for certain trainer slide-in variables at struct BattleStruct for reasons.
-Added a BattlerHPPercentage function to make HP threshold checks in ShouldDoTrainerSlide a bit more readable.
2023-04-24 09:34:11 -03:00
Bassoonian
a2bc21d902 Update battle_ai_util.h
Co-Authored-By: Salem <65783283+callmeechoo@users.noreply.github.com>
2023-04-24 14:05:35 +02:00
Bassoonian
f13c39d784 Thawing out for frostbite 2023-04-23 21:20:23 +02:00
Bassoonian
0b8d148c26 Let AI take Frostbite into account 2023-04-23 20:53:51 +02:00
Bassoonian
6b2a873071 Add comment in Ice Beam 2023-04-23 20:41:19 +02:00