Commit graph

15517 commits

Author SHA1 Message Date
cawtds
3babd7f130 shiny roll calc as separate function 2024-07-06 02:10:30 +02:00
cawtds
91550eb75f chain fishing refactored 2024-07-03 17:02:12 +02:00
cawtds
26395fe600 fix fishing encounter rolls 2024-07-03 16:51:53 +02:00
Pawkkie
d1ca1f667f
Smarter Choice AI for Status Moves (#4872)
* Smarter choice item usage

* Clarify test name / line ending

* Review feedback

* Review feedback pt. 2
2024-06-28 09:04:24 +02:00
Alex
55c13a80bc
Force species in tests (#4810)
* Force species in tests

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Update include/config/test.h

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-06-26 18:38:14 +02:00
Frank DeBlasio
f19948312e
Allowed double battles to occur with only one Pokemon by talking to the trainers (#4848) 2024-06-26 10:45:27 +02:00
ghoulslash
41583673a5
Zero Enemy Data at end of battles (#4867)
* zero enemy data in FreeResetData_ReturnToOvOrDoEvolutions

* only run through FreeBattleResources once at end of battle in FreeResetData_ReturnToOvOrDoEvolutions

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-06-26 10:41:14 +02:00
Bassoonian
81bd14818e
Add day limit for forms support (#4778)
* Add day limit for forms support

* Add missing newline

* Incorporate review suggestions
2024-06-26 10:36:44 +02:00
fakuzatsu
6c9dcd60bc
simple button config for the move description menu (#4860)
* simple button config for the move description menu

* change from preproc to normal if
2024-06-25 11:09:01 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor (#4449)
* consolidated gimmick checks, triggers, communication, and activation; updated test runner

* fixed improper use of .usableGimmick

* cleaning up battle_dynamax.c, changing function args to u32s

* fixed '#ifdef TESTING' causing errors

* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests

* added support for z-moves in tests, consolidated gimmick fields

* removed ShouldUseMaxMove and .usingMaxMove

* renamed TryChangeZIndicator, updated z move display

* added several z-move tests and fixed various z-move interactions; fixed z-move category calc

* fixed useless battler arg in GetTypeBasedZMove

* added basic test check for bad Z-Move or Mega usage

* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky

* fixed gimmick test logic; fixed damage category override

* fixed mega rayquaza test fail

* consolidated gimmick indicator logic; added graphics to gGimmicksInfo

* removed TeraData struct

* reimplemented AI logic for Z-Moves; no changes

* updated Z-Move and Ultra Burst trigger gfx

* added testrunner check for multiple gimmick use

* fixed duplicate z-move call in test

* reorganized data/graphics/gimmicks.h

* added signature Z-Move ability tests; implemented Guardian of Alola

* fixed bad test update

* fixed Thousand Arrows not affecting Tera Flying; clean-up

* fixed -ate tests

* fixed tera tests

* fixed tera tests really

* fixed last batch of tests

* fixed -ate mega test again

* code review

* code review pt.2

* tweaked CanTera again

* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
Pawkkie
2640bcd053
Minor switch AI refactor (#4849) 2024-06-22 11:17:10 +02:00
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
b9138390af
Try fixing toxic_chain.c file (#4843)
Co-authored-by: AlexOn1ine <pkmnlucid@gmail.com>
2024-06-20 21:49:35 +02:00
DizzyEggg
b9d1438162
move 3 btl ctrl player vars to gBattleStruct (#4840) 2024-06-20 17:42:52 +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
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
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
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