Bassoonian
a7f786009e
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5july
2024-07-05 20:44:29 +02:00
kleeenexfeu
8168dd7be9
Shed tail rounds up, not down ( #4913 )
...
* Shed tail rounds up, not down
* Label
2024-07-05 19:21:30 +02:00
GriffinR
a0a02f9733
Merge pull request #2012 from DizzyEggg/patch-1
...
Berry blender's Task_HandleOpponent small fixes
2024-07-04 15:02:58 -04:00
DizzyEggg
47533e3a7e
Berry blender's Task_HandleOpponent small fixes
2024-07-04 20:56:22 +02:00
Alex
13b8daf36b
Supersweet Syrup wrong ability desc ( #4902 )
2024-07-03 22:53:41 +02:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration ( #4903 )
2024-07-03 22:53:15 +02:00
Alex
594633aa15
Remove Duplicate ai code from battle_ai_util.c ( #4883 )
...
* Remove Duplicate ai code from battle_ai_util.c
* Add GetBattlerAbility in toxic self check
2024-07-03 10:48:31 +02:00
DizzyEggg
d81662daa2
Add parentheses to species egg macro ( #4899 )
2024-07-02 13:39:41 +01:00
GriffinR
502eedaed8
Merge pull request #2009 from abcboy101/berry-blender
...
Decode unused JP text in berry_blender.c
2024-06-29 16:31:56 -04:00
Frank DeBlasio
6957fc70c9
Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled ( #4866 )
2024-06-29 22:12:26 +02:00
Cafei
3ec371de05
Fixes ( #4887 )
2024-06-29 20:46:00 +02:00
abcboy101
779855ee02
Decode unused JP text in berry_blender.c
2024-06-29 14:02:50 -04:00
sneed
75be596933
fix sticky hold softlock ( #4885 )
2024-06-29 18:54:58 +02:00
DizzyEggg
26ef19d6c0
Fix wrong palette in palyer backsprite in recorded battle ( #4875 )
2024-06-27 11:33:28 +02:00
DizzyEggg
cd5a862b95
Fix Megas gaining abilities after fainting ( #4873 )
2024-06-26 23:44:01 +02:00
leo60228
566ad6d869
Don't try to deploy to GitHub Pages if it's not enabled ( #4809 )
2024-06-25 11:10:52 +02:00
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn ( #4864 )
...
* Multiple switch-ins after fainting
* empty new lines
* Fix failing tests
2024-06-24 20:37:47 +02:00
cawtds
a8ae1a0342
added missing minior description + test for missing descriptions ( #4858 )
2024-06-24 12:19:12 +02:00
sneed
ec75a75498
Update plasma_fists.c ( #4865 )
2024-06-23 21:17:58 +02:00
Alex
e74264f6de
Ported test changes from #4857 ( #4859 )
2024-06-22 19:39:01 +02:00
DizzyEggg
f73ad41fa1
Tests for post-ko switch scenarios ( #4856 )
2024-06-22 12:07:36 +02:00
Alex
8ac739ea1a
[Update moves_info.h] wrong move names ( #4854 )
2024-06-22 09:52:39 +02:00
sneed
6893d8dbef
ignoresTargetAbility doesnt ignore the attacker's ability ( #4855 )
2024-06-22 09:52:25 +02:00
Bassoonian
9f7a83fd6a
Pret merge (20th of June) ( #4845 )
...
* Don't assume bash is at /bin/bash
* Add NixOS install instructions
* Add support for LF line endings to gbagfx
---------
Co-authored-by: leo60228 <leo@60228.dev>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex Nash <contact@alexnash.dev>
2024-06-21 12:21:29 +02:00
DizzyEggg
438f478146
Fix comatose transform gastro acid interaction ( #4852 )
2024-06-21 12:19:43 +02:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early ( #4851 )
...
* apply safe switching to trainer doubles battles - with a config
* get rid of the config
* make it compile
2024-06-21 12:17:12 +02:00
sneed
c31f982a7b
Fix fury cutter scaling up to 640 power ( #4846 )
...
* Fix fury cutter scaling up to 640 power
* Replace three instances of int i with one int turn
* dynamic test
2024-06-21 08:15:00 +02:00
Martin Griffin
cb1a14c9fa
Merge pull request #2006 from leo60228/oops-not-expansion
...
Fix pokeemerald-expansion reference in INSTALL.md
2024-06-21 06:41:52 +01:00
leo60228
5dac97aa5d
Fix pokeemerald-expansion reference in INSTALL.md
2024-06-20 15:55:51 -04:00
Alex Nash
c0d630ee63
Add support for LF line endings to gbagfx
2024-06-20 21:44:32 +02:00
Martin Griffin
366f8b33a3
Merge pull request #1999 from leo60228/nixos-install
...
Fix build on NixOS and add instructions to INSTALL.md
2024-06-20 19:10:57 +01: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
Pawkkie
3c3142172b
Tests point to clear_body.c ( #4837 )
2024-06-20 00:38:56 +02:00
DizzyEggg
c3b1701c16
Contrary stat drop anim with Spectral Thief ( #4824 )
...
* Contrary stat drop anim with Spectral Thief
* Are you happy now agbcc? I hope I w
2024-06-19 13:40:46 +02:00
kittenchilly
74f53a7e18
Fix caught wild pokemon not restoring their used held item ( #4803 )
...
* Fix caught wild pokemon not restoring their used held item
* Actually we can use the same struct
2024-06-18 20:31:03 +02:00
sneed
b6d3bdf622
Confusion, cursed body and poison touch trigger chance fixes and tests ( #4831 )
...
* accurate confusion chance and a test
* Accurate Poison Touch chance and tests
* Accurate cursed body chance
* Create cursed_body.c
2024-06-18 20:07:40 +02:00
Alex
7581f20cfc
Merge in pret 189d542 ( #4832 )
2024-06-18 15:10:38 +02:00
Bassoonian
d9001a7923
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun
2024-06-18 11:04:40 +02:00
Jaizu
189d542520
Fix Steven partner battle post-battle script ( #2001 )
2024-06-17 15:44:52 -04:00
DizzyEggg
203318b9a2
Get rid of hardcoded stat raise anim values ( #4825 )
2024-06-17 13:51:04 +02:00
sneed
e64a2f3e25
Roamer's frostbite carries over between battles ( #4822 )
2024-06-17 11:44:47 +02:00
sneed
107cb96a98
Tests for Anger Point and Moxie ( #4811 )
...
* Create anger_point.c
* Create moxie.c
* Add extra test and animations
* add another test
2024-06-16 15:02:44 +02:00
kittenchilly
b8607fe3aa
Fix Poltchageist not always producing counterfeit offspring ( #4812 )
2024-06-15 18:31:29 -04:00
sneed
e18150fb35
Change code to reflect that Shell Side Arm's default category is special ( #4806 )
...
* swapped cat is physical
* Update battle_util.c
* Update src/battle_util.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-15 15:35:43 +02:00
DizzyEggg
de7a4e2328
Fix Encore turn amount bug ( #4802 )
...
* Encore 3 turns
* remove duplicate
2024-06-14 13:15:38 +02:00
DizzyEggg
2716ec5b03
Fix Pursuit not getting Choice-locked on switch-out ( #4801 )
...
* Fix Pursuit not getting Choice-locked on switch-out
* use label
2024-06-14 12:46:03 +02:00
DizzyEggg
c7224d9ca7
Fix Relic Song transforming species other than Meloetta ( #4799 )
2024-06-14 10:24:57 +02:00
DizzyEggg
1a4f277d6f
Tests for Body Press + body press interaction with Wonder room ( #4792 )
2024-06-14 09:43:10 +02:00
DizzyEggg
4b1ff3ad7f
fix starting terrain making all other terrains infinite ( #4795 )
2024-06-14 09:31:21 +02:00
Pawkkie
9ec16f4eb6
Clear Body tests include Full Metal Body and White Smoke ( #4797 )
2024-06-14 09:08:21 +02:00
