Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,519 Commits 1 Branch 0 Tags
Commit Graph

11098 Commits

Author SHA1 Message Date
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
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
c3634db0ea
Fixed Mud Sport/Water Sport reduction value (#4874) 
* Fixed Mud Sport/Water Sport reduction value

* Removed define
 2024-06-29 22:11:49 +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
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
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
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
Bassoonian
a24b767276 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into masterintoupcoming18jun 2024-06-18 15:27:06 +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
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
PhallenTree
a49c988b89
Adds Toxic Chain's effect 2024-06-16 19:53:35 +01: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 3fadaafae50aeb48c089d5a27af6deca9580ff64.

* 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
DizzyEggg
c7224d9ca7
Fix Relic Song transforming species other than Meloetta (#4799) 2024-06-14 10:24:57 +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
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
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
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