Commit graph

15724 commits

Author SHA1 Message Date
Bassoonian
87b21c2ce5
Fix item duplication glitch (#4844)
* Fix Toxic Chain file acting up

* Fix item dupe glitch
2024-06-22 10:47:25 +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
b9138390af
Try fixing toxic_chain.c file (#4843)
Co-authored-by: AlexOn1ine <pkmnlucid@gmail.com>
2024-06-20 21:49:35 +02: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
DizzyEggg
b9d1438162
move 3 btl ctrl player vars to gBattleStruct (#4840) 2024-06-20 17:42:52 +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
Eduardo Quezada
4d6452e14e
Move general config file to the config folder (#4805) 2024-06-19 13:42:01 +02:00
sneed
9538d53f93
Don't specify sDexSearchTypeOptions array size (#4820) 2024-06-19 13:41:18 +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
277b8607df
Clarify some cases of ChangeStatBuffs usage (#4826) 2024-06-18 20:14:16 +02:00
sneed
609754f0f6
Add RandomChance macro and ability trigger chance config (#4829)
* RandomChance macro, contact ability chance config

* Unify config, add shed skin
2024-06-18 20:13:44 +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
f106b21344
Adds Toxic Chain's effect (#4823) 2024-06-18 20:04:28 +02:00
Alex
cba3cf48a0
Master into upcoming merger (#4833) 2024-06-18 19:34:47 +02:00
Bassoonian
a24b767276 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun 2024-06-18 15:27:06 +02:00
Alex
7581f20cfc
Merge in pret 189d542 (#4832) 2024-06-18 15:10:38 +02:00
PhallenTree
1fd23ec929
Fix potential issue with abilities that would cause Toxic Chain to not activate 2024-06-18 11:50:30 +01:00
PhallenTree
a26050fbde
Adds Toxic Chain interaction with Knock Off 2024-06-18 11:46:23 +01:00
Bassoonian
d9001a7923 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun 2024-06-18 11:04:40 +02:00
Frank DeBlasio
eb0c3b0a12
Fixed instance of MAROWAX (#4830) 2024-06-18 10:45:55 +02:00
Jaizu
189d542520
Fix Steven partner battle post-battle script (#2001) 2024-06-17 15:44:52 -04:00
PhallenTree
161f61284a
Use RandomWeighted; fix Test 2024-06-17 17:48:05 +01:00
PhallenTree
9b8c47ac5c
Add some Toxic Chain tests 2024-06-17 16:51:08 +01: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
PhallenTree
a49c988b89
Adds Toxic Chain's effect 2024-06-16 19:53:35 +01: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
Eduardo Quezada
1eb0b3261f
Added option to disable species cries (#4791)
* Added option to disable cries

* Update src/pokemon.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-06-15 22:07:13 +02:00
sneed
e5e38c13f3
fix unitialized struct UB (#4808) 2024-06-15 21:20:10 +02: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
Bassoonian
22994c79d4
Add support for multiple roamers (#4762)
* Replicate initial commit

* Integrate the rest of Duke's vanilla commits

* Alter Roamer struct to add frostbite support

* Fix some indentation issues

* Add option to hide substitute followers

* Revert "Add option to hide substitute followers"

This reverts commit 3fadaafae5.

* Incorporate feedback
2024-06-15 11:17:32 +02:00
kittenchilly
a118b2caa8
Fix Booster Energy ability popup and message (#4804) 2024-06-14 20:22:26 -04: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
Alex
3ec8691590
Fixing my mess [correct hex in speciesInfo] (#4800) 2024-06-14 11:15:18 +02:00
DizzyEggg
c7224d9ca7
Fix Relic Song transforming species other than Meloetta (#4799) 2024-06-14 10:24:57 +02:00
Alex
9f7222e48b
Species info hex (#4798)
* Adds missing hex in speciesInfo

* fix

* review

* fix compiling

* dumb mistakes
2024-06-14 10:20:27 +02:00
Pawkkie
a7642da544
Revenge Killer switching factors in Trick Room (#4794)
* Revenge Killer switching factors in Trick Room

* Comments and float multiplication
2024-06-14 10:18:01 +02:00
DizzyEggg
1a4f277d6f
Tests for Body Press + body press interaction with Wonder room (#4792) 2024-06-14 09:43:10 +02:00