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

11393 Commits

Author SHA1 Message Date
Alex
5291117687
Global is used instead of passed var (#5546) 
In `AI_CalcDamage` a global was used for the Terastorm check instead of passed var
 2024-10-20 14:28:36 +02:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation (#5490) 
* revival blessing fixes, add anim

* fix lunar blessing anim

* Added support for Revival Blessing in tests

* Added test to confirm absent flag fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-10-19 11:34:58 -03:00
psf
8d7996dc5b
Added constant to expansion inclusive copyright magic number (#5413) 
* Added constant to expansion inclusive copyright magic number

* Fixed open brackets
 2024-10-18 18:06:04 -03:00
Bassoonian
3077592e68
Pret merge 2024-10-15 (#5527) 2024-10-17 09:00:18 +02:00
Eduardo Quezada
e230f379b3
Fixed 10,000,000 Volt Thunderbolt name (#5533) 2024-10-16 17:46:40 -03:00
AlexOn1ine
d044f53c72 Adds tests and Costar fix from PR #5526 2024-10-16 10:51:41 +02:00
Eduardo Quezada
9ed153ff93 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015 2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
Alex
ed65c4a2f7
Fixes Partner targeting and Acupressure/Ally Switch interaction (#5446) 
* Fixes Partner targeting and Acupressure/Ally Switch interaction

* More tests

* Update test/battle/move.c
 2024-10-15 17:04:35 -04:00
Bassoonian
b9ac5d1d8a
Add newline to move relearner string (#5523) 2024-10-15 21:58:58 +02:00
luckytyphlosion
a55c75d350
Get rid of common syms (#2040) 2024-10-14 23:52:11 -04:00
psf
c82ff7b5b1
Merrp merge (12th of October) (#5514) 
Co-authored-by: Ariel A <24759293+aarant@users.noreply.github.com>
Fixes #5482
 2024-10-12 10:50:31 -07:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions (#5505) 2024-10-12 19:37:11 +02:00
Bassoonian
8dba27249c Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210 2024-10-12 18:41:33 +02:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
Bassoonian
b5c884504c
Fix negative mutation value (#5504) 2024-10-11 19:49:24 +02:00
kittenchilly
8890500b77
Fix P_FRIENDSHIP_EVO_THRESHOLD not checking for Gen 8 (#5503) 2024-10-10 21:26:46 +02:00
PhallenTree
8d2d62273b
Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs (#5493) 
* Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues

* More Doodle fixes

* Add tests

* Fix Doodle not activating if partner is fainted and its ability cannot be suppressed

* Fix tests compile

* Commander cantBeOverwritten

* Add battle script for Overwrite then Regular ability
 2024-10-10 18:36:01 +02:00
Rose
9ad0018c17 Fix typo: | should be || in Task_TryFieldPoisonWhiteOut 
Yes, this is honestly overkill, as it doesn't actually fix any behavioral bugs, but I was suggested to do this. This was a typo made in the source that GameFreak made, and the compiler warns against this. I opened a PR in pokeemerald expansion and was suggested to open one here.
 2024-10-10 10:27:33 -04:00
Alex
3c3ce38378
Remove one redundant call of SetAiLogicDataForTurn in DoBattleIntro (#5491) 
This is already run at the end of `TryDoEventsBeforeFirstTurn` which makes the first calc redundant.

I've had this removed in my project for a while and didn't notice any problems
 2024-10-09 17:18:08 +02:00
Pawkkie
7fc5502afd
Don't clear move data on turn end (#5488) 2024-10-09 09:38:49 +02:00
Eduardo Quezada
a76f7fe92e
Version 1.9.3 (#5485) 
* Version 1.9.3

* Updated to latest master
 2024-10-08 14:45:09 -03:00
hedara90
f8f4fc9afd
Removed old checksum matching workaround (#5480) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-10-08 14:02:31 +02:00
ghoulslash
06fefe3318
Various AI fixes (#5474) 
* fix AI mirror move check viability call

* fix EFFECT_ABSORB missing break in AI_CalcMoveEffectScore

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-10-06 21:05:29 +02:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ (#5453) 
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2

* fixes and added new test cases

* bugfixing and added EWRAM u16 gLastUsedMoveType

* update after Pawkkie review

---------

Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
 2024-10-04 12:42:15 -04:00
Eduardo Quezada
0f8b2a1ba8 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909 2024-10-04 10:23:58 -03:00
PhallenTree
91325e83c1
Fixes to Protosynthesis, Quark Drive, Beast Boost, Orichalcum Pulse, Hadron Engine (#5447) 
* Protosynthesis & Quark Drive interactions; Fixes to Beast Boost/Protosynthesis/Quark Drive stat tie priority, Orichalcum Pulse and Hadron Engine stat boost

* Protosynthesis + Quark Drive tests

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

* Update src/battle_util.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-10-04 11:00:12 +02:00
ghoulslash
be5f2e095e
fix duplicating flute glitch (#5436) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-10-03 13:01:18 +02:00
psf
9a24c031bb
Replaced copyright magic numbers in intro.c with constants (#2035) 2024-10-02 20:48:54 -04:00
GriffinR
44e9228a6e
Merge pull request #2038 from GriffinRichards/gflib-syms 
Remove explicit symbol sizes in sym_common.txt
 2024-10-02 15:34:42 -04:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) (#5455) 2024-10-02 21:20:02 +02:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible (#5449) 
* Fixes recoil moves not triggering berries if possible

* Update battle_script_commands.h
 2024-10-01 10:43:58 +02:00
kittenchilly
1c022f4d34
Fix Jubilife Muffin full heal effect + better full heal tests (#5444) 2024-09-29 17:05:54 -04:00
Scyrous
1dc85df1f0
Update cable_car.c 2024-09-29 14:38:08 +02:00
Scyrous
8e2c3ca3f2
Bugfix for cable car sprite array count 2024-09-29 14:13:50 +02:00
GriffinR
80a37c16be Remove explicit symbol sizes in sym_common.txt 2024-09-25 16:14:10 -04:00
PhallenTree
e67d5a23ed
Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive (#5430) 
* Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)

* Add Snatch interactions with Dancer, Swallow

* Trace fix + cleanup

* Simplify Quash

* Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests

* Fix Booster Energy Ability Popup

* Accidentally removed healing from Swallow

* More Trace cleanup
 2024-09-24 18:40:44 +02:00
psf
55086586c5
Revert 5422 (#5424) 2024-09-22 16:59:43 -07:00
Bassoonian
918d45a623
Fix default tera type changing upon evolution/form change (#5422) 2024-09-22 16:33:17 +02:00
ghoulslash
ed005fc345
Fix affection check for exp multiplier (#5421) 2024-09-22 08:47:37 -04:00
Bassoonian
d122c0a222 Fix affection check for exp multiplier 2024-09-22 14:14:15 +02:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative (#5418) 
* settotemboost use callnative

* Update src/battle_main.c

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-22 11:25:42 +02:00
kleenxfeu
16e8be1233
Mega evolution animation is a little smoother (#4816) 
* Smoother primal/mega animation

* Just to make the CI run. It needs to run

* Update src/battle_anim_effects_3.c

---------

Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-09-21 23:47:19 +02:00
Bassoonian
832a7b286d
Update item_use.c (#5415) 2024-09-21 21:22:30 +02:00
kittenchilly
39a8a77d3d
Play point animation when sending a follower into battle (#5406) 
* Add point animation when sending a follower into battle

* Update trainers.h
 2024-09-21 20:28:20 +02:00
kittenchilly
f7d2e62ccc
Fix Switcheroo giving score even if the opponent has no held item (#5412) 2024-09-21 18:51:08 +02:00
Alex
68c51f8412
Fixes Spiky Shield Counter interaction (#5402) 
* Fixes Spiky Shield Counter interaction

* Update test/battle/move_effect/protect.c

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-09-19 12:00:32 +02:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects (#5391) 
* Ogerpon masks were missing their hold effects

* fix wrong num

* test

* correct tests and additional fix

* added hold effect to battle debug
 2024-09-19 00:25:53 +02:00
PhallenTree
76656e85c2
Fix Quash implementation, adds After You and Quash missing configs + tests (#5400) 
* Fix Quash + After You and Quash configs

* Add tests
 2024-09-19 00:10:29 +02:00