Eduardo Quezada
9669a0554d
Encapsulate move data ( #5852 )
2025-01-01 20:34:33 +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
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Eduardo Quezada
c625ac6d53
Added multiple missing ability TODO tests ( #5163 )
2024-08-14 15:43:18 +02:00
Eduardo Quezada
57fc0fd3b9
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-01 08:36:11 -04:00
Alex
de8002e9e0
Removes unnecessary checks for Shield Dust and Covert Cloak ( #5073 )
...
* Removes unnecessary checks for Shield Dust and Covert Cloak
* remove redundant include
* Update test/battle/ability/shield_dust.c
Co-authored-by: hedara90 <90hedara@gmail.com>
* Update test/battle/hold_effect/covert_cloak.c
Co-authored-by: hedara90 <90hedara@gmail.com>
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-01 09:58:14 +02:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
fakuzatsu
0625c90277
fix tests when B_USE_FROSTBITE is TRUE ( #4986 )
2024-07-17 23:23:52 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
Pawkkie
7ae88d8455
Tests for Corrosion, Acrobatics, Hone Claws, Hurricane ( #4708 )
...
* Tests for Corrosion, Acrobatics, Hone Claws, Hurricane
* First review feedback
* Re-review feedback
* Update acrobatics.c
* Review feedback, Sky Drop?
* Separate Sky Drop test
2024-06-20 13:46:01 +02:00
Eduardo Quezada
06153e4280
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle.h
# include/constants/battle_script_commands.h
# include/constants/pokemon.h
# src/battle_ai_util.c
# src/battle_main.c
# src/battle_util.c
# test/battle/ai.c
2024-06-13 11:44:28 -04:00
DizzyEggg
349b402f1b
Fix Soul-Heart changing stats of wrong battler ( #4785 )
2024-06-13 10:57:20 +02:00
Eduardo Quezada
64f82cdd5f
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
# src/battle_util.c
2024-06-11 08:12:03 -04:00
Alex
fd08e59e8d
Clear body tests ( #4685 )
2024-06-11 08:26:31 +02:00
Pawkkie
55a2c85d95
Review feedback
2024-06-08 20:47:19 -04:00
sneed
f1911dae59
Fix mycelium might and ability shield ( #4740 )
...
* Fix mycelium might and ability shield
* fix check
2024-06-08 07:27:44 +02:00
sneed
87e2526665
Add switching message macros for tests ( #4717 )
...
* Add switching message macros
* Add test
2024-06-03 19:59:28 -04:00
Eduardo Quezada
80b193280d
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_main.c
# src/data/item_icon_table.h
# src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00
sneed
312dcbb8a8
Speed Ignoring effect fixes ( #4613 )
...
* Custap ties with Quick Draw, Stall with Mycelium
* add a test
2024-05-24 11:21:35 +02:00
Eduardo Quezada
1ceae6e100
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-06 15:29:21 -04:00
Eduardo Quezada
5ec08ee98c
Small Battle Test reorganization ( #4504 )
...
* Fixed test folders + Chud Chew test name fixes
* Adjusted file names + merged Burn Up and Double Shock files
* Added Spit Up/Swallow files that point to Stockpile's file
* Multiple changes (see description)
- Moved secondary effect files to their own folder.
- Split hit_set_entry_hazards.c to separate files for Spikes/Stealth Rock.
- Grouped Hex/Venoshock to the same file
2024-05-06 09:36:52 +02:00
Eduardo Quezada
d5a72ec685
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-05 19:50:12 -04:00
Alex
41138f101c
Fix Red Card, Endured Damage interaction ( #4482 )
2024-05-05 14:29:59 +02:00
Eduardo Quezada
4410c1b797
Improve Eject Pack test names ( #4497 )
2024-05-05 11:58:11 +02:00
Eduardo Quezada
0c74fd31c3
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-02 14:24:17 -04:00
Alex
c1f92b088e
Eject Pack fix ( #4463 )
2024-04-29 13:21:33 +02:00
