atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15601 commits 2 branches 40 tags 600 MiB
Commit graph

6344 commits

Author SHA1 Message Date
ghoulslash
48d2bff553 merge w upcoming 2024-07-08 14:12:00 -04:00
Alex
637a7072f0
Add missing adjust scores (#4925) 
* Add missing adjust scores

* ai log made the test fail
 2024-07-08 12:05:32 +02:00
psf
4ddae07451
Removed AI_FLAG_HELP_PARTNER (#4918) 2024-07-08 11:38:52 +02:00
Eduardo Quezada
fcdc9ed65a Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_util.c
#	src/data/pokemon/species_info/gen_7_families.h
#	test/battle/ability/download.c
#	test/battle/ability/intimidate.c
#	test/battle/ability/supreme_overlord.c
#	test/battle/ability/zero_to_hero.c
#	test/battle/ai/ai.c
#	test/battle/move_effect/plasma_fists.c
 2024-07-05 14:25:25 -04:00
Pawkkie
3660a054a2
Forgot to update this when adding AI_FLAG_SEQUENCE_SWITCHING (#4911) 2024-07-05 18:41:29 +02:00
psf
2a5e4343c8
Implemented OW_IGNORE_EGGS_ON_HEAL (#4888) 
* Implemented OW_IGNORE_EGGS_ON_HEAL

* Removed videos and change nPokemon to u32

* Changed OW_IGNORE_EGGS_ON_HEAL to GEN_LATEST per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888\#issuecomment-2205271486

* Update include/config/overworld.h

Fixed spelling error per https://github.com/rh-hideout/pokeemerald-expansion/pull/4888#discussion_r1664454436

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-07-04 16:03:42 +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
Pawkkie
7e167f0b3c
Add AI_FLAG_SEQUENCE_SWITCHING (#4878) 
* AI_FLAG_BAD_SWITCHING

* Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly

* Fix U-Turn etc. tests

* Test overhaul with Egg's suggestions

* Add EFFECT_HIT_SWITCH_TARGET to tests

* Review feedback

* Re-review feedback
 2024-07-01 08:53:07 +02: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
Frank DeBlasio
103ed85b83
Added config to prevent unobtainable Pokemon from being shiny (#4735) 
* Added config to prevent unobtainable Pokemon from being shiny

* Added config for disabling shinies if the player has no Poke Balls

* Removed check for adventure started flag
 2024-06-29 22:07:14 +02:00
DizzyEggg
cd5a862b95
Fix Megas gaining abilities after fainting (#4873) 2024-06-26 23:44:01 +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
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
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
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
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
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
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
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
Bassoonian
a24b767276 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun 2024-06-18 15:27:06 +02:00
Frank DeBlasio
eb0c3b0a12
Fixed instance of MAROWAX (#4830) 2024-06-18 10:45:55 +02:00
PhallenTree
161f61284a
Use RandomWeighted; fix Test 2024-06-17 17:48:05 +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
ghoulslash
cb1696384c merge in original dexnav code with some rhh specific tweaks 2024-06-16 10:39:28 -04:00
ghoulslash
652cb007ce merge w pret master, add USE_DEXNAV_SEARCH_LEVELS flag 2024-06-16 09:45:38 -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
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
Alex
3ec8691590
Fixing my mess [correct hex in speciesInfo] (#4800) 2024-06-14 11:15:18 +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
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
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
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
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
Bassoonian
76c566a0ca
Add the Let's Go evolution method (#4758) 
* Add overworld step evolution method

* Increase evolutionTracker bits from 9 to 10

* Implement tracker increase

* Remove leftover NDEBUG activation

* Reset evolution tracker data upon evolution

* Revert an accidental change to unrelated code

* Add missing break in switch case, oops
 2024-06-12 11:31:19 +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
Bassoonian
dffaaeaaa6
Add Leader's Crest evolution method (#4768) 
* Add Leader's Crest evolution method

* Fix typo in in HGSS dex

* Update src/pokedex_plus_hgss.c

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>

* Update src/battle_script_commands.c

---------

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-06-12 09:31:59 +02: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
Bassoonian
5fe0aee063
Add config to turn off two-framed front sprites (#4750) 
* Add config to turn off two-framed front sprites

* Two frames should be on by default

* Simplifies integration
 2024-06-11 13:10:23 -04:00
sneed
821d5dccab
AI calculates/stores minimum possible move damage and uses it with AI_FLAG_TRY_TO_FAINT (#4760) 
* AI uses safest option to faint foes

* dont calculate non crit dmg unless it's needed

* struct SimulatedDamage

* add GetDamageByRollType and name DamageRollType

* Parametrize test AI flags

* use simDamage member's instead of dmg & minDmg
 2024-06-11 18:28:16 +02:00
Eduardo Quezada
64f82cdd5f Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
 2024-06-11 08:12:03 -04:00
sneed
1ca4676c4c fix ai crit calculations 2024-06-09 23:09:34 +03:00