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
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
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
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
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality ( #4761 )
...
* Split Pokémon Object Events from Following Pokémon functionality
* Renamed follower pngs and palettes
* Define renames
* Reorder configs
* Renaming: SpeciesInfo fields, macros and palettes.
2024-06-13 22:46:27 +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
Eduardo Quezada
3747668bf3
Fixed AI_FLAG_RISKY score increase making tests with AI_LOG fail ( #4790 )
2024-06-13 19:13:10 +02:00
ghoulslash
353727a805
Add createmon Script Cmd, Support for 2v1Wild Battles ( #4688 )
...
* add createmon and setwilddoubleflag script cmds to support createing mons at given player or enemy slots and setting up 2v1 battles
* give givemon macro PARTY_SIZE for tests
* style fixes
* add createmon test
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-06-13 19:11:36 +02:00
Eduardo Quezada
43310716af
Fixes to master merge
2024-06-13 11:44:52 -04: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
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
Bassoonian
ff24d1e1bb
Add release to debug scripts ( #4782 )
2024-06-13 07:38:41 +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
Bassoonian
03cc0ae6b3
Add option to hide substitute followers ( #4765 )
...
* Add option to hide substitute followers
* Update event_object_movement.c
2024-06-12 13:53:01 -04: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
