Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,981 Commits 1 Branch 0 Tags
Commit Graph

140 Commits

Author SHA1 Message Date
Alex
750098d5c9
Fixes Shell Bell for Spread Moves (#6303) 2025-02-20 10:14:54 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Eduardo Quezada
99cb40d896
Added test support for 5 battle configs (#5914) 
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-02-09 22:29:23 +01:00
Eduardo Quezada
621d2ef83d
Fixed missing move encapsulation in upcoming (#6226) 2025-02-09 20:03:53 +01:00
Eduardo Quezada
e29e1c6ca7 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-07 15:33:26 -03:00
ghoulslash
96ee24c726
Minor Terrain Seed Test Improvement (#6207) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-02-07 16:40:10 +01:00
Hedara
27da389d1e Merge branch 'master' into master-to-upcoming 2025-02-06 13:05:02 +01:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171) 2025-02-03 18:31:14 +01:00
Eduardo Quezada
a34a3cad36 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-26 22:57:11 -03:00
PhallenTree
0339f684c3
Fix seeds softlocking the game when a battler with a Surge ability enters the field (#6110) 2025-01-26 12:21:19 +01:00
Eduardo Quezada
cd84e07341 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-23 23:01:25 -03:00
Alex
f2840cb047
Fixes Eject Pack triggering twice on Intimidate (#6072) 2025-01-21 17:58:52 -05:00
Eduardo Quezada
ed505cfb5f Merge branch '_RHH/master' into _RHH/upcoming 2025-01-21 19:32:51 -03:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction (#6023) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-01-21 21:43:54 +01:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00
Alex
2da547908e
Fixes Shell Bell inlcuding heal amount from Future Sight when triggered (#5962) 2025-01-12 00:27:31 +01:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Alex
5391b451ae
Shell Bell Clean up / Simplification and Tests (#5924) 2025-01-07 21:50:23 +01:00
Alex
c3833fa55f
Fixes Parting Shot / Eject Pack interaction (#5963) 2025-01-07 15:24:12 -05:00
wiz1989
5bfc25a4ff changed data according to suggestions from the PR 2025-01-07 15:33:22 +01:00
wiz1989
04da838d88 Innards Out and Future Sight interaction 2025-01-07 14:00:09 +01:00
Alex
5317371fea
Last fix for Sparkling Aria / Covert Cloak / Shield Dust interaction (#5956) 2025-01-06 12:03:41 +01:00
Eduardo Quezada
a50c78bb1e Merge branch '_RHH/master' into _RHH/upcoming 2025-01-01 18:34:42 -03:00
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix (#5928) 2025-01-01 21:41:42 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data (#5852) 2025-01-01 20:34:33 +01:00
Eduardo Quezada
55f0d3aad5
Added missing Move Effect TODO tests - Volume E (#5915) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-01-01 16:06:20 +01:00
Eduardo Quezada
004efd1e5a Merge branch '_RHH/master' into _RHH/upcoming 2024-12-31 18:38:03 -03:00
Alex
51cfb96fd5
Fixes Sparkling Aria Shield Dust / Covert Cloak interaction (#5911) 2024-12-31 12:52:16 +01:00
Alex
e64da065e8
Fixes Eject Pack / Intimidate issue (#5902) 2024-12-29 22:24:09 +01:00
Alex
8edf14423a
Refactors argument into a union (#5853) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-12-23 15:51:35 -03:00
Alex
b22a867e11
Fixes Room Service (#5827) 2024-12-19 14:12:01 +01:00
Alex
70224f0ea3
Fixes items preventing other switch in effects (#5732) 
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
 2024-12-03 11:15:29 -05:00
Hedara
320c015565 Fixed test messages 2024-11-29 11:58:40 +01:00
Hedara
f6fdca615f Merge branch 'master' into master-to-upcoming 2024-11-29 11:32:12 +01:00
Alex
0cd0e0b005
Fixes Blunder Policy (#5722) 2024-11-28 11:24:38 +01:00
Alex
88cdd8bdfb
Fixes Kee Maranga and Enigma Berry (#5727) 2024-11-28 11:22:32 +01:00
Alex
6b170d70f1
Fixes Red Card / Eject Pack interaction (#5724) 2024-11-27 14:05:11 -05:00
Alex
a8351e305c
Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657) 
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
 2024-11-11 14:56:51 -05:00
Eduardo Quezada
b48e5770be Merge branch '_RHH/master' into _RHH/upcoming 2024-11-11 15:58:42 -03:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards (#3240) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-10-21 14:52:45 -03:00
Eduardo Quezada
80af2af9ad Merge branch '_RHH/master' into _RHH/upcoming 2024-10-03 14:33:01 -03:00
psf
2597d8a35a
Updated species defines (#5075) 
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
 2024-10-02 18:24:57 -03:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible (#5449) 
* Fixes recoil moves not triggering berries if possible

* Update battle_script_commands.h
 2024-10-01 10:43:58 +02:00
Alex
42c43a3f8f
Adds Commander and Order Up (#5246) 
* Adds Commander

* review points

* new line

* correction

* regression / double targeting still broken

* fix wrong target order

* transform fixes

* haze test

* fixes, tests

* bring back wrongly removed else if case

* Eject Pack / Button test + fix

* red card fix

* test fixes

* Fixes Tatsu being hit by multi hit move

* change transform check

* fix test + revert change

* Fix Tatsugiri attacking after freed up from Dozo in the same turn

* Dragon Darts tests

* fix test

* review comments

* assumtion in wrong file

* Order Up test fixes

---------

Co-authored-by: hedara90 <90hedara@gmail.com>
 2024-09-29 22:45:50 +02:00
Eduardo Quezada
5130ea9da3 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-28 11:45:49 -03:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects (#5391) 
* Ogerpon masks were missing their hold effects

* fix wrong num

* test

* correct tests and additional fix

* added hold effect to battle debug
 2024-09-19 00:25:53 +02:00
Alex
0d7c193e4c
fixes Micle Berry not increasing accuracy on the next turn (#5358) 
* fixes Micle Berry not increasing accuracy on the next turn

* adds bitfield instead of using protect struct

* test from pawkkie

* ndebug

* renaming

* delete redundant comment

* typo

* micle berry more detailed descriptions
 2024-09-14 19:55:03 -04:00
Eduardo Quezada
551c558186 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-11 07:28:02 -03:00
Alex
389e5c20dd
Fixes berries missing timing (#5300) 
* Fixes berries missing timing

* salac berry test
 2024-09-09 10:40:56 -03:00
Eduardo Quezada
484acdc138
Convert 8 various to callnatives (#5172) 
* Convert 8 various to callnatives

* Address review comments
 2024-09-01 15:12:43 +02:00