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
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
DizzyEggg
84d13d0abf
Fix Smack Down anim + move anim tests ( #4774 )
...
* Fix Smack Down anim + move anim tests
* really agbcc
* fix undefined reference
* hopefully everything works
2024-06-13 15:30:28 -04:00
sneed
f868de066d
fix passing hold effect instead of ability ( #4789 )
2024-06-13 16:40:53 +02:00
sneed
c2ca22d474
Various small doubles AI fixes ( #4786 )
...
* fix AI thinking defiant procs off ally moves
* AI see's partner's ability for swagger and flatter
2024-06-13 13:52:13 +02:00
DizzyEggg
8ff1cbed2a
update shiny data for battle mons ( #4788 )
2024-06-13 13:45:56 +02:00
DizzyEggg
2b64546a25
fix tectonic rage anim not clearing mon bg ( #4787 )
2024-06-13 13:45:11 +02:00
DizzyEggg
349b402f1b
Fix Soul-Heart changing stats of wrong battler ( #4785 )
2024-06-13 10:57:20 +02:00
DizzyEggg
8e41b9857f
Fix Revive in double battles ( #4784 )
2024-06-13 10:41:17 +02:00
DizzyEggg
21339cf272
Fix AI not recognising Volt Absorb/FlashFire ( #4781 )
2024-06-12 23:02:45 +02:00
Bassoonian
416519220d
Add evolution tracker check tests ( #4771 )
2024-06-12 15:52:04 -04:00
sneed
000f144465
AI actually avoids contact vs rocky helmet/rough skin ( #4779 )
2024-06-12 20:54:34 +02:00
DizzyEggg
a17259763c
Fix Baton Pass breaking on Memento ( #4773 )
...
* Fix Baton Pass breaking on Memento
* doubled headers
2024-06-12 13:17:18 +02:00
kittenchilly
251019d63d
Update wild held items to Gen 9 ( #4769 )
...
* Update wild held items to Gen 9
* Update gen_1_families.h
* Update gen_5_families.h
2024-06-12 11:33:03 +02:00
Alex
9c72392891
Fixes Shell Side Arm ( #4753 )
...
* Fixes Shell Side Arm
* Fixes to random call
* hardcoded the effect to the move
* minor change
* minor change 2
* applied reviews
2024-06-12 11:21:44 +02:00
kittenchilly
5ebdcdc9b0
Fix Pokemon in tests not being male by default ( #4766 )
2024-06-12 08:34:36 +01:00
cawtds
4724b5dfd6
Improved Surf/Thunderbolt test ( #4764 )
...
* improved Surf/Thunderbolt test that previously relied on correct AI guess
* remove unnecessary mod
* fixed infinite rng loop
* wrong ability num and readability
* Update src/battle_ai_util.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:09:15 +02:00
Bassoonian
341fa3692c
Make Tandemaus only evolve at the end of battles ( #4759 )
2024-06-12 08:43:51 +02:00
Alex
fd08e59e8d
Clear body tests ( #4685 )
2024-06-11 08:26:31 +02:00
Pawkkie
02ad637849
Review feedback
2024-06-10 21:40:42 -04:00
Alex
84583614bb
Fixes Tar shot making all of the target's types weak to fire ( #4756 )
2024-06-10 21:41:52 +02:00
sneed
178568e05d
Update test/battle/move_effect/tar_shot.c
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-10 22:15:39 +03:00
sneed
d8685bb3b1
tar shot works properly
2024-06-10 22:07:15 +03:00
Alex
a894ea4ea6
Fix AI crit calculations ( #4751 )
2024-06-10 11:07:31 +02:00
sneed
aa50bfef28
add test
2024-06-09 23:41:12 +03:00
sneed
1ca4676c4c
fix ai crit calculations
2024-06-09 23:09:34 +03:00
Pawkkie
55a2c85d95
Review feedback
2024-06-08 20:47:19 -04:00
Pawkkie
a7a89df80f
Review feedback
2024-06-08 20:32:57 -04:00
sneed
db15190508
Use GetBattlerAbility instead of the ability field in more places ( #4746 )
...
* Fix Skill Link ignoring gastro acid, neutralising gas
* Fix own tempo stopping berserk gene confusion when disabled
2024-06-08 22:58:37 +02:00
